mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-14 21:02:49 +00:00
优化样式
This commit is contained in:
parent
478d63893b
commit
ea8e1e9c57
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "DooTask",
|
||||
"version": "0.9.68",
|
||||
"version": "0.9.70",
|
||||
"description": "DooTask is task management system.",
|
||||
"main": "electron.js",
|
||||
"license": "MIT",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "DooTask",
|
||||
"version": "0.9.68",
|
||||
"version": "0.9.70",
|
||||
"description": "DooTask is task management system.",
|
||||
"scripts": {
|
||||
"start": "./cmd dev",
|
||||
|
||||
2
public/css/app.css
vendored
2
public/css/app.css
vendored
File diff suppressed because one or more lines are too long
2
public/js/app.js
vendored
2
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/build/206.js
vendored
2
public/js/build/206.js
vendored
File diff suppressed because one or more lines are too long
@ -257,7 +257,7 @@
|
||||
/** @license
|
||||
*
|
||||
* jsPDF - PDF Document creation from JavaScript
|
||||
* Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
|
||||
* Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
|
||||
* CommitID 00000000
|
||||
*
|
||||
* Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
|
||||
|
||||
2
public/js/build/33.js
vendored
2
public/js/build/33.js
vendored
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* clipboard.js v2.0.8
|
||||
* clipboard.js v2.0.10
|
||||
* https://clipboardjs.com/
|
||||
*
|
||||
* Licensed MIT © Zeno Rocha
|
||||
|
||||
2
public/js/build/486.js
vendored
2
public/js/build/486.js
vendored
File diff suppressed because one or more lines are too long
@ -257,7 +257,7 @@
|
||||
/** @license
|
||||
*
|
||||
* jsPDF - PDF Document creation from JavaScript
|
||||
* Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
|
||||
* Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
|
||||
* CommitID 00000000
|
||||
*
|
||||
* Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
|
||||
|
||||
2
public/js/build/494.js
vendored
2
public/js/build/494.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/build/528.js
vendored
Normal file
2
public/js/build/528.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -257,7 +257,7 @@
|
||||
/** @license
|
||||
*
|
||||
* jsPDF - PDF Document creation from JavaScript
|
||||
* Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
|
||||
* Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
|
||||
* CommitID 00000000
|
||||
*
|
||||
* Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
|
||||
2
public/js/build/621.js
vendored
2
public/js/build/621.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/build/712.js
vendored
2
public/js/build/712.js
vendored
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* clipboard.js v2.0.8
|
||||
* clipboard.js v2.0.10
|
||||
* https://clipboardjs.com/
|
||||
*
|
||||
* Licensed MIT © Zeno Rocha
|
||||
|
||||
2
public/js/build/856.js
vendored
2
public/js/build/856.js
vendored
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
/*! @license DOMPurify 2.3.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.4/LICENSE */
|
||||
/*! @license DOMPurify 2.3.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.6/LICENSE */
|
||||
|
||||
2
public/js/build/873.js
vendored
2
public/js/build/873.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/build/889.js
vendored
Normal file
2
public/js/build/889.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -257,7 +257,7 @@
|
||||
/** @license
|
||||
*
|
||||
* jsPDF - PDF Document creation from JavaScript
|
||||
* Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
|
||||
* Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
|
||||
* CommitID 00000000
|
||||
*
|
||||
* Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
|
||||
2
public/js/build/954.js
vendored
2
public/js/build/954.js
vendored
File diff suppressed because one or more lines are too long
@ -257,7 +257,7 @@
|
||||
/** @license
|
||||
*
|
||||
* jsPDF - PDF Document creation from JavaScript
|
||||
* Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
|
||||
* Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
|
||||
* CommitID 00000000
|
||||
*
|
||||
* Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
{{ $L('使用 SSO 登录') }}
|
||||
</div>
|
||||
<template v-if="showDown">
|
||||
<div v-if="$Electron" class="common-right-bottom-link" @click="releasesNotification">
|
||||
<div v-if="$Electron" class="common-right-bottom-link" @click="updateWinShow=true">
|
||||
<Icon type="md-download"/>
|
||||
{{ $L(repoTitle) }}
|
||||
</div>
|
||||
@ -14,20 +14,32 @@
|
||||
{{ $L(repoTitle) }}
|
||||
</a>
|
||||
</template>
|
||||
<Modal
|
||||
v-model="updateWinShow"
|
||||
:ok-text="$L('立即升级')"
|
||||
:closable="false"
|
||||
:mask-closable="false"
|
||||
@on-ok="installApplication"
|
||||
@on-cancel="repoStatus=2"
|
||||
class-name="common-right-bottom-notification">
|
||||
<div slot="header" class="notification-head">
|
||||
<div class="notification-title">{{$L('发现新版本')}}</div>
|
||||
<Tag color="volcano">{{repoReleases.tag_name}}</Tag>
|
||||
</div>
|
||||
<MarkdownPreview class="notification-body overlay-y" :initialValue="repoReleases.body"/>
|
||||
</Modal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Vue from 'vue'
|
||||
import MarkdownPreview from "./MDEditor/components/preview";
|
||||
import axios from "axios";
|
||||
Vue.component('MarkdownPreview', MarkdownPreview)
|
||||
|
||||
import {mapState} from "vuex";
|
||||
import {Store} from "le5le-store";
|
||||
|
||||
export default {
|
||||
name: 'RightBottom',
|
||||
components: {MarkdownPreview},
|
||||
data() {
|
||||
return {
|
||||
loadIng: 0,
|
||||
@ -37,6 +49,7 @@ export default {
|
||||
repoStatus: 0, // 0 没有,1有客户端,2客户端有新版本
|
||||
repoReleases: {},
|
||||
|
||||
updateWinShow: false,
|
||||
downloadResult: {},
|
||||
|
||||
subscribe: null,
|
||||
@ -46,14 +59,14 @@ export default {
|
||||
this.getReleases();
|
||||
//
|
||||
this.subscribe = Store.subscribe('releasesNotification', () => {
|
||||
this.releasesNotification();
|
||||
this.updateWinShow = true;
|
||||
});
|
||||
//
|
||||
if (this.$Electron) {
|
||||
this.$Electron.registerMsgListener('downloadDone', ({result}) => {
|
||||
if (result.name == this.repoData.name && this.repoStatus !== 2) {
|
||||
this.downloadResult = result;
|
||||
this.releasesNotification()
|
||||
this.updateWinShow = true;
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -213,44 +226,6 @@ export default {
|
||||
}
|
||||
},
|
||||
|
||||
releasesNotification() {
|
||||
const {tag_name, body} = this.repoReleases;
|
||||
this.$store.state.clientNewVersion = tag_name
|
||||
$A.modalConfirm({
|
||||
okText: this.$L('立即更新'),
|
||||
onOk: () => {
|
||||
this.installApplication();
|
||||
},
|
||||
onCancel: () => {
|
||||
this.repoStatus = 2;
|
||||
},
|
||||
render: (h) => {
|
||||
return h('div', {
|
||||
class: 'common-right-bottom-notification'
|
||||
}, [
|
||||
h('div', {
|
||||
class: "notification-head"
|
||||
}, [
|
||||
h('div', {
|
||||
class: "notification-title"
|
||||
}, this.$L('发现新版本')),
|
||||
h('Tag', {
|
||||
props: {
|
||||
color: 'volcano'
|
||||
}
|
||||
}, tag_name)
|
||||
]),
|
||||
h('MarkdownPreview', {
|
||||
class: 'notification-body',
|
||||
props: {
|
||||
initialValue: body
|
||||
}
|
||||
}),
|
||||
])
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
installApplication() {
|
||||
if (!this.$Electron) {
|
||||
return;
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
max-height: 210px;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
margin: 18px 0;
|
||||
margin-bottom: 16px;
|
||||
.markdown-preview {
|
||||
margin: -20px -12px;
|
||||
h2 {
|
||||
|
||||
@ -478,9 +478,9 @@
|
||||
padding: 0;
|
||||
margin: 10px 0 0 0;
|
||||
line-height: 20px;
|
||||
word-break: break-all;
|
||||
white-space: pre-wrap;
|
||||
word-wrap: break-word;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
.task-tags {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user