diff --git a/backend/src/main/resources/db/migration/V19__area_mapping.sql b/backend/src/main/resources/db/migration/V19__area_mapping.sql index 399d6fd5e4..057e8f8d2e 100644 --- a/backend/src/main/resources/db/migration/V19__area_mapping.sql +++ b/backend/src/main/resources/db/migration/V19__area_mapping.sql @@ -161,6 +161,7 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for area_mapping -- ---------------------------- +DROP TABLE IF EXISTS `area_mapping`; CREATE TABLE `area_mapping` ( `id` bigint(20) NOT NULL COMMENT 'id', `province_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省名称', diff --git a/frontend/src/components/Notification/index.vue b/frontend/src/components/Notification/index.vue index aad83b84da..c0a4675f2d 100644 --- a/frontend/src/components/Notification/index.vue +++ b/frontend/src/components/Notification/index.vue @@ -234,7 +234,7 @@ export default { right: 178px; top: 8px; background: red; - color: var(--TextActive); + color: var(--TextActive, #fff); border-radius: 17px; padding: 4px 7px; font-size: 16px; diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 8e1107895f..220fd6f346 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -296,7 +296,7 @@ function fillPositionBox(maxY) { function removeItemFromPositionBox(item) { const pb = positionBox // console.log('removeItem=>x:' + item.x + ';y:' + item.y + ';sizex:' + item.sizex + ';sizey:' + item.sizey) - if (item.x <= 0 || item.y <= 0) return + if (!item || item.x <= 0 || item.y <= 0) return for (let i = item.x - 1; i < item.x - 1 + item.sizex; i++) { for (let j = item.y - 1; j < item.y - 1 + item.sizey; j++) { if (pb[j][i]) { @@ -1682,7 +1682,7 @@ export default { } }, startMoveIn() { - if (this.dragComponentInfo.auxiliaryMatrix) { + if (this.$store.state.dragComponentInfo.auxiliaryMatrix) { const moveInItemInfo = this.$store.state.dragComponentInfo this.addItemBox(moveInItemInfo) // console.log('startMoveIn:') diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index c400d1f7cc..201da4765e 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -12,8 +12,8 @@
- - + + @@ -22,19 +22,33 @@ - - -
- - {{ $t('panel.matrix_design') }} -
+ + + + + + + + + + + + + + + + + + + - + + @@ -372,6 +386,9 @@ export default { }, cancelLinkageSettingStatus() { this.$store.commit('clearLinkageSettingInfo') + }, + auxiliaryMatrixChange() { + this.canvasStyleData.auxiliaryMatrix = !this.canvasStyleData.auxiliaryMatrix } } } @@ -382,7 +399,7 @@ export default { float: right; height: 35px; line-height: 35px; - min-width: 500px; + min-width: 400px; /*background: #fff;*/ /*border-bottom: 1px solid #ddd;*/ @@ -390,7 +407,6 @@ export default { display: inline-block; margin-left: 10px; font-size: 14px; - color: #606266; input { width: 50px; @@ -398,7 +414,6 @@ export default { outline: none; padding: 0 5px; border: 1px solid #ddd; - color: #606266; } span { @@ -413,7 +428,7 @@ export default { cursor: pointer; background: #FFF; border: 1px solid #DCDFE6; - color: #606266; + color: var(--TextPrimary, #606266); -webkit-appearance: none; text-align: center; box-sizing: border-box; @@ -460,4 +475,12 @@ export default { margin-bottom: 2px; } + .iconfont-tb { + font-family: "iconfont" !important; + font-size: 12px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + diff --git a/frontend/src/components/canvas/index.vue b/frontend/src/components/canvas/index.vue index bbdf3fc9fb..201d42e639 100644 --- a/frontend/src/components/canvas/index.vue +++ b/frontend/src/components/canvas/index.vue @@ -55,7 +55,7 @@ export default { created() { this.restore() // 全局监听按键事件 - listenGlobalKeyDown() + // listenGlobalKeyDown() }, methods: { restore() { diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 26ffb9a7b2..18fa38d54a 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -34,7 +34,7 @@ -
+
@@ -75,7 +75,7 @@ center >
- +
@@ -161,6 +161,10 @@ export default { }, sureViewSelector() { const nodes = this.$refs.viewSelect.getCurrentSelected() + if (!nodes || nodes.length === 0) { + this.viewDialogVisible = false + return + } const node = nodes[0] let component @@ -250,23 +254,8 @@ export default { } .de-tabs { height: 100%; - >>>div.el-tabs__content { - height: calc(100% - 55px); - .el-tab-pane { - height: 100%; - } - } - } - /* .de-tab-i { - transition: 0.1s; - opacity: 0; - transform: translateY(100%); } - .de-tab-drop:hover .de-tab-i { - opacity: 1; - transform: translateY(0); - } */ .de-tab-content { width: 100%; height: 100%; diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index bed0ee3a10..eaecff92fd 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1320,7 +1320,7 @@ export default { no_drill_field: '缺少關聯字段', matrix: '矩阵', suspension: '悬浮', - new_element_distribution: '新元素分布方式', + new_element_distribution: '当前元素移入分布方式', subject_no_edit: '系统主题不能修改', subject_name_not_null: '主题名称需要1~20字符' }, diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index ee9515228d..de631ad8e4 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1325,7 +1325,7 @@ export default { no_drill_field: '缺少关联字段', matrix: '矩阵', suspension: '悬浮', - new_element_distribution: '新元素分布方式', + new_element_distribution: '当前元素移入分布方式', subject_no_edit: '系统主题不能修改', subject_name_not_null: '主题名称需要1~20字符' }, diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index 36e3cc149a..b368277b04 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -43,9 +43,6 @@ html { box-sizing: border-box; } -#app { - //height: $contentHeight; -} *, *:before, @@ -151,6 +148,18 @@ div:focus { } } +.de-tabs { + .el-tabs__header { + margin: 0 0 0 0 !important; + } + .el-tabs__content { + height: calc(100% - 55px) !important; + .el-tab-pane { + height: 100% !important; + } + } +} + .de-search-header { .el-tabs__header { display: none !important;; @@ -418,6 +427,10 @@ div:focus { border: none !important; } +.blackTheme .el-picker-panel__footer { + background-color: var(--MainBG) !important; +} + .el-pagination { button:disabled { @@ -602,6 +615,10 @@ div:focus { background-color: #000000 ; } +.blackTheme .CodeMirror-line { + background-color: #000000 !important; +} + .blackTheme .el-radio-button__inner { background-color: var(--TableBG); color: var(--TableColor); @@ -616,5 +633,38 @@ div:focus { background: #38393a !important; } +.blackTheme .el-message-box__content { + color:#F2F6FC; +} + +.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); +} + +.blackTheme .vue-treeselect__option:not(.vue-treeselect__option--highlight) { + color: #606266; +} +.blackTheme .vue-treeselect__option--highlight { + color: #2681ff; + background-color: #000000; +} + +.blackTheme .el-table__body tr.current-row > td { + background-color: #324f62; +} + diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 4bb044ae7a..1f74048d75 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -613,7 +613,7 @@ :fullscreen="true" > -
+
{{ $t('dataset.field_manage') }} [{{ table.name }}] diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 975a744b73..79361f9f9e 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -96,7 +96,7 @@ append-to-body > - + - - + + - + @@ -189,7 +189,7 @@
- {{ $t('dataset.cancel') }} + {{ $t('dataset.cancel') }} {{ $t('dataset.confirm') }}
@@ -222,19 +222,19 @@ { this.listTaskLog(false) - }, 5000); + }, 5000) this.taskTimer = setInterval(() => { this.listTask(false) }, 5000) @@ -574,10 +574,9 @@ export default { this.listTask() this.listTaskLog() }) - }else { + } else { return false } - }) }, changeTaskStatus(task) { @@ -617,27 +616,27 @@ export default { }, onSimpleCronChange() { if (this.taskForm.extraData.simple_cron_type === 'minute') { - if(this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 59){ - this.$message({message: this.$t('cron.minute_limit'), type: 'warning', showClose: true}) + if (this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 59) { + this.$message({ message: this.$t('cron.minute_limit'), type: 'warning', showClose: true }) this.taskForm.extraData.simple_cron_value = 59 } - this.taskForm.cron = '0 0/'+ this.taskForm.extraData.simple_cron_value + ' * * * ? *' + this.taskForm.cron = '0 0/' + this.taskForm.extraData.simple_cron_value + ' * * * ? *' return } if (this.taskForm.extraData.simple_cron_type === 'hour') { - if(this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 23){ - this.$message({message: this.$t('cron.hour_limit'), type: 'warning', showClose: true}) + if (this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 23) { + this.$message({ message: this.$t('cron.hour_limit'), type: 'warning', showClose: true }) this.taskForm.extraData.simple_cron_value = 23 } - this.taskForm.cron = '0 0 0/'+ this.taskForm.extraData.simple_cron_value + ' * * ? *' + this.taskForm.cron = '0 0 0/' + this.taskForm.extraData.simple_cron_value + ' * * ? *' return } if (this.taskForm.extraData.simple_cron_type === 'day') { - if(this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 31){ - this.$message({message: this.$t('cron.day_limit'), type: 'warning', showClose: true}) + if (this.taskForm.extraData.simple_cron_value < 1 || this.taskForm.extraData.simple_cron_value > 31) { + this.$message({ message: this.$t('cron.day_limit'), type: 'warning', showClose: true }) this.taskForm.extraData.simple_cron_value = 31 } - this.taskForm.cron = '0 0 0 1/'+ this.taskForm.extraData.simple_cron_value + ' * ? *' + this.taskForm.cron = '0 0 0 1/' + this.taskForm.extraData.simple_cron_value + ' * ? *' return } }, @@ -647,16 +646,16 @@ export default { this.taskForm.endTime = '' this.taskForm.cron = '' } - if (this.taskForm.rate === 'SIMPLE_CRON'){ + if (this.taskForm.rate === 'SIMPLE_CRON') { this.taskForm.cron = '0 0 0/1 * * ? *' } - if (this.taskForm.rate === 'CRON'){ + if (this.taskForm.rate === 'CRON') { this.taskForm.cron = '00 00 * ? * * *' } }, listTaskLog(loading = true) { - const params = {"conditions":[{"field":"dataset_table_task_log.table_id","operator":"eq","value": this.table.id}],"orders":[]} - post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => { + const params = { 'conditions': [{ 'field': 'dataset_table_task_log.table_id', 'operator': 'eq', 'value': this.table.id }], 'orders': [] } + post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => { this.taskLogData = response.data.listObject this.page.total = response.data.itemCount }) @@ -754,6 +753,11 @@ export default { overflow: hidden ; } + .blackTheme .dialog_cancel_button { + background-color: #171b22 !important; + color: #2681ff !important; + } + .span{ font-size: 12px; } diff --git a/frontend/src/views/panel/GrantAuth/index.vue b/frontend/src/views/panel/GrantAuth/index.vue index 8f7cb7f6c3..f7d1132ca1 100644 --- a/frontend/src/views/panel/GrantAuth/index.vue +++ b/frontend/src/views/panel/GrantAuth/index.vue @@ -2,7 +2,7 @@
- +
diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue index f26f152376..48f0109df6 100644 --- a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue +++ b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue @@ -12,7 +12,7 @@
-
    +
    • { + this.sliders = [] this.sliders = response.data this.slidersLoading = false }).catch(() => { diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 8e25d43c81..a19bf47284 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -104,7 +104,7 @@ @mousedown="handleMouseDown" @mouseup="deselectCurComponent" > - +
      @@ -455,7 +455,9 @@ export default { const self = evt.target.closest('.el-drawer__wrapper') // 点击样式按钮 排除 const stick = evt.target.closest('.el-icon-magic-stick') - if (!parent && !self && !stick) { + const xuanfuanniu = evt.target.closest('.icon-xuanfuanniu') + const shujujuzhen = evt.target.closest('.icon-shujujuzhen') + if (!parent && !self && !stick && !xuanfuanniu && !shujujuzhen) { this.show = false window.removeEventListener('click', this.closeSidebar) this.showIndex = -1 diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue index 779370a044..27d429b3c1 100644 --- a/frontend/src/views/panel/filter/filterDialog.vue +++ b/frontend/src/views/panel/filter/filterDialog.vue @@ -166,7 +166,8 @@ group="dimension" animation="300" :move="onMove" - style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;background-color: white;" + class="theme-drag" + style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;" @end="end2" > @@ -715,7 +716,7 @@ export default { padding: 8px; height: 100%; border-right: none; - border: 1px solid #E6E6E6; + border: 1px solid var(--TableBorderColor, #E6E6E6);; .field-content-text { box-sizing: border-box; overflow: hidden; @@ -727,7 +728,7 @@ export default { .field-content-right { border-left: none; color: #9ea6b2; - border: 1px solid #E6E6E6; + border: 1px solid var(--TableBorderColor, #E6E6E6); width: 0%; max-width: 0%; position: relative; @@ -764,7 +765,7 @@ export default { } .filter-dialog-tabs { - border: 1px solid #E6E6E6; + border: 1px solid var(--TableBorderColor, #E6E6E6); padding: 10px; height: 100%; >>> div.el-tabs__content { @@ -867,4 +868,8 @@ export default { content: attr(data-value); } + .blackTheme .theme-drag { + background-color: var(--MainBG, #fff); + } + diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index fa0cdb8578..1bb8a1fad0 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -798,11 +798,11 @@ export default { } -