From 93e9b6ee009f02e9eca6b22ecef5df65af117501 Mon Sep 17 00:00:00 2001 From: liujuping Date: Tue, 28 Feb 2023 15:38:00 +0800 Subject: [PATCH] fix: fix build error due to ts definition --- .../designer/src/designer/setting/setting-entry.ts | 8 ++++---- .../designer/src/designer/setting/setting-field.ts | 14 +++++++++----- .../src/designer/setting/setting-prop-entry.ts | 10 +++++----- .../src/designer/setting/setting-top-entry.ts | 4 ++-- .../src/components/settings/settings-pane.tsx | 6 +++--- packages/engine/src/modules/shell-model-factory.ts | 4 ++-- packages/shell/src/model/setting-prop-entry.ts | 4 ++-- packages/shell/src/model/setting-top-entry.ts | 8 ++++---- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/packages/designer/src/designer/setting/setting-entry.ts b/packages/designer/src/designer/setting/setting-entry.ts index a625e9424..39f978a70 100644 --- a/packages/designer/src/designer/setting/setting-entry.ts +++ b/packages/designer/src/designer/setting/setting-entry.ts @@ -3,15 +3,15 @@ import { IComponentMeta } from '../../component-meta'; import { Designer } from '../designer'; import { INode } from '../../document'; -export interface SettingEntry extends IPublicModelSettingTarget { +export interface ISettingEntry extends IPublicModelSettingTarget { readonly nodes: INode[]; readonly componentMeta: IComponentMeta | null; readonly designer: Designer; // 顶端 - readonly top: SettingEntry; + readonly top: ISettingEntry; // 父级 - readonly parent: SettingEntry; + readonly parent: ISettingEntry; - get: (propName: string | number) => SettingEntry | null; + get: (propName: string | number) => ISettingEntry | null; } diff --git a/packages/designer/src/designer/setting/setting-field.ts b/packages/designer/src/designer/setting/setting-field.ts index 50e2819d6..c073e2854 100644 --- a/packages/designer/src/designer/setting/setting-field.ts +++ b/packages/designer/src/designer/setting/setting-field.ts @@ -9,11 +9,11 @@ import { } from '@alilc/lowcode-types'; import { Transducer } from './utils'; import { SettingPropEntry } from './setting-prop-entry'; -import { SettingEntry } from './setting-entry'; +import { ISettingEntry } from './setting-entry'; import { computed, obx, makeObservable, action, untracked, intl } from '@alilc/lowcode-editor-core'; import { cloneDeep, isCustomView, isDynamicSetter } from '@alilc/lowcode-utils'; -function getSettingFieldCollectorKey(parent: SettingEntry, config: IPublicTypeFieldConfig) { +function getSettingFieldCollectorKey(parent: ISettingEntry, config: IPublicTypeFieldConfig) { let cur = parent; const path = [config.name]; while (cur !== parent.top) { @@ -25,7 +25,11 @@ function getSettingFieldCollectorKey(parent: SettingEntry, config: IPublicTypeFi return path.join('.'); } -export class SettingField extends SettingPropEntry implements SettingEntry { +export interface ISettingField extends ISettingEntry { + +} + +export class SettingField extends SettingPropEntry implements ISettingField { readonly isSettingField = true; readonly isRequired: boolean; @@ -36,7 +40,7 @@ export class SettingField extends SettingPropEntry implements SettingEntry { private hotValue: any; - parent: SettingEntry; + parent: ISettingEntry; extraProps: IPublicTypeFieldExtraProps; @@ -56,7 +60,7 @@ export class SettingField extends SettingPropEntry implements SettingEntry { private _items: Array = []; constructor( - parent: SettingEntry, + parent: ISettingEntry, config: IPublicTypeFieldConfig, private settingFieldCollector?: (name: string | number, field: SettingField) => void, ) { diff --git a/packages/designer/src/designer/setting/setting-prop-entry.ts b/packages/designer/src/designer/setting/setting-prop-entry.ts index d523a0d35..ed20964ba 100644 --- a/packages/designer/src/designer/setting/setting-prop-entry.ts +++ b/packages/designer/src/designer/setting/setting-prop-entry.ts @@ -2,13 +2,13 @@ import { obx, computed, makeObservable, runInAction, IEventBus, createModuleEven import { GlobalEvent, IPublicModelEditor, IPublicTypeSetValueOptions } from '@alilc/lowcode-types'; import { uniqueId, isJSExpression, isSettingField } from '@alilc/lowcode-utils'; import { Setters } from '@alilc/lowcode-shell'; -import { SettingEntry } from './setting-entry'; +import { ISettingEntry } from './setting-entry'; import { INode } from '../../document'; import { IComponentMeta } from '../../component-meta'; import { Designer } from '../designer'; -import { SettingField } from './setting-field'; +import { ISettingField } from './setting-field'; -export class SettingPropEntry implements SettingEntry { +export class SettingPropEntry implements ISettingEntry { // === static properties === readonly editor: IPublicModelEditor; @@ -26,7 +26,7 @@ export class SettingPropEntry implements SettingEntry { readonly designer: Designer; - readonly top: SettingEntry; + readonly top: ISettingEntry; readonly isGroup: boolean; @@ -53,7 +53,7 @@ export class SettingPropEntry implements SettingEntry { extraProps: any = {}; - constructor(readonly parent: SettingEntry | SettingField, name: string | number, type?: 'field' | 'group') { + constructor(readonly parent: ISettingEntry | ISettingField, name: string | number, type?: 'field' | 'group') { makeObservable(this); if (type == null) { const c = typeof name === 'string' ? name.slice(0, 1) : ''; diff --git a/packages/designer/src/designer/setting/setting-top-entry.ts b/packages/designer/src/designer/setting/setting-top-entry.ts index 1c36f8e1b..5c3c1c250 100644 --- a/packages/designer/src/designer/setting/setting-top-entry.ts +++ b/packages/designer/src/designer/setting/setting-top-entry.ts @@ -1,7 +1,7 @@ import { IPublicTypeCustomView, IPublicModelEditor } from '@alilc/lowcode-types'; import { isCustomView } from '@alilc/lowcode-utils'; import { computed, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core'; -import { SettingEntry } from './setting-entry'; +import { ISettingEntry } from './setting-entry'; import { SettingField } from './setting-field'; import { SettingPropEntry } from './setting-prop-entry'; import { INode } from '../../document'; @@ -16,7 +16,7 @@ function generateSessionId(nodes: INode[]) { .join(','); } -export interface ISettingTopEntry extends SettingEntry { +export interface ISettingTopEntry extends ISettingEntry { } export class SettingTopEntry implements ISettingTopEntry { diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx index 8972c4ad7..0b470557b 100644 --- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx @@ -3,7 +3,7 @@ import { shallowIntl, observer, obx, engineConfig, runInAction, globalContext } import { createContent, isJSSlot, isSetterConfig, isSettingField } from '@alilc/lowcode-utils'; import { Skeleton } from '@alilc/lowcode-editor-skeleton'; import { IPublicTypeCustomView } from '@alilc/lowcode-types'; -import { SettingField, SettingTopEntry, SettingEntry, ComponentMeta } from '@alilc/lowcode-designer'; +import { SettingField, SettingTopEntry, ISettingEntry, ComponentMeta } from '@alilc/lowcode-designer'; import { createField } from '../field'; import PopupService, { PopupPipe } from '../popup'; import { SkeletonContext } from '../../context'; @@ -58,7 +58,7 @@ class SettingFieldView extends Component{field.items.map((item, index) => createSettingFieldView(item, field, index))}, @@ -324,7 +324,7 @@ class SettingGroupView extends Component { } } -export function createSettingFieldView(item: SettingField | IPublicTypeCustomView, field: SettingEntry, index?: number) { +export function createSettingFieldView(item: SettingField | IPublicTypeCustomView, field: ISettingEntry, index?: number) { if (isSettingField(item)) { if (item.isGroup) { return ; diff --git a/packages/engine/src/modules/shell-model-factory.ts b/packages/engine/src/modules/shell-model-factory.ts index 05c7b19cb..bd3f795eb 100644 --- a/packages/engine/src/modules/shell-model-factory.ts +++ b/packages/engine/src/modules/shell-model-factory.ts @@ -1,5 +1,5 @@ import { - Node as InnerNode, + INode, SettingField as InnerSettingField, } from '@alilc/lowcode-designer'; import { IShellModelFactory, IPublicModelNode, IPublicModelSettingPropEntry } from '@alilc/lowcode-types'; @@ -8,7 +8,7 @@ import { SettingPropEntry, } from '@alilc/lowcode-shell'; class ShellModelFactory implements IShellModelFactory { - createNode(node: InnerNode | null | undefined): IPublicModelNode | null { + createNode(node: INode | null | undefined): IPublicModelNode | null { return Node.create(node); } createSettingPropEntry(prop: InnerSettingField): IPublicModelSettingPropEntry { diff --git a/packages/shell/src/model/setting-prop-entry.ts b/packages/shell/src/model/setting-prop-entry.ts index 88861cac4..94d39a522 100644 --- a/packages/shell/src/model/setting-prop-entry.ts +++ b/packages/shell/src/model/setting-prop-entry.ts @@ -1,4 +1,4 @@ -import { SettingField, SettingEntry } from '@alilc/lowcode-designer'; +import { SettingField, ISettingEntry } from '@alilc/lowcode-designer'; import { IPublicTypeCompositeValue, IPublicTypeFieldConfig, @@ -233,7 +233,7 @@ export class SettingPropEntry implements IPublicModelSettingPropEntry { * @returns */ getProps(): IPublicModelSettingTopEntry { - return ShellSettingTopEntry.create(this[settingPropEntrySymbol].getProps() as SettingEntry); + return ShellSettingTopEntry.create(this[settingPropEntrySymbol].getProps() as ISettingEntry); } /** diff --git a/packages/shell/src/model/setting-top-entry.ts b/packages/shell/src/model/setting-top-entry.ts index ddcd16471..7947baffa 100644 --- a/packages/shell/src/model/setting-top-entry.ts +++ b/packages/shell/src/model/setting-top-entry.ts @@ -1,17 +1,17 @@ -import { SettingEntry } from '@alilc/lowcode-designer'; +import { ISettingEntry } from '@alilc/lowcode-designer'; import { settingTopEntrySymbol } from '../symbols'; import { Node as ShellNode } from './node'; import { SettingPropEntry as ShellSettingPropEntry } from './setting-prop-entry'; import { IPublicModelSettingTopEntry, IPublicModelNode, IPublicModelSettingPropEntry } from '@alilc/lowcode-types'; export class SettingTopEntry implements IPublicModelSettingTopEntry { - private readonly [settingTopEntrySymbol]: SettingEntry; + private readonly [settingTopEntrySymbol]: ISettingEntry; - constructor(prop: SettingEntry) { + constructor(prop: ISettingEntry) { this[settingTopEntrySymbol] = prop; } - static create(prop: SettingEntry): IPublicModelSettingTopEntry { + static create(prop: ISettingEntry): IPublicModelSettingTopEntry { return new SettingTopEntry(prop); }