Merge branch 'master' into develop

# Conflicts: # electron/package.json # package.json # public/js/app.js # public/js/build/221.js # public/js/build/501.js # public/js/build/747.js # public/js/build/862.js # public/js/build/984.js
2022-03-04 08:59:28 +08:00
parent 60086ead7c 9eaa575d1a
commit 4785cae8f0
28 changed files with 152 additions and 70 deletions
@@ -257,7 +257,7 @@
 /** @license
 *
 * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
+ * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
 *                      CommitID 00000000
 *
 * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
@@ -1,5 +1,5 @@
 /*!
- * clipboard.js v2.0.10
+ * clipboard.js v2.0.8
 * https://clipboardjs.com/
 *
 * Licensed MIT © Zeno Rocha
@@ -257,7 +257,7 @@
 /** @license
 *
 * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
+ * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
 *                      CommitID 00000000
 *
 * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
@@ -257,7 +257,7 @@
 /** @license
 *
 * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
+ * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
 *                      CommitID 00000000
 *
 * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
@@ -1 +1 @@
-/*! @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 */
+/*! @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 */
@@ -1,5 +1,5 @@
 /*!
- * clipboard.js v2.0.10
+ * clipboard.js v2.0.8
 * https://clipboardjs.com/
 *
 * Licensed MIT © Zeno Rocha
@@ -257,7 +257,7 @@
 /** @license
 *
 * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
+ * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
 *                      CommitID 00000000
 *
 * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
@@ -257,7 +257,7 @@
 /** @license
 *
 * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
+ * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
 *                      CommitID 00000000
 *
 * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
@@ -1,8 +1,20 @@
 <template>
    <div class="quick-edit" :class="[alwaysIcon ? 'quick-always' : '']">
        <div v-if="isEdit" v-clickoutside="onClickOut" class="quick-input">
-            <TagInput v-if="isTag" ref="input" v-model="content" :disabled="isLoad" @on-enter="onEnter" @on-blur="onBlur"/>
-            <Input v-else ref="input" v-model="content" :disabled="isLoad" @on-enter="onEnter" @on-blur="onBlur"/>
+            <TagInput
+                v-if="isTag"
+                ref="input"
+                v-model="content"
+                :disabled="isLoad"
+                @on-keyup="onKeyup"
+                @on-blur="onBlur"/>
+            <Input
+                v-else
+                ref="input"
+                v-model="content"
+                :disabled="isLoad"
+                @on-keyup="onKeyup"
+                @on-blur="onBlur"/>
            <div v-if="isLoad" class="quick-loading"><Loading/></div>
        </div>
        <template v-else>
@@ -54,9 +66,6 @@ export default {
    },

    watch: {
-        isEdit(val) {
-            this.$emit("on-edit-change", val);
-        },
        autoEdit(val) {
            if (val === true) {
                setTimeout(this.onEdit, 0)
@@ -65,9 +74,14 @@ export default {
    },

    methods: {
+        onEditChange(val) {
+            this.isEdit = val;
+            this.$emit("on-edit-change", val);
+        },
+
        onEdit() {
            this.content = this.value;
-            this.isEdit = true;
+            this.onEditChange(true);
            this.$nextTick(() => {
                this.$refs.input.focus({
                    cursor: 'all'
@@ -75,9 +89,18 @@ export default {
            })
        },

+        onKeyup(e) {
+            if (e.keyCode === 13) {
+                this.onEnter();
+            } else if (e.keyCode === 27) {
+                this.isEdit = false;
+                this.isLoad = false;
+            }
+        },
+
        onEnter() {
            if (this.content == this.value) {
-                this.isEdit = false;
+                this.onEditChange(false);
                return;
            }
            if (this.isLoad) {
@@ -86,7 +109,7 @@ export default {
            this.isLoad = true;
            this.$emit("input", this.content);
            this.$emit("on-update", this.content, () => {
-                this.isEdit = false;
+                this.onEditChange(false);
                this.isLoad = false;
            })
        },
@@ -99,7 +122,7 @@ export default {
        },

        onBlur() {
-            if (this.clickOutSide) {
+            if (this.clickOutSide || !this.isEdit) {
                return;
            }
            this.onEnter();
@@ -181,11 +181,7 @@
                    newValue = "";
                }
                if (!this.isTyping) {
-                    if (this.getEditor() !== null) {
-                        this.getEditor().setContent(newValue);
-                    } else{
-                        this.content = newValue;
-                    }
+                    this.setContent(newValue);
                }
            },
            readOnly(value) {
@@ -459,6 +455,14 @@
                return this.getEditor().getContent();
            },

+            setContent(content) {
+                if (this.getEditor() === null) {
+                    this.content = content;
+                } else if (content != this.getEditor().getContent()){
+                    this.getEditor().setContent(content);
+                }
+            },
+
            insertImage(src) {
                this.insertContent('<img src="' + src + '">');
            },
@@ -11,7 +11,7 @@
            :placeholder="tis || placeholderText"
            @keydown.enter="downEnter($event)"
            @keydown.delete="delTag(false)"
-            @keyup="addTag($event, content)"
+            @keyup="onKeyup"
            @focus="onFocus"
            @blur="onBlur"
            :disabled="disabled"
@@ -158,19 +158,22 @@
                this.addTag(false, this.content)
                this.$emit("on-blur", e)
            },
+            onKeyup(e) {
+                this.addTag(e, this.content);
+                //
+                this.$emit("on-keyup", e)
+                if (e.keyCode === 13) {
+                    this.$nextTick(() => {
+                        this.$emit("on-enter", e)
+                    })
+                }
+            },
            addTag(e, content) {
-
                if (e === false || e.keyCode === 13) {
                    if (content.trim() != '' && this.disSource.indexOf(content.trim()) === -1) {
                        this.disSource.push(content.trim());
                    }
                    this.content = '';
-                    //
-                    if (e.keyCode === 13) {
-                        this.$nextTick(() => {
-                            this.$emit("on-enter", e)
-                        })
-                    }
                    return;
                }
                if (this.max > 0 && this.disSource.length >= this.max) {
@@ -103,7 +103,9 @@
                <li @click="toggleRoute('dashboard')" :class="classNameRoute('dashboard')">
                    <i class="taskfont">&#xe6fb;</i>
                    <div class="menu-title">{{$L('仪表盘')}}</div>
-                    <Badge class="menu-badge" :type="dashboardTask.overdue.length > 0 ? 'error' : 'primary'" :count="dashboardTotal"></Badge>
+                    <Badge v-if="dashboardTask.overdue.length > 0" class="menu-badge" type="error" :count="dashboardTask.overdue.length"/>
+                    <Badge v-else-if="dashboardTask.today.length > 0" class="menu-badge" type="info" :count="dashboardTask.today.length"/>
+                    <Badge v-else-if="dashboardTask.all.length > 0" class="menu-badge" type="primary" :count="dashboardTask.all.length"/>
                </li>
                <li @click="toggleRoute('calendar')" :class="classNameRoute('calendar')">
                    <i class="taskfont">&#xe6f5;</i>
@@ -112,7 +114,7 @@
                <li @click="toggleRoute('messenger')" :class="classNameRoute('messenger')">
                    <i class="taskfont">&#xe6eb;</i>
                    <div class="menu-title">{{$L('消息')}}</div>
-                    <Badge class="menu-badge" :count="msgAllUnread"></Badge>
+                    <Badge class="menu-badge" :count="msgAllUnread"/>
                </li>
                <li @click="toggleRoute('file')" :class="classNameRoute('file')">
                    <i class="taskfont">&#xe6f3;</i>
@@ -257,15 +259,15 @@
        <!--任务详情-->
        <Modal
            :value="taskId > 0"
-            :mask-closable="false"
            :styles="{
                width: '90%',
                maxWidth: taskData.dialog_id ? '1200px' : '700px'
            }"
-            @on-visible-change="taskVisibleChange"
-            footer-hide>
+            :mask-closable="false"
+            :footer-hide="true"
+            @on-visible-change="taskVisibleChange">
            <div class="page-manage-task-modal" :style="taskStyle">
-                <TaskDetail :task-id="taskId" :open-task="taskData"/>
+                <TaskDetail ref="taskDetail" :task-id="taskId" :open-task="taskData"/>
            </div>
        </Modal>

@@ -464,12 +466,8 @@ export default {
            return num;
        },

-        dashboardTotal() {
-            return this.dashboardTask.today.length + this.dashboardTask.overdue.length
-        },
-
        unreadTotal() {
-            return this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber;
+            return this.msgAllUnread + this.dashboardTask.overdue.length + this.reportUnreadNumber;
        },

        currentLanguage() {
@@ -836,10 +834,13 @@ export default {
        },

        shortcutEvent(e) {
-            if (e.keyCode === 75 || e.keyCode === 78) {
-                if (e.metaKey || e.ctrlKey) {
+            if (e.metaKey || e.ctrlKey) {
+                if (e.keyCode === 75 || e.keyCode === 78) {
                    e.preventDefault();
                    this.onAddTask(0)
+                } else if (e.keyCode === 83 && this.taskId > 0) {
+                    e.preventDefault();
+                    this.$refs.taskDetail.checkUpdate(true)
                }
            }
        },
@@ -3,6 +3,7 @@
    <li v-if="ready && taskDetail.parent_id > 0">
        <div class="subtask-icon">
            <TaskMenu
+                v-if="taskId > 0"
                :ref="`taskMenu_${taskDetail.id}`"
                :task="taskDetail"
                :load-status="taskDetail.loading === true"
@@ -72,6 +73,7 @@
        <div v-show="taskDetail.id > 0" class="task-info">
            <div class="head">
                <TaskMenu
+                    v-if="taskId > 0"
                    :ref="`taskMenu_${taskDetail.id}`"
                    :task="taskDetail"
                    class="icon"
@@ -121,6 +123,7 @@
                    </ETooltip>
                    <div class="menu">
                        <TaskMenu
+                            v-if="taskId > 0"
                            :task="taskDetail"
                            icon="ios-more"
                            completed-icon="ios-more"
@@ -150,7 +153,6 @@
                        :option-full="taskOptionFull"
                        :placeholder="$L('详细描述...')"
                        @on-blur="updateData('content')"
-                        @editorSave="updateData('content')"
                        inline/>
                </div>
                <Form class="items" label-position="left" label-width="auto" @submit.native.prevent>
@@ -307,7 +309,13 @@
                            <i class="taskfont">&#xe6f0;</i>{{$L('子任务')}}
                        </div>
                        <ul class="item-content subtask">
-                            <TaskDetail v-for="(task, key) in subList" :key="key" :task-id="task.id" :open-task="task" :main-end-at="taskDetail.end_at"/>
+                            <TaskDetail
+                                v-for="(task, key) in subList"
+                                :ref="`subTask_${task.id}`"
+                                :key="key"
+                                :task-id="task.id"
+                                :open-task="task"
+                                :main-end-at="taskDetail.end_at"/>
                        </ul>
                        <ul :class="['item-content', subList.length === 0 ? 'nosub' : '']">
                            <li>
@@ -745,12 +753,7 @@ export default {
        },

        onNameKeydown(e) {
-            if (e.keyCode === 83) {
-                if (e.metaKey || e.ctrlKey) {
-                    e.preventDefault();
-                    this.updateData('name');
-                }
-            } else if (e.keyCode === 13) {
+            if (e.keyCode === 13) {
                if (!e.shiftKey) {
                    e.preventDefault();
                    this.updateData('name');
@@ -758,6 +761,40 @@ export default {
            }
        },

+        checkUpdate(update) {
+            let isModify = false;
+            if (this.openTask.name != this.taskDetail.name) {
+                isModify = true;
+                if (update) {
+                    this.updateData('name');
+                } else if (isModify) {
+                    return true
+                }
+            }
+            if (this.$refs.desc && this.$refs.desc.getContent() != this.taskContent) {
+                isModify = true;
+                if (update) {
+                    this.updateData('content');
+                } else if (isModify) {
+                    return true
+                }
+            }
+            if (this.addsubShow && this.addsubName) {
+                isModify = true;
+                if (update) {
+                    this.onAddsub();
+                } else if (isModify) {
+                    return true
+                }
+            }
+            this.subList.some(({id}) => {
+                if (this.$refs[`subTask_${id}`][0].checkUpdate(update)) {
+                    isModify = true;
+                }
+            })
+            return isModify;
+        },
+
        updateData(action, params) {
            switch (action) {
                case 'priority':
@@ -87,9 +87,9 @@
                            <li
                                v-for="item in fileList"
                                :class="{
-                                shear: shearIds.includes(item.id),
-                                highlight: selectIds.includes(item.id),
-                            }"
+                                    shear: shearIds.includes(item.id),
+                                    highlight: selectIds.includes(item.id),
+                                }"
                                @contextmenu.prevent.stop="handleRightClick($event, item)"
                                @click="openFile(item)">
                                <div class="file-check" :class="{'file-checked':selectIds.includes(item.id)}" @click.stop="dropFile(item, 'select')">
@@ -121,7 +121,7 @@
                                        size="small"
                                        :disabled="!!item._load"
                                        @on-blur="onBlur(item)"
-                                        @on-enter="onEnter(item)"/>
+                                        @on-keyup="onKeyup($event, item)"/>
                                    <div v-if="item._load" class="file-load"><Loading/></div>
                                </div>
                                <div v-else class="file-name" :title="item.name">{{formatName(item)}}</div>
@@ -959,7 +959,6 @@ export default {
                    break;

                case 'rename':
-                    this.$set(item, 'newname', item.name);
                    this.setEdit(item.id, true)
                    this.autoBlur(item.id)
                    break;
@@ -1154,9 +1153,21 @@ export default {
        },

        onBlur(item) {
+            if (this.files.find(({id, _edit}) => id == item.id && !_edit)) {
+                return;
+            }
            this.onEnter(item);
        },

+        onKeyup(e, item) {
+            if (e.keyCode === 13) {
+                this.onEnter(item);
+            } else if (e.keyCode === 27) {
+                this.setLoad(item.id, false)
+                this.setEdit(item.id, false)
+            }
+        },
+
        onEnter(item) {
            let isCreate = !/^\d+$/.test(item.id);
            if (!item.newname) {
@@ -1204,6 +1215,9 @@ export default {
            let item = this.$store.state.files.find(({id}) => id == fileId)
            if (item) {
                this.$set(item, '_edit', is);
+                if (is) {
+                    this.$set(item, 'newname', item.name);
+                }
            }
        },