Skip to content

Commit 93e9b6e

Browse files
liujupingJackLian
liujuping
authored and
JackLian
committed
fix: fix build error due to ts definition
1 parent d8014c9 commit 93e9b6e

8 files changed

Lines changed: 31 additions & 27 deletions

File tree

‎packages/designer/src/designer/setting/setting-entry.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import { IComponentMeta } from '../../component-meta';
33
import { Designer } from '../designer';
44
import { INode } from '../../document';
55

6-
export interface SettingEntry extends IPublicModelSettingTarget {
6+
export interface ISettingEntry extends IPublicModelSettingTarget {
77
readonly nodes: INode[];
88
readonly componentMeta: IComponentMeta | null;
99
readonly designer: Designer;
1010

1111
// 顶端
12-
readonly top: SettingEntry;
12+
readonly top: ISettingEntry;
1313
// 父级
14-
readonly parent: SettingEntry;
14+
readonly parent: ISettingEntry;
1515

16-
get: (propName: string | number) => SettingEntry | null;
16+
get: (propName: string | number) => ISettingEntry | null;
1717
}

‎packages/designer/src/designer/setting/setting-field.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import {
99
} from '@alilc/lowcode-types';
1010
import { Transducer } from './utils';
1111
import { SettingPropEntry } from './setting-prop-entry';
12-
import { SettingEntry } from './setting-entry';
12+
import { ISettingEntry } from './setting-entry';
1313
import { computed, obx, makeObservable, action, untracked, intl } from '@alilc/lowcode-editor-core';
1414
import { cloneDeep, isCustomView, isDynamicSetter } from '@alilc/lowcode-utils';
1515

16-
function getSettingFieldCollectorKey(parent: SettingEntry, config: IPublicTypeFieldConfig) {
16+
function getSettingFieldCollectorKey(parent: ISettingEntry, config: IPublicTypeFieldConfig) {
1717
let cur = parent;
1818
const path = [config.name];
1919
while (cur !== parent.top) {
@@ -25,7 +25,11 @@ function getSettingFieldCollectorKey(parent: SettingEntry, config: IPublicTypeFi
2525
return path.join('.');
2626
}
2727

28-
export class SettingField extends SettingPropEntry implements SettingEntry {
28+
export interface ISettingField extends ISettingEntry {
29+
30+
}
31+
32+
export class SettingField extends SettingPropEntry implements ISettingField {
2933
readonly isSettingField = true;
3034

3135
readonly isRequired: boolean;
@@ -36,7 +40,7 @@ export class SettingField extends SettingPropEntry implements SettingEntry {
3640

3741
private hotValue: any;
3842

39-
parent: SettingEntry;
43+
parent: ISettingEntry;
4044

4145
extraProps: IPublicTypeFieldExtraProps;
4246

@@ -56,7 +60,7 @@ export class SettingField extends SettingPropEntry implements SettingEntry {
5660
private _items: Array<SettingField | IPublicTypeCustomView> = [];
5761

5862
constructor(
59-
parent: SettingEntry,
63+
parent: ISettingEntry,
6064
config: IPublicTypeFieldConfig,
6165
private settingFieldCollector?: (name: string | number, field: SettingField) => void,
6266
) {

‎packages/designer/src/designer/setting/setting-prop-entry.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { obx, computed, makeObservable, runInAction, IEventBus, createModuleEven
22
import { GlobalEvent, IPublicModelEditor, IPublicTypeSetValueOptions } from '@alilc/lowcode-types';
33
import { uniqueId, isJSExpression, isSettingField } from '@alilc/lowcode-utils';
44
import { Setters } from '@alilc/lowcode-shell';
5-
import { SettingEntry } from './setting-entry';
5+
import { ISettingEntry } from './setting-entry';
66
import { INode } from '../../document';
77
import { IComponentMeta } from '../../component-meta';
88
import { Designer } from '../designer';
9-
import { SettingField } from './setting-field';
9+
import { ISettingField } from './setting-field';
1010

11-
export class SettingPropEntry implements SettingEntry {
11+
export class SettingPropEntry implements ISettingEntry {
1212
// === static properties ===
1313
readonly editor: IPublicModelEditor;
1414

@@ -26,7 +26,7 @@ export class SettingPropEntry implements SettingEntry {
2626

2727
readonly designer: Designer;
2828

29-
readonly top: SettingEntry;
29+
readonly top: ISettingEntry;
3030

3131
readonly isGroup: boolean;
3232

@@ -53,7 +53,7 @@ export class SettingPropEntry implements SettingEntry {
5353

5454
extraProps: any = {};
5555

56-
constructor(readonly parent: SettingEntry | SettingField, name: string | number, type?: 'field' | 'group') {
56+
constructor(readonly parent: ISettingEntry | ISettingField, name: string | number, type?: 'field' | 'group') {
5757
makeObservable(this);
5858
if (type == null) {
5959
const c = typeof name === 'string' ? name.slice(0, 1) : '';

‎packages/designer/src/designer/setting/setting-top-entry.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { IPublicTypeCustomView, IPublicModelEditor } from '@alilc/lowcode-types';
22
import { isCustomView } from '@alilc/lowcode-utils';
33
import { computed, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
4-
import { SettingEntry } from './setting-entry';
4+
import { ISettingEntry } from './setting-entry';
55
import { SettingField } from './setting-field';
66
import { SettingPropEntry } from './setting-prop-entry';
77
import { INode } from '../../document';
@@ -16,7 +16,7 @@ function generateSessionId(nodes: INode[]) {
1616
.join(',');
1717
}
1818

19-
export interface ISettingTopEntry extends SettingEntry {
19+
export interface ISettingTopEntry extends ISettingEntry {
2020
}
2121

2222
export class SettingTopEntry implements ISettingTopEntry {

‎packages/editor-skeleton/src/components/settings/settings-pane.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { shallowIntl, observer, obx, engineConfig, runInAction, globalContext }
33
import { createContent, isJSSlot, isSetterConfig, isSettingField } from '@alilc/lowcode-utils';
44
import { Skeleton } from '@alilc/lowcode-editor-skeleton';
55
import { IPublicTypeCustomView } from '@alilc/lowcode-types';
6-
import { SettingField, SettingTopEntry, SettingEntry, ComponentMeta } from '@alilc/lowcode-designer';
6+
import { SettingField, SettingTopEntry, ISettingEntry, ComponentMeta } from '@alilc/lowcode-designer';
77
import { createField } from '../field';
88
import PopupService, { PopupPipe } from '../popup';
99
import { SkeletonContext } from '../../context';
@@ -58,7 +58,7 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
5858
stageName = `${field.getNode().id}_${field.name.toString()}`;
5959
// 清除原 stage，不然 content 引用的一直是老的 field，导致数据无法得到更新
6060
stages.container.remove(stageName);
61-
const stage = stages.add({
61+
stages.add({
6262
type: 'Widget',
6363
name: stageName,
6464
content: <Fragment>{field.items.map((item, index) => createSettingFieldView(item, field, index))}</Fragment>,
@@ -324,7 +324,7 @@ class SettingGroupView extends Component<SettingGroupViewProps> {
324324
}
325325
}
326326

327-
export function createSettingFieldView(item: SettingField | IPublicTypeCustomView, field: SettingEntry, index?: number) {
327+
export function createSettingFieldView(item: SettingField | IPublicTypeCustomView, field: ISettingEntry, index?: number) {
328328
if (isSettingField(item)) {
329329
if (item.isGroup) {
330330
return <SettingGroupView field={item} key={item.id} />;

‎packages/engine/src/modules/shell-model-factory.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
Node as InnerNode,
2+
INode,
33
SettingField as InnerSettingField,
44
} from '@alilc/lowcode-designer';
55
import { IShellModelFactory, IPublicModelNode, IPublicModelSettingPropEntry } from '@alilc/lowcode-types';
@@ -8,7 +8,7 @@ import {
88
SettingPropEntry,
99
} from '@alilc/lowcode-shell';
1010
class ShellModelFactory implements IShellModelFactory {
11-
createNode(node: InnerNode | null | undefined): IPublicModelNode | null {
11+
createNode(node: INode | null | undefined): IPublicModelNode | null {
1212
return Node.create(node);
1313
}
1414
createSettingPropEntry(prop: InnerSettingField): IPublicModelSettingPropEntry {

‎packages/shell/src/model/setting-prop-entry.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SettingField, SettingEntry } from '@alilc/lowcode-designer';
1+
import { SettingField, ISettingEntry } from '@alilc/lowcode-designer';
22
import {
33
IPublicTypeCompositeValue,
44
IPublicTypeFieldConfig,
@@ -233,7 +233,7 @@ export class SettingPropEntry implements IPublicModelSettingPropEntry {
233233
* @returns
234234
*/
235235
getProps(): IPublicModelSettingTopEntry {
236-
return ShellSettingTopEntry.create(this[settingPropEntrySymbol].getProps() as SettingEntry);
236+
return ShellSettingTopEntry.create(this[settingPropEntrySymbol].getProps() as ISettingEntry);
237237
}
238238

239239
/**

‎packages/shell/src/model/setting-top-entry.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import { SettingEntry } from '@alilc/lowcode-designer';
1+
import { ISettingEntry } from '@alilc/lowcode-designer';
22
import { settingTopEntrySymbol } from '../symbols';
33
import { Node as ShellNode } from './node';
44
import { SettingPropEntry as ShellSettingPropEntry } from './setting-prop-entry';
55
import { IPublicModelSettingTopEntry, IPublicModelNode, IPublicModelSettingPropEntry } from '@alilc/lowcode-types';
66

77
export class SettingTopEntry implements IPublicModelSettingTopEntry {
8-
private readonly [settingTopEntrySymbol]: SettingEntry;
8+
private readonly [settingTopEntrySymbol]: ISettingEntry;
99

10-
constructor(prop: SettingEntry) {
10+
constructor(prop: ISettingEntry) {
1111
this[settingTopEntrySymbol] = prop;
1212
}
1313

14-
static create(prop: SettingEntry): IPublicModelSettingTopEntry {
14+
static create(prop: ISettingEntry): IPublicModelSettingTopEntry {
1515
return new SettingTopEntry(prop);
1616
}
1717

0 commit comments

Comments
 (0)