From fc964ec7156f7598ead2a568c4c315fbb1264d2f Mon Sep 17 00:00:00 2001 From: Justin-lu Date: Thu, 23 Mar 2023 10:51:38 +0800 Subject: [PATCH] fix: ts interface error --- packages/designer/src/designer/detecting.ts | 6 ++--- packages/designer/src/designer/location.ts | 4 ++-- .../src/designer/setting/setting-field.ts | 12 ++++++---- .../designer/setting/setting-prop-entry.ts | 2 +- .../src/designer/setting/setting-top-entry.ts | 2 +- .../designer/src/document/document-model.ts | 23 +++++++++++-------- .../src/document/node/exclusive-group.ts | 2 +- packages/designer/src/document/node/node.ts | 9 ++++---- .../designer/src/document/node/props/prop.ts | 5 ++-- .../designer/src/document/node/props/props.ts | 3 ++- packages/designer/src/project/project.ts | 17 ++++++++------ packages/shell/src/model/condition-group.ts | 4 ++-- packages/shell/src/model/history.ts | 2 +- packages/workspace/src/workspace.ts | 3 ++- 14 files changed, 53 insertions(+), 41 deletions(-) diff --git a/packages/designer/src/designer/detecting.ts b/packages/designer/src/designer/detecting.ts index 568639c37..a5d898d6e 100644 --- a/packages/designer/src/designer/detecting.ts +++ b/packages/designer/src/designer/detecting.ts @@ -1,10 +1,10 @@ import { makeObservable, obx, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core'; import { IPublicModelDetecting } from '@alilc/lowcode-types'; -import { IDocumentModel } from '../document/document-model'; -import { INode } from '../document/node/node'; +import type { IDocumentModel } from '../document/document-model'; +import type { INode } from '../document/node/node'; const DETECTING_CHANGE_EVENT = 'detectingChange'; -export interface IDetecting extends Omit< IPublicModelDetecting, +export interface IDetecting extends Omit, 'capture' | 'release' | 'leave' diff --git a/packages/designer/src/designer/location.ts b/packages/designer/src/designer/location.ts index 00ee4681c..3b9b080cd 100644 --- a/packages/designer/src/designer/location.ts +++ b/packages/designer/src/designer/location.ts @@ -1,4 +1,4 @@ -import { IDocumentModel, INode } from '../document'; +import type { IDocumentModel, INode } from '../document'; import { ILocateEvent } from './dragon'; import { IPublicModelDropLocation, @@ -98,7 +98,7 @@ function isDocument(elem: any): elem is Document { export function getWindow(elem: Element | Document): Window { return (isDocument(elem) ? elem : elem.ownerDocument!).defaultView!; } -export interface IDropLocation extends Omit< IPublicModelDropLocation, 'target' | 'clone' > { +export interface IDropLocation extends Omit { readonly source: string; diff --git a/packages/designer/src/designer/setting/setting-field.ts b/packages/designer/src/designer/setting/setting-field.ts index 7e91f02ce..139373c0b 100644 --- a/packages/designer/src/designer/setting/setting-field.ts +++ b/packages/designer/src/designer/setting/setting-field.ts @@ -6,11 +6,13 @@ import { IPublicTypeFieldExtraProps, IPublicTypeFieldConfig, IPublicTypeCustomView, - IPublicTypeSetValueOptions, IPublicTypeDisposable, IPublicModelSettingField, IBaseModelSettingField, } from '@alilc/lowcode-types'; +import type { + IPublicTypeSetValueOptions, +} from '@alilc/lowcode-types'; import { Transducer } from './utils'; import { ISettingPropEntry, SettingPropEntry } from './setting-prop-entry'; import { computed, obx, makeObservable, action, untracked, intl } from '@alilc/lowcode-editor-core'; @@ -31,10 +33,10 @@ function getSettingFieldCollectorKey(parent: ISettingTopEntry | ISettingField, c } export interface ISettingField extends ISettingPropEntry, Omit, 'setValue' | 'key' | 'node'> { get items(): Array; diff --git a/packages/designer/src/designer/setting/setting-prop-entry.ts b/packages/designer/src/designer/setting/setting-prop-entry.ts index c061c4c8e..271ea4f3c 100644 --- a/packages/designer/src/designer/setting/setting-prop-entry.ts +++ b/packages/designer/src/designer/setting/setting-prop-entry.ts @@ -3,7 +3,7 @@ import { GlobalEvent, IPublicApiSetters, IPublicModelEditor, IPublicModelSetting import { uniqueId, isJSExpression } from '@alilc/lowcode-utils'; import { ISettingEntry } from './setting-entry-type'; import { INode } from '../../document'; -import { IComponentMeta } from '../../component-meta'; +import type { IComponentMeta } from '../../component-meta'; import { IDesigner } from '../designer'; import { ISettingTopEntry } from './setting-top-entry'; import { ISettingField, isSettingField } from './setting-field'; diff --git a/packages/designer/src/designer/setting/setting-top-entry.ts b/packages/designer/src/designer/setting/setting-top-entry.ts index 62efd5f53..f89ff8a62 100644 --- a/packages/designer/src/designer/setting/setting-top-entry.ts +++ b/packages/designer/src/designer/setting/setting-top-entry.ts @@ -4,7 +4,7 @@ import { computed, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor import { ISettingEntry } from './setting-entry-type'; import { ISettingField, SettingField } from './setting-field'; import { INode } from '../../document'; -import { IComponentMeta } from '../../component-meta'; +import type { IComponentMeta } from '../../component-meta'; import { IDesigner } from '../designer'; import { Setters } from '@alilc/lowcode-shell'; diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 63b1a45dd..c55e7a8e4 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -11,7 +11,6 @@ import { import { IPublicTypeNodeData, IPublicTypeNodeSchema, - IPublicTypeRootSchema, IPublicTypePageSchema, IPublicTypeComponentsMap, IPublicTypeDragNodeObject, @@ -21,7 +20,10 @@ import { IPublicTypeOnChangeOptions, IPublicTypeDisposable, } from '@alilc/lowcode-types'; -import { +import type { + IPublicTypeRootSchema, +} from '@alilc/lowcode-types'; +import type { IDropLocation, } from '@alilc/lowcode-designer'; import { @@ -37,9 +39,10 @@ import { } from '@alilc/lowcode-utils'; import { IProject } from '../project'; import { ISimulatorHost } from '../simulator'; -import { IComponentMeta } from '../component-meta'; +import type { IComponentMeta } from '../component-meta'; import { IDesigner, IHistory } from '../designer'; -import { insertChildren, insertChild, IRootNode, INode } from './node/node'; +import { insertChildren, insertChild, IRootNode } from './node/node'; +import type { INode } from './node/node'; import { Selection, ISelection } from './selection'; import { History } from './history'; import { IModalNodesManager, ModalNodesManager, Node } from './node'; @@ -49,11 +52,11 @@ export type GetDataType = T extends undefined ? NodeType extends { schema: infer R; } - ? R - : any + ? R + : any : T; -export interface IDocumentModel extends Omit< IPublicModelDocumentModel< +export interface IDocumentModel extends Omit; if (isDragNodeDataObject(dragObject)) { items = Array.isArray(dragObject.data) ? dragObject.data : [dragObject.data]; diff --git a/packages/designer/src/document/node/exclusive-group.ts b/packages/designer/src/document/node/exclusive-group.ts index d8c14cedb..9f57b12fc 100644 --- a/packages/designer/src/document/node/exclusive-group.ts +++ b/packages/designer/src/document/node/exclusive-group.ts @@ -1,7 +1,7 @@ import { obx, computed, makeObservable } from '@alilc/lowcode-editor-core'; import { uniqueId } from '@alilc/lowcode-utils'; import { IPublicTypeTitleContent, IPublicModelExclusiveGroup } from '@alilc/lowcode-types'; -import { INode } from './node'; +import type { INode } from './node'; import { intl } from '../../locale'; export interface IExclusiveGroup extends IPublicModelExclusiveGroup { diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts index df4e30c6f..4ff300f36 100644 --- a/packages/designer/src/document/node/node.ts +++ b/packages/designer/src/document/node/node.ts @@ -21,11 +21,12 @@ import { import { compatStage, isDOMText, isJSExpression, isNode, isNodeSchema } from '@alilc/lowcode-utils'; import { ISettingTopEntry } from '@alilc/lowcode-designer'; import { Props, getConvertedExtraKey, IProps } from './props/props'; -import { IDocumentModel } from '../document-model'; +import type { IDocumentModel } from '../document-model'; import { NodeChildren, INodeChildren } from './node-children'; import { IProp, Prop } from './props/prop'; -import { IComponentMeta } from '../../component-meta'; -import { ExclusiveGroup, IExclusiveGroup, isExclusiveGroup } from './exclusive-group'; +import type { IComponentMeta } from '../../component-meta'; +import { ExclusiveGroup, isExclusiveGroup } from './exclusive-group'; +import type { IExclusiveGroup } from './exclusive-group'; import { includeSlot, removeSlot } from '../../utils/slot'; import { foreachReverse } from '../../utils/tree'; import { NodeRemoveOptions, EDITOR_EVENT } from '../../types'; @@ -1095,7 +1096,7 @@ export class Node condition(this) !== false : condition !== false; }) - .map((action: IPublicTypeComponentAction) => action.name) || []; + .map((action: IPublicTypeComponentAction) => action.name) || []; return availableActions.indexOf(actionName) >= 0; } diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts index a679c28c8..f93f2b608 100644 --- a/packages/designer/src/document/node/props/prop.ts +++ b/packages/designer/src/document/node/props/prop.ts @@ -1,5 +1,6 @@ import { untracked, computed, obx, engineConfig, action, makeObservable, mobx, runInAction } from '@alilc/lowcode-editor-core'; -import { IPublicTypeCompositeValue, GlobalEvent, IPublicTypeJSSlot, IPublicTypeSlotSchema, IPublicEnumTransformStage, IPublicModelProp } from '@alilc/lowcode-types'; +import { GlobalEvent, IPublicEnumTransformStage } from '@alilc/lowcode-types'; +import type { IPublicTypeCompositeValue, IPublicTypeJSSlot, IPublicTypeSlotSchema, IPublicModelProp } from '@alilc/lowcode-types'; import { uniqueId, isPlainObject, hasOwnProperty, compatStage, isJSExpression, isJSSlot, isNodeSchema } from '@alilc/lowcode-utils'; import { valueToSource } from './value-to-source'; import { IProps, IPropParent } from './props'; @@ -13,7 +14,7 @@ export type UNSET = typeof UNSET; export interface IProp extends Omit, 'exportSchema' | 'node' > { +>, 'exportSchema' | 'node'> { readonly props: IProps; diff --git a/packages/designer/src/document/node/props/props.ts b/packages/designer/src/document/node/props/props.ts index 23519519b..09c90849d 100644 --- a/packages/designer/src/document/node/props/props.ts +++ b/packages/designer/src/document/node/props/props.ts @@ -1,5 +1,6 @@ import { computed, makeObservable, obx, action } from '@alilc/lowcode-editor-core'; -import { IPublicTypePropsMap, IPublicTypePropsList, IPublicTypeCompositeValue, IPublicEnumTransformStage, IBaseModelProps } from '@alilc/lowcode-types'; +import { IPublicTypePropsList, IPublicTypeCompositeValue, IPublicEnumTransformStage, IBaseModelProps } from '@alilc/lowcode-types'; +import type { IPublicTypePropsMap } from '@alilc/lowcode-types'; import { uniqueId, compatStage } from '@alilc/lowcode-utils'; import { Prop, IProp, UNSET } from './prop'; import { INode } from '../node'; diff --git a/packages/designer/src/project/project.ts b/packages/designer/src/project/project.ts index 3204e5c8b..3f9a68dc7 100644 --- a/packages/designer/src/project/project.ts +++ b/packages/designer/src/project/project.ts @@ -1,17 +1,20 @@ import { obx, computed, makeObservable, action, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core'; import { IDesigner } from '../designer'; -import { DocumentModel, IDocumentModel, isDocumentModel } from '../document'; +import { DocumentModel, isDocumentModel } from '../document'; +import type { IDocumentModel } from "../document"; import { - IPublicTypeProjectSchema, - IPublicTypeRootSchema, IPublicTypeComponentsMap, IPublicEnumTransformStage, IBaseApiProject, } from '@alilc/lowcode-types'; +import type { + IPublicTypeProjectSchema, + IPublicTypeRootSchema, +} from '@alilc/lowcode-types'; import { isLowCodeComponentType, isProCodeComponentType } from '@alilc/lowcode-utils'; import { ISimulatorHost } from '../simulator'; -export interface IProject extends Omit< IBaseApiProject< +export interface IProject extends Omit, 'simulatorHost' | @@ -146,7 +149,7 @@ export class Project implements IProject { return this.documents.reduce(( componentsMap: IPublicTypeComponentsMap, curDoc: IDocumentModel, - ): IPublicTypeComponentsMap => { + ): IPublicTypeComponentsMap => { const curComponentsMap = curDoc.getComponentsMap(); if (Array.isArray(curComponentsMap)) { curComponentsMap.forEach((item) => { @@ -178,8 +181,8 @@ export class Project implements IProject { * 获取项目整体 schema */ getSchema( - stage: IPublicEnumTransformStage = IPublicEnumTransformStage.Save, - ): IPublicTypeProjectSchema { + stage: IPublicEnumTransformStage = IPublicEnumTransformStage.Save, + ): IPublicTypeProjectSchema { return { ...this.data, componentsMap: this.getComponentsMap(), diff --git a/packages/shell/src/model/condition-group.ts b/packages/shell/src/model/condition-group.ts index 22b926615..e2dd316ed 100644 --- a/packages/shell/src/model/condition-group.ts +++ b/packages/shell/src/model/condition-group.ts @@ -1,4 +1,4 @@ -import { IExclusiveGroup } from '@alilc/lowcode-designer'; +import type { IExclusiveGroup } from '@alilc/lowcode-designer'; import { IPublicModelExclusiveGroup, IPublicModelNode } from '@alilc/lowcode-types'; import { conditionGroupSymbol, nodeSymbol } from '../symbols'; import { Node } from './node'; @@ -39,4 +39,4 @@ export class ConditionGroup implements IPublicModelExclusiveGroup { shellConditionGroup[conditionGroupSymbol] = shellConditionGroup; return shellConditionGroup; } -} \ No newline at end of file +} diff --git a/packages/shell/src/model/history.ts b/packages/shell/src/model/history.ts index d16f1e3f8..ddc567aee 100644 --- a/packages/shell/src/model/history.ts +++ b/packages/shell/src/model/history.ts @@ -1,4 +1,4 @@ -import { IDocumentModel as InnerDocumentModel, IHistory as InnerHistory } from '@alilc/lowcode-designer'; +import type { IDocumentModel as InnerDocumentModel, IHistory as InnerHistory } from '@alilc/lowcode-designer'; import { historySymbol, documentSymbol } from '../symbols'; import { IPublicModelHistory, IPublicTypeDisposable } from '@alilc/lowcode-types'; diff --git a/packages/workspace/src/workspace.ts b/packages/workspace/src/workspace.ts index 24c81cc79..d959c55eb 100644 --- a/packages/workspace/src/workspace.ts +++ b/packages/workspace/src/workspace.ts @@ -2,7 +2,8 @@ import { IDesigner, ILowCodePluginManager, LowCodePluginManager } from '@alilc/l import { createModuleEventBus, Editor, IEventBus, makeObservable, obx } from '@alilc/lowcode-editor-core'; import { IPublicApiPlugins, IPublicApiWorkspace, IPublicResourceList, IPublicTypeResourceType, IShellModelFactory } from '@alilc/lowcode-types'; import { BasicContext } from './context/base-context'; -import { EditorWindow, IEditorWindow } from './window'; +import { EditorWindow } from './window'; +import type { IEditorWindow } from './window'; import { IResource, Resource } from './resource'; import { IResourceType, ResourceType } from './resource-type';