From 5d7da59142922dd6664b2c9df9100a0d6f3d114b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 4 Jan 2023 17:52:43 +0800 Subject: [PATCH 01/35] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=A7=86=E5=9B=BE=E7=BF=BB=E9=A1=B5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=98=B2=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/ChartComponent.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue index 6b5057a14f..46c9c1ec02 100644 --- a/frontend/src/views/chart/components/ChartComponent.vue +++ b/frontend/src/views/chart/components/ChartComponent.vue @@ -332,12 +332,14 @@ export default { }) return } - if (this.canvasStyleData.panel.themeColor === 'dark') { - chart_option.legend['pageIconColor'] = '#ffffff' - chart_option.legend['pageIconInactiveColor'] = '#8c8c8c' - } else { - chart_option.legend['pageIconColor'] = '#000000' - chart_option.legend['pageIconInactiveColor'] = '#8c8c8c' + if (chart_option.legend) { + if (this.canvasStyleData.panel.themeColor === 'dark') { + chart_option.legend['pageIconColor'] = '#ffffff' + chart_option.legend['pageIconInactiveColor'] = '#8c8c8c' + } else { + chart_option.legend['pageIconColor'] = '#000000' + chart_option.legend['pageIconInactiveColor'] = '#8c8c8c' + } } this.myEcharts(chart_option) this.$nextTick(() => (this.linkageActive())) From c3853152efb7dfc5a8789df603e4d2b102470ab2 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 4 Jan 2023 21:47:54 +0800 Subject: [PATCH 02/35] =?UTF-8?q?fix(tab):=20=E7=82=B9=E5=87=BBtab?= =?UTF-8?q?=E5=86=85=E9=83=A8=E8=A7=86=E5=9B=BE=E4=BC=9A=E8=AF=AF=E8=A7=A6?= =?UTF-8?q?resize=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/customComponent/UserView.vue | 6 ++++-- frontend/src/views/chart/components/map/MapController.vue | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue index 0bf9ca6ce9..6a4cf3700e 100644 --- a/frontend/src/components/canvas/customComponent/UserView.vue +++ b/frontend/src/components/canvas/customComponent/UserView.vue @@ -475,7 +475,9 @@ export default { watch: { 'innerPadding': { handler: function(val1, val2) { - this.resizeChart() + if (val1 !== val2) { + this.resizeChart() + } }, deep: true }, @@ -575,7 +577,7 @@ export default { this.$refs[this.element.propValue.id].chartResize() } }, - //编辑状态下 不启动刷新 + // 编辑状态下 不启动刷新 buildInnerRefreshTimer(refreshViewEnable = false, refreshUnit = 'minute', refreshTime = 5) { if (this.editMode === 'preview' && !this.innerRefreshTimer && refreshViewEnable) { this.innerRefreshTimer && clearInterval(this.innerRefreshTimer) diff --git a/frontend/src/views/chart/components/map/MapController.vue b/frontend/src/views/chart/components/map/MapController.vue index 2f877ceae4..d0da9875a3 100644 --- a/frontend/src/views/chart/components/map/MapController.vue +++ b/frontend/src/views/chart/components/map/MapController.vue @@ -8,7 +8,7 @@ size="mini" icon="el-icon-plus" circle - @click="callParent('roamMap', true)" + @click.stop="callParent('roamMap', true)" /> @@ -18,7 +18,7 @@ size="mini" icon="el-icon-refresh" circle - @click="callParent('resetZoom')" + @click.stop="callParent('resetZoom')" /> @@ -28,7 +28,7 @@ size="mini" icon="el-icon-minus" circle - @click="callParent('roamMap', false)" + @click.stop="callParent('roamMap', false)" /> From af3abbdab4decd30a011619cf5c7210e3313ea6d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 5 Jan 2023 09:53:54 +0800 Subject: [PATCH 03/35] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E5=99=A8):=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81=E5=AF=BC=E8=87=B4=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E7=8A=B6=E6=80=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/filter/filterMain/FilterControl.vue | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue index 352138253b..846602157d 100644 --- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue +++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue @@ -280,10 +280,8 @@ export default { datasetParams: { type: Array, default: () => [] - }, - activeName:{ - } + }, data() { return { @@ -344,18 +342,18 @@ export default { hasParam = true } } - if(!hasParam){ + if (!hasParam) { this.allParams.push(this.datasetParams[j]) } } } } }, - 'activeName':{ + 'activeName': { handler(newName, oldName) { - if(this.activeName === 'assembly'){ + if (this.activeName === 'assembly') { this.allParams = JSON.parse(JSON.stringify(this.childViews.datasetParams)) - }else { + } else { if (this.datasetParams.length > 0) { for (var j = 0; j < this.datasetParams.length; j++) { var hasParam = false @@ -364,7 +362,7 @@ export default { hasParam = true } } - if(!hasParam){ + if (!hasParam) { this.allParams.push(this.datasetParams[j]) } } From 0c1031a85b977b83ddedc5689e5537dfa02bebcd Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 5 Jan 2023 14:30:34 +0800 Subject: [PATCH 04/35] =?UTF-8?q?fix(=E5=9C=B0=E5=9B=BE):=20=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8E=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + .../functionStyle/MapMarkSelector.vue | 46 ++++++++++--------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 5f6df2ea07..a096931859 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1366,6 +1366,7 @@ export default { chart_table_pivot: 'Pivot Table', table_pivot_row: 'Data Row', field_error_tips: 'This field is changed(Include dimension、quota,field type,deleted),please edit again.', + mark_field_error: 'The current field does not exist, please select again', table_border_color: 'Border Color', table_header_align: 'Header Align', table_item_align: 'Body Align', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index bc46329abc..f9eae689f4 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1365,6 +1365,7 @@ export default { chart_table_pivot: '透視表', table_pivot_row: '數據行', field_error_tips: '該字段所對應的數據集原始字段發生變更(包括維度、指標,字段類型,字段被刪除等),建議重新編輯', + mark_field_error: '數據集變更,當前字段不存在,請重新選擇', table_border_color: '邊框顏色', table_header_align: '表頭對齊方式', table_item_align: '表格對齊方式', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 3b766b950a..619d3ce1a7 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1364,6 +1364,7 @@ export default { chart_table_pivot: '透视表', table_pivot_row: '数据行', field_error_tips: '该字段所对应的数据集原始字段发生变更(包括维度、指标,字段类型,字段被删除等),建议重新编辑', + mark_field_error: '数据集变更,当前字段不存在,请重新选择', table_border_color: '边框颜色', table_header_align: '表头对齐方式', table_item_align: '表格对齐方式', diff --git a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue index 3781a99fce..8439fa2b92 100644 --- a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue +++ b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue @@ -6,11 +6,13 @@ :model="markForm" label-width="40px" size="mini" + :rules="rules" > group.options.some(item => item.id === this.markForm.fieldId)) - if (!valid) { - this.markForm.fieldId = null - } + this.getItemTagType() } } } @@ -375,22 +392,9 @@ export default { this.changeMarkAttr('fieldId') }, getItemTagType() { - if (this.markForm.fieldId) { - const field = this.getField(this.markForm.fieldId) - if (!field) { - this.changeFields() - this.markForm.fieldId = null - return - } - const tagType = getItemType(this.dimensionData, this.quotaData, field) - if (tagType === 'danger') { - this.changeFields() - this.markForm.fieldId = null - } - } else { - this.changeFields() - this.markForm.fieldId = null - } + this.$refs['markForm'].validate((valid) => { + console.log(valid) + }) } } } From faa1976d386a4db8e04f914e8a5149619eca751f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 5 Jan 2023 15:05:13 +0800 Subject: [PATCH 05/35] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=82=AC=E6=B5=AE=E7=BB=84=E4=BB=B6=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4=E6=9C=80=E5=A4=A7=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=8C=E4=BC=98=E5=8C=96=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E5=88=B6=E9=80=BB=E8=BE=91=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E5=A4=8D=E5=88=B6=E4=BD=8D=E7=BD=AE=E5=B7=AE=E8=B7=9D?= =?UTF-8?q?=E5=A4=AA=E5=A4=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/store/copy.js | 4 ++-- .../src/views/chart/view/PositionAdjust.vue | 22 +++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js index 4d740986e7..08c8bef204 100644 --- a/frontend/src/components/canvas/store/copy.js +++ b/frontend/src/components/canvas/store/copy.js @@ -115,8 +115,8 @@ export default { // 仪表板复制的组件默认不在移动端部署中mobileSelected = false data.mobileSelected = false if (!state.curComponent.auxiliaryMatrix) { - data.style.top += 20 - data.style.left += 20 + data.style.top = Number(data.style.top) + 20 + data.style.left = Number(data.style.left) + 20 } data.id = generateID() // 如果是用户视图 测先进行底层复制 diff --git a/frontend/src/views/chart/view/PositionAdjust.vue b/frontend/src/views/chart/view/PositionAdjust.vue index b2377909ac..00f5618e8a 100644 --- a/frontend/src/views/chart/view/PositionAdjust.vue +++ b/frontend/src/views/chart/view/PositionAdjust.vue @@ -16,7 +16,6 @@ :min="0" :max="maxTop" class="hide-icon-number" - @change="topOnChange" > @@ -33,7 +32,6 @@ :min="0" :max="maxLeft" class="hide-icon-number" - @change="leftOnChange" > @@ -50,7 +48,6 @@ :max="maxWidth" type="number" class="hide-icon-number" - @change="widthOnChange" > @@ -59,7 +56,6 @@ :label="$t('panel.space_height')" :min="0" class="form-item" - prop="marginTop" > @@ -87,7 +82,7 @@ export default { data() { return { maxHeight: 2000, - maxTop: 40000 + maxTop: 20000 } }, computed: { @@ -104,7 +99,20 @@ export default { 'componentGap' ]) }, - watch: {}, + watch: { + 'styleInfo.top': function() { + this.topOnChange() + }, + 'styleInfo.left': function() { + this.leftOnChange() + }, + 'styleInfo.width': function() { + this.widthOnChange() + }, + 'styleInfo.height': function() { + this.heightOnChange() + } + }, mounted() { }, methods: { From d8bb552b5e5a0fd56d09b6704a92c01709e6a3eb Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 5 Jan 2023 15:30:50 +0800 Subject: [PATCH 06/35] =?UTF-8?q?fix(=E5=9C=B0=E5=9B=BE):=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=BA0=E5=9C=A8=E6=8F=90=E7=A4=BA=E4=B8=AD?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/map/map.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js index b721601414..b2ff1ef1fb 100644 --- a/frontend/src/views/chart/chart/map/map.js +++ b/frontend/src/views/chart/chart/map/map.js @@ -73,7 +73,7 @@ export function baseMapOption(chart_option, chart, themeStyle, curAreaCode, seri tooltip.formatter = params => { const a = params.seriesName const b = params.name - const c = params.value ? params.value : '' + const c = params.value ?? '' return text.replace(new RegExp('{a}', 'g'), a).replace(new RegExp('{b}', 'g'), b).replace(new RegExp('{c}', 'g'), c) } chart_option.tooltip = tooltip From ee8b461992840d99f271efcbbaa1cc654705b219 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 5 Jan 2023 16:43:29 +0800 Subject: [PATCH 07/35] =?UTF-8?q?fix(ldap):=20=E6=B5=8B=E8=AF=95=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E4=BB=A5=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF=E4=B8=BA?= =?UTF-8?q?=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/plugins/server/XLdapServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java b/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java index 742a9f03cb..2e66c91e6d 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java @@ -31,10 +31,10 @@ public class XLdapServer { } @PostMapping("/testConn") - public void testConn() { + public void testConn(@RequestBody List settings) { LdapXpackService ldapXpackService = SpringContextUtil.getBean(LdapXpackService.class); try { - ldapXpackService.testConn(); + ldapXpackService.testConn(settings); }catch(Exception e) { throw new RuntimeException(e); } From efb1e7e1b7ae118eb53dc71efedbc8d817cf6c8a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 6 Jan 2023 10:22:27 +0800 Subject: [PATCH 08/35] =?UTF-8?q?style:=20=E6=B0=B4=E5=8D=B0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 4 ++-- frontend/src/lang/tw.js | 4 ++-- frontend/src/lang/zh.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 5f6df2ea07..3c4b418117 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2836,8 +2836,8 @@ export default { watermark_color: 'Watermark Color', watermark_font_size: 'Watermark Fontsize', watermark_space: 'Watermark Space', - horizontal: 'Horizontal', - vertical: 'Vertical', + horizontal: 'Horizontal Space', + vertical: 'Vertical Space', reset: 'Reset', preview: 'Preview', save: 'Save' diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index bc46329abc..42af02d963 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2829,8 +2829,8 @@ export default { watermark_color: '水印顏色', watermark_font_size: '水印字號', watermark_space: '水印間距', - horizontal: '橫向', - vertical: '縱向', + horizontal: '橫向間距', + vertical: '縱向間距', reset: '重置', preview: '預覽', save: '保存' diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 3b766b950a..e2080ca78a 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2829,8 +2829,8 @@ export default { watermark_color: '水印颜色', watermark_font_size: '水印字号', watermark_space: '水印间距', - horizontal: '横向', - vertical: '纵向', + horizontal: '横向间距', + vertical: '纵向间距', reset: '重置', preview: '预览', save: '保存' From c51f1ca15589a119c40a7cb4d675664d5cdd58a4 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 6 Jan 2023 10:56:21 +0800 Subject: [PATCH 09/35] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BD=93=E6=8C=87=E6=A0=87=E6=88=96=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=AF=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=A7=86=E5=9B=BE=E9=80=89=E6=8B=A9=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=8F=82=E6=95=B0=E8=B6=85=E8=BF=87=E4=B8=80?= =?UTF-8?q?=E5=B1=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20#4300?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/editor/FieldsList.vue | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/canvas/components/editor/FieldsList.vue b/frontend/src/components/canvas/components/editor/FieldsList.vue index 06c2513694..9135f9aa45 100644 --- a/frontend/src/components/canvas/components/editor/FieldsList.vue +++ b/frontend/src/components/canvas/components/editor/FieldsList.vue @@ -1,5 +1,5 @@