diff --git a/frontend/src/components/AssistButton/ColorButton.vue b/frontend/src/components/assistButton/ColorButton.vue similarity index 100% rename from frontend/src/components/AssistButton/ColorButton.vue rename to frontend/src/components/assistButton/ColorButton.vue diff --git a/frontend/src/components/AsyncComponent/index.vue b/frontend/src/components/asyncComponent/index.vue similarity index 100% rename from frontend/src/components/AsyncComponent/index.vue rename to frontend/src/components/asyncComponent/index.vue diff --git a/frontend/src/components/AsyncSoltComponent/index.vue b/frontend/src/components/asyncSoltComponent/index.vue similarity index 100% rename from frontend/src/components/AsyncSoltComponent/index.vue rename to frontend/src/components/asyncSoltComponent/index.vue diff --git a/frontend/src/components/back-button/index.vue b/frontend/src/components/backButton/index.vue similarity index 100% rename from frontend/src/components/back-button/index.vue rename to frontend/src/components/backButton/index.vue diff --git a/frontend/src/components/Breadcrumb/index.vue b/frontend/src/components/breadcrumb/index.vue similarity index 100% rename from frontend/src/components/Breadcrumb/index.vue rename to frontend/src/components/breadcrumb/index.vue diff --git a/frontend/src/components/business/DeLayoutContent.vue b/frontend/src/components/business/DeLayoutContent.vue index 039be3d450..197849f166 100644 --- a/frontend/src/components/business/DeLayoutContent.vue +++ b/frontend/src/components/business/DeLayoutContent.vue @@ -19,7 +19,7 @@ diff --git a/frontend/src/components/canvas/components/ComponentList.vue b/frontend/src/components/canvas/components/ComponentList.vue index 798d5f510a..ec757d1fa2 100644 --- a/frontend/src/components/canvas/components/ComponentList.vue +++ b/frontend/src/components/canvas/components/ComponentList.vue @@ -20,7 +20,7 @@ diff --git a/frontend/src/components/canvas/components/Editor/ContextMenu.vue b/frontend/src/components/canvas/components/editor/ContextMenu.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/ContextMenu.vue rename to frontend/src/components/canvas/components/editor/ContextMenu.vue diff --git a/frontend/src/components/canvas/components/Editor/DateFormat.vue b/frontend/src/components/canvas/components/editor/DateFormat.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/DateFormat.vue rename to frontend/src/components/canvas/components/editor/DateFormat.vue diff --git a/frontend/src/components/canvas/components/Editor/DeEditor.vue b/frontend/src/components/canvas/components/editor/DeEditor.vue similarity index 99% rename from frontend/src/components/canvas/components/Editor/DeEditor.vue rename to frontend/src/components/canvas/components/editor/DeEditor.vue index bd7bc2c023..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" /> - + import { mapState } from 'vuex' import Shape from './Shape' -import DeDrag from '@/components/DeDrag' +import DeDrag from '@/components/deDrag' // eslint-disable-next-line no-unused-vars -import { getStyle, getComponentRotatedStyle } from '@/components/canvas/utils/style' +import { getComponentRotatedStyle, getStyle } from '@/components/canvas/utils/style' import { _$, imgUrlTrans } from '@/components/canvas/utils/utils' import ContextMenu from './ContextMenu' import MarkLine from './MarkLine' @@ -158,9 +158,9 @@ import eventBus from '@/components/canvas/utils/eventBus' import Grid from './Grid' import PGrid from './PGrid' import { changeStyleWithScale } from '@/components/canvas/utils/translate' -import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog' +import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog' import DeOutWidget from '@/components/dataease/DeOutWidget' -import DragShadow from '@/components/DeDrag/shadow' +import DragShadow from '@/components/deDrag/shadow' import bus from '@/utils/bus' import LinkJumpSet from '@/views/panel/LinkJumpSet' import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil' @@ -168,7 +168,7 @@ import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMat import _ from 'lodash' import _jq from 'jquery' import Background from '@/views/background/index' -import PointShadow from '@/components/DeDrag/pointShadow' +import PointShadow from '@/components/deDrag/pointShadow' // let positionBox = [] // let coordinates = [] // 坐标点集合 @@ -1790,7 +1790,6 @@ export default { } .edit { - /*outline: 1px solid gainsboro;*/ .component { outline: none; width: 100%; diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue similarity index 93% rename from frontend/src/components/canvas/components/Editor/EditBar.vue rename to frontend/src/components/canvas/components/editor/EditBar.vue index e969bf1bfc..b7df7c6e36 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/editor/EditBar.vue @@ -179,10 +179,10 @@ diff --git a/frontend/src/components/canvas/components/Editor/EditBarView.vue b/frontend/src/components/canvas/components/editor/EditBarView.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/EditBarView.vue rename to frontend/src/components/canvas/components/editor/EditBarView.vue diff --git a/frontend/src/components/canvas/components/Editor/FrameLinks.vue b/frontend/src/components/canvas/components/editor/FrameLinks.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/FrameLinks.vue rename to frontend/src/components/canvas/components/editor/FrameLinks.vue diff --git a/frontend/src/components/canvas/components/Editor/Grid.vue b/frontend/src/components/canvas/components/editor/Grid.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/Grid.vue rename to frontend/src/components/canvas/components/editor/Grid.vue diff --git a/frontend/src/components/canvas/components/Editor/Hyperlinks.vue b/frontend/src/components/canvas/components/editor/Hyperlinks.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/Hyperlinks.vue rename to frontend/src/components/canvas/components/editor/Hyperlinks.vue diff --git a/frontend/src/components/canvas/components/Editor/HyperlinksDialog.vue b/frontend/src/components/canvas/components/editor/HyperlinksDialog.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/HyperlinksDialog.vue rename to frontend/src/components/canvas/components/editor/HyperlinksDialog.vue diff --git a/frontend/src/components/canvas/components/Editor/LinkageField.vue b/frontend/src/components/canvas/components/editor/LinkageField.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/LinkageField.vue rename to frontend/src/components/canvas/components/editor/LinkageField.vue diff --git a/frontend/src/components/canvas/components/Editor/MarkLine.vue b/frontend/src/components/canvas/components/editor/MarkLine.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/MarkLine.vue rename to frontend/src/components/canvas/components/editor/MarkLine.vue diff --git a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue b/frontend/src/components/canvas/components/editor/MobileCheckBar.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/MobileCheckBar.vue rename to frontend/src/components/canvas/components/editor/MobileCheckBar.vue diff --git a/frontend/src/components/canvas/components/Editor/PGrid.vue b/frontend/src/components/canvas/components/editor/PGrid.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/PGrid.vue rename to frontend/src/components/canvas/components/editor/PGrid.vue diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue similarity index 92% rename from frontend/src/components/canvas/components/Editor/Preview.vue rename to frontend/src/components/canvas/components/editor/Preview.vue index ef6cba429d..063b08b4d2 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/editor/Preview.vue @@ -68,10 +68,11 @@ import { uuid } from 'vue-uuid' import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils' import eventBus from '@/components/canvas/utils/eventBus' import elementResizeDetectorMaker from 'element-resize-detector' -import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar' +import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar' import bus from '@/utils/bus' import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil' import { hasDataPermission } from '@/utils/permission' + const erd = elementResizeDetectorMaker() export default { @@ -338,9 +339,7 @@ export default { buttonExist: false, relationFilterIds: [], autoTrigger: true, - filterMap: { - - } + filterMap: {} } if (!panelItems || !panelItems.length) return result let sureButtonItem = null @@ -443,7 +442,10 @@ export default { this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height// 获取高度比 } if (this.isMainCanvas()) { - this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) }) + this.$store.commit('setPreviewCanvasScale', { + scaleWidth: (this.scaleWidth / 100), + scaleHeight: (this.scaleHeight / 100) + }) } this.handleScaleChange() }, @@ -529,63 +531,64 @@ export default { diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/editor/PreviewEject.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/PreviewEject.vue rename to frontend/src/components/canvas/components/editor/PreviewEject.vue diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/editor/PreviewFullScreen.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue rename to frontend/src/components/canvas/components/editor/PreviewFullScreen.vue diff --git a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue b/frontend/src/components/canvas/components/editor/PreviewMobile.vue similarity index 88% rename from frontend/src/components/canvas/components/Editor/PreviewMobile.vue rename to frontend/src/components/canvas/components/editor/PreviewMobile.vue index 7305826280..bebde5aabb 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue +++ b/frontend/src/components/canvas/components/editor/PreviewMobile.vue @@ -47,7 +47,7 @@ import { uuid } from 'vue-uuid' import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils' import eventBus from '@/components/canvas/utils/eventBus' import elementResizeDetectorMaker from 'element-resize-detector' -import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar' +import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar' export default { components: { ComponentWrapper, CanvasOptBar }, @@ -245,51 +245,51 @@ export default { diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/editor/SettingMenu.vue similarity index 99% rename from frontend/src/components/canvas/components/Editor/SettingMenu.vue rename to frontend/src/components/canvas/components/editor/SettingMenu.vue index 2f34abf834..198ab192c4 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/editor/SettingMenu.vue @@ -148,7 +148,7 @@ import { mapState } from 'vuex' import bus from '@/utils/bus' import { getViewLinkageGather } from '@/api/panel/linkage' -import HyperlinksDialog from '@/components/canvas/components/Editor/HyperlinksDialog' +import HyperlinksDialog from '@/components/canvas/components/editor/HyperlinksDialog' import CustomTabsSort from '@/components/widget/DeWidget/CustomTabsSort' export default { diff --git a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue b/frontend/src/components/canvas/components/editor/SettingMenuTest.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/SettingMenuTest.vue rename to frontend/src/components/canvas/components/editor/SettingMenuTest.vue diff --git a/frontend/src/components/canvas/components/Editor/Shape.vue b/frontend/src/components/canvas/components/editor/Shape.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/Shape.vue rename to frontend/src/components/canvas/components/editor/Shape.vue diff --git a/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue b/frontend/src/components/canvas/components/editor/StreamMediaLinks.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue rename to frontend/src/components/canvas/components/editor/StreamMediaLinks.vue diff --git a/frontend/src/components/canvas/components/Editor/VideoLinks.vue b/frontend/src/components/canvas/components/editor/VideoLinks.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/VideoLinks.vue rename to frontend/src/components/canvas/components/editor/VideoLinks.vue diff --git a/frontend/src/components/canvas/components/Editor/ViewTrackBar.vue b/frontend/src/components/canvas/components/editor/ViewTrackBar.vue similarity index 100% rename from frontend/src/components/canvas/components/Editor/ViewTrackBar.vue rename to frontend/src/components/canvas/components/editor/ViewTrackBar.vue 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 similarity index 94% rename from frontend/src/components/canvas/components/Editor/index.vue rename to frontend/src/components/canvas/components/editor/index.vue index 8c0c0dbe8b..18ae216c8d 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/editor/index.vue @@ -114,7 +114,7 @@ v-if="(curComponent&&curComponent.auxiliaryMatrix&&(curComponent.optStatus.dragging||curComponent.optStatus.resizing))||(dragComponentInfo)" /> - + @@ -215,11 +215,11 @@ diff --git a/frontend/src/components/canvas/custom-component/index.js b/frontend/src/components/canvas/custom-component/index.js deleted file mode 100644 index 7f9e99b351..0000000000 --- a/frontend/src/components/canvas/custom-component/index.js +++ /dev/null @@ -1,24 +0,0 @@ -import Vue from 'vue' - -import Picture from '@/components/canvas/custom-component/Picture' -import VText from '@/components/canvas/custom-component/VText' -import VButton from '@/components/canvas/custom-component/VButton' -import Group from '@/components/canvas/custom-component/Group' -import RectShape from '@/components/canvas/custom-component/RectShape' -import UserView from '@/components/canvas/custom-component/UserView' -import DeVideo from '@/components/canvas/custom-component/DeVideo' -import DeFrame from '@/components/canvas/custom-component/DeFrame' -import DeStreamMedia from '@/components/canvas/custom-component/DeStreamMedia' -import DeRichText from '@/components/canvas/custom-component/DeRichText' -Vue.component('DeRichText', DeRichText) -Vue.component('DeStreamMedia', DeStreamMedia) -// eslint-disable-next-line -Vue.component('Picture', Picture) -Vue.component('VText', VText) -Vue.component('VButton', VButton) -Vue.component('Group', Group) -Vue.component('RectShape', RectShape) -Vue.component('UserView', UserView) -Vue.component('DeVideo', DeVideo) -Vue.component('DeFrame', DeFrame) - diff --git a/frontend/src/components/canvas/custom-component/DeFrame.vue b/frontend/src/components/canvas/customComponent/DeFrame.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/DeFrame.vue rename to frontend/src/components/canvas/customComponent/DeFrame.vue diff --git a/frontend/src/components/canvas/custom-component/DeRichText.vue b/frontend/src/components/canvas/customComponent/DeRichText.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/DeRichText.vue rename to frontend/src/components/canvas/customComponent/DeRichText.vue diff --git a/frontend/src/components/canvas/custom-component/DeRichTextView.vue b/frontend/src/components/canvas/customComponent/DeRichTextView.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/DeRichTextView.vue rename to frontend/src/components/canvas/customComponent/DeRichTextView.vue diff --git a/frontend/src/components/canvas/custom-component/DeStreamMedia.vue b/frontend/src/components/canvas/customComponent/DeStreamMedia.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/DeStreamMedia.vue rename to frontend/src/components/canvas/customComponent/DeStreamMedia.vue diff --git a/frontend/src/components/canvas/custom-component/DeVideo.vue b/frontend/src/components/canvas/customComponent/DeVideo.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/DeVideo.vue rename to frontend/src/components/canvas/customComponent/DeVideo.vue diff --git a/frontend/src/components/canvas/custom-component/Group.vue b/frontend/src/components/canvas/customComponent/Group.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/Group.vue rename to frontend/src/components/canvas/customComponent/Group.vue diff --git a/frontend/src/components/canvas/custom-component/LinkJumpSetDialog.vue b/frontend/src/components/canvas/customComponent/LinkJumpSetDialog.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/LinkJumpSetDialog.vue rename to frontend/src/components/canvas/customComponent/LinkJumpSetDialog.vue diff --git a/frontend/src/components/canvas/custom-component/Picture.vue b/frontend/src/components/canvas/customComponent/Picture.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/Picture.vue rename to frontend/src/components/canvas/customComponent/Picture.vue diff --git a/frontend/src/components/canvas/custom-component/RectShape.vue b/frontend/src/components/canvas/customComponent/RectShape.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/RectShape.vue rename to frontend/src/components/canvas/customComponent/RectShape.vue diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue similarity index 95% rename from frontend/src/components/canvas/custom-component/UserView.vue rename to frontend/src/components/canvas/customComponent/UserView.vue index b7140f6448..fa814f692c 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/customComponent/UserView.vue @@ -196,26 +196,39 @@ import { mapState } from 'vuex' import { isChange } from '@/utils/conditionUtil' import { BASE_CHART_STRING } from '@/views/chart/chart/chart' import { deepCopy } from '@/components/canvas/utils/utils' -import { getToken, getLinkToken } from '@/utils/auth' +import { getLinkToken, getToken } from '@/utils/auth' import DrillPath from '@/views/chart/view/DrillPath' import { areaMapping } from '@/api/map/map' import ChartComponentG2 from '@/views/chart/components/ChartComponentG2' -import EditBarView from '@/components/canvas/components/Editor/EditBarView' +import EditBarView from '@/components/canvas/components/editor/EditBarView' import { adaptCurTheme, customAttrTrans, customStyleTrans, recursionTransObj } from '@/components/canvas/utils/style' import ChartComponentS2 from '@/views/chart/components/ChartComponentS2' import PluginCom from '@/views/system/plugin/PluginCom' import LabelNormalText from '@/views/chart/components/normal/LabelNormalText' import { viewEditSave, viewPropsSave } from '@/api/chart/chart' import { checkAddHttp } from '@/utils/urlUtils' -import DeRichTextView from '@/components/canvas/custom-component/DeRichTextView' +import DeRichTextView from '@/components/canvas/customComponent/DeRichTextView' import Vue from 'vue' import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter' -import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog' -import UserViewMobileDialog from '@/components/canvas/custom-component/UserViewMobileDialog' +import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog' +import UserViewMobileDialog from '@/components/canvas/customComponent/UserViewMobileDialog' export default { name: 'UserView', - components: { UserViewMobileDialog, UserViewDialog, DeRichTextView, LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 }, + components: { + UserViewMobileDialog, + UserViewDialog, + DeRichTextView, + LabelNormalText, + PluginCom, + ChartComponentS2, + EditBarView, + ChartComponent, + TableNormal, + LabelNormal, + DrillPath, + ChartComponentG2 + }, props: { canvasId: { type: String, @@ -688,7 +701,11 @@ export default { adaptCurTheme(customStyleObj, customAttrObj) this.chart.customStyle = JSON.stringify(customStyleObj) this.chart.customAttr = JSON.stringify(customAttrObj) - viewEditSave(this.panelInfo.id, { id: this.chart.id, customStyle: this.chart.customStyle, customAttr: this.chart.customAttr }) + viewEditSave(this.panelInfo.id, { + id: this.chart.id, + customStyle: this.chart.customStyle, + customAttr: this.chart.customAttr + }) this.$store.commit('adaptorStatusDisable', this.element.id) } this.sourceCustomAttrStr = this.chart.customAttr @@ -933,7 +950,10 @@ export default { const current = this.$refs[this.element.propValue.id] if (this.chart.isPlugin) { - current && current.callPluginInner && this.setDetailMapCode(null) && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null }) + current && current.callPluginInner && this.setDetailMapCode(null) && current.callPluginInner({ + methodName: 'registerDynamicMap', + methodParam: null + }) } else { current && current.registerDynamicMap && this.setDetailMapCode(null) && current.registerDynamicMap(null) } @@ -963,7 +983,10 @@ export default { this.currentAcreaNode = tempNode const current = this.$refs[this.element.propValue.id] if (this.chart.isPlugin) { - current && current.callPluginInner && this.setDetailMapCode(this.currentAcreaNode.code) && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: this.currentAcreaNode.code }) + current && current.callPluginInner && this.setDetailMapCode(this.currentAcreaNode.code) && current.callPluginInner({ + methodName: 'registerDynamicMap', + methodParam: this.currentAcreaNode.code + }) } else { current && current.registerDynamicMap && this.setDetailMapCode(this.currentAcreaNode.code) && current.registerDynamicMap(this.currentAcreaNode.code) } @@ -990,7 +1013,10 @@ export default { this.currentAcreaNode = nextNode const current = this.$refs[this.element.propValue.id] if (this.chart.isPlugin) { - nextNode && current && current.callPluginInner && this.setDetailMapCode(nextNode.code) && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: nextNode.code }) + nextNode && current && current.callPluginInner && this.setDetailMapCode(nextNode.code) && current.callPluginInner({ + methodName: 'registerDynamicMap', + methodParam: nextNode.code + }) } else { nextNode && current && current.registerDynamicMap && this.setDetailMapCode(nextNode.code) && current.registerDynamicMap(nextNode.code) } @@ -1024,7 +1050,10 @@ export default { const current = this.$refs[this.element.propValue.id] if (this.chart.isPlugin) { - current && current.callPluginInner && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: areaNode.code }) + current && current.callPluginInner && current.callPluginInner({ + methodName: 'registerDynamicMap', + methodParam: areaNode.code + }) } else { current && current.registerDynamicMap && current.registerDynamicMap(areaNode.code) } @@ -1126,45 +1155,45 @@ export default { diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/customComponent/UserViewDialog.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/UserViewDialog.vue rename to frontend/src/components/canvas/customComponent/UserViewDialog.vue diff --git a/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue b/frontend/src/components/canvas/customComponent/UserViewMobileDialog.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue rename to frontend/src/components/canvas/customComponent/UserViewMobileDialog.vue diff --git a/frontend/src/components/canvas/custom-component/VButton.vue b/frontend/src/components/canvas/customComponent/VButton.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/VButton.vue rename to frontend/src/components/canvas/customComponent/VButton.vue diff --git a/frontend/src/components/canvas/custom-component/VText.vue b/frontend/src/components/canvas/customComponent/VText.vue similarity index 100% rename from frontend/src/components/canvas/custom-component/VText.vue rename to frontend/src/components/canvas/customComponent/VText.vue diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/customComponent/component-list.js similarity index 100% rename from frontend/src/components/canvas/custom-component/component-list.js rename to frontend/src/components/canvas/customComponent/component-list.js diff --git a/frontend/src/components/canvas/customComponent/index.js b/frontend/src/components/canvas/customComponent/index.js new file mode 100644 index 0000000000..dc40c41056 --- /dev/null +++ b/frontend/src/components/canvas/customComponent/index.js @@ -0,0 +1,24 @@ +import Vue from 'vue' + +import Picture from '@/components/canvas/customComponent/Picture' +import VText from '@/components/canvas/customComponent/VText' +import VButton from '@/components/canvas/customComponent/VButton' +import Group from '@/components/canvas/customComponent/Group' +import RectShape from '@/components/canvas/customComponent/RectShape' +import UserView from '@/components/canvas/customComponent/UserView' +import DeVideo from '@/components/canvas/customComponent/DeVideo' +import DeFrame from '@/components/canvas/customComponent/DeFrame' +import DeStreamMedia from '@/components/canvas/customComponent/DeStreamMedia' +import DeRichText from '@/components/canvas/customComponent/DeRichText' +Vue.component('DeRichText', DeRichText) +Vue.component('DeStreamMedia', DeStreamMedia) +// eslint-disable-next-line +Vue.component('Picture', Picture) +Vue.component('VText', VText) +Vue.component('VButton', VButton) +Vue.component('Group', Group) +Vue.component('RectShape', RectShape) +Vue.component('UserView', UserView) +Vue.component('DeVideo', DeVideo) +Vue.component('DeFrame', DeFrame) + diff --git a/frontend/src/components/canvas/index.vue b/frontend/src/components/canvas/index.vue index cb54b624a3..d53a0011e9 100644 --- a/frontend/src/components/canvas/index.vue +++ b/frontend/src/components/canvas/index.vue @@ -20,12 +20,13 @@ diff --git a/frontend/src/components/dataease-tabs/index.vue b/frontend/src/components/dataeaseTabs/index.vue similarity index 100% rename from frontend/src/components/dataease-tabs/index.vue rename to frontend/src/components/dataeaseTabs/index.vue 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/DeDrag/index.vue b/frontend/src/components/deDrag/index.vue similarity index 99% rename from frontend/src/components/DeDrag/index.vue rename to frontend/src/components/deDrag/index.vue index e6c4b96bc9..36589b10a1 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -84,20 +84,19 @@ diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/deWidget/DeSelectTree.vue similarity index 95% rename from frontend/src/components/widget/DeWidget/DeSelectTree.vue rename to frontend/src/components/widget/deWidget/DeSelectTree.vue index 77950175d1..15a6f49710 100644 --- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue +++ b/frontend/src/components/widget/deWidget/DeSelectTree.vue @@ -24,13 +24,13 @@ diff --git a/frontend/src/main.js b/frontend/src/main.js index 1d583ade25..c72219e522 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -20,38 +20,42 @@ import widgets from '@/components/widget' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import './utils/dialog' -import DeComplexInput from '@/components/business/condition-table/DeComplexInput' -import DeComplexSelect from '@/components/business/condition-table/DeComplexSelect' -import DeViewSelect from '@/components/DeViewSelect' +import DeComplexInput from '@/components/business/conditionTable/DeComplexInput' +import DeComplexSelect from '@/components/business/conditionTable/DeComplexSelect' +import DeViewSelect from '@/components/deViewSelect' import RemarkEditor from '@/views/chart/components/component-style/dialog/RemarkEditor' import TitleRemark from '@/views/chart/view/TitleRemark' -import '@/components/canvas/custom-component' // 注册自定义组件 +import '@/components/canvas/customComponent' // 注册自定义组件 import deBtn from '@/components/deCustomCm/deBtn.vue' import '@/utils/DateUtil' import draggable from 'vuedraggable' import deWebsocket from '@/websocket' import { GaodeMap } from '@antv/l7-maps' +import * as echarts from 'echarts' +import UmyUi from 'umy-ui' +// 全屏插件 +import fullscreen from 'vue-fullscreen' +import VueFriendlyIframe from 'vue-friendly-iframe' +import vueToPdf from 'vue-to-pdf' +import VueVideoPlayer from 'vue-video-player' +import 'video.js/dist/video-js.css' +// 控制标签宽高成比例的指令 +import proportion from 'vue-proportion-directive' + Vue.config.productionTip = false Vue.use(VueClipboard) Vue.use(widgets) Vue.component('Draggable', draggable) Vue.prototype.$api = api -import * as echarts from 'echarts' - Vue.prototype.$echarts = echarts Vue.prototype.$gaodeMap = GaodeMap -import UmyUi from 'umy-ui' Vue.use(UmyUi) -// 全屏插件 -import fullscreen from 'vue-fullscreen' Vue.use(fullscreen) -import VueFriendlyIframe from 'vue-friendly-iframe' - Vue.use(VueFriendlyIframe) Vue.use(Vuetify) // import TEditor from '@/components/Tinymce/index.vue' @@ -96,15 +100,10 @@ Vue.component('DeBtn', deBtn) Vue.config.productionTip = false -import vueToPdf from 'vue-to-pdf' Vue.use(vueToPdf) -import VueVideoPlayer from 'vue-video-player' -import 'video.js/dist/video-js.css' Vue.use(VueVideoPlayer) -// 控制标签宽高成比例的指令 -import proportion from 'vue-proportion-directive' Vue.use(proportion) Vue.prototype.hasDataPermission = function(pTarget, pSource) { diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 066503b320..c63d5842b9 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -79,17 +79,17 @@ export const constantRoutes = [ { path: '/preview/:reportId', - component: () => import('@/components/canvas/components/Editor/PreviewEject'), + component: () => import('@/components/canvas/components/editor/PreviewEject'), hidden: true }, { path: '/previewScreenShot/:reportId/:backScreenShot', - component: () => import('@/components/canvas/components/Editor/PreviewEject'), + component: () => import('@/components/canvas/components/editor/PreviewEject'), hidden: true }, { path: '/previewFullScreen', - component: () => import('@/components/canvas/components/Editor/PreviewFullScreen'), + component: () => import('@/components/canvas/components/editor/PreviewFullScreen'), hidden: true } diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index 12e2388627..f03e066752 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -29,7 +29,7 @@ import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel' import bus from '@/utils/bus' -import { BASE_MOBILE_STYLE } from '@/components/canvas/custom-component/component-list' +import { BASE_MOBILE_STYLE } from '@/components/canvas/customComponent/component-list' import { TYPE_CONFIGS } from '@/views/chart/chart/util' import { deepCopy } from '@/components/canvas/utils/utils' diff --git a/frontend/src/views/background/index.vue b/frontend/src/views/background/index.vue index a8155447d7..1b264d968b 100644 --- a/frontend/src/views/background/index.vue +++ b/frontend/src/views/background/index.vue @@ -97,7 +97,8 @@ v-model="curComponent.commonBackground.backgroundType" label="outerImage" @change="onChangeType" - >{{ $t('panel.photo') }} + >{{ $t('panel.photo') }} + 边框 + >边框 + {{ $t('commons.cancel') }} + >{{ $t('commons.cancel') }} + {{ $t('commons.confirm') }} + >{{ $t('commons.confirm') }} + @@ -255,7 +259,7 @@ import { mapState } from 'vuex' import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils' import { COLOR_PANEL } from '@/views/chart/chart/chart' import { uploadFileResult } from '@/api/staticResource/staticResource' -import { COMMON_BACKGROUND_NONE } from '@/components/canvas/custom-component/component-list' +import { COMMON_BACKGROUND_NONE } from '@/components/canvas/customComponent/component-list' export default { name: 'Background', @@ -341,73 +345,83 @@ export default { diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js index 65ae8ff0d9..4e6e9d7da7 100644 --- a/frontend/src/views/chart/chart/map/map.js +++ b/frontend/src/views/chart/chart/map/map.js @@ -1,7 +1,7 @@ // import { hexColorToRGBA } from '@/views/chart/chart/util' import { componentStyle } from '../common/common' import { BASE_ECHARTS_SELECT, DEFAULT_TOOLTIP } from '@/views/chart/chart/chart' -import { isGradientValue } from '@/components/GradientColorSelector/base' +import { isGradientValue } from '@/components/gradientColorSelector/base' const linearCOlor = (start, end) => { return { type: 'linear', diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue index c7d1178eca..84c7849e1c 100644 --- a/frontend/src/views/chart/components/ChartComponent.vue +++ b/frontend/src/views/chart/components/ChartComponent.vue @@ -56,61 +56,33 @@ diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index 891c7195eb..fe5998d8be 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -41,7 +41,7 @@ diff --git a/frontend/src/views/chart/components/normal/LabelNormalText.vue b/frontend/src/views/chart/components/normal/LabelNormalText.vue index 350aff5983..db3e79ab7f 100644 --- a/frontend/src/views/chart/components/normal/LabelNormalText.vue +++ b/frontend/src/views/chart/components/normal/LabelNormalText.vue @@ -59,7 +59,7 @@ diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue index 6d2a8037bc..6c8d7a0749 100644 --- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue @@ -59,7 +59,8 @@ type="text" style="margin-left: 2px;" @click="resetCustomColor" - >{{ $t('commons.reset') }} + >{{ $t('commons.reset') }} +
diff --git a/frontend/src/views/panel/AssistComponent/index.vue b/frontend/src/views/panel/AssistComponent/index.vue index 7f08ce4c50..6274cf901a 100644 --- a/frontend/src/views/panel/AssistComponent/index.vue +++ b/frontend/src/views/panel/AssistComponent/index.vue @@ -8,7 +8,7 @@
-
样式
+
样式
@@ -89,9 +89,14 @@ diff --git a/frontend/src/views/panel/ViewSelect/multiplexing.vue b/frontend/src/views/panel/ViewSelect/multiplexing.vue index ff8494595a..fa49a7fcb5 100644 --- a/frontend/src/views/panel/ViewSelect/multiplexing.vue +++ b/frontend/src/views/panel/ViewSelect/multiplexing.vue @@ -42,10 +42,10 @@ import DeContainer from '@/components/dataease/DeContainer' import DeAsideContainer from '@/components/dataease/DeAsideContainer' import { findOne } from '@/api/panel/panel' import { deepCopy, panelDataPrepare } from '@/components/canvas/utils/utils' -import Preview from '@/components/canvas/components/Editor/Preview' +import Preview from '@/components/canvas/components/editor/Preview' import MultiplexingView from '@/views/panel/ViewSelect/multiplexingView' import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel' -import { USER_VIEW } from '@/components/canvas/custom-component/component-list' +import { USER_VIEW } from '@/components/canvas/customComponent/component-list' import { uuid } from 'vue-uuid' export default { @@ -78,9 +78,7 @@ export default { return this.componentData.filter(item => item.canvasId === this.canvasId) } }, - watch: { - - }, + watch: {}, mounted() { this.$store.commit('initCurMultiplexingComponents') }, @@ -114,9 +112,10 @@ export default { const componentId = uuid.v1() _this.canvasStyleData = deepCopy(DEFAULT_COMMON_CANVAS_STYLE_STRING) const userView = { - ... deepCopy(USER_VIEW), + ...deepCopy(USER_VIEW), 'id': componentId, - 'auxiliaryMatrix': false } + 'auxiliaryMatrix': false + } userView.style.width = _this.canvasStyleData.width userView.style.height = _this.canvasStyleData.height userView['propValue'] = { @@ -137,45 +136,51 @@ export default { diff --git a/frontend/src/views/panel/edit/ComponentWaitItem.vue b/frontend/src/views/panel/edit/ComponentWaitItem.vue index fad8a6f0ac..80dda2ac9e 100644 --- a/frontend/src/views/panel/edit/ComponentWaitItem.vue +++ b/frontend/src/views/panel/edit/ComponentWaitItem.vue @@ -43,7 +43,7 @@ diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 9edc605344..d7334c8c0d 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -490,23 +490,20 @@ import { deepCopy, getNowCanvasComponentData, imgUrlTrans, matrixBaseChange } fr import componentList, { BASE_MOBILE_STYLE, COMMON_BACKGROUND, - HYPERLINKS, PIC_STYLE -} from '@/components/canvas/custom-component/component-list' // 左侧列表数据 + commonAttr, + HYPERLINKS, + PIC_STYLE +} from '@/components/canvas/customComponent/component-list' // 左侧列表数据 import { mapState } from 'vuex' import { uuid } from 'vue-uuid' import Toolbar from '@/components/canvas/components/Toolbar' -import { - checkUserCache, - initPanelData, - initViewCache, - queryPanelMultiplexingViewTree -} from '@/api/panel/panel' -import Preview from '@/components/canvas/components/Editor/Preview' +import { checkUserCache, initPanelData, initViewCache, queryPanelMultiplexingViewTree } from '@/api/panel/panel' +import Preview from '@/components/canvas/components/editor/Preview' import elementResizeDetectorMaker from 'element-resize-detector' import AssistComponent from '@/views/panel/AssistComponent' import ChartGroup from '@/views/chart/group/Group' import { chartCopy } from '@/api/chart/chart' -import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar' +import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar' // 引入样式 import '@/components/canvas/assets/iconfont/iconfont.css' @@ -516,7 +513,6 @@ import FilterDialog from '../filter/filterDialog' import ButtonDialog from '../filter/ButtonDialog' import ButtonResetDialog from '../filter/ButtonResetDialog' import toast from '@/components/canvas/utils/toast' -import { commonAttr } from '@/components/canvas/custom-component/component-list' import generateID from '@/components/canvas/utils/generateID' import ComponentWait from '@/views/panel/edit/ComponentWait' import { deleteEnshrine, saveEnshrine, starStatus } from '@/api/panel/enshrine' diff --git a/frontend/src/views/panel/filter/filterMain/FilterHead.vue b/frontend/src/views/panel/filter/filterMain/FilterHead.vue index fe65265515..1f9367ab76 100644 --- a/frontend/src/views/panel/filter/filterMain/FilterHead.vue +++ b/frontend/src/views/panel/filter/filterMain/FilterHead.vue @@ -45,7 +45,7 @@ diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index db3759ea47..7779e9ff51 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -431,18 +431,10 @@ import LinkGenerate from '@/views/link/generate' import { uuid } from 'vue-uuid' import bus from '@/utils/bus' import EditPanel from './EditPanel' -import { - addGroup, - delGroup, - groupTree, - defaultTree, - initPanelData, - panelUpdate, - viewPanelLog -} from '@/api/panel/panel' +import { addGroup, defaultTree, delGroup, groupTree, initPanelData, panelUpdate, viewPanelLog } from '@/api/panel/panel' import { mapState } from 'vuex' import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel' -import TreeSelector from '@/components/TreeSelector' +import TreeSelector from '@/components/treeSelector' import { queryAuthModel } from '@/api/authModel/authModel' export default { diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index 93dc150180..4b497eca58 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -324,13 +324,13 @@