From 8c7df65fd51b1a5e6172b5b52459d41041556d24 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:55:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20=E8=AF=A6=E6=83=85=E7=AD=9B=E9=80=89=20=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E4=BC=98=E5=8C=96=20=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/msgCfm/index.js | 6 ++-- frontend/src/components/msgCfm/keyEnter.js | 16 +++++++++ .../src/components/widget/DeWidget/DeDate.vue | 25 +++++++++++++ frontend/src/lang/en.js | 4 ++- frontend/src/lang/tw.js | 4 ++- frontend/src/lang/zh.js | 4 ++- frontend/src/styles/index.scss | 36 ------------------- frontend/src/views/link/pwd/index.vue | 2 +- .../views/system/SysParam/EmailSetting.vue | 4 +-- frontend/src/views/system/log/filterUser.vue | 2 +- frontend/src/views/system/log/index.vue | 24 ++++++------- .../src/views/system/task/DatasetTaskList.vue | 3 +- frontend/src/views/system/task/TaskRecord.vue | 2 ++ frontend/src/views/system/task/filterUser.vue | 2 +- .../views/system/task/filterUserRecord.vue | 2 +- frontend/src/views/system/task/form.vue | 9 +++-- frontend/src/views/system/user/personPwd.vue | 16 ++++++--- 17 files changed, 90 insertions(+), 71 deletions(-) create mode 100644 frontend/src/components/msgCfm/keyEnter.js 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/lang/en.js b/frontend/src/lang/en.js index 3ed07e410e..43c2305abb 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -835,7 +835,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 baef6af164..01b350e87d 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 6ce4993ba5..53ef274b54 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -838,7 +838,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..a7c44da9ab 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -627,28 +627,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 +663,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); 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 { const blob = new Blob([res], { type: "application/vnd.ms-excel" }); @@ -265,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/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 09ddc2380e..44093f8031 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -325,11 +325,12 @@ import GridTable from "@/components/gridTable/index.vue"; import filterUser from "./filterUser.vue"; import msgCfm from "@/components/msgCfm/index"; import _ from "lodash"; +import keyEnter from '@/components/msgCfm/keyEnter.js' export default { name: "DatasetTaskList", components: { GridTable, cron, filterUser, TableSelector }, - mixins: [msgCfm], + mixins: [msgCfm, keyEnter], props: { transCondition: { type: Object, diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue index 6f8cce5cfe..ab8e1e1596 100644 --- a/frontend/src/views/system/task/TaskRecord.vue +++ b/frontend/src/views/system/task/TaskRecord.vue @@ -137,10 +137,12 @@ import { exportExcel, post } from "@/api/dataset/dataset"; import GridTable from "@/components/gridTable/index.vue"; import filterUser from "./filterUserRecord.vue"; import _ from "lodash"; +import keyEnter from '@/components/msgCfm/keyEnter.js' export default { name: "TaskRecord", components: { GridTable, filterUser }, + mixins: [keyEnter], props: { param: { type: Object, diff --git a/frontend/src/views/system/task/filterUser.vue b/frontend/src/views/system/task/filterUser.vue index 664616d838..3f0d447f99 100644 --- a/frontend/src/views/system/task/filterUser.vue +++ b/frontend/src/views/system/task/filterUser.vue @@ -455,7 +455,7 @@ export default { right: 0; bottom: 0; text-align: right; - background: #FFFFFF; + background-color: var(--MainBG, #fff); box-shadow: 0px -1px 4px rgba(0, 0, 0, 0.05); } } diff --git a/frontend/src/views/system/task/filterUserRecord.vue b/frontend/src/views/system/task/filterUserRecord.vue index 0352a7629e..9a731e164b 100644 --- a/frontend/src/views/system/task/filterUserRecord.vue +++ b/frontend/src/views/system/task/filterUserRecord.vue @@ -443,7 +443,7 @@ export default { right: 0; bottom: 0; text-align: right; - background: #ffffff; + background-color: var(--MainBG, #fff); box-shadow: 0px -1px 4px rgba(0, 0, 0, 0.05); } } diff --git a/frontend/src/views/system/task/form.vue b/frontend/src/views/system/task/form.vue index 3041dcfacd..23d368b284 100644 --- a/frontend/src/views/system/task/form.vue +++ b/frontend/src/views/system/task/form.vue @@ -232,7 +232,6 @@ import "codemirror/addon/hint/show-hint.css"; import "codemirror/addon/hint/sql-hint"; import "codemirror/addon/hint/show-hint"; import TableSelector from "./TableSelector"; -import { log } from "@antv/g2plot/lib/utils"; export default { components: { cron, codemirror, TableSelector, DeLayoutContent }, @@ -590,11 +589,11 @@ export default { box-sizing: border-box; padding: 20px; width: 100%; - background: #f5f6f7; + background-color: var(--MainBG, #f5f6f7); border-radius: 4px; .el-input__inner { - background: #ffffff !important; + background: var(--ContentBG, #ffffff) !important; } .el-date-editor { @@ -607,7 +606,7 @@ export default { width: 100%; border-radius: 4px; padding: 20px; - background: #f5f6f7; + background-color: var(--MainBG, #f5f6f7); .param-title { width: 100%; @@ -641,7 +640,7 @@ export default { height: 80px; bottom: 0; right: 24px; - background: #ffffff; + background-color: var(--MainBG, #fff); box-shadow: 0px -2px 4px rgba(0, 0, 0, 0.08); display: flex; justify-content: center; diff --git a/frontend/src/views/system/user/personPwd.vue b/frontend/src/views/system/user/personPwd.vue index a29ff33b13..30ab9f697a 100644 --- a/frontend/src/views/system/user/personPwd.vue +++ b/frontend/src/views/system/user/personPwd.vue @@ -7,15 +7,20 @@ - + - + - + - {{ $t('commons.confirm') }} @@ -28,9 +33,10 @@ - - - diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 44093f8031..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 @@