diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index 5cf6b84f..153dc6af 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -90,12 +90,8 @@ export interface CreateComponentType extends PublicConfigType, requestConfig { option: GlobalThemeJsonType } -// 组件成组实例类 (部分属性用不到设置为 any) -export interface CreateComponentGroupType extends PublicConfigType { - // 保持结构一致, 设置组件名称 - chartConfig: { - title: ConfigType.title - } +// 组件成组实例类 +export interface CreateComponentGroupType extends CreateComponentType { groupList: Array } diff --git a/src/packages/public/publicConfig.ts b/src/packages/public/publicConfig.ts index b1c2038d..a285cf13 100644 --- a/src/packages/public/publicConfig.ts +++ b/src/packages/public/publicConfig.ts @@ -1,5 +1,5 @@ import { getUUID } from '@/utils' -import { PublicConfigType, CreateComponentType, CreateComponentGroupType } from '@/packages/index.d' +import { ChartFrameEnum, PublicConfigType, CreateComponentType, CreateComponentGroupType } from '@/packages/index.d' import { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d' import { groupTitle } from '@/settings/designSetting' import { @@ -79,48 +79,30 @@ export class publicConfig implements PublicConfigType { } // 成组类 (部分属性不需要, 不继承 publicConfig) -export class PublicGroupConfigClass implements CreateComponentGroupType { +export class PublicGroupConfigClass extends publicConfig implements CreateComponentGroupType { // 成组 public isGroup = true // 名称 public chartConfig = { - title: groupTitle + key: 'group', + chartKey: 'group', + conKey: 'group', + category: 'group', + categoryName: 'group', + package: 'group', + chartFrame: ChartFrameEnum.COMMON, + title: groupTitle, + image: '' } // 组成员列表 public groupList: Array = [] // ---- 原有 --- + // key + public key = 'group' + // 配置 + public option = {} // 标识 public id = getUUID() // 基本信息 public attr = { w: 0, h: 0, x: 0, y: 0, zIndex: -1 } - // 基本样式 - public styles = { - // 色相 - hueRotate: 0, - // 饱和度 - saturate: 1, - // 对比度 - contrast: 1, - // 亮度 - brightness: 1, - // 透明 - opacity: 1, - - // 旋转 - rotateZ: 0, - rotateX: 0, - rotateY: 0, - - // 倾斜 - skewX: 0, - skewY: 0, - - // 动画 - animations: [] - } - // 设置坐标 - public setPosition(x: number, y: number): void { - this.attr.x = x - this.attr.y = y - } } diff --git a/src/views/chart/ContentEdit/components/EditHistory/index.vue b/src/views/chart/ContentEdit/components/EditHistory/index.vue index 00d9d9e0..1477ca80 100644 --- a/src/views/chart/ContentEdit/components/EditHistory/index.vue +++ b/src/views/chart/ContentEdit/components/EditHistory/index.vue @@ -24,8 +24,8 @@
{ const options = backStack.map((e: HistoryItemType) => { return { label: labelHandle(e), - key: e.id, icon: iconHandle(e), } }) diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue index 34045c80..6d3a1cc9 100644 --- a/src/views/chart/ContentEdit/index.vue +++ b/src/views/chart/ContentEdit/index.vue @@ -24,11 +24,11 @@
- + { // 重新创建是为了处理类种方法消失的问题 const create = async (e: CreateComponentType, callBack?: (e: CreateComponentType) => void) => { // 补充 class 上的方法 - let newComponent: CreateComponentType = await createComponent(e.chartConfig as ConfigType) + let newComponent: CreateComponentType = await createComponent(e.chartConfig) if (callBack) { callBack(Object.assign(newComponent, { ...e, id: getUUID() })) } else { @@ -82,7 +82,7 @@ export const useSync = () => { } else { // 非组件(顺便排除脏数据) if (key !== 'editCanvasConfig' && key !== 'requestGlobalConfig') return - Object.assign((chartEditStore as any)[key], projectData[key]) + Object.assign(chartEditStore[key], projectData[key]) } } } diff --git a/src/views/preview/components/PreviewRenderGroup/index.vue b/src/views/preview/components/PreviewRenderGroup/index.vue index 6ef63d12..edecb3f8 100644 --- a/src/views/preview/components/PreviewRenderGroup/index.vue +++ b/src/views/preview/components/PreviewRenderGroup/index.vue @@ -44,8 +44,6 @@ const props = defineProps({ required: true } }) - -console.log(props.groupData)