From a9d2e201ab83fa3d4a07cdc10e13e3a89c3568ab Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 7 Nov 2022 15:39:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=96=87=E4=BB=B6=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E6=A0=87=E5=87=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/TextAttr.vue | 20 +-- .../canvas/components/editor/DeEditor.vue | 3 +- .../canvas/components/editor/index.vue | 3 +- .../src/components/dataease/DeOutWidget.vue | 161 ++++++++++-------- .../{pointShadow.vue => PointShadow.vue} | 0 .../deDrag/{shadow.vue => Shadow.vue} | 0 .../src/components/elVisualSelect/index.vue | 30 ++-- .../{DeWidget => deWidget}/CustomTabsSort.vue | 0 .../{DeWidget => deWidget}/DeButton.vue | 0 .../widget/{DeWidget => deWidget}/DeDate.vue | 29 ++-- .../{DeWidget => deWidget}/DeInputSearch.vue | 0 .../{DeWidget => deWidget}/DeNumberRange.vue | 0 .../{DeWidget => deWidget}/DeQuarter.vue | 0 .../{DeWidget => deWidget}/DeResetButton.vue | 0 .../{DeWidget => deWidget}/DeSelect.vue | 4 +- .../{DeWidget => deWidget}/DeSelectGrid.vue | 91 +++++----- .../{DeWidget => deWidget}/DeSelectTree.vue | 4 +- .../{DeWidget => deWidget}/DeShowDate.vue | 0 .../widget/{DeWidget => deWidget}/DeTabs.vue | 0 .../{DeWidget => deWidget}/DeTreeSelect.vue | 0 .../{DeWidget => deWidget}/TabStyle.vue | 0 .../{DeWidget => deWidget}/TimeComplex.vue | 0 .../{DeWidget => deWidget}/TimeDefault.vue | 0 .../{DeWidget => deWidget}/TimeElec.vue | 0 .../{DeWidget => deWidget}/TimeSimple.vue | 0 .../{DeWidget => deWidget}/TitlePosition.vue | 0 .../{DeWidget => deWidget}/customInput.js | 2 +- .../{DeWidget => deWidget}/inputStyleMixin.js | 8 +- .../{DeWidget => deWidget}/serviceNameFn.js | 0 .../sources/ElQuarter.vue | 0 30 files changed, 195 insertions(+), 160 deletions(-) rename frontend/src/components/deDrag/{pointShadow.vue => PointShadow.vue} (100%) rename frontend/src/components/deDrag/{shadow.vue => Shadow.vue} (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/CustomTabsSort.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeButton.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeDate.vue (94%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeInputSearch.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeNumberRange.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeQuarter.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeResetButton.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeSelect.vue (98%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeSelectGrid.vue (90%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeSelectTree.vue (99%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeShowDate.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeTabs.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/DeTreeSelect.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/TabStyle.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/TimeComplex.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/TimeDefault.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/TimeElec.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/TimeSimple.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/TitlePosition.vue (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/customInput.js (96%) rename frontend/src/components/widget/{DeWidget => deWidget}/inputStyleMixin.js (95%) rename frontend/src/components/widget/{DeWidget => deWidget}/serviceNameFn.js (100%) rename frontend/src/components/widget/{DeWidget => deWidget}/sources/ElQuarter.vue (100%) diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 634e5c1122..5c507823fc 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -24,7 +24,7 @@ > - + @@ -47,7 +47,7 @@ :value="item.value" > - + {{ item.label }} @@ -233,7 +233,7 @@ @click="goColor" /> -
+
-
+
-
+
- +
@@ -303,7 +303,7 @@ style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;" > - +
@@ -312,7 +312,7 @@ style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;" > - +
- +
@@ -415,7 +415,7 @@ import StreamMediaLinks from '@/components/canvas/components/editor/StreamMediaL import DateFormat from '@/components/canvas/components/editor/DateFormat' import { COLOR_PANEL } from '@/views/chart/chart/chart' import FrameLinks from '@/components/canvas/components/editor/FrameLinks' -import TitlePosition from '@/components/widget/DeWidget/TitlePosition' +import TitlePosition from '@/components/widget/deWidget/TitlePosition' export default { components: { TitlePosition, FrameLinks, DateFormat, VideoLinks, StreamMediaLinks }, diff --git a/frontend/src/components/canvas/components/editor/DeEditor.vue b/frontend/src/components/canvas/components/editor/DeEditor.vue index 5aa2176c01..b62db0d7b0 100644 --- a/frontend/src/components/canvas/components/editor/DeEditor.vue +++ b/frontend/src/components/canvas/components/editor/DeEditor.vue @@ -120,7 +120,7 @@ :canvas-id="canvasId" /> - + - + @@ -1855,7 +1855,6 @@ export default { } .edit { - /*outline: 1px solid gainsboro;*/ .component { outline: none; width: 100%; diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue index ceec98763f..af303f59b9 100644 --- a/frontend/src/components/dataease/DeOutWidget.vue +++ b/frontend/src/components/dataease/DeOutWidget.vue @@ -59,7 +59,8 @@ diff --git a/frontend/src/components/deDrag/pointShadow.vue b/frontend/src/components/deDrag/PointShadow.vue similarity index 100% rename from frontend/src/components/deDrag/pointShadow.vue rename to frontend/src/components/deDrag/PointShadow.vue diff --git a/frontend/src/components/deDrag/shadow.vue b/frontend/src/components/deDrag/Shadow.vue similarity index 100% rename from frontend/src/components/deDrag/shadow.vue rename to frontend/src/components/deDrag/Shadow.vue diff --git a/frontend/src/components/elVisualSelect/index.vue b/frontend/src/components/elVisualSelect/index.vue index dd1006c10b..682115ecca 100644 --- a/frontend/src/components/elVisualSelect/index.vue +++ b/frontend/src/components/elVisualSelect/index.vue @@ -15,12 +15,15 @@

{{ $t('dataset.check_all') }}

+ > + {{ $t('dataset.check_all') }} + +

diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/deWidget/DeSelectTree.vue similarity index 99% rename from frontend/src/components/widget/DeWidget/DeSelectTree.vue rename to frontend/src/components/widget/deWidget/DeSelectTree.vue index 7b27ef8b46..15a6f49710 100644 --- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue +++ b/frontend/src/components/widget/deWidget/DeSelectTree.vue @@ -29,8 +29,8 @@ import bus from '@/utils/bus' import { isSameVueObj } from '@/utils' import { getLinkToken, getToken } from '@/utils/auth' import ElTreeSelect from '@/components/elTreeSelect' -import customInput from '@/components/widget/DeWidget/customInput' -import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js' +import customInput from '@/components/widget/deWidget/customInput' +import { textSelectWidget } from '@/components/widget/deWidget/serviceNameFn.js' export default { components: { ElTreeSelect }, diff --git a/frontend/src/components/widget/DeWidget/DeShowDate.vue b/frontend/src/components/widget/deWidget/DeShowDate.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/DeShowDate.vue rename to frontend/src/components/widget/deWidget/DeShowDate.vue diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/DeTabs.vue rename to frontend/src/components/widget/deWidget/DeTabs.vue diff --git a/frontend/src/components/widget/DeWidget/DeTreeSelect.vue b/frontend/src/components/widget/deWidget/DeTreeSelect.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/DeTreeSelect.vue rename to frontend/src/components/widget/deWidget/DeTreeSelect.vue diff --git a/frontend/src/components/widget/DeWidget/TabStyle.vue b/frontend/src/components/widget/deWidget/TabStyle.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/TabStyle.vue rename to frontend/src/components/widget/deWidget/TabStyle.vue diff --git a/frontend/src/components/widget/DeWidget/TimeComplex.vue b/frontend/src/components/widget/deWidget/TimeComplex.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/TimeComplex.vue rename to frontend/src/components/widget/deWidget/TimeComplex.vue diff --git a/frontend/src/components/widget/DeWidget/TimeDefault.vue b/frontend/src/components/widget/deWidget/TimeDefault.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/TimeDefault.vue rename to frontend/src/components/widget/deWidget/TimeDefault.vue diff --git a/frontend/src/components/widget/DeWidget/TimeElec.vue b/frontend/src/components/widget/deWidget/TimeElec.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/TimeElec.vue rename to frontend/src/components/widget/deWidget/TimeElec.vue diff --git a/frontend/src/components/widget/DeWidget/TimeSimple.vue b/frontend/src/components/widget/deWidget/TimeSimple.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/TimeSimple.vue rename to frontend/src/components/widget/deWidget/TimeSimple.vue diff --git a/frontend/src/components/widget/DeWidget/TitlePosition.vue b/frontend/src/components/widget/deWidget/TitlePosition.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/TitlePosition.vue rename to frontend/src/components/widget/deWidget/TitlePosition.vue diff --git a/frontend/src/components/widget/DeWidget/customInput.js b/frontend/src/components/widget/deWidget/customInput.js similarity index 96% rename from frontend/src/components/widget/DeWidget/customInput.js rename to frontend/src/components/widget/deWidget/customInput.js index be9bd6c8b5..7d04365e4f 100644 --- a/frontend/src/components/widget/DeWidget/customInput.js +++ b/frontend/src/components/widget/deWidget/customInput.js @@ -1,5 +1,5 @@ // 通过控制css变量控制过滤组件弹框样式 de-select-grid除外 -import { attrsMap, styleAttrs } from '@/components/widget/DeWidget/serviceNameFn.js' +import { attrsMap, styleAttrs } from '@/components/widget/deWidget/serviceNameFn.js' export default { data() { diff --git a/frontend/src/components/widget/DeWidget/inputStyleMixin.js b/frontend/src/components/widget/deWidget/inputStyleMixin.js similarity index 95% rename from frontend/src/components/widget/DeWidget/inputStyleMixin.js rename to frontend/src/components/widget/deWidget/inputStyleMixin.js index cbcf72c892..0c8c2c93e4 100644 --- a/frontend/src/components/widget/DeWidget/inputStyleMixin.js +++ b/frontend/src/components/widget/deWidget/inputStyleMixin.js @@ -1,5 +1,11 @@ // 通过控制 js 控制过滤组件输入框样式 如需额外处理 声明组件serviceName同名函数处理 -import { timeDateRangeWidget, textInputWidget, attrsMap, styleAttrs } from '@/components/widget/DeWidget/serviceNameFn.js' +import { + attrsMap, + styleAttrs, + textInputWidget, + timeDateRangeWidget +} from '@/components/widget/deWidget/serviceNameFn.js' + export default { data() { return { diff --git a/frontend/src/components/widget/DeWidget/serviceNameFn.js b/frontend/src/components/widget/deWidget/serviceNameFn.js similarity index 100% rename from frontend/src/components/widget/DeWidget/serviceNameFn.js rename to frontend/src/components/widget/deWidget/serviceNameFn.js diff --git a/frontend/src/components/widget/DeWidget/sources/ElQuarter.vue b/frontend/src/components/widget/deWidget/sources/ElQuarter.vue similarity index 100% rename from frontend/src/components/widget/DeWidget/sources/ElQuarter.vue rename to frontend/src/components/widget/deWidget/sources/ElQuarter.vue