From e1a2d903821c86c79f081719b4c581817ff50108 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 13 Apr 2025 09:10:54 +0800 Subject: [PATCH] no message --- resources/assets/js/components/TEditor.vue | 8 +- .../js/pages/manage/components/TaskDetail.vue | 1 + .../assets/sass/components/t-editor.scss | 175 ++++++++++-------- .../sass/pages/components/task-detail.scss | 8 +- 4 files changed, 109 insertions(+), 83 deletions(-) diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue index 184793afb..e94dca979 100755 --- a/resources/assets/js/components/TEditor.vue +++ b/resources/assets/js/components/TEditor.vue @@ -43,7 +43,13 @@
{{$L('正在上传文件...')}}
- +
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 9c2a40899..5749670d0 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1312,6 +1312,7 @@ export default { }, onCancel: () => { this.$refs.desc.updateContent(this.taskContent); + this.$refs.desc.updateTouchContent(); } }); return; diff --git a/resources/assets/sass/components/t-editor.scss b/resources/assets/sass/components/t-editor.scss index a65da4f0d..642143359 100755 --- a/resources/assets/sass/components/t-editor.scss +++ b/resources/assets/sass/components/t-editor.scss @@ -1,95 +1,38 @@ -.teditor-box, -.teditor-transfer { - .tox { - &.tox-silver-sink { - z-index: 13000; - } - } -} - -.teditor-box { - position: relative; - min-height: 22px; - - .icon-inline { - color: #bbbbbb; - position: absolute; - left: 0; - top: 0; - } - - textarea { - opacity: 0; - } - - .tox-checklist { - padding-inline-start: 26px; - } - - .tox-tinymce { - box-shadow: none; - box-sizing: border-box; - border-color: #dddee1; - border-radius: 4px; - overflow: hidden; - - .tox-statusbar { - span.tox-statusbar__branding { - a { - display: none; - } - } - } - - .tox-tbtn__select-label { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - - .tox-tbtn--bespoke { - .tox-tbtn__select-label { - width: auto; - } - } - } -} - -.teditor-transfer { - background-color: #ffffff; - - .tox-toolbar { - > div:last-child { - > button:last-child { - margin-right: 64px; +body { + .teditor-box, + .teditor-transfer { + .tox { + &.tox-silver-sink { + z-index: 13000; } } } - .ivu-modal-header { - display: none; - } + .teditor-box { + position: relative; + min-height: 22px; - .ivu-modal-close { - top: 7px; - z-index: 2; - } - - .teditor-transfer-body { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - padding: 0; - margin: 0; + .icon-inline { + color: #bbbbbb; + position: absolute; + left: 0; + top: 0; + } textarea { opacity: 0; } + .tox-checklist { + padding-inline-start: 26px; + } + .tox-tinymce { - border: 0; + box-shadow: none; + box-sizing: border-box; + border-color: #dddee1; + border-radius: 4px; + overflow: hidden; .tox-statusbar { span.tox-statusbar__branding { @@ -112,6 +55,76 @@ } } } + + .teditor-transfer { + background-color: #ffffff; + + .ivu-modal-wrap { + .ivu-modal { + &.ivu-modal-fullscreen { + .ivu-modal-content { + margin-top: 0; + margin-bottom: 0; + } + } + } + } + + .tox-toolbar { + > div:last-child { + > button:last-child { + margin-right: 64px; + } + } + } + + .ivu-modal-header { + display: none; + } + + .ivu-modal-close { + top: calc(var(--status-bar-height) + 7px); + z-index: 2; + } + + .teditor-transfer-body { + position: absolute; + top: var(--status-bar-height); + bottom: var(--navigation-bar-height); + left: 0; + right: 0; + padding: 0; + margin: 0; + + textarea { + opacity: 0; + } + + .tox-tinymce { + border: 0; + + .tox-statusbar { + span.tox-statusbar__branding { + a { + display: none; + } + } + } + + .tox-tbtn__select-label { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .tox-tbtn--bespoke { + .tox-tbtn__select-label { + width: auto; + } + } + } + } + } } .teditor-loadstyle { diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss index 74daf93b7..9ddc7e9d8 100644 --- a/resources/assets/sass/pages/components/task-detail.scss +++ b/resources/assets/sass/pages/components/task-detail.scss @@ -41,9 +41,15 @@ } } + .task-info { + .scroller { + margin-bottom: 4px; + } + } + .task-dialog { padding-bottom: calc(var(--navigation-bar-height) + 20px); - margin-top: 4px; + margin-top: 0; } } }