From c8c1bec0f16c4d88209ccbefaa6f6437abb4e28b Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Mon, 7 Nov 2022 17:28:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E5=90=8D=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/DeCanvas.vue | 2 +- .../canvas/components/editor/DeEditor.vue | 2 +- .../canvas/components/editor/EditBar.vue | 4 +- .../editor/{fieldsList.vue => FieldsList.vue} | 0 .../canvas/components/editor/index.vue | 2 +- frontend/src/components/canvas/index.vue | 2 +- .../components/cron/{cron.vue => Cron.vue} | 12 ++--- .../src/components/dataease/DeOutWidget.vue | 1 - frontend/src/components/gridTable/index.vue | 2 +- .../src/components/widget/deWidget/DeTabs.vue | 4 +- frontend/src/main.js | 4 +- .../BackgroundColorSelector.vue | 0 .../LegendSelector.vue | 0 .../LegendSelectorAntV.vue | 0 .../MarginSelector.vue | 0 .../SplitSelector.vue | 0 .../SplitSelectorAntV.vue | 0 .../TitleSelector.vue | 0 .../TitleSelectorAntV.vue | 0 .../XAxisSelector.vue | 0 .../XAxisSelectorAntV.vue | 0 .../YAxisExtSelector.vue | 0 .../YAxisExtSelectorAntV.vue | 0 .../YAxisSelector.vue | 0 .../YAxisSelectorAntV.vue | 0 .../dialog/RemarkEditor.vue | 0 .../{drag-item => dragItem}/ChartDragItem.vue | 4 +- .../DimensionExtItem.vue | 4 +- .../{drag-item => dragItem}/DimensionItem.vue | 4 +- .../{drag-item => dragItem}/DrillItem.vue | 4 +- .../{drag-item => dragItem}/FilterItem.vue | 4 +- .../{drag-item => dragItem}/QuotaExtItem.vue | 4 +- .../{drag-item => dragItem}/QuotaItem.vue | 4 +- .../components/FieldErrorTips.vue | 0 .../{drag-item => dragItem}/utils.js | 0 .../ColorSelector.vue | 0 .../ColorSelectorExt.vue | 0 .../LabelSelector.vue | 0 .../LabelSelectorAntV.vue | 0 .../SizeSelector.vue | 0 .../SizeSelectorAntV.vue | 0 .../SizeSelectorCommon.vue | 0 .../TooltipSelector.vue | 0 .../TooltipSelectorAntV.vue | 0 .../{shape-attr => shapeAttr}/TotalCfg.vue | 0 .../ChartMoveSelector.vue | 0 .../GroupMoveSelector.vue | 0 .../{TreeSelector => treeSelector}/index.vue | 0 .../ValueFormatterEdit.vue | 0 frontend/src/views/chart/group/Group.vue | 4 +- frontend/src/views/chart/view/ChartEdit.vue | 16 +++---- frontend/src/views/chart/view/ChartStyle.vue | 44 +++++++++---------- frontend/src/views/dataset/add/AddUnion.vue | 2 +- .../src/views/dataset/add/union/NodeItem.vue | 2 +- .../src/views/dataset/data/UpdateInfo.vue | 2 +- .../src/views/dataset/data/UpdateRecords.vue | 2 +- frontend/src/views/dataset/index.vue | 2 +- frontend/src/views/nested/menu1/index.vue | 10 ----- .../src/views/nested/menu1/menu1-1/index.vue | 11 ----- .../src/views/nested/menu1/menu1-2/index.vue | 11 ----- .../nested/menu1/menu1-2/menu1-2-1/index.vue | 9 ---- .../nested/menu1/menu1-2/menu1-2-2/index.vue | 9 ---- .../src/views/nested/menu1/menu1-3/index.vue | 9 ---- frontend/src/views/nested/menu2/index.vue | 5 --- .../PanelBackgroundColorSelector.vue | 2 +- .../src/views/panel/SubjectSetting/index.vue | 14 +++--- .../views/panel/ViewSelect/multiplexing.vue | 2 +- .../log/{filterUser.vue => FilterUser.vue} | 2 +- .../panel/appTemplateMarket/log/index.vue | 2 +- frontend/src/views/panel/edit/index.vue | 10 ++--- .../src/views/panel/list/AppExportForm.vue | 2 +- frontend/src/views/panel/list/PanelList.vue | 4 +- frontend/src/views/panel/list/PanelMain.vue | 2 +- .../src/views/panel/list/PanelViewShow.vue | 2 +- frontend/src/views/panel/video/index.vue | 1 - .../IndexWithDrag.vue} | 0 .../views/system/datasource/ApiAuthConfig.vue | 2 +- .../system/datasource/DsConfiguration.vue | 2 +- .../src/views/system/datasource/DsForm.vue | 2 +- .../src/views/system/datasource/DsMain.vue | 2 +- .../datasource/{dsTable.vue => DsTable.vue} | 0 .../src/views/system/datasource/DsTree.vue | 2 +- frontend/src/views/system/datasource/form.vue | 11 ----- frontend/src/views/system/log/FilterUser.vue | 2 +- .../plugin/{dynamic.vue => Dynamic.vue} | 0 .../views/system/sysParam/BasicSetting.vue | 2 +- .../system/sysParam/ClusterModeSetting.vue | 2 +- .../views/system/sysParam/EmailSetting.vue | 2 +- .../views/system/sysParam/KettleSetting.vue | 2 +- frontend/src/views/system/task/FilterUser.vue | 2 +- .../views/system/task/FilterUserRecord.vue | 2 +- frontend/src/views/system/task/Form.vue | 2 +- frontend/src/views/system/user/PersonPwd.vue | 2 +- .../wizard/{index_back.vue => IndexBack.vue} | 4 +- frontend/src/views/wizard/index.vue | 6 +-- 95 files changed, 108 insertions(+), 185 deletions(-) rename frontend/src/components/canvas/components/editor/{fieldsList.vue => FieldsList.vue} (100%) rename frontend/src/components/cron/{cron.vue => Cron.vue} (95%) rename frontend/src/views/chart/components/{component-style => componentStyle}/BackgroundColorSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/LegendSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/LegendSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/MarginSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/SplitSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/SplitSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/TitleSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/TitleSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/XAxisSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/XAxisSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/YAxisExtSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/YAxisExtSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/YAxisSelector.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/YAxisSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{component-style => componentStyle}/dialog/RemarkEditor.vue (100%) rename frontend/src/views/chart/components/{drag-item => dragItem}/ChartDragItem.vue (98%) rename frontend/src/views/chart/components/{drag-item => dragItem}/DimensionExtItem.vue (98%) rename frontend/src/views/chart/components/{drag-item => dragItem}/DimensionItem.vue (98%) rename frontend/src/views/chart/components/{drag-item => dragItem}/DrillItem.vue (96%) rename frontend/src/views/chart/components/{drag-item => dragItem}/FilterItem.vue (96%) rename frontend/src/views/chart/components/{drag-item => dragItem}/QuotaExtItem.vue (99%) rename frontend/src/views/chart/components/{drag-item => dragItem}/QuotaItem.vue (99%) rename frontend/src/views/chart/components/{drag-item => dragItem}/components/FieldErrorTips.vue (100%) rename frontend/src/views/chart/components/{drag-item => dragItem}/utils.js (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/ColorSelector.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/ColorSelectorExt.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/LabelSelector.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/LabelSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/SizeSelector.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/SizeSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/SizeSelectorCommon.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/TooltipSelector.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/TooltipSelectorAntV.vue (100%) rename frontend/src/views/chart/components/{shape-attr => shapeAttr}/TotalCfg.vue (100%) rename frontend/src/views/chart/components/{TreeSelector => treeSelector}/ChartMoveSelector.vue (100%) rename frontend/src/views/chart/components/{TreeSelector => treeSelector}/GroupMoveSelector.vue (100%) rename frontend/src/views/chart/components/{TreeSelector => treeSelector}/index.vue (100%) rename frontend/src/views/chart/components/{value-formatter => valueFormatter}/ValueFormatterEdit.vue (100%) delete mode 100644 frontend/src/views/nested/menu1/index.vue delete mode 100644 frontend/src/views/nested/menu1/menu1-1/index.vue delete mode 100644 frontend/src/views/nested/menu1/menu1-2/index.vue delete mode 100644 frontend/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue delete mode 100644 frontend/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue delete mode 100644 frontend/src/views/nested/menu1/menu1-3/index.vue delete mode 100644 frontend/src/views/nested/menu2/index.vue rename frontend/src/views/panel/appTemplateMarket/log/{filterUser.vue => FilterUser.vue} (97%) rename frontend/src/views/panel/{ViewSelect/index-with-drag.vue => viewSelect/IndexWithDrag.vue} (100%) rename frontend/src/views/system/datasource/{dsTable.vue => DsTable.vue} (100%) delete mode 100644 frontend/src/views/system/datasource/form.vue rename frontend/src/views/system/plugin/{dynamic.vue => Dynamic.vue} (100%) rename frontend/src/views/wizard/{index_back.vue => IndexBack.vue} (98%) diff --git a/frontend/src/components/canvas/DeCanvas.vue b/frontend/src/components/canvas/DeCanvas.vue index d9e6d9a767..e954e3fb4c 100644 --- a/frontend/src/components/canvas/DeCanvas.vue +++ b/frontend/src/components/canvas/DeCanvas.vue @@ -112,7 +112,7 @@ import toast from '@/components/canvas/utils/toast' import generateID from '@/components/canvas/utils/generateID' import ButtonDialog from '@/views/panel/filter/ButtonDialog' import ButtonResetDialog from '@/views/panel/filter/ButtonResetDialog' -import FilterDialog from '@/views/panel/filter/filterDialog' +import FilterDialog from '@/views/panel/filter/FilterDialog' export default { components: { FilterDialog, ButtonResetDialog, ButtonDialog, DeEditor }, diff --git a/frontend/src/components/canvas/components/editor/DeEditor.vue b/frontend/src/components/canvas/components/editor/DeEditor.vue index d46ec9c9e9..cf74a1599e 100644 --- a/frontend/src/components/canvas/components/editor/DeEditor.vue +++ b/frontend/src/components/canvas/components/editor/DeEditor.vue @@ -162,7 +162,7 @@ import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog' import DeOutWidget from '@/components/dataease/DeOutWidget' import DragShadow from '@/components/deDrag/Shadow' import bus from '@/utils/bus' -import LinkJumpSet from '@/views/panel/LinkJumpSet' +import LinkJumpSet from '@/views/panel/linkJumpSet' import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil' // 挤占式画布 import _ from 'lodash' diff --git a/frontend/src/components/canvas/components/editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue index b7df7c6e36..ac4ca871e9 100644 --- a/frontend/src/components/canvas/components/editor/EditBar.vue +++ b/frontend/src/components/canvas/components/editor/EditBar.vue @@ -182,8 +182,8 @@ import bus from '@/utils/bus' import SettingMenu from '@/components/canvas/components/editor/SettingMenu' import LinkageField from '@/components/canvas/components/editor/LinkageField' import toast from '@/components/canvas/utils/toast' -import FieldsList from '@/components/canvas/components/editor/fieldsList' -import LinkJumpSet from '@/views/panel/LinkJumpSet' +import FieldsList from '@/components/canvas/components/editor/FieldsList' +import LinkJumpSet from '@/views/panel/linkJumpSet' import Background from '@/views/background/index' export default { diff --git a/frontend/src/components/canvas/components/editor/fieldsList.vue b/frontend/src/components/canvas/components/editor/FieldsList.vue similarity index 100% rename from frontend/src/components/canvas/components/editor/fieldsList.vue rename to frontend/src/components/canvas/components/editor/FieldsList.vue diff --git a/frontend/src/components/canvas/components/editor/index.vue b/frontend/src/components/canvas/components/editor/index.vue index 76db58cf1c..913e10f2e1 100644 --- a/frontend/src/components/canvas/components/editor/index.vue +++ b/frontend/src/components/canvas/components/editor/index.vue @@ -231,7 +231,7 @@ import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog' import DeOutWidget from '@/components/dataease/DeOutWidget' import DragShadow from '@/components/deDrag/shadow' import bus from '@/utils/bus' -import LinkJumpSet from '@/views/panel/LinkJumpSet' +import LinkJumpSet from '@/views/panel/linkJumpSet' import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil' // 挤占式画布 import _ from 'lodash' diff --git a/frontend/src/components/canvas/index.vue b/frontend/src/components/canvas/index.vue index d53a0011e9..e2e06ddf5e 100644 --- a/frontend/src/components/canvas/index.vue +++ b/frontend/src/components/canvas/index.vue @@ -19,7 +19,7 @@ - - diff --git a/frontend/src/views/system/log/FilterUser.vue b/frontend/src/views/system/log/FilterUser.vue index 494e64d8b6..2a3235a6b7 100644 --- a/frontend/src/views/system/log/FilterUser.vue +++ b/frontend/src/views/system/log/FilterUser.vue @@ -88,7 +88,7 @@ import { dateFormat } from '@/views/system/task/options.js' import { opTypes } from '@/api/system/log' import { post } from '@/api/dataset/dataset' -import DeDatePick from '@/components/deCustomCm/deDatePick.vue' +import DeDatePick from '@/components/deCustomCm/DeDatePick.vue' export default { components: { DeDatePick diff --git a/frontend/src/views/system/plugin/dynamic.vue b/frontend/src/views/system/plugin/Dynamic.vue similarity index 100% rename from frontend/src/views/system/plugin/dynamic.vue rename to frontend/src/views/system/plugin/Dynamic.vue diff --git a/frontend/src/views/system/sysParam/BasicSetting.vue b/frontend/src/views/system/sysParam/BasicSetting.vue index e555dd783e..8f1cfa19e5 100644 --- a/frontend/src/views/system/sysParam/BasicSetting.vue +++ b/frontend/src/views/system/sysParam/BasicSetting.vue @@ -290,7 +290,7 @@ export default { if (res.success && res.data) { this.loginTypes.push(3) } - }), + }) wecomStatus().then(res => { if (res.success && res.data) { this.loginTypes.push(4) diff --git a/frontend/src/views/system/sysParam/ClusterModeSetting.vue b/frontend/src/views/system/sysParam/ClusterModeSetting.vue index f3ac3b02ca..8db92418eb 100644 --- a/frontend/src/views/system/sysParam/ClusterModeSetting.vue +++ b/frontend/src/views/system/sysParam/ClusterModeSetting.vue @@ -184,7 +184,7 @@ import { engineInfo, validate, save } from '@/api/system/engine' import i18n from '@/lang' import operator from './Operator' import msgCfm from '@/components/msgCfm' -import dePwd from '@/components/deCustomCm/dePwd.vue' +import dePwd from '@/components/deCustomCm/DePwd.vue' export default { name: 'ClusterMode', components: { diff --git a/frontend/src/views/system/sysParam/EmailSetting.vue b/frontend/src/views/system/sysParam/EmailSetting.vue index 8518980f16..59a5a818d6 100644 --- a/frontend/src/views/system/sysParam/EmailSetting.vue +++ b/frontend/src/views/system/sysParam/EmailSetting.vue @@ -131,7 +131,7 @@ import { emailInfo, updateInfo, validate } from '@/api/system/email' import operator from './Operator' import msgCfm from '@/components/msgCfm' -import dePwd from '@/components/deCustomCm/dePwd.vue' +import dePwd from '@/components/deCustomCm/DePwd.vue' const list = ['host', 'port', 'account', 'password', 'ssl', 'tls', '', 'recipient'] export default { name: 'EmailSetting', diff --git a/frontend/src/views/system/sysParam/KettleSetting.vue b/frontend/src/views/system/sysParam/KettleSetting.vue index 9fd2a18fb0..e8463456f4 100644 --- a/frontend/src/views/system/sysParam/KettleSetting.vue +++ b/frontend/src/views/system/sysParam/KettleSetting.vue @@ -161,7 +161,7 @@ import { validateById } from '@/api/system/kettle' import GridTable from '@/components/gridTable/index.vue' -import dePwd from '@/components/deCustomCm/dePwd.vue' +import dePwd from '@/components/deCustomCm/DePwd.vue' import msgCfm from '@/components/msgCfm' export default { diff --git a/frontend/src/views/system/task/FilterUser.vue b/frontend/src/views/system/task/FilterUser.vue index b57dd9ac08..65fc8d8d2c 100644 --- a/frontend/src/views/system/task/FilterUser.vue +++ b/frontend/src/views/system/task/FilterUser.vue @@ -145,7 +145,7 @@