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..df648e37f5 --- /dev/null +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -0,0 +1,11 @@ +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', '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'); + + 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) 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 @@ - - - -