diff --git a/frontend/src/components/msgCfm/index.js b/frontend/src/components/msgCfm/index.js index b4bd469128..140c4e6615 100644 --- a/frontend/src/components/msgCfm/index.js +++ b/frontend/src/components/msgCfm/index.js @@ -12,7 +12,7 @@ export default { }); }, handlerConfirm(options) { - let { title, content, type = 'danger', cb, confirmButtonText = this.$t('commons.delete'), showCancelButton = true, cancelButtonText = this.$t("commons.cancel") } = options; + let { title, content, type = 'danger', cb, confirmButtonText = this.$t('commons.delete'), showCancelButton = true, cancelButtonText = this.$t("commons.cancel"), cancelCb = () => {} } = options; let text = content ? `${ this.$t(title) }
${ this.$t(content) }` : this.$t(title); const dangerouslyUseHTMLString = Boolean(content); let customClass = `de-confirm de-confirm-fail ${ dangerouslyUseHTMLString && 'de-use-html'}` @@ -34,7 +34,9 @@ export default { .then(() => { cb(); }) - .catch(() => {}); + .catch(() => { + cancelCb() + }); }, }, }; diff --git a/frontend/src/components/msgCfm/keyEnter.js b/frontend/src/components/msgCfm/keyEnter.js new file mode 100644 index 0000000000..ca0d8f36a0 --- /dev/null +++ b/frontend/src/components/msgCfm/keyEnter.js @@ -0,0 +1,16 @@ +export default { + mounted() { + document.addEventListener('keypress', this.entryKey) + }, + destroyed() { + document.removeEventListener('keypress', this.entryKey) + }, + methods: { + entryKey(event) { + const keyCode = event.keyCode + if (keyCode === 13) { + this.$refs.search.blur() + } + }, + } +} \ No newline at end of file diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index c78db79bfa..cec51a1614 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -304,6 +304,31 @@ export default { color: var(--DateColor, #606266); } } + + .el-date-range-picker__time-header, + .el-date-picker__time-header { + border-bottom: 1px solid var(--BrDateColor, #dfe4ed) !important; + } + + .el-picker-panel__footer { + border-top: 1px solid var(--BrDateColor, #dfe4ed) !important; + background: var(--BgDateColor, #FFFFFF) !important; + } + + .el-date-range-picker__time-picker-wrap, + .el-date-picker__time-header { + .el-input__inner { + border:1px solid var(--BrDateColor, #dfe4ed) !important; + color: var(--DateColor, #606266); + background: var(--BgDateColor, #FFFFFF) !important; + } + } + + .el-picker-panel__link-btn:nth-child(2) { + color: #FFFFFF; + background: var(--BgDateColor, #FFFFFF) !important; + border:1px solid var(--BrDateColor, #dfe4ed) !important; + } .popper__arrow, diff --git a/frontend/src/icons/svg/all-msg.svg b/frontend/src/icons/svg/all-msg.svg index 104bbacee3..320a433a2f 100644 --- a/frontend/src/icons/svg/all-msg.svg +++ b/frontend/src/icons/svg/all-msg.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/dashboard.svg b/frontend/src/icons/svg/dashboard.svg index 20de439dca..1b62f683a2 100644 --- a/frontend/src/icons/svg/dashboard.svg +++ b/frontend/src/icons/svg/dashboard.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/dept.svg b/frontend/src/icons/svg/dept.svg index 128dcfe2b5..0930bc5c3b 100644 --- a/frontend/src/icons/svg/dept.svg +++ b/frontend/src/icons/svg/dept.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/log.svg b/frontend/src/icons/svg/log.svg index c5b12c57aa..2c1a6704ec 100644 --- a/frontend/src/icons/svg/log.svg +++ b/frontend/src/icons/svg/log.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/password.svg b/frontend/src/icons/svg/password.svg index b0f6b44866..162b25f32f 100644 --- a/frontend/src/icons/svg/password.svg +++ b/frontend/src/icons/svg/password.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/peoples.svg b/frontend/src/icons/svg/peoples.svg index 13cecdc128..3a899eb8ce 100644 --- a/frontend/src/icons/svg/peoples.svg +++ b/frontend/src/icons/svg/peoples.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/plugins-new.svg b/frontend/src/icons/svg/plugins-new.svg index 7390a6252d..09668d959b 100644 --- a/frontend/src/icons/svg/plugins-new.svg +++ b/frontend/src/icons/svg/plugins-new.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/role.svg b/frontend/src/icons/svg/role.svg index 76524133b0..ae889b1942 100644 --- a/frontend/src/icons/svg/role.svg +++ b/frontend/src/icons/svg/role.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/sys-setting.svg b/frontend/src/icons/svg/sys-setting.svg index 3e6fb729e5..a85a89c5d4 100644 --- a/frontend/src/icons/svg/sys-setting.svg +++ b/frontend/src/icons/svg/sys-setting.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/icons/svg/task.svg b/frontend/src/icons/svg/task.svg index 7c5cf181ec..575ba4c18b 100644 --- a/frontend/src/icons/svg/task.svg +++ b/frontend/src/icons/svg/task.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index a5fc91d8f9..ca4c7eb98e 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -834,7 +834,9 @@ export default { delete_this_category: 'Are you sure to delete this category?', edit_template: 'Edit template', edit_classification: 'Edit classification', - classification_name: 'Classification Name:' + classification_name: 'Classification Name:', + by_event_details: 'Search by event details', + password_input_error: 'Original password input error' }, chart: { rich_text_view_result_tips: 'The rich text view selects only the first result', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index b6eedd0e53..8361c1c3b3 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -836,7 +836,9 @@ export default { delete_this_category: '確定删除該分類嗎？', edit_template: '編輯模版', edit_classification: '編輯分類', - classification_name: '分類名稱' + classification_name: '分類名稱', + by_event_details: '通過事件詳情蒐索', + password_input_error: '原始密碼輸入錯誤' }, chart: { rich_text_view_result_tips: '富文本只选取第一条结果', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index ab944e0e3c..8ee7a1d4dd 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -836,7 +836,9 @@ export default { delete_this_category: '确定删除该分类吗？', edit_template: '编辑模版', edit_classification: '编辑分类', - classification_name: '分类名称' + classification_name: '分类名称', + by_event_details: '通过事件详情搜索', + password_input_error: '原始密码输入错误' }, chart: { rich_text_view_result_tips: '富文本只选取第一条结果', diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index c2925ce407..e601d6a8e1 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -557,12 +557,6 @@ div:focus { color: var(--TextPrimary); } -.blackTheme .el-button--default { - background-color: var(--MainBG) !important; - color: var(--Main) !important; -} - - .blackTheme .title-text { color: var(--TextPrimary) !important; @@ -627,28 +621,6 @@ div:focus { background-color: var(--ContentBG); } -.blackTheme .el-select-dropdown__item.hover { - background-color: #171B22 !important; -} - -.blackTheme .el-select-dropdown__item:hover { - background-color: #171B22 !important; -} - -.blackTheme .el-dropdown-menu__item:not(.is-disabled):hover { - background-color: #171B22 !important; -} - -.blackTheme .el-dropdown-menu__item:focus { - background-color: #171B22 !important; -} - - -.blackTheme .el-dropdown-menu__item--divided:before { - background-color: #000000 !important; -} - - .blackTheme .el-card__header { border-color: var(--TableBorderColor) !important; } @@ -685,20 +657,6 @@ div:focus { } - -.blackTheme .el-message-box__btns { - .el-button--default:not(.el-button--primary) { - background-color: #171b22; - color: #2681ff; - } - - .el-button--primary { - color: #21333b; - background-color: #2681ff; - border-color: #2681ff; - } -} - .blackTheme .vue-treeselect__menu { border: 1px solid var(--TableBorderColor, #cfcfcf); background: var(--MainBG, #fff); @@ -1212,4 +1170,36 @@ div:focus { font-size: 16px; } } +} + +.user-drawer-task { + .filter { + display: flex; + min-height: 46px; + > :nth-child(1) { + color: #1f2329; + font-family: "PingFang SC"; + font-style: normal; + font-weight: 400; + font-size: 14px; + line-height: 24px; + white-space: nowrap; + width: 116px; + } + .filter-item { + .item, + .more { + background: #f5f6f7; + } + + .active, + .more:hover { + background: rgba(51, 112, 255, 0.1); + color: #0c296e; + } + .more { + white-space: nowrap; + } + } + } } \ No newline at end of file diff --git a/frontend/src/views/link/pwd/index.vue b/frontend/src/views/link/pwd/index.vue index 96456ebaf3..41a060a4ac 100644 --- a/frontend/src/views/link/pwd/index.vue +++ b/frontend/src/views/link/pwd/index.vue @@ -96,7 +96,7 @@ export default { const param = this.user ? { password: this.form.password, resourceId: this.resourceId, user: this.user } : { password: this.form.password, resourceId: this.resourceId } validatePwd(param).then(res => { if (!res.data) { - this.msg = this.$t('pblink.pwd_error') + this.msg = this.$t('system_parameter_setting.password_input_error') } else { this.$emit('fresh-token') } diff --git a/frontend/src/views/system/SysParam/EmailSetting.vue b/frontend/src/views/system/SysParam/EmailSetting.vue index d059650987..4bc042e0d2 100644 --- a/frontend/src/views/system/SysParam/EmailSetting.vue +++ b/frontend/src/views/system/SysParam/EmailSetting.vue @@ -92,7 +92,7 @@ 开启SSL + >{{ $t('chart.open') }}SSL - 开启TSL + {{ $t('chart.open') }}TSL { @@ -271,11 +267,7 @@ export default { conditions: [...this.cacheCondition], }; if (this.nikeName) { - param.conditions.push({ - field: `nick_name`, - operator: "like", - value: this.nikeName, - }); + param.keyWord = this.nikeName; } const { currentPage, pageSize } = this.paginationConfig; logGrid(currentPage, pageSize, param).then((response) => { diff --git a/frontend/src/views/system/plugin/index.vue b/frontend/src/views/system/plugin/index.vue index e83333b811..0cb123a1a5 100644 --- a/frontend/src/views/system/plugin/index.vue +++ b/frontend/src/views/system/plugin/index.vue @@ -225,9 +225,9 @@ export default { del(row) { if (row.pluginId < 4) return; const options = { - title: "确定卸载该插件？", - content: "卸载并重启服务器之后才能生效", - confirmButtonText: this.$t("卸载"), + title: "components.uninstall_the_plugin", + content: "components.it_takes_effect", + confirmButtonText: this.$t("components.uninstall"), type: "primary", cb: () => { uninstall(row.pluginId) @@ -260,7 +260,7 @@ export default { margin-right: 12px; } .el-input__inner { - background: #ffffff !important; + background: var(--ContentBG, #ffffff) !important; } } @@ -275,8 +275,8 @@ export default { .de-card-plugin { width: 270px; min-height: 188px; - background: #ffffff; - border: 1px solid #dee0e3; + background: var(--ContentBG, #ffffff); + border: 1px solid var(--deCardStrokeColor, #dee0e3); border-radius: 4px; margin: 0 24px 24px 0; &:hover { @@ -412,7 +412,7 @@ export default { display: inline-block; margin-left: 12px; .value { - color: #1f2329; + color: var(--TextPrimary, #1F2329); } } } diff --git a/frontend/src/views/system/settings/AppearanceSetting.vue b/frontend/src/views/system/settings/AppearanceSetting.vue deleted file mode 100644 index abcafc60a2..0000000000 --- a/frontend/src/views/system/settings/AppearanceSetting.vue +++ /dev/null @@ -1,80 +0,0 @@ -
- - - - - -
-
- - -
-
-
- - - - - - - diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 09ddc2380e..8cf5f32c71 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -107,7 +107,8 @@ > @@ -122,12 +123,14 @@ @@ -146,7 +149,8 @@