diff --git a/language/original-web.txt b/language/original-web.txt index 0324622f9..10fd403dc 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -54,7 +54,6 @@ 仅限项目或任务负责人操作 仅限项目或任务负责人添加 任务列表不存在或已被删除 -你确定要删除这个文件吗？ 密码错误，请输入正确密码 开放：所有人都可以发言。 强大易用的协同创作云文档 @@ -1600,3 +1599,4 @@ License Key 长按语音消息可转换成文字。 需要在应用中开启 ChatGPT AI 机器人 关闭语音转文字功能。 +你确定要删除文件【(*)】吗？ diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue index 4ac54663b..7f5168cea 100644 --- a/resources/assets/js/pages/manage/components/FileContent.vue +++ b/resources/assets/js/pages/manage/components/FileContent.vue @@ -14,7 +14,7 @@
-
+

{{$L('未保存当前修改内容？')}}

diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 6c1b5e723..1d1a6e06d 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -277,25 +277,11 @@
  • {{$L(`共${taskDetail.file_num}个文件，仅显示最新50个`)}}
    • -
  • +
  • {{file.name}}
    {{$A.bytesToSize(file.size)}}
    -
    - - - -
    -

    {{$L('你确定要删除这个文件吗？')}}

    -
    - - -
    -
    - -     -
    @@ -365,21 +351,21 @@
    -
    +
    {{$L('项目人员')}}
    -
    +
    {{$L('任务人员')}}
    -
    +
    {{$L('指定成员')}} @@ -391,14 +377,24 @@
    -
    - {{$L('任务延期')}} -
    + {{$L('任务延期')}}     -
    - {{$L('修改时间')}} -
    + {{$L('修改时间')}} +     +     + + +
    + + + {{$L('查看附件')}} + + + {{$L('下载附件')}} + + + {{$L('删除附件')}}     @@ -1679,6 +1675,22 @@ export default { }); }, + showDropdown(ref, eRect){ + const boxRect = this.$refs.scroller.$el.getBoundingClientRect() + const refEl = ref.$el + refEl.style.top = (eRect.top - boxRect.top) + 'px' + refEl.style.left = (eRect.left - boxRect.left) + 'px' + refEl.style.width = eRect.width + 'px' + refEl.style.height = eRect.height + 'px' + // + if (ref.visible) { + ref.hide() + } + setTimeout(() => { + ref.show() + }, 0) + }, + showCisibleDropdown(e){ let eRect = null if (e === null) { @@ -1689,37 +1701,12 @@ export default { if (eRect === null) { return } - const boxRect = this.$refs.scroller.$el.getBoundingClientRect() - const refEl = this.$refs.eDropdownRef.$el - refEl.style.top = (eRect.top - boxRect.top) + 'px' - refEl.style.left = (eRect.left - boxRect.left) + 'px' - refEl.style.width = eRect.width + 'px' - refEl.style.height = eRect.height + 'px' - // - if (this.$refs.eDropdownRef.visible) { - this.$refs.eDropdownRef.hide() - } - setTimeout(() => { - this.$refs.eDropdownRef.show() - }, 0) + this.showDropdown(this.$refs.eDropdownRef, eRect) }, showAtDropdown({target}){ this.timeOpen = false - const eRect = target.getBoundingClientRect() - const boxRect = this.$refs.scroller.$el.getBoundingClientRect() - const refEl = this.$refs.eDeadlineRef.$el - refEl.style.top = (eRect.top - boxRect.top) + 'px' - refEl.style.left = (eRect.left - boxRect.left) + 'px' - refEl.style.width = eRect.width + 'px' - refEl.style.height = eRect.height + 'px' - // - if (this.$refs.eDeadlineRef.visible) { - this.$refs.eDeadlineRef.hide() - } - setTimeout(() => { - this.$refs.eDeadlineRef.show() - }, 0) + this.showDropdown(this.$refs.eDeadlineRef, target.getBoundingClientRect()) }, visibleUserSelectShowChange(isShow){ @@ -1794,6 +1781,31 @@ export default { }) }, + showFileDropdown(file, {target}){ + this.operationFile = file + this.showDropdown(this.$refs.eFileRef, target.getBoundingClientRect()) + }, + + dropFile(command) { + switch (command) { + case 1: + this.viewFile(this.operationFile) + break; + case 2: + this.downFile(this.operationFile) + break; + case 3: + $A.modalConfirm({ + title: '删除文件', + content: `你确定要删除文件【${this.operationFile.name}】吗？`, + onOk: () => { + this.deleteFile(this.operationFile) + } + }); + break; + } + }, + updateVisible() { this.updateData(['visibility', 'visibility_appointor']) } diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss index 92d98fb34..8d22054de 100755 --- a/resources/assets/sass/pages/common.scss +++ b/resources/assets/sass/pages/common.scss @@ -834,3 +834,13 @@ body.window-portrait { .block-setting-space { height: 8px; } +.confirm-popover { + max-width: 200px; + .buttons { + text-align: right; + margin-top: 12px; + .ivu-btn-small { + font-size: 12px + } + } +} diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss index 33b96eab2..2eacf60a2 100644 --- a/resources/assets/sass/pages/components/task-detail.scss +++ b/resources/assets/sass/pages/components/task-detail.scss @@ -251,6 +251,7 @@ &.file { margin-bottom: -3px; > li { + cursor: pointer; margin-bottom: 2px; &.tip { color: #999; @@ -281,38 +282,12 @@ font-size: 12px; color: #bbbbbb; } - .file-menu { - display: flex; - align-items: center; - opacity: 0; - transition: all 0.3s; - padding-left: 12px; - &.show { - opacity: 1; - } - i { - font-size: 14px; - color: #aaaaaa; - transition: color 0.3s; - cursor: pointer; - padding: 0 4px; - &:hover { - color: #777777; - } - &.del { - font-size: 13px; - &:hover { - color: #ff0000; - } - } - } - } &:hover { .file-name { color: $primary-title-color; } - .file-menu { - opacity: 1; + .file-size { + color: $primary-text-color; } } } @@ -528,6 +503,9 @@ width: 100%; height: 100%; } + .calculate-text { + color: $flow-status-start-color; + } } } .upload { @@ -855,23 +833,16 @@ } } -.task-detail-delete-file-popover { - max-width: 200px; - .buttons { - text-align: right; - margin-top: 12px; - .ivu-btn-small { - font-size: 12px - } - } -} - .task-detail-loop { > li { text-align: center; } } +.task-calc-warn-text { + color: $flow-status-start-color !important; +} + body.window-portrait { .task-detail { .task-info {