From 6bf7c40dacc01f58a5e14fd241d7ea9b25e5d6cc Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 18 Oct 2022 15:28:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf(=E8=B7=AF=E7=94=B1):=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8=E9=A9=BC=E5=B3=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V42__1.16.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 backend/src/main/resources/db/migration/V42__1.16.sql diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql new file mode 100644 index 0000000000..83256625e6 --- /dev/null +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -0,0 +1,5 @@ +UPDATE `sys_menu` set `component` = REPLACE(`component`, 'SysParam', 'sysParam') where (`component` like '%SysParam%'); + +UPDATE `sys_menu` set `component` = REPLACE(`component`, 'privateForm', 'PrivateForm') where (`component` like '%privateForm%'); + +UPDATE `sys_menu` set `component` = REPLACE(`component`, 'personPwd', 'PsersonPwd') where (`component` like '%personPwd%'); From e339d565fa4a6ca9c73e1c538cc9785ad1684a85 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 18 Oct 2022 15:44:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?perf(=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5):?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8=E9=A9=BC=E5=B3=B0=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V42__1.16.sql | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql index 83256625e6..df648e37f5 100644 --- a/backend/src/main/resources/db/migration/V42__1.16.sql +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -2,4 +2,10 @@ UPDATE `sys_menu` set `component` = REPLACE(`component`, 'SysParam', 'sysParam') UPDATE `sys_menu` set `component` = REPLACE(`component`, 'privateForm', 'PrivateForm') where (`component` like '%privateForm%'); -UPDATE `sys_menu` set `component` = REPLACE(`component`, 'personPwd', 'PsersonPwd') where (`component` like '%personPwd%'); +UPDATE `sys_menu` set `component` = REPLACE(`component`, 'personPwd', 'PersonPwd') where (`component` like '%personPwd%'); + +UPDATE `sys_menu` set `component` = REPLACE(`component`, 'dataset', 'Dataset') where (`component` = 'system/task/dataset'); + +UPDATE `sys_menu` set `component` = REPLACE(`component`, 'form', 'Form') where (`component` = 'system/task/form'); + + From af646a28617df49b12891853227958dd5397534c Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 18 Oct 2022 15:48:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Decharts=E8=BD=B4=E5=80=BC=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E9=94=99=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/chart/common/common.js | 57 ++++++++++--------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/frontend/src/views/chart/chart/common/common.js b/frontend/src/views/chart/chart/common/common.js index f587aa76e2..1cfd5e5ce0 100644 --- a/frontend/src/views/chart/chart/common/common.js +++ b/frontend/src/views/chart/chart/common/common.js @@ -2,11 +2,34 @@ import { hexColorToRGBA } from '@/views/chart/chart/util' import { DEFAULT_XAXIS_STYLE, DEFAULT_YAXIS_EXT_STYLE, DEFAULT_YAXIS_STYLE } from '@/views/chart/chart/chart' import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter' -let xAxisLabelFormatter = null -let yAxisLabelFormatter = null -let yExtAxisLabelFormatter = null - export function componentStyle(chart_option, chart) { + let xAxisLabelFormatter = null + let yAxisLabelFormatter = null + let yExtAxisLabelFormatter = null + const xFormatter = function(value) { + if (!xAxisLabelFormatter) { + return valueFormatter(value, formatterItem) + } else { + return valueFormatter(value, xAxisLabelFormatter) + } + } + + const yFormatter = function(value) { + if (!yAxisLabelFormatter) { + return valueFormatter(value, formatterItem) + } else { + return valueFormatter(value, yAxisLabelFormatter) + } + } + + const yExtFormatter = function(value) { + if (!yExtAxisLabelFormatter) { + return valueFormatter(value, formatterItem) + } else { + return valueFormatter(value, yExtAxisLabelFormatter) + } + } + const padding = '8px' if (chart.customStyle) { const customStyle = JSON.parse(chart.customStyle) @@ -224,6 +247,7 @@ export function componentStyle(chart_option, chart) { } } } + export const getMarginUnit = marginForm => { if (!marginForm.marginModel || marginForm.marginModel === 'auto') return null if (marginForm.marginModel === 'absolute') return 'px' @@ -241,6 +265,7 @@ const hexToRgba = (hex, opacity) => { } return rgbaColor } + export function seniorCfg(chart_option, chart) { if (chart.senior && chart.type && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('mix'))) { const senior = JSON.parse(chart.senior) @@ -366,30 +391,6 @@ export function seniorCfg(chart_option, chart) { } } -const xFormatter = function(value) { - if (!xAxisLabelFormatter) { - return valueFormatter(value, formatterItem) - } else { - return valueFormatter(value, xAxisLabelFormatter) - } -} - -const yFormatter = function(value) { - if (!yAxisLabelFormatter) { - return valueFormatter(value, formatterItem) - } else { - return valueFormatter(value, yAxisLabelFormatter) - } -} - -const yExtFormatter = function(value) { - if (!yExtAxisLabelFormatter) { - return valueFormatter(value, formatterItem) - } else { - return valueFormatter(value, yExtAxisLabelFormatter) - } -} - export const reverseColor = colorValue => { colorValue = '0x' + colorValue.replace(/#/g, '') const str = '000000' + (0xFFFFFF - colorValue).toString(16) From b0958e6d38764cd6a9fa87a0d02b78451d9dd128 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 18 Oct 2022 16:36:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/system/SysParam/KettleSetting.vue | 385 ------------------ .../SysParam/MapSetting/MapSettingLeft.vue | 284 ------------- .../system/SysParam/MapSetting/index.vue | 88 ---- frontend/src/views/system/SysParam/index.vue | 145 ------- .../src/views/system/SysParam/operater.vue | 36 -- frontend/src/views/system/task/filterUser.vue | 355 ---------------- .../views/system/task/filterUserRecord.vue | 349 ---------------- frontend/src/views/system/user/personPwd.vue | 144 ------- 8 files changed, 1786 deletions(-) delete mode 100644 frontend/src/views/system/SysParam/KettleSetting.vue delete mode 100644 frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue delete mode 100644 frontend/src/views/system/SysParam/MapSetting/index.vue delete mode 100644 frontend/src/views/system/SysParam/index.vue delete mode 100644 frontend/src/views/system/SysParam/operater.vue delete mode 100644 frontend/src/views/system/task/filterUser.vue delete mode 100644 frontend/src/views/system/task/filterUserRecord.vue delete mode 100644 frontend/src/views/system/user/personPwd.vue diff --git a/frontend/src/views/system/SysParam/KettleSetting.vue b/frontend/src/views/system/SysParam/KettleSetting.vue deleted file mode 100644 index 6ac986693f..0000000000 --- a/frontend/src/views/system/SysParam/KettleSetting.vue +++ /dev/null @@ -1,385 +0,0 @@ - - - - - diff --git a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue deleted file mode 100644 index 668cfaaa96..0000000000 --- a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - - - diff --git a/frontend/src/views/system/SysParam/MapSetting/index.vue b/frontend/src/views/system/SysParam/MapSetting/index.vue deleted file mode 100644 index 4bd7b5232d..0000000000 --- a/frontend/src/views/system/SysParam/MapSetting/index.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/frontend/src/views/system/SysParam/index.vue b/frontend/src/views/system/SysParam/index.vue deleted file mode 100644 index e5781b584c..0000000000 --- a/frontend/src/views/system/SysParam/index.vue +++ /dev/null @@ -1,145 +0,0 @@ - - - diff --git a/frontend/src/views/system/SysParam/operater.vue b/frontend/src/views/system/SysParam/operater.vue deleted file mode 100644 index d5b4811a22..0000000000 --- a/frontend/src/views/system/SysParam/operater.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/frontend/src/views/system/task/filterUser.vue b/frontend/src/views/system/task/filterUser.vue deleted file mode 100644 index 771a78a64f..0000000000 --- a/frontend/src/views/system/task/filterUser.vue +++ /dev/null @@ -1,355 +0,0 @@ - - - diff --git a/frontend/src/views/system/task/filterUserRecord.vue b/frontend/src/views/system/task/filterUserRecord.vue deleted file mode 100644 index 1e8dc9a2aa..0000000000 --- a/frontend/src/views/system/task/filterUserRecord.vue +++ /dev/null @@ -1,349 +0,0 @@ - - - diff --git a/frontend/src/views/system/user/personPwd.vue b/frontend/src/views/system/user/personPwd.vue deleted file mode 100644 index eb0203848d..0000000000 --- a/frontend/src/views/system/user/personPwd.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - -