diff --git a/src/assets/images/chart/decorates/Base1.png b/src/assets/images/chart/decorates/Base1.png new file mode 100644 index 00000000..e1fdc46c Binary files /dev/null and b/src/assets/images/chart/decorates/Base1.png differ diff --git a/src/assets/images/chart/decorates/Base2.png b/src/assets/images/chart/decorates/Base2.png new file mode 100644 index 00000000..7c813a1c Binary files /dev/null and b/src/assets/images/chart/decorates/Base2.png differ diff --git a/src/assets/images/chart/decorates/Base3.png b/src/assets/images/chart/decorates/Base3.png new file mode 100644 index 00000000..02310f25 Binary files /dev/null and b/src/assets/images/chart/decorates/Base3.png differ diff --git a/src/assets/images/chart/decorates/Base4.png b/src/assets/images/chart/decorates/Base4.png new file mode 100644 index 00000000..f7bab931 Binary files /dev/null and b/src/assets/images/chart/decorates/Base4.png differ diff --git a/src/assets/images/chart/decorates/Base5.png b/src/assets/images/chart/decorates/Base5.png new file mode 100644 index 00000000..c04eb621 Binary files /dev/null and b/src/assets/images/chart/decorates/Base5.png differ diff --git a/src/assets/images/chart/decorates/Base6.png b/src/assets/images/chart/decorates/Base6.png new file mode 100644 index 00000000..ead2a929 Binary files /dev/null and b/src/assets/images/chart/decorates/Base6.png differ diff --git a/src/assets/images/chart/decorates/Base7.png b/src/assets/images/chart/decorates/Base7.png new file mode 100644 index 00000000..9e33c52c Binary files /dev/null and b/src/assets/images/chart/decorates/Base7.png differ diff --git a/src/assets/images/chart/decorates/Base8.png b/src/assets/images/chart/decorates/Base8.png new file mode 100644 index 00000000..091aed4a Binary files /dev/null and b/src/assets/images/chart/decorates/Base8.png differ diff --git a/src/packages/components/Charts/Mores/index.ts b/src/packages/components/Charts/Mores/index.ts index 76bf90dc..4ddd2c7f 100644 --- a/src/packages/components/Charts/Mores/index.ts +++ b/src/packages/components/Charts/Mores/index.ts @@ -10,7 +10,7 @@ import { GraphConfig } from './Graph/index' export default [ // ProcessConfig, - RadarConfig, + // RadarConfig, // FunnelConfig, // HeatmapConfig, WaterPoloConfig, diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts index 06a70f20..aff0ba2d 100644 --- a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts +++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts @@ -14,7 +14,7 @@ export const option = { top: 0, scale: 1, // 展示标题 - isThereATitleComponet: true, + isThereATitleComponet: false, } export default class Config extends PublicConfigClass implements CreateComponentType diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue index 2ef30754..bbe116d3 100644 --- a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue +++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue @@ -1,5 +1,21 @@ diff --git a/src/packages/components/Decorates/Base/index.ts b/src/packages/components/Decorates/Base/index.ts new file mode 100644 index 00000000..bc0217d8 --- /dev/null +++ b/src/packages/components/Decorates/Base/index.ts @@ -0,0 +1,27 @@ +import { BaseConfig } from './Base/index' +import { PackagesCategoryEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../index.d' + +const topbarNames = [ + 'Base1.png', + 'Base2.png', + 'Base3.png', + 'Base4.png', + 'Base5.png', + 'Base6.png', + 'Base7.png', + 'Base8.png', +] +const base = topbarNames.map((name, i) => ({ + ...BaseConfig, + category: ChatCategoryEnum.BASE, + categoryName: ChatCategoryEnumName.BASE, + package: PackagesCategoryEnum.DECORATES, + dataset: name, + // 既是缩略图 又是背景图 + image: name, + title: `底座${i + 1}`, + redirectComponent: `${BaseConfig.package}/${BaseConfig.category}/${BaseConfig.key}` // 跳转组件路径规则:packageName/categoryName/componentKey +})) + +export default base diff --git a/src/packages/components/Decorates/index.d.ts b/src/packages/components/Decorates/index.d.ts index 5808516d..99358a52 100644 --- a/src/packages/components/Decorates/index.d.ts +++ b/src/packages/components/Decorates/index.d.ts @@ -3,7 +3,8 @@ export enum ChatCategoryEnum { DECORATE = 'Decorates', THREE = 'Three', MORE = 'Mores', - TOPBARS = 'TopBars' + TOPBARS = 'TopBars', + BASE = 'Base' } export enum ChatCategoryEnumName { @@ -11,5 +12,6 @@ export enum ChatCategoryEnumName { DECORATE = '装饰', THREE = '三维', MORE = '更多', - TOPBARS = '顶栏' + TOPBARS = '顶栏', + BASE = '底座' } \ No newline at end of file diff --git a/src/packages/components/Decorates/index.ts b/src/packages/components/Decorates/index.ts index 9511171b..c95aa29f 100644 --- a/src/packages/components/Decorates/index.ts +++ b/src/packages/components/Decorates/index.ts @@ -1,8 +1,9 @@ import Borders from './Borders' import TopBars from './TopBars' +import Base from './Base' import Decorates from './Decorates' // import Three from './Three' import Mores from './Mores' // export const DecorateList = [...Borders, ...Decorates, ...Three, ...Mores] -export const DecorateList = [...Borders, ...TopBars, ...Decorates, ...Mores] +export const DecorateList = [...Borders, ...TopBars, ...Base, ...Decorates, ...Mores] diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue index 6fff00fa..c316aa6a 100644 --- a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue +++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue @@ -128,8 +128,11 @@ const dblclickHandle = async (item: ConfigType) => { newComponent.chartConfig.title = item.title newComponent.chartConfig.chartFrame = item.chartFrame } + let isHead = false + let isHeadList = ['EngineeringConfig'] + if(isHeadList.includes(newComponent.chartConfig.key)) isHead = true // 添加 - chartEditStore.addComponentList(newComponent, false, true) + chartEditStore.addComponentList(newComponent, isHead, true) // 选中 chartEditStore.setTargetSelectChart(newComponent.id) loadingFinish()