Skip to content

Commit

Permalink
Merge pull request dataease#3667 from dataease/pr@dev_memory_component
Browse files Browse the repository at this point in the history 
Pr@dev memory component
  • Loading branch information
@tjlygdx
tjlygdx authored Nov 8, 2022
2 parents 5d3a4a1 + bd51f3e commit 8aca852
Show file tree
Hide file tree
Showing 149 changed files with 108 additions and 185 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/canvas/DeCanvas.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/canvas/components/editor/DeEditor.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/canvas/components/editor/EditBar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...s/canvas/components/editor/fieldsList.vue → ...s/canvas/components/editor/FieldsList.vue
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion frontend/src/components/canvas/components/editor/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/canvas/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</template>

<script>
import Editor from '@/components/Editor/index'
import Editor from '@/components/editor/index'
import componentList from '@/components/canvas/customComponent/component-list' // 左侧列表数据
import Toolbar from '@/components/Toolbar'
import { deepCopy } from '@/utils/utils'
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/components/cron/cron.vue → frontend/src/components/cron/Cron.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@
</template>

<script>
import SecondAndMinute from './cron/secondAndMinute'
import hour from './cron/hour'
import day from './cron/day'
import month from './cron/month'
import week from './cron/week'
import year from './cron/year'
import SecondAndMinute from './cron/SecondAndMinute'
import hour from './cron/Hour'
import day from './cron/Day'
import month from './cron/Month'
import week from './cron/Week'
import year from './cron/Year'
export default {
components: {
SecondAndMinute, hour, day, month, week, year
Expand Down
0 frontend/src/components/cron/cron/day.vue → frontend/src/components/cron/cron/Day.vue
View file
File renamed without changes.
0 frontend/src/components/cron/cron/hour.vue → frontend/src/components/cron/cron/Hour.vue
View file
File renamed without changes.
0 frontend/src/components/cron/cron/month.vue → frontend/src/components/cron/cron/Month.vue
View file
File renamed without changes.
0 .../components/cron/cron/secondAndMinute.vue → .../components/cron/cron/SecondAndMinute.vue
View file
File renamed without changes.
0 frontend/src/components/cron/cron/week.vue → frontend/src/components/cron/cron/Week.vue
View file
File renamed without changes.
0 frontend/src/components/cron/cron/year.vue → frontend/src/components/cron/cron/Year.vue
View file
File renamed without changes.
1 change: 0 additions & 1 deletion frontend/src/components/dataease/DeOutWidget.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@

<script>
import inputStyleMixin from '@/components/widget/deWidget/inputStyleMixin'
export default {
name: 'DeOutWidget',
mixins: [inputStyleMixin],
Expand Down
0 frontend/src/components/deCustomCm/deBtn.vue → frontend/src/components/deCustomCm/DeBtn.vue
View file
File renamed without changes.
0 .../src/components/deCustomCm/deDatePick.vue → .../src/components/deCustomCm/DeDatePick.vue
View file
File renamed without changes.
0 frontend/src/components/deCustomCm/dePwd.vue → frontend/src/components/deCustomCm/DePwd.vue
View file
File renamed without changes.
0 .../src/components/deCustomCm/deTextarea.vue → .../src/components/deCustomCm/DeTextarea.vue
View file
File renamed without changes.
0 ...nd/src/components/gridTable/tableBody.vue → ...nd/src/components/gridTable/TableBody.vue
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion frontend/src/components/gridTable/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</template>

<script>
import tableBody from './tableBody'
import tableBody from './TableBody'
export default {
components: { tableBody },
props: {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/widget/deWidget/DeTabs.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,14 @@

<script>
import DataeaseTabs from '@/components/dataeaseTabs'
import ViewSelect from '@/views/panel/ViewSelect'
import ViewSelect from '@/views/panel/viewSelect'
import { uuid } from 'vue-uuid'
import bus from '@/utils/bus'
import componentList from '@/components/canvas/customComponent/component-list'
import { mapState } from 'vuex'
import { chartCopy } from '@/api/chart/chart'
import { buildFilterMap } from '@/utils/conditionUtil'
import TabUseList from '@/views/panel/AssistComponent/tabUseList'
import TabUseList from '@/views/panel/assistComponent/TabUseList'
import { findPanelElementInfo } from '@/api/panel/panel'
import { getNowCanvasComponentData } from '@/components/canvas/utils/utils'
import DeCanvasTab from '@/components/canvas/DeCanvas'
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import './utils/dialog'
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 RemarkEditor from '@/views/chart/components/componentStyle/dialog/RemarkEditor'
import TitleRemark from '@/views/chart/view/TitleRemark'
import '@/components/canvas/customComponent' // 注册自定义组件
import deBtn from '@/components/deCustomCm/deBtn.vue'
import deBtn from '@/components/deCustomCm/DeBtn.vue'

import '@/utils/DateUtil'
import draggable from 'vuedraggable'
Expand Down
0 ...mponent-style/BackgroundColorSelector.vue → ...omponentStyle/BackgroundColorSelector.vue
View file
File renamed without changes.
0 ...onents/component-style/LegendSelector.vue → ...ponents/componentStyle/LegendSelector.vue
View file
File renamed without changes.
0 ...ts/component-style/LegendSelectorAntV.vue → ...nts/componentStyle/LegendSelectorAntV.vue
View file
File renamed without changes.
0 ...onents/component-style/MarginSelector.vue → ...ponents/componentStyle/MarginSelector.vue
View file
File renamed without changes.
0 ...ponents/component-style/SplitSelector.vue → ...mponents/componentStyle/SplitSelector.vue
View file
File renamed without changes.
0 ...nts/component-style/SplitSelectorAntV.vue → ...ents/componentStyle/SplitSelectorAntV.vue
View file
File renamed without changes.
0 ...ponents/component-style/TitleSelector.vue → ...mponents/componentStyle/TitleSelector.vue
View file
File renamed without changes.
0 ...nts/component-style/TitleSelectorAntV.vue → ...ents/componentStyle/TitleSelectorAntV.vue
View file
File renamed without changes.
0 ...ponents/component-style/XAxisSelector.vue → ...mponents/componentStyle/XAxisSelector.vue
View file
File renamed without changes.
0 ...nts/component-style/XAxisSelectorAntV.vue → ...ents/componentStyle/XAxisSelectorAntV.vue
View file
File renamed without changes.
0 ...ents/component-style/YAxisExtSelector.vue → ...nents/componentStyle/YAxisExtSelector.vue
View file
File renamed without changes.
0 .../component-style/YAxisExtSelectorAntV.vue → ...s/componentStyle/YAxisExtSelectorAntV.vue
View file
File renamed without changes.
0 ...ponents/component-style/YAxisSelector.vue → ...mponents/componentStyle/YAxisSelector.vue
View file
File renamed without changes.
0 ...nts/component-style/YAxisSelectorAntV.vue → ...ents/componentStyle/YAxisSelectorAntV.vue
View file
File renamed without changes.
0 ...s/component-style/dialog/RemarkEditor.vue → ...ts/componentStyle/dialog/RemarkEditor.vue
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rt/components/drag-item/ChartDragItem.vue → ...art/components/dragItem/ChartDragItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@
</template>

<script>
import { getItemType } from '@/views/chart/components/drag-item/utils'
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import { getItemType } from '@/views/chart/components/dragItem/utils'
import FieldErrorTips from '@/views/chart/components/dragItem/components/FieldErrorTips'
import bus from '@/utils/bus'
export default {
Expand Down
4 changes: 2 additions & 2 deletions ...components/drag-item/DimensionExtItem.vue → .../components/dragItem/DimensionExtItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@
</template>

<script>
import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import { getItemType, getOriginFieldName } from '@/views/chart/components/dragItem/utils'
import FieldErrorTips from '@/views/chart/components/dragItem/components/FieldErrorTips'
import bus from '@/utils/bus'
export default {
Expand Down
4 changes: 2 additions & 2 deletions ...rt/components/drag-item/DimensionItem.vue → ...art/components/dragItem/DimensionItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@
</template>

<script>
import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import { getItemType, getOriginFieldName } from '@/views/chart/components/dragItem/utils'
import FieldErrorTips from '@/views/chart/components/dragItem/components/FieldErrorTips'
import bus from '@/utils/bus'
import { formatterItem } from '@/views/chart/chart/formatter'
Expand Down
4 changes: 2 additions & 2 deletions .../chart/components/drag-item/DrillItem.vue → ...s/chart/components/dragItem/DrillItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
</template>

<script>
import { getItemType } from '@/views/chart/components/drag-item/utils'
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import { getItemType } from '@/views/chart/components/dragItem/utils'
import FieldErrorTips from '@/views/chart/components/dragItem/components/FieldErrorTips'
import bus from '@/utils/bus'
export default {
Expand Down
4 changes: 2 additions & 2 deletions ...chart/components/drag-item/FilterItem.vue → .../chart/components/dragItem/FilterItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
</template>

<script>
import { getItemType } from '@/views/chart/components/drag-item/utils'
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import { getItemType } from '@/views/chart/components/dragItem/utils'
import FieldErrorTips from '@/views/chart/components/dragItem/components/FieldErrorTips'
import bus from '@/utils/bus'
export default {
Expand Down
4 changes: 2 additions & 2 deletions ...art/components/drag-item/QuotaExtItem.vue → ...hart/components/dragItem/QuotaExtItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@

<script>
import { compareItem } from '@/views/chart/chart/compare'
import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import { getItemType, getOriginFieldName } from '@/views/chart/components/dragItem/utils'
import FieldErrorTips from '@/views/chart/components/dragItem/components/FieldErrorTips'
import bus from '@/utils/bus'
import { formatterItem } from '@/views/chart/chart/formatter'
import { quotaViews } from '@/views/chart/chart/util'
Expand Down
4 changes: 2 additions & 2 deletions .../chart/components/drag-item/QuotaItem.vue → ...s/chart/components/dragItem/QuotaItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@

<script>
import { compareItem } from '@/views/chart/chart/compare'
import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import { getItemType, getOriginFieldName } from '@/views/chart/components/dragItem/utils'
import FieldErrorTips from '@/views/chart/components/dragItem/components/FieldErrorTips'
import bus from '@/utils/bus'
import { formatterItem } from '@/views/chart/chart/formatter'
import { quotaViews } from '@/views/chart/chart/util'
Expand Down
0 ...s/drag-item/components/FieldErrorTips.vue → ...ts/dragItem/components/FieldErrorTips.vue
View file
File renamed without changes.
0 ...views/chart/components/drag-item/utils.js → .../views/chart/components/dragItem/utils.js
View file
File renamed without changes.
0 ...t/components/shape-attr/ColorSelector.vue → ...rt/components/shapeAttr/ColorSelector.vue
View file
File renamed without changes.
0 ...omponents/shape-attr/ColorSelectorExt.vue → ...components/shapeAttr/ColorSelectorExt.vue
View file
File renamed without changes.
0 ...t/components/shape-attr/LabelSelector.vue → ...rt/components/shapeAttr/LabelSelector.vue
View file
File renamed without changes.
0 ...mponents/shape-attr/LabelSelectorAntV.vue → ...omponents/shapeAttr/LabelSelectorAntV.vue
View file
File renamed without changes.
0 ...rt/components/shape-attr/SizeSelector.vue → ...art/components/shapeAttr/SizeSelector.vue
View file
File renamed without changes.
0 ...omponents/shape-attr/SizeSelectorAntV.vue → ...components/shapeAttr/SizeSelectorAntV.vue
View file
File renamed without changes.
0 ...ponents/shape-attr/SizeSelectorCommon.vue → ...mponents/shapeAttr/SizeSelectorCommon.vue
View file
File renamed without changes.
0 ...components/shape-attr/TooltipSelector.vue → .../components/shapeAttr/TooltipSelector.vue
View file
File renamed without changes.
0 ...onents/shape-attr/TooltipSelectorAntV.vue → ...ponents/shapeAttr/TooltipSelectorAntV.vue
View file
File renamed without changes.
0 .../chart/components/shape-attr/TotalCfg.vue → ...s/chart/components/shapeAttr/TotalCfg.vue
View file
File renamed without changes.
0 ...onents/TreeSelector/ChartMoveSelector.vue → ...onents/treeSelector/ChartMoveSelector.vue
View file
File renamed without changes.
0 ...onents/TreeSelector/GroupMoveSelector.vue → ...onents/treeSelector/GroupMoveSelector.vue
View file
File renamed without changes.
0 ...s/chart/components/TreeSelector/index.vue → ...s/chart/components/treeSelector/index.vue
View file
File renamed without changes.
0 ...ts/value-formatter/ValueFormatterEdit.vue → ...nts/valueFormatter/ValueFormatterEdit.vue
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions frontend/src/views/chart/group/Group.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,8 @@
import { post, chartGroupTree } from '@/api/chart/chart'
import { queryAuthModel } from '@/api/authModel/authModel'
import TableSelector from '../view/TableSelector'
import GroupMoveSelector from '../components/TreeSelector/GroupMoveSelector'
import ChartMoveSelector from '../components/TreeSelector/ChartMoveSelector'
import GroupMoveSelector from '../components/treeSelector/GroupMoveSelector'
import ChartMoveSelector from '../components/treeSelector/ChartMoveSelector'
import ChartType from '@/views/chart/view/ChartType'
import { pluginTypes } from '@/api/chart/chart'
import {
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/views/chart/view/ChartEdit.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1532,11 +1532,11 @@ import {
viewEditSave,
resetViewCacheCallBack
} from '@/api/chart/chart'
import DimensionItem from '../components/drag-item/DimensionItem'
import QuotaItem from '../components/drag-item/QuotaItem'
import FilterItem from '../components/drag-item/FilterItem'
import ChartDragItem from '../components/drag-item/ChartDragItem'
import DrillItem from '../components/drag-item/DrillItem'
import DimensionItem from '../components/dragItem/DimensionItem'
import QuotaItem from '../components/dragItem/QuotaItem'
import FilterItem from '../components/dragItem/FilterItem'
import ChartDragItem from '../components/dragItem/ChartDragItem'
import DrillItem from '../components/dragItem/DrillItem'
import ResultFilterEditor from '../components/filter/ResultFilterEditor'
import ChartComponent from '../components/ChartComponent'
import DrillPath from '@/views/chart/view/DrillPath'
Expand Down Expand Up @@ -1566,13 +1566,13 @@ import LabelNormal from '../components/normal/LabelNormal'
import TableSelector from './TableSelector'
import FieldEdit from '../../dataset/data/FieldEdit'
import { areaMapping } from '@/api/map/map'
import QuotaExtItem from '@/views/chart/components/drag-item/QuotaExtItem'
import QuotaExtItem from '@/views/chart/components/dragItem/QuotaExtItem'
import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
import ChartType from '@/views/chart/view/ChartType'
import CompareEdit from '@/views/chart/components/compare/CompareEdit'
import { compareItem } from '@/views/chart/chart/compare'
import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
import DimensionExtItem from '@/views/chart/components/drag-item/DimensionExtItem'
import DimensionExtItem from '@/views/chart/components/dragItem/DimensionExtItem'
import PluginCom from '@/views/system/plugin/PluginCom'
import { mapState } from 'vuex'
Expand All @@ -1582,7 +1582,7 @@ import AssistLine from '@/views/chart/components/senior/AssistLine'
import Threshold from '@/views/chart/components/senior/Threshold'
import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
import { pluginTypes } from '@/api/chart/chart'
import ValueFormatterEdit from '@/views/chart/components/value-formatter/ValueFormatterEdit'
import ValueFormatterEdit from '@/views/chart/components/valueFormatter/ValueFormatterEdit'
import ChartStyle from '@/views/chart/view/ChartStyle'
import CustomSortEdit from '@/views/chart/components/compare/CustomSortEdit'
import ScrollCfg from '@/views/chart/components/senior/ScrollCfg'
Expand Down
44 changes: 22 additions & 22 deletions frontend/src/views/chart/view/ChartStyle.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,28 +295,28 @@
</template>
<script>
import PluginCom from '@/views/system/plugin/PluginCom'
import ColorSelector from '@/views/chart/components/shape-attr/ColorSelector'
import SizeSelector from '@/views/chart/components/shape-attr/SizeSelector'
import SizeSelectorAntV from '@/views/chart/components/shape-attr/SizeSelectorAntV'
import LabelSelector from '@/views/chart/components/shape-attr/LabelSelector'
import LabelSelectorAntV from '@/views/chart/components/shape-attr/LabelSelectorAntV'
import TooltipSelector from '@/views/chart/components/shape-attr/TooltipSelector'
import TooltipSelectorAntV from '@/views/chart/components/shape-attr/TooltipSelectorAntV'
import TotalCfg from '@/views/chart/components/shape-attr/TotalCfg'
import XAxisSelector from '@/views/chart/components/component-style/XAxisSelector'
import XAxisSelectorAntV from '@/views/chart/components/component-style/XAxisSelectorAntV'
import YAxisSelector from '@/views/chart/components/component-style/YAxisSelector'
import YAxisSelectorAntV from '@/views/chart/components/component-style/YAxisSelectorAntV'
import YAxisExtSelector from '@/views/chart/components/component-style/YAxisExtSelector'
import YAxisExtSelectorAntV from '@/views/chart/components/component-style/YAxisExtSelectorAntV'
import TitleSelector from '@/views/chart/components/component-style/TitleSelector'
import TitleSelectorAntV from '@/views/chart/components/component-style/TitleSelectorAntV'
import LegendSelector from '@/views/chart/components/component-style/LegendSelector'
import MarginSelector from '@/views/chart/components/component-style/MarginSelector'
import LegendSelectorAntV from '@/views/chart/components/component-style/LegendSelectorAntV'
import BackgroundColorSelector from '@/views/chart/components/component-style/BackgroundColorSelector'
import SplitSelector from '@/views/chart/components/component-style/SplitSelector'
import SplitSelectorAntV from '@/views/chart/components/component-style/SplitSelectorAntV'
import ColorSelector from '@/views/chart/components/shapeAttr/ColorSelector'
import SizeSelector from '@/views/chart/components/shapeAttr/SizeSelector'
import SizeSelectorAntV from '@/views/chart/components/shapeAttr/SizeSelectorAntV'
import LabelSelector from '@/views/chart/components/shapeAttr/LabelSelector'
import LabelSelectorAntV from '@/views/chart/components/shapeAttr/LabelSelectorAntV'
import TooltipSelector from '@/views/chart/components/shapeAttr/TooltipSelector'
import TooltipSelectorAntV from '@/views/chart/components/shapeAttr/TooltipSelectorAntV'
import TotalCfg from '@/views/chart/components/shapeAttr/TotalCfg'
import XAxisSelector from '@/views/chart/components/componentStyle/XAxisSelector'
import XAxisSelectorAntV from '@/views/chart/components/componentStyle/XAxisSelectorAntV'
import YAxisSelector from '@/views/chart/components/componentStyle/YAxisSelector'
import YAxisSelectorAntV from '@/views/chart/components/componentStyle/YAxisSelectorAntV'
import YAxisExtSelector from '@/views/chart/components/componentStyle/YAxisExtSelector'
import YAxisExtSelectorAntV from '@/views/chart/components/componentStyle/YAxisExtSelectorAntV'
import TitleSelector from '@/views/chart/components/componentStyle/TitleSelector'
import TitleSelectorAntV from '@/views/chart/components/componentStyle/TitleSelectorAntV'
import LegendSelector from '@/views/chart/components/componentStyle/LegendSelector'
import MarginSelector from '@/views/chart/components/componentStyle/MarginSelector'
import LegendSelectorAntV from '@/views/chart/components/componentStyle/LegendSelectorAntV'
import BackgroundColorSelector from '@/views/chart/components/componentStyle/BackgroundColorSelector'
import SplitSelector from '@/views/chart/components/componentStyle/SplitSelector'
import SplitSelectorAntV from '@/views/chart/components/componentStyle/SplitSelectorAntV'
import { mapState } from 'vuex'
export default {
Expand Down
0 frontend/src/views/dataset/form.vue → frontend/src/views/dataset/Form.vue
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion frontend/src/views/dataset/add/AddUnion.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<script>
import UnionNode from '@/views/dataset/add/union/UnionNode'
import NodeItem from '@/views/dataset/add/union/NodeItem'
import datasetTree from '@/views/dataset/common/datasetTree'
import datasetTree from '@/views/dataset/common/DatasetTree'
import UnionEdit from '@/views/dataset/add/union/UnionEdit'
import { post } from '@/api/dataset/dataset'
import UnionPreview from '@/views/dataset/add/union/UnionPreview'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/dataset/add/union/NodeItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
</template>

<script>
import datasetTree from '@/views/dataset/common/datasetTree'
import datasetTree from '@/views/dataset/common/DatasetTree'
import UnionFieldEdit from '@/views/dataset/add/union/UnionFieldEdit'
export default {
name: 'NodeItem',
Expand Down
0 .../src/views/dataset/common/datasetTree.vue → .../src/views/dataset/common/DatasetTree.vue
View file
File renamed without changes.
0 ...end/src/views/dataset/data/authConfig.vue → ...end/src/views/dataset/data/AuthConfig.vue
View file
File renamed without changes.
0 frontend/src/views/dataset/data/noSelect.vue → frontend/src/views/dataset/data/NoSelect.vue
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion frontend/src/views/dataset/data/UpdateInfo.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ import 'codemirror/addon/hint/show-hint.css'
import 'codemirror/addon/hint/sql-hint'
import 'codemirror/addon/hint/show-hint'
// vue-cron
import cron from '@/components/cron/cron'
import cron from '@/components/cron/Cron'
import { hasDataPermission } from '@/utils/permission'
import { engineMode } from '@/api/system/engine'
import GridTable from '@/components/gridTable/index.vue'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/dataset/data/UpdateRecords.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ import 'codemirror/keymap/emacs.js'
import 'codemirror/addon/hint/show-hint.css'
import 'codemirror/addon/hint/sql-hint'
import 'codemirror/addon/hint/show-hint'
import cron from '@/components/cron/cron'
import cron from '@/components/cron/Cron'
import { hasDataPermission } from '@/utils/permission'
import { engineMode } from '@/api/system/engine'
export default {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/dataset/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import DeContainer from '@/components/dataease/DeContainer'
import DeAsideContainer from '@/components/dataease/DeAsideContainer'
import Group from './group/Group'
import noSelect from './data/noSelect'
import noSelect from './data/NoSelect'
import ViewTable from './data/ViewTable'
import FieldEdit from './data/FieldEdit'
import { removeClass } from '@/utils'
Expand Down
0 frontend/src/views/msg/all.vue → frontend/src/views/msg/All.vue
View file
File renamed without changes.
0 frontend/src/views/msg/setting.vue → frontend/src/views/msg/Setting.vue
View file
File renamed without changes.
10 changes: 0 additions & 10 deletions frontend/src/views/nested/menu1/index.vue
View file

This file was deleted.

11 changes: 0 additions & 11 deletions frontend/src/views/nested/menu1/menu1-1/index.vue
View file

This file was deleted.

11 changes: 0 additions & 11 deletions frontend/src/views/nested/menu1/menu1-2/index.vue
View file

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
View file

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
View file

This file was deleted.

Loading

0 comments on commit 8aca852

Please sign in to comment.