-
-
this.controller.mount(shell)} className="lc-outline-tree-container">
-
+ { !this.props.hideFilter &&
}
+
this.controller.mount(shell)} className={`lc-outline-tree-container ${ this.props.hideFilter ? 'lc-hidden-outline-filter' : '' }`}>
+
);
diff --git a/packages/plugin-outline-pane/src/views/style.less b/packages/plugin-outline-pane/src/views/style.less
index cd133932b..f343fba17 100644
--- a/packages/plugin-outline-pane/src/views/style.less
+++ b/packages/plugin-outline-pane/src/views/style.less
@@ -14,10 +14,14 @@
overflow: auto;
}
+ > .lc-outline-tree-container.lc-hidden-outline-filter {
+ top: 0;
+ }
+
> .lc-outline-filter {
padding: 12px 16px;
display: flex;
- align-items: center;
+ align-items: stretch;
justify-content: right;
.lc-outline-filter-search-input {
@@ -27,7 +31,6 @@
.lc-outline-filter-icon {
background: #ebecf0;
border: 1px solid #c4c6cf;
- height: 28px;
display: flex;
align-items: center;
border-radius: 0 2px 2px 0;
diff --git a/packages/plugin-outline-pane/src/views/tree-branches.tsx b/packages/plugin-outline-pane/src/views/tree-branches.tsx
index 210fe0af8..2e281071b 100644
--- a/packages/plugin-outline-pane/src/views/tree-branches.tsx
+++ b/packages/plugin-outline-pane/src/views/tree-branches.tsx
@@ -2,12 +2,11 @@ import { PureComponent } from 'react';
import classNames from 'classnames';
import TreeNode from '../controllers/tree-node';
import TreeNodeView from './tree-node';
-import { IPublicModelPluginContext, IPublicModelExclusiveGroup, IPublicTypeDisposable, IPublicTypeLocationChildrenDetail } from '@alilc/lowcode-types';
+import { IPublicModelExclusiveGroup, IPublicTypeDisposable, IPublicTypeLocationChildrenDetail } from '@alilc/lowcode-types';
export default class TreeBranches extends PureComponent<{
treeNode: TreeNode;
isModal?: boolean;
- pluginContext: IPublicModelPluginContext;
expanded: boolean;
treeChildren: TreeNode[] | null;
}> {
@@ -51,12 +50,11 @@ export default class TreeBranches extends PureComponent<{
return (
{
- !isModal &&
+ !isModal &&
}
@@ -73,7 +71,6 @@ interface ITreeNodeChildrenState {
class TreeNodeChildren extends PureComponent<{
treeNode: TreeNode;
isModal?: boolean;
- pluginContext: IPublicModelPluginContext;
treeChildren: TreeNode[] | null;
}, ITreeNodeChildrenState> {
state: ITreeNodeChildrenState = {
@@ -84,8 +81,8 @@ class TreeNodeChildren extends PureComponent<{
};
offLocationChanged: IPublicTypeDisposable | undefined;
componentDidMount() {
- const { treeNode, pluginContext } = this.props;
- const { project } = pluginContext;
+ const { treeNode } = this.props;
+ const { project } = treeNode.pluginContext;
const { filterWorking, matchSelf, keywords } = treeNode.filterReult;
const { dropDetail } = treeNode;
this.setState({
@@ -122,13 +119,14 @@ class TreeNodeChildren extends PureComponent<{
let groupContents: any[] = [];
let currentGrp: IPublicModelExclusiveGroup;
const { filterWorking, matchSelf, keywords } = this.state;
- const Title = this.props.pluginContext.common.editorCabin.Title;
+ const Title = this.props.treeNode.pluginContext.common.editorCabin.Title;
const endGroup = () => {
if (groupContents.length > 0) {
children.push(
+ {/* @ts-ignore */}
);
+ groupContents.push(
);
} else {
if (index === dropIndex) {
children.push(insertion);
}
- children.push(
);
+ children.push(
);
}
});
endGroup();
@@ -191,14 +189,13 @@ class TreeNodeChildren extends PureComponent<{
class TreeNodeSlots extends PureComponent<{
treeNode: TreeNode;
- pluginContext: IPublicModelPluginContext;
}> {
render() {
const { treeNode } = this.props;
if (!treeNode.hasSlots()) {
return null;
}
- const Title = this.props.pluginContext.common.editorCabin.Title;
+ const Title = this.props.treeNode.pluginContext.common.editorCabin.Title;
return (
-
+ {/* @ts-ignore */}
+
{treeNode.slots.map(tnode => (
-
+
))}
);
diff --git a/packages/plugin-outline-pane/src/views/tree-node.tsx b/packages/plugin-outline-pane/src/views/tree-node.tsx
index 712dc20fa..882fe15b1 100644
--- a/packages/plugin-outline-pane/src/views/tree-node.tsx
+++ b/packages/plugin-outline-pane/src/views/tree-node.tsx
@@ -4,34 +4,56 @@ import TreeNode from '../controllers/tree-node';
import TreeTitle from './tree-title';
import TreeBranches from './tree-branches';
import { IconEyeClose } from '../icons/eye-close';
-import { IPublicModelPluginContext, IPublicModelModalNodesManager, IPublicTypeDisposable } from '@alilc/lowcode-types';
+import { IPublicModelModalNodesManager, IPublicTypeDisposable } from '@alilc/lowcode-types';
+import { IOutlinePanelPluginContext } from '../controllers/tree-master';
class ModalTreeNodeView extends PureComponent<{
treeNode: TreeNode;
- pluginContext: IPublicModelPluginContext;
+}, {
+ treeChildren: TreeNode[] | null;
}> {
private modalNodesManager: IPublicModelModalNodesManager | undefined | null;
- readonly pluginContext: IPublicModelPluginContext;
+ readonly pluginContext: IOutlinePanelPluginContext;
- constructor(props: any) {
+ constructor(props: {
+ treeNode: TreeNode;
+ }) {
super(props);
// 模态管理对象
- this.pluginContext = props.pluginContext;
+ this.pluginContext = props.treeNode.pluginContext;
const { project } = this.pluginContext;
this.modalNodesManager = project.currentDocument?.modalNodesManager;
+ this.state = {
+ treeChildren: this.rootTreeNode.children,
+ };
}
hideAllNodes() {
this.modalNodesManager?.hideModalNodes();
}
- render() {
+ componentDidMount(): void {
+ const rootTreeNode = this.rootTreeNode;
+ rootTreeNode.onExpandableChanged(() => {
+ this.setState({
+ treeChildren: rootTreeNode.children,
+ });
+ });
+ }
+
+ get rootTreeNode() {
const { treeNode } = this.props;
// 当指定了新的根节点时，要从原始的根节点去获取模态节点
const { project } = this.pluginContext;
const rootNode = project.currentDocument?.root;
const rootTreeNode = treeNode.tree.getTreeNode(rootNode!);
+
+ return rootTreeNode;
+ }
+
+ render() {
+ const rootTreeNode = this.rootTreeNode;
const { expanded } = rootTreeNode;
const hasVisibleModalNode = !!this.modalNodesManager?.getVisibleModalNode();
@@ -49,10 +71,9 @@ class ModalTreeNodeView extends PureComponent<{
@@ -63,7 +84,6 @@ class ModalTreeNodeView extends PureComponent<{
export default class TreeNodeView extends PureComponent<{
treeNode: TreeNode;
isModal?: boolean;
- pluginContext: IPublicModelPluginContext;
isRootNode?: boolean;
}> {
state: {
@@ -114,8 +134,8 @@ export default class TreeNodeView extends PureComponent<{
}
componentDidMount() {
- const { treeNode, pluginContext } = this.props;
- const { project } = pluginContext;
+ const { treeNode } = this.props;
+ const { project } = treeNode.pluginContext;
const doc = project.currentDocument;
@@ -158,14 +178,14 @@ export default class TreeNodeView extends PureComponent<{
}
shouldShowModalTreeNode(): boolean {
- const { treeNode, isRootNode, pluginContext } = this.props;
+ const { treeNode, isRootNode } = this.props;
if (!isRootNode) {
// 只在 当前树 的根节点展示模态节点
return false;
}
// 当指定了新的根节点时，要从原始的根节点去获取模态节点
- const { project } = pluginContext;
+ const { project } = treeNode.pluginContext;
const rootNode = project.currentDocument?.root;
const rootTreeNode = treeNode.tree.getTreeNode(rootNode!);
const modalNodes = rootTreeNode.children?.filter((item) => {
@@ -214,19 +234,16 @@ export default class TreeNodeView extends PureComponent<{
hidden={this.state.hidden}
locked={this.state.locked}
expandable={this.state.expandable}
- pluginContext={this.props.pluginContext}
/>
{shouldShowModalTreeNode &&
}
diff --git a/packages/plugin-outline-pane/src/views/tree-title.tsx b/packages/plugin-outline-pane/src/views/tree-title.tsx
index 6e1b14a46..6f35c6a61 100644
--- a/packages/plugin-outline-pane/src/views/tree-title.tsx
+++ b/packages/plugin-outline-pane/src/views/tree-title.tsx
@@ -1,7 +1,7 @@
import { KeyboardEvent, FocusEvent, Fragment, PureComponent } from 'react';
import classNames from 'classnames';
import { createIcon } from '@alilc/lowcode-utils';
-import { IPublicModelPluginContext, IPublicApiEvent } from '@alilc/lowcode-types';
+import { IPublicApiEvent } from '@alilc/lowcode-types';
import TreeNode from '../controllers/tree-node';
import { IconLock, IconUnlock, IconArrowRight, IconEyeClose, IconEye, IconCond, IconLoop, IconRadioActive, IconRadio, IconSetting } from '../icons';
@@ -23,11 +23,12 @@ export default class TreeTitle extends PureComponent<{
hidden: boolean;
locked: boolean;
expandable: boolean;
- pluginContext: IPublicModelPluginContext;
}> {
state: {
editing: boolean;
title: string;
+ condition?: boolean;
+ visible?: boolean;
} = {
editing: false,
title: '',
@@ -53,7 +54,7 @@ export default class TreeTitle extends PureComponent<{
const { treeNode } = this.props;
const value = (e.target as HTMLInputElement).value || '';
treeNode.setTitleLabel(value);
- emitOutlineEvent(this.props.pluginContext.event, 'rename', treeNode, { value });
+ emitOutlineEvent(this.props.treeNode.pluginContext.event, 'rename', treeNode, { value });
this.cancelEdit();
};
@@ -81,16 +82,28 @@ export default class TreeTitle extends PureComponent<{
this.setState({
editing: false,
title: treeNode.titleLabel,
+ condition: treeNode.condition,
});
treeNode.onTitleLabelChanged(() => {
this.setState({
title: treeNode.titleLabel,
});
});
+ treeNode.onConditionChanged(() => {
+ this.setState({
+ condition: treeNode.condition,
+ });
+ });
+ treeNode.onHiddenChanged((hidden: boolean) => {
+ this.setState({
+ visible: !hidden,
+ });
+ });
}
render() {
- const { treeNode, isModal, pluginContext } = this.props;
+ const { treeNode, isModal } = this.props;
+ const { pluginContext } = treeNode;
const { editing } = this.state;
const isCNode = !treeNode.isRoot();
const { node } = treeNode;
@@ -125,7 +138,7 @@ export default class TreeTitle extends PureComponent<{
data-id={treeNode.id}
onClick={() => {
if (isModal) {
- if (node.visible) {
+ if (this.state.visible) {
node.document?.modalNodesManager?.setInvisible(node);
} else {
node.document?.modalNodesManager?.setVisible(node);
@@ -137,7 +150,7 @@ export default class TreeTitle extends PureComponent<{
}
}}
>
- {isModal && node.visible && (
+ {isModal && this.state.visible && (
{
node.document?.modalNodesManager?.setInvisible(node);
}}
@@ -145,7 +158,7 @@ export default class TreeTitle extends PureComponent<{
)}
- {isModal && !node.visible && (
+ {isModal && !this.state.visible && (
{
node.document?.modalNodesManager?.setVisible(node);
}}
@@ -153,7 +166,7 @@ export default class TreeTitle extends PureComponent<{
)}
- {isCNode &&
}
+ {isCNode &&
}
{createIcon(treeNode.icon)}
{editing ? (
@@ -166,6 +179,7 @@ export default class TreeTitle extends PureComponent<{
/>
) : (
+ {/* @ts-ignore */}
{/* todo: click redirect to prop */}
+ {/* @ts-ignore */}
<Tip>{intlNode('Slot for {prop}', { prop: node.slotFor.key })}</Tip>
</a>
)}
@@ -182,22 +197,24 @@ export default class TreeTitle extends PureComponent<{
<a className="tree-node-tag loop">
{/* todo: click todo something */}
<IconLoop />
+ {/* @ts-ignore */}
<Tip>{intlNode('Loop')}</Tip>
</a>
)}
- {node.hasCondition() && !node.conditionGroup && (
+ {this.state.condition && (
<a className="tree-node-tag cond">
{/* todo: click todo something */}
<IconCond />
+ {/* @ts-ignore */}
<Tip>{intlNode('Conditional')}</Tip>
</a>
)}
</Fragment>
)}
</div>
- {shouldShowHideBtn && <HideBtn hidden={this.props.hidden} treeNode={treeNode} pluginContext={this.props.pluginContext} />}
- {shouldShowLockBtn && <LockBtn locked={this.props.locked} treeNode={treeNode} pluginContext={this.props.pluginContext} />}
- {shouldEditBtn && <RenameBtn treeNode={treeNode} pluginContext={this.props.pluginContext} onClick={this.enableEdit} /> }
+ {shouldShowHideBtn && <HideBtn hidden={this.props.hidden} treeNode={treeNode} />}
+ {shouldShowLockBtn && <LockBtn locked={this.props.locked} treeNode={treeNode} />}
+ {shouldEditBtn && <RenameBtn treeNode={treeNode} onClick={this.enableEdit} /> }
</div>
);
@@ -206,11 +223,10 @@ export default class TreeTitle extends PureComponent<{
class RenameBtn extends PureComponent<{
treeNode: TreeNode;
- pluginContext: IPublicModelPluginContext;
onClick: (e: any) => void;
}> {
render() {
- const { intl, common } = this.props.pluginContext;
+ const { intl, common } = this.props.treeNode.pluginContext;
const Tip = common.editorCabin.Tip;
return (
<div
@@ -218,6 +234,7 @@ class RenameBtn extends PureComponent<{
onClick={this.props.onClick}
>
<IconSetting />
+ {/* @ts-ignore */}
<Tip>{intl('Rename')}</Tip>
</div>
);
@@ -226,12 +243,11 @@ class RenameBtn extends PureComponent<{
class LockBtn extends PureComponent<{
treeNode: TreeNode;
- pluginContext: IPublicModelPluginContext;
locked: boolean;
}> {
render() {
const { treeNode, locked } = this.props;
- const { intl, common } = this.props.pluginContext;
+ const { intl, common } = this.props.treeNode.pluginContext;
const Tip = common.editorCabin.Tip;
return (
<div
@@ -242,6 +258,7 @@ class LockBtn extends PureComponent<{
}}
>
{locked ? <IconUnlock /> : <IconLock /> }
+ {/* @ts-ignore */}
<Tip>{locked ? intl('Unlock') : intl('Lock')}</Tip>
</div>
);
@@ -251,24 +268,24 @@ class LockBtn extends PureComponent<{
class HideBtn extends PureComponent<{
treeNode: TreeNode;
hidden: boolean;
- pluginContext: IPublicModelPluginContext;
}, {
hidden: boolean;
}> {
render() {
const { treeNode, hidden } = this.props;
- const { intl, common } = this.props.pluginContext;
+ const { intl, common } = treeNode.pluginContext;
const Tip = common.editorCabin.Tip;
return (
<div
className="tree-node-hide-btn"
onClick={(e) => {
e.stopPropagation();
- emitOutlineEvent(this.props.pluginContext.event, hidden ? 'show' : 'hide', treeNode);
+ emitOutlineEvent(treeNode.pluginContext.event, hidden ? 'show' : 'hide', treeNode);
treeNode.setHidden(!hidden);
}}
>
{hidden ? <IconEye /> : <IconEyeClose />}
+ {/* @ts-ignore */}
<Tip>{hidden ? intl('Show') : intl('Hide')}</Tip>
</div>
);
@@ -277,7 +294,6 @@ class HideBtn extends PureComponent<{
class ExpandBtn extends PureComponent<{
treeNode: TreeNode;
- pluginContext: IPublicModelPluginContext;
expanded: boolean;
expandable: boolean;
}> {
@@ -294,7 +310,7 @@ class ExpandBtn extends PureComponent<{
if (expanded) {
e.stopPropagation();
}
- emitOutlineEvent(this.props.pluginContext.event, expanded ? 'collapse' : 'expand', treeNode);
+ emitOutlineEvent(treeNode.pluginContext.event, expanded ? 'collapse' : 'expand', treeNode);
treeNode.setExpanded(!expanded);
}}
>
diff --git a/packages/plugin-outline-pane/src/views/tree.tsx b/packages/plugin-outline-pane/src/views/tree.tsx
index 930c65cce..4bc502886 100644
--- a/packages/plugin-outline-pane/src/views/tree.tsx
+++ b/packages/plugin-outline-pane/src/views/tree.tsx
@@ -2,7 +2,7 @@ import { MouseEvent as ReactMouseEvent, PureComponent } from 'react';
import { isFormEvent, canClickNode, isShaken } from '@alilc/lowcode-utils';
import { Tree } from '../controllers/tree';
import TreeNodeView from './tree-node';
-import { IPublicEnumDragObjectType, IPublicModelPluginContext, IPublicModelNode } from '@alilc/lowcode-types';
+import { IPublicEnumDragObjectType, IPublicModelNode } from '@alilc/lowcode-types';
import TreeNode from '../controllers/tree-node';
function getTreeNodeIdByEvent(e: ReactMouseEvent, stop: Element): null | string {
@@ -20,12 +20,21 @@ function getTreeNodeIdByEvent(e: ReactMouseEvent, stop: Element): null | string
export default class TreeView extends PureComponent<{
tree: Tree;
- pluginContext: IPublicModelPluginContext;
}> {
private shell: HTMLDivElement | null = null;
+ private ignoreUpSelected = false;
+
+ private boostEvent?: MouseEvent;
+
+ state: {
+ root: TreeNode | null;
+ } = {
+ root: null,
+ };
+
private hover(e: ReactMouseEvent) {
- const { project } = this.props.pluginContext;
+ const { project } = this.props.tree.pluginContext;
const detecting = project.currentDocument?.detecting;
if (detecting?.enable) {
return;
@@ -54,7 +63,7 @@ export default class TreeView extends PureComponent<{
return;
}
- const { project, event, canvas } = this.props.pluginContext;
+ const { project, event, canvas } = this.props.tree.pluginContext;
const doc = project.currentDocument;
const selection = doc?.selection;
const focusNode = doc?.focusNode;
@@ -109,10 +118,6 @@ export default class TreeView extends PureComponent<{
return tree.getTreeNodeById(id);
}
- private ignoreUpSelected = false;
-
- private boostEvent?: MouseEvent;
-
private onMouseDown = (e: ReactMouseEvent) => {
if (isFormEvent(e.nativeEvent)) {
return;
@@ -127,7 +132,7 @@ export default class TreeView extends PureComponent<{
if (!canClickNode(node, e)) {
return;
}
- const { project, canvas } = this.props.pluginContext;
+ const { project, canvas } = this.props.tree.pluginContext;
const selection = project.currentDocument?.selection;
const focusNode = project.currentDocument?.focusNode;
@@ -166,22 +171,16 @@ export default class TreeView extends PureComponent<{
};
private onMouseLeave = () => {
- const { pluginContext } = this.props;
+ const { pluginContext } = this.props.tree;
const { project } = pluginContext;
const doc = project.currentDocument;
doc?.detecting.leave();
};
- state: {
- root: TreeNode | null
- } = {
- root: null,
- };
-
componentDidMount() {
- const { tree, pluginContext } = this.props;
+ const { tree } = this.props;
const { root } = tree;
- const { project } = pluginContext;
+ const { project } = tree.pluginContext;
this.setState({ root });
const doc = project.currentDocument;
doc?.onFocusNodeChanged(() => {
@@ -208,7 +207,6 @@ export default class TreeView extends PureComponent<{
<TreeNodeView
key={this.state.root?.id}
treeNode={this.state.root}
- pluginContext={this.props.pluginContext}
isRootNode
/>
</div>
diff --git a/packages/rax-renderer/package.json b/packages/rax-renderer/package.json
index 489cf1409..3910afe41 100644
--- a/packages/rax-renderer/package.json
+++ b/packages/rax-renderer/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-rax-renderer",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "Rax renderer for Ali lowCode engine",
"main": "lib/index.js",
"module": "es/index.js",
@@ -30,8 +30,8 @@
"build": "build-scripts build"
},
"dependencies": {
- "@alilc/lowcode-renderer-core": "1.1.6",
- "@alilc/lowcode-utils": "1.1.6",
+ "@alilc/lowcode-renderer-core": "1.1.7",
+ "@alilc/lowcode-utils": "1.1.7",
"rax-find-dom-node": "^1.0.1"
},
"devDependencies": {
diff --git a/packages/rax-simulator-renderer/build.json b/packages/rax-simulator-renderer/build.json
index b95a17aaf..e7ae1dcf7 100644
--- a/packages/rax-simulator-renderer/build.json
+++ b/packages/rax-simulator-renderer/build.json
@@ -1,3 +1,3 @@
{
- "plugins": ["build-plugin-component", "./build.plugin.js"]
+ "plugins": ["@alilc/build-plugin-lce", "./build.plugin.js"]
}
diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json
index 76954ff36..0e29b1091 100644
--- a/packages/rax-simulator-renderer/package.json
+++ b/packages/rax-simulator-renderer/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-rax-simulator-renderer",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "rax simulator renderer for alibaba lowcode designer",
"main": "lib/index.js",
"module": "es/index.js",
@@ -9,14 +9,14 @@
"dist"
],
"scripts": {
- "build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --skip-demo",
+ "build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build",
"build:umd": "build-scripts build --config build.umd.json"
},
"dependencies": {
- "@alilc/lowcode-designer": "1.1.6",
- "@alilc/lowcode-rax-renderer": "1.1.6",
- "@alilc/lowcode-types": "1.1.6",
- "@alilc/lowcode-utils": "1.1.6",
+ "@alilc/lowcode-designer": "1.1.7",
+ "@alilc/lowcode-rax-renderer": "1.1.7",
+ "@alilc/lowcode-types": "1.1.7",
+ "@alilc/lowcode-utils": "1.1.7",
"classnames": "^2.2.6",
"driver-universal": "^3.1.3",
"history": "^5.0.0",
diff --git a/packages/react-renderer/build.json b/packages/react-renderer/build.json
index e791d5b6b..d0aec1038 100644
--- a/packages/react-renderer/build.json
+++ b/packages/react-renderer/build.json
@@ -1,6 +1,6 @@
{
"plugins": [
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
"build-plugin-fusion",
["build-plugin-moment-locales", {
"locales": ["zh-cn"]
diff --git a/packages/react-renderer/build.test.json b/packages/react-renderer/build.test.json
index dcdc891e9..9cc30d746 100644
--- a/packages/react-renderer/build.test.json
+++ b/packages/react-renderer/build.test.json
@@ -1,6 +1,6 @@
{
"plugins": [
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
"@alilc/lowcode-test-mate/plugin/index.ts"
]
}
diff --git a/packages/react-renderer/package.json b/packages/react-renderer/package.json
index 862f69d01..451ef1ee3 100644
--- a/packages/react-renderer/package.json
+++ b/packages/react-renderer/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-react-renderer",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "react renderer for ali lowcode engine",
"main": "lib/index.js",
"module": "es/index.js",
@@ -12,7 +12,7 @@
"scripts": {
"test": "build-scripts test --config build.test.json",
"start": "build-scripts start",
- "build": "build-scripts build --skip-demo",
+ "build": "build-scripts build",
"build:umd": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --config build.umd.json"
},
"keywords": [
@@ -22,7 +22,7 @@
],
"dependencies": {
"@alifd/next": "^1.21.16",
- "@alilc/lowcode-renderer-core": "1.1.6"
+ "@alilc/lowcode-renderer-core": "1.1.7"
},
"devDependencies": {
"@alib/build-scripts": "^0.1.18",
diff --git a/packages/react-simulator-renderer/build.json b/packages/react-simulator-renderer/build.json
index b95a17aaf..e7ae1dcf7 100644
--- a/packages/react-simulator-renderer/build.json
+++ b/packages/react-simulator-renderer/build.json
@@ -1,3 +1,3 @@
{
- "plugins": ["build-plugin-component", "./build.plugin.js"]
+ "plugins": ["@alilc/build-plugin-lce", "./build.plugin.js"]
}
diff --git a/packages/react-simulator-renderer/build.test.json b/packages/react-simulator-renderer/build.test.json
index dcdc891e9..9cc30d746 100644
--- a/packages/react-simulator-renderer/build.test.json
+++ b/packages/react-simulator-renderer/build.test.json
@@ -1,6 +1,6 @@
{
"plugins": [
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
"@alilc/lowcode-test-mate/plugin/index.ts"
]
}
diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json
index fce8d866e..adb5526c7 100644
--- a/packages/react-simulator-renderer/package.json
+++ b/packages/react-simulator-renderer/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-react-simulator-renderer",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "react simulator renderer for alibaba lowcode designer",
"main": "lib/index.js",
"module": "es/index.js",
@@ -12,15 +12,15 @@
],
"scripts": {
"test": "build-scripts test --config build.test.json",
- "build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --skip-demo",
+ "build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build",
"build:umd": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --config build.umd.json",
"test:cov": "build-scripts test --config build.test.json --jest-coverage"
},
"dependencies": {
- "@alilc/lowcode-designer": "1.1.6",
- "@alilc/lowcode-react-renderer": "1.1.6",
- "@alilc/lowcode-types": "1.1.6",
- "@alilc/lowcode-utils": "1.1.6",
+ "@alilc/lowcode-designer": "1.1.7",
+ "@alilc/lowcode-react-renderer": "1.1.7",
+ "@alilc/lowcode-types": "1.1.7",
+ "@alilc/lowcode-utils": "1.1.7",
"classnames": "^2.2.6",
"mobx": "^6.3.0",
"mobx-react": "^7.2.0",
diff --git a/packages/renderer-core/build.json b/packages/renderer-core/build.json
index a8e42f154..9140815c5 100644
--- a/packages/renderer-core/build.json
+++ b/packages/renderer-core/build.json
@@ -1,7 +1,7 @@
{
"plugins": [
[
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
{
"babelPlugins": ["@babel/plugin-transform-typescript"]
}
diff --git a/packages/renderer-core/build.test.json b/packages/renderer-core/build.test.json
index dcdc891e9..9cc30d746 100644
--- a/packages/renderer-core/build.test.json
+++ b/packages/renderer-core/build.test.json
@@ -1,6 +1,6 @@
{
"plugins": [
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
"@alilc/lowcode-test-mate/plugin/index.ts"
]
}
diff --git a/packages/renderer-core/jest.config.js b/packages/renderer-core/jest.config.js
index 652a76e70..2489490fa 100644
--- a/packages/renderer-core/jest.config.js
+++ b/packages/renderer-core/jest.config.js
@@ -11,6 +11,7 @@ const jestConfig = {
// },
// testMatch: ['(/tests?/.*(test))\\.[jt]s$'],
// testMatch: ['**/*/base.test.tsx'],
+ // testMatch: ['**/utils/common.test.ts'],
transformIgnorePatterns: [
`/node_modules/(?!${esModules})/`,
],
diff --git a/packages/renderer-core/package.json b/packages/renderer-core/package.json
index 84a63aa9a..ce633dd54 100644
--- a/packages/renderer-core/package.json
+++ b/packages/renderer-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-renderer-core",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "renderer core",
"license": "MIT",
"main": "lib/index.js",
@@ -10,14 +10,14 @@
"es"
],
"scripts": {
- "build": "build-scripts build --skip-demo",
+ "build": "build-scripts build",
"test": "build-scripts test --config build.test.json",
"test:cov": "build-scripts test --config build.test.json --jest-coverage"
},
"dependencies": {
"@alilc/lowcode-datasource-engine": "^1.0.0",
- "@alilc/lowcode-types": "1.1.6",
- "@alilc/lowcode-utils": "1.1.6",
+ "@alilc/lowcode-types": "1.1.7",
+ "@alilc/lowcode-utils": "1.1.7",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"fetch-jsonp": "^1.1.3",
@@ -32,7 +32,7 @@
"devDependencies": {
"@alib/build-scripts": "^0.1.18",
"@alifd/next": "^1.26.0",
- "@alilc/lowcode-designer": "1.1.6",
+ "@alilc/lowcode-designer": "1.1.7",
"@babel/plugin-transform-typescript": "^7.16.8",
"@testing-library/react": "^11.2.2",
"@types/classnames": "^2.2.11",
diff --git a/packages/renderer-core/src/hoc/leaf.tsx b/packages/renderer-core/src/hoc/leaf.tsx
index 5df988048..98b267475 100644
--- a/packages/renderer-core/src/hoc/leaf.tsx
+++ b/packages/renderer-core/src/hoc/leaf.tsx
@@ -102,6 +102,9 @@ function initRerenderEvent({
return;
}
cache.event.get(schema.id)?.dispose.forEach((disposeFn: any) => disposeFn && disposeFn());
+ const debounceRerender = debounce(() => {
+ container.rerender();
+ }, 20);
cache.event.set(schema.id, {
clear: false,
leaf,
@@ -111,21 +114,21 @@ function initRerenderEvent({
return;
}
__debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onPropsChange make rerender`);
- container.rerender();
+ debounceRerender();
}),
leaf?.onChildrenChange?.(() => {
if (!container.autoRepaintNode) {
return;
}
__debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onChildrenChange make rerender`);
- container.rerender();
+ debounceRerender();
}) as Function,
leaf?.onVisibleChange?.(() => {
if (!container.autoRepaintNode) {
return;
}
__debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onVisibleChange make rerender`);
- container.rerender();
+ debounceRerender();
}),
],
});
diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx
index 56f58599b..99a9a40cf 100644
--- a/packages/renderer-core/src/renderer/base.tsx
+++ b/packages/renderer-core/src/renderer/base.tsx
@@ -493,6 +493,11 @@ export default function baseRendererFactory(): IBaseRenderComponent {
return schema.map((item, idy) => this.__createVirtualDom(item, scope, parentInfo, (item as IPublicTypeNodeSchema)?.__ctx?.lceKey ? '' : String(idy)));
}
+ // @ts-expect-error 如果直接转换好了，可以返回
+ if (schema.$$typeof) {
+ return schema;
+ }
+
const _children = getSchemaChildren(schema);
if (!schema.componentName) {
logger.error('The componentName in the schema is invalid, please check the schema: ', schema);
@@ -510,11 +515,6 @@ export default function baseRendererFactory(): IBaseRenderComponent {
schema.children = [text];
}
- // @ts-expect-error 如果直接转换好了，可以返回
- if (schema.$$typeof) {
- return schema;
- }
-
if (!isSchema(schema)) {
return null;
}
diff --git a/packages/renderer-core/src/renderer/component.tsx b/packages/renderer-core/src/renderer/component.tsx
index 4be33f5c1..f9f6e8f96 100644
--- a/packages/renderer-core/src/renderer/component.tsx
+++ b/packages/renderer-core/src/renderer/component.tsx
@@ -47,11 +47,25 @@ export default function componentRendererFactory(): IBaseRenderComponent {
return this.__renderComp(Component, this.__renderContextProvider({ compContext: this }));
}
+ getComponentName() {
+ return this.props?.componentName;
+ }
+
/** 需要重载下面几个方法，如果在低代码组件中绑定了对应的生命周期时会出现死循环 */
- componentDidMount() {}
- getSnapshotBeforeUpdate() {}
- componentDidUpdate() {}
- componentWillUnmount() {}
- componentDidCatch() {}
+ componentDidMount() {
+ this.__debug(`componentDidMount - ${this.getComponentName()}`);
+ }
+ getSnapshotBeforeUpdate() {
+ this.__debug(`getSnapshotBeforeUpdate - ${this.getComponentName()}`);
+ }
+ componentDidUpdate() {
+ this.__debug(`componentDidUpdate - ${this.getComponentName()}`);
+ }
+ componentWillUnmount() {
+ this.__debug(`componentWillUnmount - ${this.getComponentName()}`);
+ }
+ componentDidCatch() {
+ this.__debug(`componentDidCatch - ${this.getComponentName()}`);
+ }
};
}
diff --git a/packages/renderer-core/src/renderer/page.tsx b/packages/renderer-core/src/renderer/page.tsx
index 9ba49c723..16d55e01b 100644
--- a/packages/renderer-core/src/renderer/page.tsx
+++ b/packages/renderer-core/src/renderer/page.tsx
@@ -1,6 +1,9 @@
+import { getLogger } from '@alilc/lowcode-utils';
import baseRendererFactory from './base';
import { IBaseRendererProps, IBaseRenderComponent } from '../types';
+const logger = getLogger({ level: 'warn', bizName: 'renderer-core:page' });
+
export default function pageRendererFactory(): IBaseRenderComponent {
const BaseRenderer = baseRendererFactory();
return class PageRenderer extends BaseRenderer {
@@ -29,6 +32,11 @@ export default function pageRendererFactory(): IBaseRenderComponent {
super.componentDidUpdate?.(prevProps, _prevState, snapshot);
}
+ setState(state: any, callback?: () => void) {
+ logger.info('page set state', state);
+ super.setState(state, callback);
+ }
+
render() {
const { __schema, __components } = this.props;
if (this.__checkSchema(__schema)) {
diff --git a/packages/renderer-core/tests/hoc/leaf.test.tsx b/packages/renderer-core/tests/hoc/leaf.test.tsx
index 94d50f87a..d4a65e578 100644
--- a/packages/renderer-core/tests/hoc/leaf.test.tsx
+++ b/packages/renderer-core/tests/hoc/leaf.test.tsx
@@ -83,7 +83,6 @@ beforeEach(() => {
});
component = renderer.create(
- // @ts-ignore
<Div _leaf={DivNode}>
<Text _leaf={TextNode} content="content"></Text>
</Div>
@@ -238,7 +237,6 @@ describe('mini unit render', () => {
nodeMap.set(textSchema.id, TextNode);
component = renderer.create(
- // @ts-ignore
<MiniRenderDiv _leaf={MiniRenderDivNode}>
<Text _leaf={TextNode} content="content"></Text>
</MiniRenderDiv>
@@ -285,7 +283,6 @@ describe('mini unit render', () => {
nodeMap.set(textSchema.id, TextNode);
renderer.create(
- // @ts-ignore
<div>
<Text _leaf={TextNode} content="content"></Text>
</div>
@@ -309,7 +306,6 @@ describe('mini unit render', () => {
});
renderer.create(
- // @ts-ignore
<div>
<Text _leaf={TextNode} content="content"></Text>
</div>
@@ -388,7 +384,6 @@ describe('mini unit render', () => {
};
const component = renderer.create(
- // @ts-ignore
<MiniRenderDiv _leaf={MiniRenderDivNode}>
<Text _leaf={TextNode} content="content"></Text>
</MiniRenderDiv>
@@ -428,7 +423,6 @@ describe('mini unit render', () => {
nodeMap.set(miniRenderSchema.id, MiniRenderDivNode);
component = renderer.create(
- // @ts-ignore
<MiniRenderDiv _leaf={MiniRenderDivNode}>
<Text _leaf={TextNode} content="content"></Text>
</MiniRenderDiv>
@@ -491,7 +485,6 @@ describe('onVisibleChange', () => {
describe('children', () => {
it('this.props.children is array', () => {
const component = renderer.create(
- // @ts-ignore
<Div _leaf={DivNode}>
<Text _leaf={TextNode} content="content"></Text>
<Text _leaf={TextNode} content="content"></Text>
diff --git a/packages/renderer-core/tests/renderer/base.test.tsx b/packages/renderer-core/tests/renderer/base.test.tsx
index 63c5cfbb2..3faa2bcf4 100644
--- a/packages/renderer-core/tests/renderer/base.test.tsx
+++ b/packages/renderer-core/tests/renderer/base.test.tsx
@@ -79,7 +79,6 @@ describe('Base Render methods', () => {
// const originalUtils = jest.requireActual('../../src/utils');
// mockParseExpression.mockImplementation(originalUtils.parseExpression);
const component = TestRenderer.create(
- // @ts-ignore
<RendererClass
__schema={mockSchema}
components={components as any}
diff --git a/packages/renderer-core/tests/renderer/renderer.test.tsx b/packages/renderer-core/tests/renderer/renderer.test.tsx
index 36ee4167e..081cede8a 100644
--- a/packages/renderer-core/tests/renderer/renderer.test.tsx
+++ b/packages/renderer-core/tests/renderer/renderer.test.tsx
@@ -13,7 +13,6 @@ function getComp(schema, comp = null, others = {}): Promise<{
}> {
return new Promise((resolve, reject) => {
const component = renderer.create(
- // @ts-ignore
<Renderer
schema={schema}
components={components as any}
@@ -48,7 +47,6 @@ afterEach(() => {
describe('Base Render', () => {
it('renderComp', () => {
const content = (
- // @ts-ignore
<Renderer
schema={schema as any}
components={components as any}
diff --git a/packages/renderer-core/tests/utils/common.test.ts b/packages/renderer-core/tests/utils/common.test.ts
index 6fac55024..995e55642 100644
--- a/packages/renderer-core/tests/utils/common.test.ts
+++ b/packages/renderer-core/tests/utils/common.test.ts
@@ -374,7 +374,7 @@ describe('test parseThisRequiredExpression', () => {
};
const fn = logger.error = jest.fn();
parseThisRequiredExpression(mockExpression, { state: { text: 'text' } });
- expect(fn).toBeCalledWith('parseExpression.error', new ReferenceError('state is not defined'), {"type": "JSExpression", "value": "state.text"}, {"state": {"text": "text"}});
+ expect(fn).toBeCalledWith(' parseExpression.error', new ReferenceError('state is not defined'), {"type": "JSExpression", "value": "state.text"}, {"state": {"text": "text"}});
});
it('[success] JSExpression handle without this use scopeValue', () => {
diff --git a/packages/shell/build.json b/packages/shell/build.json
index bd5cf18dd..3e9260055 100644
--- a/packages/shell/build.json
+++ b/packages/shell/build.json
@@ -1,5 +1,5 @@
{
"plugins": [
- "build-plugin-component"
+ "@alilc/build-plugin-lce"
]
}
diff --git a/packages/shell/build.test.json b/packages/shell/build.test.json
index dcdc891e9..9cc30d746 100644
--- a/packages/shell/build.test.json
+++ b/packages/shell/build.test.json
@@ -1,6 +1,6 @@
{
"plugins": [
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
"@alilc/lowcode-test-mate/plugin/index.ts"
]
}
diff --git a/packages/shell/package.json b/packages/shell/package.json
index 9b9cc0416..9ec85ec5c 100644
--- a/packages/shell/package.json
+++ b/packages/shell/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-shell",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "Shell Layer for AliLowCodeEngine",
"main": "lib/index.js",
"module": "es/index.js",
@@ -9,18 +9,16 @@
"es"
],
"scripts": {
- "build": "build-scripts build --skip-demo",
- "test": "build-scripts test --config build.test.json",
- "test:cov": "build-scripts test --config build.test.json --jest-coverage"
+ "build": "build-scripts build"
},
"license": "MIT",
"dependencies": {
- "@alilc/lowcode-designer": "1.1.6",
- "@alilc/lowcode-editor-core": "1.1.6",
- "@alilc/lowcode-editor-skeleton": "1.1.6",
- "@alilc/lowcode-types": "1.1.6",
- "@alilc/lowcode-utils": "1.1.6",
- "@alilc/lowcode-workspace": "1.1.6",
+ "@alilc/lowcode-designer": "1.1.7",
+ "@alilc/lowcode-editor-core": "1.1.7",
+ "@alilc/lowcode-editor-skeleton": "1.1.7",
+ "@alilc/lowcode-types": "1.1.7",
+ "@alilc/lowcode-utils": "1.1.7",
+ "@alilc/lowcode-workspace": "1.1.7",
"classnames": "^2.2.6",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",
diff --git a/packages/shell/src/api/common.tsx b/packages/shell/src/api/common.tsx
index 6a44dc82e..9f38cf109 100644
--- a/packages/shell/src/api/common.tsx
+++ b/packages/shell/src/api/common.tsx
@@ -1,4 +1,4 @@
-import { editorSymbol, skeletonSymbol, designerCabinSymbol, designerSymbol } from '../symbols';
+import { editorSymbol, skeletonSymbol, designerCabinSymbol, designerSymbol, settingFieldSymbol } from '../symbols';
import {
isFormEvent as innerIsFormEvent,
compatibleLegaoSchema as innerCompatibleLegaoSchema,
@@ -25,6 +25,7 @@ import {
IPublicTypeLocationDetailType as InnerLocationDetailType,
IPublicApiCommonEditorCabin,
IPublicModelDragon,
+ IPublicModelSettingField,
} from '@alilc/lowcode-types';
import {
SettingField as InnerSettingField,
@@ -57,6 +58,9 @@ import {
untracked as innerUntracked,
computed as innerComputed,
observer as innerObserver,
+ action as innerAction,
+ runInAction as innerRunInAction,
+ engineConfig as innerEngineConfig,
} from '@alilc/lowcode-editor-core';
import { Dragon as ShellDragon } from '../model';
import { ReactNode } from 'react';
@@ -168,8 +172,8 @@ class SkeletonCabin implements IPublicApiCommonSkeletonCabin {
/**
* @deprecated
*/
- createSettingFieldView(item: any, field: any) {
- return innerCreateSettingFieldView(item, field);
+ createSettingFieldView(field: IPublicModelSettingField, fieldEntry: any) {
+ return innerCreateSettingFieldView((field as any)[settingFieldSymbol] || field, fieldEntry);
}
/**
@@ -301,6 +305,27 @@ class EditorCabin implements IPublicApiCommonEditorCabin {
return innerObx;
}
+ /**
+ * @deprecated
+ */
+ get action() {
+ return innerAction;
+ }
+
+ /**
+ * @deprecated
+ */
+ get engineConfig() {
+ return innerEngineConfig;
+ }
+
+ /**
+ * @deprecated
+ */
+ get runInAction() {
+ return innerRunInAction;
+ }
+
/**
* @deprecated
*/
diff --git a/packages/shell/src/api/material.ts b/packages/shell/src/api/material.ts
index e3ebd20ec..ea9d6e01b 100644
--- a/packages/shell/src/api/material.ts
+++ b/packages/shell/src/api/material.ts
@@ -143,9 +143,16 @@ export class Material implements IPublicApiMaterial {
* 在设计器辅助层增加一个扩展 action
* @param action
*/
- addBuiltinComponentAction(action: IPublicTypeComponentAction) {
+ addBuiltinComponentAction = (action: IPublicTypeComponentAction) => {
this[designerSymbol].componentActions.addBuiltinComponentAction(action);
- }
+ };
+
+ /**
+ * 刷新 componentMetasMap，可触发模拟器里的 components 重新构建
+ */
+ refreshComponentMetasMap = () => {
+ this[designerSymbol].refreshComponentMetasMap();
+ };
/**
* 移除设计器辅助层的指定 action
diff --git a/packages/shell/src/api/plugins.ts b/packages/shell/src/api/plugins.ts
index e5a79edbd..b6f5e6371 100644
--- a/packages/shell/src/api/plugins.ts
+++ b/packages/shell/src/api/plugins.ts
@@ -66,8 +66,8 @@ export class Plugins implements IPublicApiPlugins {
return this[pluginsSymbol].has(pluginName);
}
- delete(pluginName: string) {
- this[pluginsSymbol].delete(pluginName);
+ async delete(pluginName: string) {
+ return await this[pluginsSymbol].delete(pluginName);
}
toProxy() {
diff --git a/packages/shell/src/api/project.ts b/packages/shell/src/api/project.ts
index ed45701b3..f005d0af0 100644
--- a/packages/shell/src/api/project.ts
+++ b/packages/shell/src/api/project.ts
@@ -18,6 +18,9 @@ import {
import { DocumentModel as ShellDocumentModel } from '../model';
import { SimulatorHost } from './simulator-host';
import { editorSymbol, projectSymbol, simulatorHostSymbol, documentSymbol } from '../symbols';
+import { getLogger } from '@alilc/lowcode-utils';
+
+const logger = getLogger({ level: 'warn', bizName: 'shell-project' });
const innerProjectSymbol = Symbol('innerProject');
export class Project implements IPublicApiProject {
@@ -29,6 +32,10 @@ export class Project implements IPublicApiProject {
}
const workspace = globalContext.get('workspace');
if (workspace.isActive) {
+ if (!workspace.window?.innerProject) {
+ logger.error('project api 调用时机出现问题，请检查');
+ return this[innerProjectSymbol];
+ }
return workspace.window.innerProject;
}
@@ -43,8 +50,8 @@ export class Project implements IPublicApiProject {
this[innerProjectSymbol] = project;
}
- static create(project: InnerProject) {
- return new Project(project);
+ static create(project: InnerProject, workspaceMode: boolean = false) {
+ return new Project(project, workspaceMode);
}
/**
@@ -225,15 +232,15 @@ export class Project implements IPublicApiProject {
*/
setConfig<T extends keyof IPublicTypeAppConfig>(key: T, value: IPublicTypeAppConfig[T]): void;
setConfig(value: IPublicTypeAppConfig): void;
- setConfig(...params: any[]): void{
- if(params.length === 2) {
+ setConfig(...params: any[]): void {
+ if (params.length === 2) {
const oldConfig = this[projectSymbol].get('config');
this[projectSymbol].set('config', {
...oldConfig,
[params[0]]: params[1],
- })
+ });
} else {
- this[projectSymbol].set('config', params[0])
+ this[projectSymbol].set('config', params[0]);
}
}
}
diff --git a/packages/shell/src/api/setters.ts b/packages/shell/src/api/setters.ts
index 553f32c4e..7750a5152 100644
--- a/packages/shell/src/api/setters.ts
+++ b/packages/shell/src/api/setters.ts
@@ -1,27 +1,36 @@
import { IPublicTypeCustomView, IPublicApiSetters, IPublicTypeRegisteredSetter } from '@alilc/lowcode-types';
-import { Setters as InnerSetters, globalContext } from '@alilc/lowcode-editor-core';
+import { ISetters, globalContext, untracked } from '@alilc/lowcode-editor-core';
import { ReactNode } from 'react';
+import { getLogger } from '@alilc/lowcode-utils';
const innerSettersSymbol = Symbol('setters');
const settersSymbol = Symbol('setters');
-export class Setters implements IPublicApiSetters {
- readonly [innerSettersSymbol]: InnerSetters;
+const logger = getLogger({ level: 'warn', bizName: 'shell-setters' });
- get [settersSymbol](): InnerSetters {
+export class Setters implements IPublicApiSetters {
+ readonly [innerSettersSymbol]: ISetters;
+
+ get [settersSymbol](): ISetters {
if (this.workspaceMode) {
return this[innerSettersSymbol];
}
const workspace = globalContext.get('workspace');
if (workspace.isActive) {
- return workspace.window.innerSetters;
+ return untracked(() => {
+ if (!workspace.window.innerSetters) {
+ logger.error('setter api 调用时机出现问题，请检查');
+ return this[innerSettersSymbol];
+ }
+ return workspace.window.innerSetters;
+ });
}
return this[innerSettersSymbol];
}
- constructor(innerSetters: InnerSetters, readonly workspaceMode = false) {
+ constructor(innerSetters: ISetters, readonly workspaceMode = false) {
this[innerSettersSymbol] = innerSetters;
}
@@ -38,11 +47,11 @@ export class Setters implements IPublicApiSetters {
* 获取已注册的所有 settersMap
* @returns
*/
- getSettersMap(): Map<string, IPublicTypeRegisteredSetter & {
+ getSettersMap = (): Map<string, IPublicTypeRegisteredSetter & {
type: string;
- }> {
+ }> => {
return this[settersSymbol].getSettersMap();
- }
+ };
/**
* 注册一个 setter
@@ -57,6 +66,9 @@ export class Setters implements IPublicApiSetters {
return this[settersSymbol].registerSetter(typeOrMaps, setter);
};
+ /**
+ * @deprecated
+ */
createSetterContent = (setter: any, props: Record<string, any>): ReactNode => {
return this[settersSymbol].createSetterContent(setter, props);
};
diff --git a/packages/shell/src/api/skeleton.ts b/packages/shell/src/api/skeleton.ts
index 928c55a0d..b48747598 100644
--- a/packages/shell/src/api/skeleton.ts
+++ b/packages/shell/src/api/skeleton.ts
@@ -4,10 +4,14 @@ import {
SkeletonEvents,
} from '@alilc/lowcode-editor-skeleton';
import { skeletonSymbol } from '../symbols';
-import { IPublicApiSkeleton, IPublicTypeDisposable, IPublicTypeSkeletonConfig, IPublicTypeWidgetConfigArea } from '@alilc/lowcode-types';
+import { IPublicApiSkeleton, IPublicModelSkeletonItem, IPublicTypeDisposable, IPublicTypeSkeletonConfig, IPublicTypeWidgetConfigArea } from '@alilc/lowcode-types';
+import { getLogger } from '@alilc/lowcode-utils';
+import { SkeletonItem } from '../model/skeleton-item';
const innerSkeletonSymbol = Symbol('skeleton');
+const logger = getLogger({ level: 'warn', bizName: 'shell-skeleton' });
+
export class Skeleton implements IPublicApiSkeleton {
private readonly [innerSkeletonSymbol]: ISkeleton;
private readonly pluginName: string;
@@ -18,6 +22,10 @@ export class Skeleton implements IPublicApiSkeleton {
}
const workspace = globalContext.get('workspace');
if (workspace.isActive) {
+ if (!workspace.window.innerSkeleton) {
+ logger.error('skeleton api 调用时机出现问题，请检查');
+ return this[innerSkeletonSymbol];
+ }
return workspace.window.innerSkeleton;
}
@@ -39,12 +47,15 @@ export class Skeleton implements IPublicApiSkeleton {
* @param extraConfig
* @returns
*/
- add(config: IPublicTypeSkeletonConfig, extraConfig?: Record<string, any>) {
+ add(config: IPublicTypeSkeletonConfig, extraConfig?: Record<string, any>): IPublicModelSkeletonItem | undefined {
const configWithName = {
...config,
pluginName: this.pluginName,
};
- return this[skeletonSymbol].add(configWithName, extraConfig);
+ const item = this[skeletonSymbol].add(configWithName, extraConfig);
+ if (item) {
+ return new SkeletonItem(item);
+ }
}
/**
@@ -61,6 +72,10 @@ export class Skeleton implements IPublicApiSkeleton {
skeleton[normalizeArea(area)].container?.remove(name);
}
+ getAreaItems(areaName: IPublicTypeWidgetConfigArea): IPublicModelSkeletonItem[] {
+ return this[skeletonSymbol][normalizeArea(areaName)].container.items?.map(d => new SkeletonItem(d));
+ }
+
/**
* 显示面板
* @param name
@@ -186,7 +201,7 @@ export class Skeleton implements IPublicApiSkeleton {
}
}
-function normalizeArea(area: IPublicTypeWidgetConfigArea | undefined): 'leftArea' | 'rightArea' | 'topArea' | 'toolbar' | 'mainArea' | 'bottomArea' | 'leftFixedArea' | 'leftFloatArea' | 'stages' {
+function normalizeArea(area: IPublicTypeWidgetConfigArea | undefined): 'leftArea' | 'rightArea' | 'topArea' | 'toolbar' | 'mainArea' | 'bottomArea' | 'leftFixedArea' | 'leftFloatArea' | 'stages' | 'subTopArea' {
switch (area) {
case 'leftArea':
case 'left':
@@ -213,6 +228,8 @@ function normalizeArea(area: IPublicTypeWidgetConfigArea | undefined): 'leftArea
return 'leftFloatArea';
case 'stages':
return 'stages';
+ case 'subTopArea':
+ return 'subTopArea';
default:
throw new Error(`${area} not supported`);
}
diff --git a/packages/shell/src/api/workspace.ts b/packages/shell/src/api/workspace.ts
index 21015431f..8192ac67d 100644
--- a/packages/shell/src/api/workspace.ts
+++ b/packages/shell/src/api/workspace.ts
@@ -28,15 +28,22 @@ export class Workspace implements IPublicApiWorkspace {
}
get window() {
+ if (!this[workspaceSymbol].window) {
+ return null;
+ }
return new ShellWindow(this[workspaceSymbol].window);
}
+ onWindowRendererReady(fn: () => void): IPublicTypeDisposable {
+ return this[workspaceSymbol].onWindowRendererReady(fn);
+ }
+
registerResourceType(resourceTypeModel: IPublicTypeResourceType): void {
this[workspaceSymbol].registerResourceType(resourceTypeModel);
}
- openEditorWindow(resourceName: string, title: string, extra: object, viewName?: string) {
- this[workspaceSymbol].openEditorWindow(resourceName, title, extra, viewName);
+ async openEditorWindow(resourceName: string, title: string, extra: object, viewName?: string, sleep?: boolean): Promise<void> {
+ await this[workspaceSymbol].openEditorWindow(resourceName, title, extra, viewName, sleep);
}
openEditorWindowById(id: string) {
@@ -66,4 +73,8 @@ export class Workspace implements IPublicApiWorkspace {
onChangeActiveWindow(fn: () => void): IPublicTypeDisposable {
return this[workspaceSymbol].onChangeActiveWindow(fn);
}
+
+ onChangeActiveEditorView(fn: () => void): IPublicTypeDisposable {
+ return this[workspaceSymbol].onChangeActiveEditorView(fn);
+ }
}
diff --git a/packages/shell/src/index.ts b/packages/shell/src/index.ts
index 7017ca289..6f79c78bc 100644
--- a/packages/shell/src/index.ts
+++ b/packages/shell/src/index.ts
@@ -10,6 +10,8 @@ import {
SettingTopEntry,
Clipboard,
SettingField,
+ Window,
+ SkeletonItem,
} from './model';
import {
Project,
@@ -50,6 +52,7 @@ export {
Selection,
Setters,
Hotkey,
+ Window,
Skeleton,
SettingField as SettingPropEntry,
SettingTopEntry,
@@ -64,4 +67,5 @@ export {
SimulatorHost,
Config,
SettingField,
+ SkeletonItem,
};
diff --git a/packages/shell/src/model/active-tracker.ts b/packages/shell/src/model/active-tracker.ts
index 41871aacb..32d4c04eb 100644
--- a/packages/shell/src/model/active-tracker.ts
+++ b/packages/shell/src/model/active-tracker.ts
@@ -12,6 +12,22 @@ export class ActiveTracker implements IPublicModelActiveTracker {
this[activeTrackerSymbol] = innerTracker;
}
+ get target() {
+ const _target = this[activeTrackerSymbol]._target;
+
+ if (!_target) {
+ return null;
+ }
+
+ const { node: innerNode, detail, instance } = _target;
+ const publicNode = ShellNode.create(innerNode);
+ return {
+ node: publicNode!,
+ detail,
+ instance,
+ };
+ }
+
onChange(fn: (target: IPublicTypeActiveTarget) => void): () => void {
if (!fn) {
return () => {};
diff --git a/packages/shell/src/model/document-model.ts b/packages/shell/src/model/document-model.ts
index 68252e3a5..06f3cebcd 100644
--- a/packages/shell/src/model/document-model.ts
+++ b/packages/shell/src/model/document-model.ts
@@ -90,7 +90,7 @@ export class DocumentModel implements IPublicModelDocumentModel {
* @returns
*/
get project(): IPublicApiProject {
- return ShellProject.create(this[documentSymbol].project);
+ return ShellProject.create(this[documentSymbol].project, true);
}
/**
diff --git a/packages/shell/src/model/editor-view.ts b/packages/shell/src/model/editor-view.ts
new file mode 100644
index 000000000..d70a109b1
--- /dev/null
+++ b/packages/shell/src/model/editor-view.ts
@@ -0,0 +1,27 @@
+import { editorViewSymbol, pluginContextSymbol } from '../symbols';
+import { IPublicModelPluginContext } from '@alilc/lowcode-types';
+import { IViewContext } from '@alilc/lowcode-workspace';
+
+export class EditorView {
+ [editorViewSymbol]: IViewContext;
+
+ [pluginContextSymbol]: IPublicModelPluginContext;
+
+ constructor(editorView: IViewContext) {
+ this[editorViewSymbol] = editorView;
+ this[pluginContextSymbol] = this[editorViewSymbol].innerPlugins._getLowCodePluginContext({
+ pluginName: editorView.editorWindow + editorView.viewName,
+ });
+ }
+
+ toProxy() {
+ return new Proxy(this, {
+ get(target, prop, receiver) {
+ if ((target[pluginContextSymbol] as any)[prop as string]) {
+ return Reflect.get(target[pluginContextSymbol], prop, receiver);
+ }
+ return Reflect.get(target, prop, receiver);
+ },
+ });
+ }
+}
diff --git a/packages/shell/src/model/index.ts b/packages/shell/src/model/index.ts
index cd481643e..a15d50b54 100644
--- a/packages/shell/src/model/index.ts
+++ b/packages/shell/src/model/index.ts
@@ -19,3 +19,5 @@ export * from './active-tracker';
export * from './plugin-instance';
export * from './window';
export * from './clipboard';
+export * from './editor-view';
+export * from './skeleton-item';
diff --git a/packages/shell/src/model/resource.ts b/packages/shell/src/model/resource.ts
index b2b065398..43f28fbd8 100644
--- a/packages/shell/src/model/resource.ts
+++ b/packages/shell/src/model/resource.ts
@@ -25,6 +25,10 @@ export class Resource implements IPublicModelResource {
return this[resourceSymbol].resourceType.name;
}
+ get config() {
+ return this[resourceSymbol].config;
+ }
+
get type() {
return this[resourceSymbol].resourceType.type;
}
diff --git a/packages/shell/src/model/skeleton-item.ts b/packages/shell/src/model/skeleton-item.ts
new file mode 100644
index 000000000..b91e5a19a
--- /dev/null
+++ b/packages/shell/src/model/skeleton-item.ts
@@ -0,0 +1,31 @@
+import { skeletonItemSymbol } from '../symbols';
+import { IPublicModelSkeletonItem } from '@alilc/lowcode-types';
+import { Dock, IWidget, Panel, PanelDock, Stage, Widget } from '@alilc/lowcode-editor-skeleton';
+
+export class SkeletonItem implements IPublicModelSkeletonItem {
+ private [skeletonItemSymbol]: IWidget | Widget | Panel | Stage | Dock | PanelDock;
+
+ constructor(skeletonItem: IWidget | Widget | Panel | Stage | Dock | PanelDock) {
+ this[skeletonItemSymbol] = skeletonItem;
+ }
+
+ get name() {
+ return this[skeletonItemSymbol].name;
+ }
+
+ disable() {
+ this[skeletonItemSymbol].disable?.();
+ }
+
+ enable() {
+ this[skeletonItemSymbol].enable?.();
+ }
+
+ hide() {
+ this[skeletonItemSymbol].hide();
+ }
+
+ show() {
+ this[skeletonItemSymbol].show();
+ }
+}
\ No newline at end of file
diff --git a/packages/shell/src/model/window.ts b/packages/shell/src/model/window.ts
index b1263d541..3e6bd6450 100644
--- a/packages/shell/src/model/window.ts
+++ b/packages/shell/src/model/window.ts
@@ -2,6 +2,7 @@ import { windowSymbol } from '../symbols';
import { IPublicModelResource, IPublicModelWindow, IPublicTypeDisposable } from '@alilc/lowcode-types';
import { IEditorWindow } from '@alilc/lowcode-workspace';
import { Resource as ShellResource } from './resource';
+import { EditorView } from './editor-view';
export class Window implements IPublicModelWindow {
private readonly [windowSymbol]: IEditorWindow;
@@ -41,4 +42,19 @@ export class Window implements IPublicModelWindow {
async save() {
return await this[windowSymbol].save();
}
+
+ onSave(fn: () => void) {
+ return this[windowSymbol].onSave(fn);
+ }
+
+ get currentEditorView() {
+ if (this[windowSymbol].editorView) {
+ return new EditorView(this[windowSymbol].editorView).toProxy() as any;
+ }
+ return null;
+ }
+
+ get editorViews() {
+ return Array.from(this[windowSymbol].editorViews.values()).map(d => new EditorView(d).toProxy() as any);
+ }
}
diff --git a/packages/shell/src/symbols.ts b/packages/shell/src/symbols.ts
index 4ba6ff236..b4ec01c7e 100644
--- a/packages/shell/src/symbols.ts
+++ b/packages/shell/src/symbols.ts
@@ -34,3 +34,6 @@ export const resourceSymbol = Symbol('resource');
export const clipboardSymbol = Symbol('clipboard');
export const configSymbol = Symbol('configSymbol');
export const conditionGroupSymbol = Symbol('conditionGroup');
+export const editorViewSymbol = Symbol('editorView');
+export const pluginContextSymbol = Symbol('pluginContext');
+export const skeletonItemSymbol = Symbol('skeletonItem');
\ No newline at end of file
diff --git a/packages/types/build.json b/packages/types/build.json
index bd5cf18dd..3e9260055 100644
--- a/packages/types/build.json
+++ b/packages/types/build.json
@@ -1,5 +1,5 @@
{
"plugins": [
- "build-plugin-component"
+ "@alilc/build-plugin-lce"
]
}
diff --git a/packages/types/package.json b/packages/types/package.json
index 6d9033886..0b05893ca 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-types",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "Types for Ali lowCode engine",
"files": [
"es",
@@ -9,7 +9,7 @@
"main": "lib/index.js",
"module": "es/index.js",
"scripts": {
- "build": "build-scripts build --skip-demo"
+ "build": "build-scripts build"
},
"dependencies": {
"@alilc/lowcode-datasource-types": "^1.0.0",
diff --git a/packages/types/src/shell/api/material.ts b/packages/types/src/shell/api/material.ts
index 1e9f54996..d64455edd 100644
--- a/packages/types/src/shell/api/material.ts
+++ b/packages/types/src/shell/api/material.ts
@@ -122,4 +122,10 @@ export interface IPublicApiMaterial {
* @param fn
*/
onChangeAssets(fn: () => void): IPublicTypeDisposable;
+
+ /**
+ * 刷新 componentMetasMap，可触发模拟器里的 components 重新构建
+ * @since v1.1.7
+ */
+ refreshComponentMetasMap(): void;
}
diff --git a/packages/types/src/shell/api/setters.ts b/packages/types/src/shell/api/setters.ts
index 9ff2e8eda..011a9dcac 100644
--- a/packages/types/src/shell/api/setters.ts
+++ b/packages/types/src/shell/api/setters.ts
@@ -1,6 +1,9 @@
+import { ReactNode } from 'react';
+
import { IPublicTypeRegisteredSetter, IPublicTypeCustomView } from '../type';
export interface IPublicApiSetters {
+
/**
* 获取指定 setter
* get setter by type
@@ -29,4 +32,9 @@ export interface IPublicApiSetters {
typeOrMaps: string | { [key: string]: IPublicTypeCustomView | IPublicTypeRegisteredSetter },
setter?: IPublicTypeCustomView | IPublicTypeRegisteredSetter | undefined
): void;
+
+ /**
+ * @deprecated
+ */
+ createSetterContent (setter: any, props: Record<string, any>): ReactNode;
}
diff --git a/packages/types/src/shell/api/skeleton.ts b/packages/types/src/shell/api/skeleton.ts
index b22b3586c..13ba3468b 100644
--- a/packages/types/src/shell/api/skeleton.ts
+++ b/packages/types/src/shell/api/skeleton.ts
@@ -1,3 +1,4 @@
+import { IPublicModelSkeletonItem } from '../model';
import { IPublicTypeDisposable, IPublicTypeSkeletonConfig } from '../type';
export interface IPublicApiSkeleton {
@@ -9,7 +10,7 @@ export interface IPublicApiSkeleton {
* @param extraConfig
* @returns
*/
- add(config: IPublicTypeSkeletonConfig, extraConfig?: Record<string, any>): any;
+ add(config: IPublicTypeSkeletonConfig, extraConfig?: Record<string, any>): IPublicModelSkeletonItem | undefined;
/**
* 移除一个面板实例
diff --git a/packages/types/src/shell/api/workspace.ts b/packages/types/src/shell/api/workspace.ts
index 8c19846f7..8ae2434bc 100644
--- a/packages/types/src/shell/api/workspace.ts
+++ b/packages/types/src/shell/api/workspace.ts
@@ -10,7 +10,7 @@ export interface IPublicApiWorkspace<
isActive: boolean;
/** 当前设计器窗口 */
- window: ModelWindow;
+ window: ModelWindow | null;
plugins: Plugins;
@@ -30,7 +30,7 @@ export interface IPublicApiWorkspace<
registerResourceType(resourceTypeModel: IPublicTypeResourceType): void;
/** 打开视图窗口 */
- openEditorWindow(resourceName: string, title: string, extra: Object, viewName?: string): void;
+ openEditorWindow(resourceName: string, title: string, extra: Object, viewName?: string, sleep?: boolean): Promise<void>;
/** 通过视图 id 打开窗口 */
openEditorWindowById(id: string): void;
@@ -46,4 +46,16 @@ export interface IPublicApiWorkspace<
/** active 窗口变更事件 */
onChangeActiveWindow(fn: () => void): IPublicTypeDisposable;
+
+ /**
+ * active 视图变更事件
+ * @since v1.1.7
+ */
+ onChangeActiveEditorView(fn: () => void): IPublicTypeDisposable;
+
+ /**
+ * window 下的所有视图 renderer ready 事件
+ * @since v1.1.7
+ */
+ onWindowRendererReady(fn: () => void): IPublicTypeDisposable;
}
\ No newline at end of file
diff --git a/packages/types/src/shell/enum/index.ts b/packages/types/src/shell/enum/index.ts
index 506055825..f3d558011 100644
--- a/packages/types/src/shell/enum/index.ts
+++ b/packages/types/src/shell/enum/index.ts
@@ -2,4 +2,5 @@ export * from './event-names';
export * from './transition-type';
export * from './transform-stage';
export * from './drag-object-type';
-export * from './prop-value-changed-type';
\ No newline at end of file
+export * from './prop-value-changed-type';
+export * from './plugin-register-level';
\ No newline at end of file
diff --git a/packages/types/src/shell/enum/plugin-register-level.ts b/packages/types/src/shell/enum/plugin-register-level.ts
new file mode 100644
index 000000000..a0d9b746b
--- /dev/null
+++ b/packages/types/src/shell/enum/plugin-register-level.ts
@@ -0,0 +1,6 @@
+export enum IPublicEnumPluginRegisterLevel {
+ Default = 'default',
+ Workspace = 'workspace',
+ Resource = 'resource',
+ EditorView = 'editorView',
+}
\ No newline at end of file
diff --git a/packages/types/src/shell/model/active-tracker.ts b/packages/types/src/shell/model/active-tracker.ts
index b0ceec11f..ac116a947 100644
--- a/packages/types/src/shell/model/active-tracker.ts
+++ b/packages/types/src/shell/model/active-tracker.ts
@@ -2,6 +2,12 @@ import { IPublicTypeActiveTarget } from '../type';
import { IPublicModelNode } from './node';
export interface IPublicModelActiveTracker {
+
+ /**
+ * @since 1.1.7
+ */
+ target: IPublicTypeActiveTarget | null;
+
onChange(fn: (target: IPublicTypeActiveTarget) => void): () => void;
track(node: IPublicModelNode): void;
diff --git a/packages/types/src/shell/model/dragon.ts b/packages/types/src/shell/model/dragon.ts
index 662eb6a00..917149faf 100644
--- a/packages/types/src/shell/model/dragon.ts
+++ b/packages/types/src/shell/model/dragon.ts
@@ -1,5 +1,5 @@
/* eslint-disable max-len */
-import { IPublicTypeDragNodeDataObject, IPublicTypeDragObject } from '../type';
+import { IPublicTypeDisposable, IPublicTypeDragNodeDataObject, IPublicTypeDragObject } from '../type';
import { IPublicModelDragObject, IPublicModelLocateEvent, IPublicModelNode } from './';
export interface IPublicModelDragon<
@@ -19,7 +19,7 @@ export interface IPublicModelDragon<
* @param func
* @returns
*/
- onDragstart(func: (e: LocateEvent) => any): () => void;
+ onDragstart(func: (e: LocateEvent) => any): IPublicTypeDisposable;
/**
* 绑定 drag 事件
@@ -27,7 +27,7 @@ export interface IPublicModelDragon<
* @param func
* @returns
*/
- onDrag(func: (e: LocateEvent) => any): () => void;
+ onDrag(func: (e: LocateEvent) => any): IPublicTypeDisposable;
/**
* 绑定 dragend 事件
@@ -35,7 +35,7 @@ export interface IPublicModelDragon<
* @param func
* @returns
*/
- onDragend(func: (o: { dragObject: IPublicModelDragObject; copy?: boolean }) => any): () => void;
+ onDragend(func: (o: { dragObject: IPublicModelDragObject; copy?: boolean }) => any): IPublicTypeDisposable;
/**
* 设置拖拽监听的区域 shell，以及自定义拖拽转换函数 boost
diff --git a/packages/types/src/shell/model/editor-view.ts b/packages/types/src/shell/model/editor-view.ts
new file mode 100644
index 000000000..793417845
--- /dev/null
+++ b/packages/types/src/shell/model/editor-view.ts
@@ -0,0 +1,3 @@
+import { IPublicModelPluginContext } from './plugin-context';
+
+export interface IPublicModelEditorView extends IPublicModelPluginContext {}
\ No newline at end of file
diff --git a/packages/types/src/shell/model/index.ts b/packages/types/src/shell/model/index.ts
index b62fb76b9..1924f1121 100644
--- a/packages/types/src/shell/model/index.ts
+++ b/packages/types/src/shell/model/index.ts
@@ -30,3 +30,5 @@ export * from './sensor';
export * from './resource';
export * from './clipboard';
export * from './setting-field';
+export * from './editor-view';
+export * from './skeleton-item';
diff --git a/packages/types/src/shell/model/plugin-context.ts b/packages/types/src/shell/model/plugin-context.ts
index 5d97b5472..1f3d3b5e8 100644
--- a/packages/types/src/shell/model/plugin-context.ts
+++ b/packages/types/src/shell/model/plugin-context.ts
@@ -12,18 +12,11 @@ import {
IPublicApiPlugins,
IPublicApiWorkspace,
} from '../api';
-import { IPublicModelEngineConfig } from './';
+import { IPublicEnumPluginRegisterLevel } from '../enum';
+import { IPublicModelEngineConfig, IPublicModelWindow } from './';
export interface IPublicModelPluginContext {
- /**
- * 对于插件开发者来说，可以在 context 挂载自定义的内容，作为插件内全局上下文使用
- *
- * for plugin developers, costom properties can be add to plugin context
- * from inside plugin for convenience.
- */
- [key: string]: any;
-
/**
* 可通过该对象读取插件初始化配置
* by using this, init options can be accessed from inside plugin
@@ -108,6 +101,14 @@ export interface IPublicModelPluginContext {
* @tutorial https://lowcode-engine.cn/site/docs/api/workspace
*/
get workspace(): IPublicApiWorkspace;
+
+ /**
+ * 插件注册层级
+ * @since v1.1.7
+ */
+ get registerLevel(): IPublicEnumPluginRegisterLevel;
+
+ get editorWindow(): IPublicModelWindow;
}
/**
diff --git a/packages/types/src/shell/model/resource.ts b/packages/types/src/shell/model/resource.ts
index e18f3d503..1f59845e6 100644
--- a/packages/types/src/shell/model/resource.ts
+++ b/packages/types/src/shell/model/resource.ts
@@ -18,6 +18,10 @@ export interface IBaseModelResource<
get children(): Resource[];
get viewName(): string | undefined;
+
+ get config(): {
+ disableBehaviors?: ('copy' | 'remove')[];
+ } | undefined;
}
export type IPublicModelResource = IBaseModelResource<IPublicModelResource>;
diff --git a/packages/types/src/shell/model/skeleton-item.ts b/packages/types/src/shell/model/skeleton-item.ts
new file mode 100644
index 000000000..ca262ccbf
--- /dev/null
+++ b/packages/types/src/shell/model/skeleton-item.ts
@@ -0,0 +1,6 @@
+/**
+ * @since 1.1.7
+ */
+export interface IPublicModelSkeletonItem {
+
+}
\ No newline at end of file
diff --git a/packages/types/src/shell/model/window.ts b/packages/types/src/shell/model/window.ts
index bb27ce317..95ab738bc 100644
--- a/packages/types/src/shell/model/window.ts
+++ b/packages/types/src/shell/model/window.ts
@@ -1,6 +1,7 @@
import { ReactElement } from 'react';
import { IPublicTypeDisposable, IPublicTypeNodeSchema } from '../type';
import { IPublicModelResource } from './resource';
+import { IPublicModelEditorView } from './editor-view';
export interface IPublicModelWindow<
Resource = IPublicModelResource
@@ -18,6 +19,18 @@ export interface IPublicModelWindow<
/** 窗口资源类型 */
resource?: Resource;
+ /**
+ * 窗口当前视图
+ * @since v1.1.7
+ */
+ currentEditorView: IPublicModelEditorView | null;
+
+ /**
+ * 窗口全部视图实例
+ * @since v1.1.7
+ */
+ editorViews: IPublicModelEditorView[];
+
/** 当前窗口导入 schema */
importSchema(schema: IPublicTypeNodeSchema): void;
@@ -29,4 +42,10 @@ export interface IPublicModelWindow<
/** 窗口视图变更事件 */
onChangeViewType(fn: (viewName: string) => void): IPublicTypeDisposable;
+
+ /**
+ * 窗口视图保存事件
+ * @since 1.1.7
+ */
+ onSave(fn: () => void): IPublicTypeDisposable;
}
\ No newline at end of file
diff --git a/packages/types/src/shell/type/engine-options.ts b/packages/types/src/shell/type/engine-options.ts
index 195db8912..f17716653 100644
--- a/packages/types/src/shell/type/engine-options.ts
+++ b/packages/types/src/shell/type/engine-options.ts
@@ -2,6 +2,7 @@ import { RequestHandlersMap } from '@alilc/lowcode-datasource-types';
import { ComponentType } from 'react';
export interface IPublicTypeEngineOptions {
+
/**
* 是否开启 condition 的能力，默认在设计器中不管 condition 是啥都正常展示
* when this is true, node that configured as conditional not renderring
@@ -136,8 +137,10 @@ export interface IPublicTypeEngineOptions {
* 与 react-renderer 的 appHelper 一致，https://lowcode-engine.cn/site/docs/guide/expand/runtime/renderer#apphelper
*/
appHelper?: {
+
/** 全局公共函数 */
utils?: Record<string, any>;
+
/** 全局常量 */
constants?: Record<string, any>;
};
@@ -168,6 +171,12 @@ export interface IPublicTypeEngineOptions {
* 开启应用级设计模式
*/
enableWorkspaceMode?: boolean;
+
+ /**
+ * @default true
+ * 应用级设计模式下，自动打开第一个窗口
+ */
+ enableAutoOpenFirstWindow?: boolean;
}
/**
diff --git a/packages/types/src/shell/type/resource-list.ts b/packages/types/src/shell/type/resource-list.ts
index 5831d7b50..7abdcc7b1 100644
--- a/packages/types/src/shell/type/resource-list.ts
+++ b/packages/types/src/shell/type/resource-list.ts
@@ -24,6 +24,10 @@ export interface IPublicResourceData {
/** 资源子元素 */
children?: IPublicResourceData[];
+
+ config?: {
+ disableBehaviors?: ('copy' | 'remove')[];
+ };
}
export type IPublicResourceList = IPublicResourceData[];
\ No newline at end of file
diff --git a/packages/types/src/shell/type/widget-base-config.ts b/packages/types/src/shell/type/widget-base-config.ts
index f8268628b..edddf2d68 100644
--- a/packages/types/src/shell/type/widget-base-config.ts
+++ b/packages/types/src/shell/type/widget-base-config.ts
@@ -25,7 +25,7 @@ export interface IPublicTypePanelDockConfig extends IPublicTypeWidgetBaseConfig
props?: IPublicTypePanelDockProps;
/** 面板 name, 当没有 props.title 时, 会使用 name 作为标题 */
- name?: string;
+ name: string;
}
export interface IPublicTypePanelDockProps {
diff --git a/packages/utils/build.json b/packages/utils/build.json
index bd5cf18dd..3e9260055 100644
--- a/packages/utils/build.json
+++ b/packages/utils/build.json
@@ -1,5 +1,5 @@
{
"plugins": [
- "build-plugin-component"
+ "@alilc/build-plugin-lce"
]
}
diff --git a/packages/utils/build.test.json b/packages/utils/build.test.json
index dcdc891e9..9cc30d746 100644
--- a/packages/utils/build.test.json
+++ b/packages/utils/build.test.json
@@ -1,6 +1,6 @@
{
"plugins": [
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
"@alilc/lowcode-test-mate/plugin/index.ts"
]
}
diff --git a/packages/utils/jest.config.js b/packages/utils/jest.config.js
index 0e05687d7..328ea622e 100644
--- a/packages/utils/jest.config.js
+++ b/packages/utils/jest.config.js
@@ -1,9 +1,20 @@
-module.exports = {
+const fs = require('fs');
+const { join } = require('path');
+const pkgNames = fs.readdirSync(join('..')).filter(pkgName => !pkgName.startsWith('.'));
+
+const jestConfig = {
moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
- collectCoverage: true,
+ collectCoverage: false,
collectCoverageFrom: [
- 'src/**/*.{ts,tsx}',
+ 'src/**/*.ts',
+ '!src/**/*.d.ts',
'!**/node_modules/**',
'!**/vendor/**',
],
};
+
+// 只对本仓库内的 pkg 做 mapping
+jestConfig.moduleNameMapper = {};
+jestConfig.moduleNameMapper[`^@alilc/lowcode\\-(${pkgNames.join('|')})$`] = '<rootDir>/../$1/src';
+
+module.exports = jestConfig;
\ No newline at end of file
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 8043a9e10..6a0880b00 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-utils",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "Utils for Ali lowCode engine",
"files": [
"lib",
@@ -10,11 +10,11 @@
"module": "es/index.js",
"scripts": {
"test": "build-scripts test --config build.test.json",
- "build": "build-scripts build --skip-demo"
+ "build": "build-scripts build"
},
"dependencies": {
"@alifd/next": "^1.19.16",
- "@alilc/lowcode-types": "1.1.6",
+ "@alilc/lowcode-types": "1.1.7",
"lodash": "^4.17.21",
"mobx": "^6.3.0",
"react": "^16"
diff --git a/packages/utils/src/cursor.css b/packages/utils/src/cursor.css
new file mode 100644
index 000000000..e13da656e
--- /dev/null
+++ b/packages/utils/src/cursor.css
@@ -0,0 +1,19 @@
+html.lc-cursor-dragging,
+html.lc-cursor-dragging * {
+ cursor: move !important;
+}
+
+html.lc-cursor-x-resizing,
+html.lc-cursor-x-resizing * {
+ cursor: col-resize;
+}
+
+html.lc-cursor-y-resizing,
+html.lc-cursor-y-resizing * {
+ cursor: row-resize;
+}
+
+html.lc-cursor-copy,
+html.lc-cursor-copy * {
+ cursor: copy !important;
+}
diff --git a/packages/utils/src/cursor.less b/packages/utils/src/cursor.less
deleted file mode 100644
index 30c890862..000000000
--- a/packages/utils/src/cursor.less
+++ /dev/null
@@ -1,15 +0,0 @@
-html.lc-cursor-dragging, html.lc-cursor-dragging * {
- cursor: move !important;
-}
-
-html.lc-cursor-x-resizing, html.lc-cursor-x-resizing * {
- cursor: col-resize;
-}
-
-html.lc-cursor-y-resizing, html.lc-cursor-y-resizing * {
- cursor: row-resize;
-}
-
-html.lc-cursor-copy, html.lc-cursor-copy * {
- cursor: copy !important;
-}
diff --git a/packages/utils/src/cursor.ts b/packages/utils/src/cursor.ts
index fea4bce65..c12ec64b9 100644
--- a/packages/utils/src/cursor.ts
+++ b/packages/utils/src/cursor.ts
@@ -1,4 +1,4 @@
-import './cursor.less';
+import './cursor.css';
export class Cursor {
private states = new Set<string>();
diff --git a/packages/utils/src/is-react.ts b/packages/utils/src/is-react.ts
index 1f17f9afc..07568db98 100644
--- a/packages/utils/src/is-react.ts
+++ b/packages/utils/src/is-react.ts
@@ -3,6 +3,7 @@ import { cloneEnumerableProperty } from './clone-enumerable-property';
const hasSymbol = typeof Symbol === 'function' && Symbol.for;
const REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
+const REACT_MEMO_TYPE = hasSymbol ? Symbol.for('react.memo') : 0xead3;
export function isReactClass(obj: any): obj is ComponentClass<any> {
return obj && obj.prototype && (obj.prototype.isReactComponent || obj.prototype instanceof Component);
@@ -16,8 +17,16 @@ function isForwardRefType(obj: any): boolean {
return obj?.$$typeof && obj?.$$typeof === REACT_FORWARD_REF_TYPE;
}
+function isMemoType(obj: any): boolean {
+ return obj?.$$typeof && obj.$$typeof === REACT_MEMO_TYPE;
+}
+
export function isReactComponent(obj: any): obj is ComponentType<any> {
- return obj && (isReactClass(obj) || typeof obj === 'function' || isForwardRefType(obj));
+ if (!obj) {
+ return false;
+ }
+
+ return Boolean(isReactClass(obj) || typeof obj === 'function' || isForwardRefType(obj) || isMemoType(obj));
}
export function wrapReactClass(view: FunctionComponent) {
diff --git a/packages/utils/src/misc.ts b/packages/utils/src/misc.ts
index 4510e8643..89f121065 100644
--- a/packages/utils/src/misc.ts
+++ b/packages/utils/src/misc.ts
@@ -81,6 +81,7 @@ const stageList = [
'init',
'upgrade',
];
+
/**
* 兼容原来的数字版本的枚举对象
* @param stage
@@ -108,4 +109,18 @@ export function deprecate(fail: any, message: string, alterative?: string) {
export function isRegExp(obj: any): obj is RegExp {
return obj && obj.test && obj.exec && obj.compile;
+}
+
+/**
+ * The prop supportVariable SHOULD take precedence over default global supportVariable.
+ * @param propSupportVariable prop supportVariable
+ * @param globalSupportVariable global supportVariable
+ * @returns
+ */
+export function shouldUseVariableSetter(
+ propSupportVariable: boolean | undefined,
+ globalSupportVariable: boolean,
+) {
+ if (propSupportVariable === false) return false;
+ return propSupportVariable || globalSupportVariable;
}
\ No newline at end of file
diff --git a/packages/utils/test/src/build-components/buildComponents.test.ts b/packages/utils/test/src/build-components/buildComponents.test.ts
index 5662aa12c..e854890da 100644
--- a/packages/utils/test/src/build-components/buildComponents.test.ts
+++ b/packages/utils/test/src/build-components/buildComponents.test.ts
@@ -309,8 +309,14 @@ describe('build-component', () => {
))
.toEqual({
Button: {
- componentName: 'Component',
- schema: {},
+ componentsMap: [],
+ componentsTree: [
+ {
+ componentName: 'Component',
+ schema: {},
+ }
+ ],
+ version: "",
},
});
})
diff --git a/packages/utils/test/src/is-react.test.ts b/packages/utils/test/src/is-react.test.ts
new file mode 100644
index 000000000..74c88c933
--- /dev/null
+++ b/packages/utils/test/src/is-react.test.ts
@@ -0,0 +1,38 @@
+import React from "react";
+import { isReactComponent, wrapReactClass } from "../../src/is-react";
+
+class reactDemo extends React.Component {
+
+}
+
+const reactMemo = React.memo(reactDemo);
+
+const reactForwardRef = React.forwardRef((props, ref): any => {
+ return '';
+});
+
+describe('is-react-ut', () => {
+ it('isReactComponent', () => {
+ expect(isReactComponent(null)).toBeFalsy();
+ expect(isReactComponent(() => {})).toBeTruthy();
+ expect(isReactComponent({
+ $$typeof: Symbol.for('react.memo')
+ })).toBeTruthy();
+ expect(isReactComponent({
+ $$typeof: Symbol.for('react.forward_ref')
+ })).toBeTruthy();
+ expect(isReactComponent(reactDemo)).toBeTruthy();
+ expect(isReactComponent(reactMemo)).toBeTruthy();
+ expect(isReactComponent(reactForwardRef)).toBeTruthy();
+
+ });
+
+ it('wrapReactClass', () => {
+ const wrap = wrapReactClass(() => {});
+ expect(isReactComponent(wrap)).toBeTruthy();
+
+ const fun = () => {};
+ fun.displayName = 'mock';
+ expect(wrapReactClass(fun).displayName).toBe('mock');
+ })
+})
\ No newline at end of file
diff --git a/packages/utils/test/src/misc.test.ts b/packages/utils/test/src/misc.test.ts
new file mode 100644
index 000000000..8873dc4c8
--- /dev/null
+++ b/packages/utils/test/src/misc.test.ts
@@ -0,0 +1,9 @@
+import { shouldUseVariableSetter } from '../../src/misc';
+
+it('shouldUseVariableSetter', () => {
+ expect(shouldUseVariableSetter(false, true)).toBeFalsy();
+ expect(shouldUseVariableSetter(true, true)).toBeTruthy();
+ expect(shouldUseVariableSetter(true, false)).toBeTruthy();
+ expect(shouldUseVariableSetter(undefined, false)).toBeFalsy();
+ expect(shouldUseVariableSetter(undefined, true)).toBeTruthy();
+});
\ No newline at end of file
diff --git a/packages/workspace/build.json b/packages/workspace/build.json
index bd5cf18dd..3e9260055 100644
--- a/packages/workspace/build.json
+++ b/packages/workspace/build.json
@@ -1,5 +1,5 @@
{
"plugins": [
- "build-plugin-component"
+ "@alilc/build-plugin-lce"
]
}
diff --git a/packages/workspace/build.test.json b/packages/workspace/build.test.json
index dcdc891e9..9cc30d746 100644
--- a/packages/workspace/build.test.json
+++ b/packages/workspace/build.test.json
@@ -1,6 +1,6 @@
{
"plugins": [
- "build-plugin-component",
+ "@alilc/build-plugin-lce",
"@alilc/lowcode-test-mate/plugin/index.ts"
]
}
diff --git a/packages/workspace/package.json b/packages/workspace/package.json
index c1b1e25a5..569d65203 100644
--- a/packages/workspace/package.json
+++ b/packages/workspace/package.json
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-workspace",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "Shell Layer for AliLowCodeEngine",
"main": "lib/index.js",
"module": "es/index.js",
@@ -9,17 +9,17 @@
"es"
],
"scripts": {
- "build": "build-scripts build --skip-demo",
+ "build": "build-scripts build",
"test": "build-scripts test --config build.test.json",
"test:cov": "build-scripts test --config build.test.json --jest-coverage"
},
"license": "MIT",
"dependencies": {
- "@alilc/lowcode-designer": "1.1.6",
- "@alilc/lowcode-editor-core": "1.1.6",
- "@alilc/lowcode-editor-skeleton": "1.1.6",
- "@alilc/lowcode-types": "1.1.6",
- "@alilc/lowcode-utils": "1.1.6",
+ "@alilc/lowcode-designer": "1.1.7",
+ "@alilc/lowcode-editor-core": "1.1.7",
+ "@alilc/lowcode-editor-skeleton": "1.1.7",
+ "@alilc/lowcode-types": "1.1.7",
+ "@alilc/lowcode-utils": "1.1.7",
"classnames": "^2.2.6",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",
diff --git a/packages/workspace/src/context/base-context.ts b/packages/workspace/src/context/base-context.ts
index e74ae2ffb..b359a6139 100644
--- a/packages/workspace/src/context/base-context.ts
+++ b/packages/workspace/src/context/base-context.ts
@@ -30,6 +30,7 @@ import {
Common,
Logger,
Workspace,
+ Window,
Canvas,
} from '@alilc/lowcode-shell';
import {
@@ -43,6 +44,7 @@ import {
IPublicApiProject,
IPublicApiSetters,
IPublicApiSkeleton,
+ IPublicEnumPluginRegisterLevel,
IPublicModelPluginContext,
IPublicTypePluginMeta,
} from '@alilc/lowcode-types';
@@ -99,7 +101,7 @@ export class BasicContext implements IBasicContext {
preference: IPluginPreferenceMananger;
workspace: IWorkspace;
- constructor(innerWorkspace: IWorkspace, viewName: string, public editorWindow?: IEditorWindow) {
+ constructor(innerWorkspace: IWorkspace, viewName: string, readonly registerLevel: IPublicEnumPluginRegisterLevel, public editorWindow?: IEditorWindow) {
const editor = new Editor(viewName, true);
const innerSkeleton = new InnerSkeleton(editor, viewName);
@@ -164,6 +166,10 @@ export class BasicContext implements IBasicContext {
context.plugins = plugins;
context.logger = new Logger({ level: 'warn', bizName: `plugin:${pluginName}` });
context.canvas = canvas;
+ if (editorWindow) {
+ context.editorWindow = new Window(editorWindow);
+ }
+ context.registerLevel = registerLevel;
},
};
diff --git a/packages/workspace/src/context/view-context.ts b/packages/workspace/src/context/view-context.ts
index 38a9e570f..ff4c12eee 100644
--- a/packages/workspace/src/context/view-context.ts
+++ b/packages/workspace/src/context/view-context.ts
@@ -1,12 +1,18 @@
import { computed, makeObservable, obx } from '@alilc/lowcode-editor-core';
-import { IPublicEditorViewConfig, IPublicTypeEditorView } from '@alilc/lowcode-types';
+import { IPublicEditorViewConfig, IPublicEnumPluginRegisterLevel, IPublicTypeEditorView } from '@alilc/lowcode-types';
import { flow } from 'mobx';
import { IWorkspace } from '../workspace';
-import { BasicContext } from './base-context';
+import { BasicContext, IBasicContext } from './base-context';
import { IEditorWindow } from '../window';
import { getWebviewPlugin } from '../inner-plugins/webview';
-export class Context extends BasicContext {
+export interface IViewContext extends IBasicContext {
+ editorWindow: IEditorWindow;
+
+ viewName: string;
+}
+
+export class Context extends BasicContext implements IViewContext {
viewName = 'editor-view';
instance: IPublicEditorViewConfig;
@@ -17,10 +23,6 @@ export class Context extends BasicContext {
@obx isInit: boolean = false;
- @computed get active() {
- return this._activate;
- }
-
init = flow(function* (this: Context) {
if (this.viewType === 'webview') {
const url = yield this.instance?.url?.();
@@ -34,7 +36,7 @@ export class Context extends BasicContext {
});
constructor(public workspace: IWorkspace, public editorWindow: IEditorWindow, public editorView: IPublicTypeEditorView, options: Object | undefined) {
- super(workspace, editorView.viewName, editorWindow);
+ super(workspace, editorView.viewName, IPublicEnumPluginRegisterLevel.EditorView, editorWindow);
this.viewType = editorView.viewType || 'editor';
this.viewName = editorView.viewName;
this.instance = editorView(this.innerPlugins._getLowCodePluginContext({
@@ -43,6 +45,18 @@ export class Context extends BasicContext {
makeObservable(this);
}
+ @computed get active() {
+ return this._activate;
+ }
+
+ onSimulatorRendererReady = (): Promise<void> => {
+ return new Promise((resolve) => {
+ this.project.onSimulatorRendererReady(() => {
+ resolve();
+ });
+ });
+ };
+
setActivate = (_activate: boolean) => {
this._activate = _activate;
this.innerHotkey.activate(this._activate);
diff --git a/packages/workspace/src/index.ts b/packages/workspace/src/index.ts
index 1f3b77a7a..6c437fad0 100644
--- a/packages/workspace/src/index.ts
+++ b/packages/workspace/src/index.ts
@@ -4,3 +4,4 @@ export * from './window';
export * from './layouts/workbench';
export { Resource } from './resource';
export type { IResource } from './resource';
+export type { IViewContext } from './context/view-context';
diff --git a/packages/workspace/src/layouts/workbench.less b/packages/workspace/src/layouts/workbench.less
index 95574871a..c8c89d6f0 100644
--- a/packages/workspace/src/layouts/workbench.less
+++ b/packages/workspace/src/layouts/workbench.less
@@ -368,6 +368,9 @@ body {
right: 0;
bottom: 0;
left: 0;
+ flex-direction: column;
+ display: flex;
+ align-content: stretch;
}
.engine-actionitem {
diff --git a/packages/workspace/src/layouts/workbench.tsx b/packages/workspace/src/layouts/workbench.tsx
index fe5ef846f..0c69f9717 100644
--- a/packages/workspace/src/layouts/workbench.tsx
+++ b/packages/workspace/src/layouts/workbench.tsx
@@ -47,7 +47,7 @@ export class Workbench extends Component<{
{
workspace.windows.map(d => (
<WindowView
- active={d.id === workspace.window.id}
+ active={d.id === workspace.window?.id}
window={d}
key={d.id}
/>
diff --git a/packages/workspace/src/resource.ts b/packages/workspace/src/resource.ts
index 10cb7f0a1..4b695d036 100644
--- a/packages/workspace/src/resource.ts
+++ b/packages/workspace/src/resource.ts
@@ -1,5 +1,5 @@
import { ISkeleton } from '@alilc/lowcode-editor-skeleton';
-import { IPublicTypeEditorView, IPublicResourceData, IPublicResourceTypeConfig, IBaseModelResource } from '@alilc/lowcode-types';
+import { IPublicTypeEditorView, IPublicResourceData, IPublicResourceTypeConfig, IBaseModelResource, IPublicEnumPluginRegisterLevel } from '@alilc/lowcode-types';
import { Logger } from '@alilc/lowcode-utils';
import { BasicContext, IBasicContext } from './context/base-context';
import { ResourceType, IResourceType } from './resource-type';
@@ -39,7 +39,7 @@ export class Resource implements IResource {
}
get viewName() {
- return this.resourceData.viewName || (this.resourceData as any).viewType;
+ return this.resourceData.viewName || (this.resourceData as any).viewType || this.defaultViewType;
}
get description() {
@@ -70,12 +70,14 @@ export class Resource implements IResource {
return this.context.innerSkeleton;
}
- get children(): IResource[] {
- return this.resourceData?.children?.map(d => new Resource(d, this.workspace.getResourceType(d.resourceName || this.resourceType.name), this.workspace)) || [];
+ children: IResource[];
+
+ get config() {
+ return this.resourceData.config;
}
constructor(readonly resourceData: IPublicResourceData, readonly resourceType: IResourceType, readonly workspace: IWorkspace) {
- this.context = new BasicContext(workspace, `resource-${resourceData.resourceName || resourceType.name}`);
+ this.context = new BasicContext(workspace, `resource-${resourceData.resourceName || resourceType.name}`, IPublicEnumPluginRegisterLevel.Resource);
this.resourceTypeInstance = resourceType.resourceTypeModel(this.context.innerPlugins._getLowCodePluginContext({
pluginName: '',
}), this.options);
@@ -88,6 +90,7 @@ export class Resource implements IResource {
if (!resourceType) {
logger.error(`resourceType[${resourceType}] is unValid.`);
}
+ this.children = this.resourceData?.children?.map(d => new Resource(d, this.workspace.getResourceType(d.resourceName || this.resourceType.name), this.workspace)) || [];
}
async init() {
diff --git a/packages/workspace/src/window.ts b/packages/workspace/src/window.ts
index 96707dcb8..6fb706632 100644
--- a/packages/workspace/src/window.ts
+++ b/packages/workspace/src/window.ts
@@ -1,23 +1,31 @@
import { uniqueId } from '@alilc/lowcode-utils';
import { createModuleEventBus, IEventBus, makeObservable, obx } from '@alilc/lowcode-editor-core';
-import { Context } from './context/view-context';
+import { Context, IViewContext } from './context/view-context';
import { IWorkspace } from './workspace';
import { IResource } from './resource';
-import { IPublicTypeDisposable } from '../../types/es/shell/type/disposable';
-import { IPublicModelWindow } from '@alilc/lowcode-types';
+import { IPublicModelWindow, IPublicTypeDisposable } from '@alilc/lowcode-types';
interface IWindowCOnfig {
title: string | undefined;
options?: Object;
viewType?: string | undefined;
+ sleep?: boolean;
}
-export interface IEditorWindow extends Omit<IPublicModelWindow<IResource>, 'changeViewType'> {
+export interface IEditorWindow extends Omit<IPublicModelWindow<IResource>, 'changeViewType' | 'currentEditorView' | 'editorViews'> {
readonly resource: IResource;
- editorViews: Map<string, Context>;
+ editorViews: Map<string, IViewContext>;
+
+ editorView: IViewContext;
changeViewType: (name: string, ignoreEmit?: boolean) => void;
+
+ initReady: boolean;
+
+ sleep?: boolean;
+
+ init(): void;
}
export class EditorWindow implements IEditorWindow {
@@ -36,11 +44,13 @@ export class EditorWindow implements IEditorWindow {
@obx initReady = false;
+ sleep: boolean | undefined;
+
constructor(readonly resource: IResource, readonly workspace: IWorkspace, private config: IWindowCOnfig) {
makeObservable(this);
- this.init();
this.title = config.title;
this.icon = resource.icon;
+ this.sleep = config.sleep;
}
async importSchema(schema: any) {
@@ -59,20 +69,39 @@ export class EditorWindow implements IEditorWindow {
async save() {
const value: any = {};
const editorViews = this.resource.editorViews;
+ if (!editorViews) {
+ return;
+ }
for (let i = 0; i < editorViews.length; i++) {
const name = editorViews[i].viewName;
const saveResult = await this.editorViews.get(name)?.save();
value[name] = saveResult;
}
- return await this.resource.save(value);
+ const result = await this.resource.save(value);
+ this.emitter.emit('handle.save');
+
+ return result;
+ }
+
+ onSave(fn: () => void) {
+ this.emitter.on('handle.save', fn);
+
+ return () => {
+ this.emitter.off('handle.save', fn);
+ };
}
async init() {
await this.initViewTypes();
await this.execViewTypesInit();
+ Promise.all(Array.from(this.editorViews.values()).map((d) => d.onSimulatorRendererReady)).then(() => {
+ this.workspace.emitWindowRendererReady();
+ });
this.url = await this.resource.url();
this.setDefaultViewType();
this.initReady = true;
+ this.workspace.checkWindowQueue();
+ this.sleep = false;
}
initViewTypes = async () => {
@@ -134,10 +163,15 @@ export class EditorWindow implements IEditorWindow {
return;
}
+ this.editorView.setActivate(true);
+
if (!ignoreEmit) {
this.emitter.emit('window.change.view.type', name);
+
+ if (this.id === this.workspace.window.id) {
+ this.workspace.emitChangeActiveEditorView();
+ }
}
- this.editorView.setActivate(true);
};
get project() {
@@ -168,6 +202,10 @@ export class EditorWindow implements IEditorWindow {
return this.editorView?.designer;
}
+ get plugins() {
+ return this.editorView?.plugins;
+ }
+
get innerPlugins() {
return this.editorView?.innerPlugins;
}
diff --git a/packages/workspace/src/workspace.ts b/packages/workspace/src/workspace.ts
index d959c55eb..46c8c4a0e 100644
--- a/packages/workspace/src/workspace.ts
+++ b/packages/workspace/src/workspace.ts
@@ -1,6 +1,6 @@
import { IDesigner, ILowCodePluginManager, LowCodePluginManager } from '@alilc/lowcode-designer';
-import { createModuleEventBus, Editor, IEventBus, makeObservable, obx } from '@alilc/lowcode-editor-core';
-import { IPublicApiPlugins, IPublicApiWorkspace, IPublicResourceList, IPublicTypeResourceType, IShellModelFactory } from '@alilc/lowcode-types';
+import { createModuleEventBus, Editor, IEditor, IEventBus, makeObservable, obx } from '@alilc/lowcode-editor-core';
+import { IPublicApiPlugins, IPublicApiWorkspace, IPublicEnumPluginRegisterLevel, IPublicResourceList, IPublicTypeDisposable, IPublicTypeResourceType, IShellModelFactory } from '@alilc/lowcode-types';
import { BasicContext } from './context/base-context';
import { EditorWindow } from './window';
import type { IEditorWindow } from './window';
@@ -11,6 +11,10 @@ enum EVENT {
CHANGE_WINDOW = 'change_window',
CHANGE_ACTIVE_WINDOW = 'change_active_window',
+
+ WINDOW_RENDER_READY = 'window_render_ready',
+
+ CHANGE_ACTIVE_EDITOR_VIEW = 'change_active_editor_view',
}
const CHANGE_EVENT = 'resource.list.change';
@@ -19,10 +23,12 @@ export interface IWorkspace extends Omit<IPublicApiWorkspace<
LowCodePluginManager,
IEditorWindow
>, 'resourceList' | 'plugins'> {
- readonly registryInnerPlugin: (designer: IDesigner, editor: Editor, plugins: IPublicApiPlugins) => Promise<void>;
+ readonly registryInnerPlugin: (designer: IDesigner, editor: Editor, plugins: IPublicApiPlugins) => Promise<IPublicTypeDisposable>;
readonly shellModelFactory: IShellModelFactory;
+ enableAutoOpenFirstWindow: boolean;
+
window: IEditorWindow;
plugins: ILowCodePluginManager;
@@ -30,11 +36,25 @@ export interface IWorkspace extends Omit<IPublicApiWorkspace<
getResourceList(): IResource[];
getResourceType(resourceName: string): IResourceType;
+
+ checkWindowQueue(): void;
+
+ emitWindowRendererReady(): void;
+
+ initWindow(): void;
+
+ setActive(active: boolean): void;
+
+ onChangeActiveEditorView(fn: () => void): IPublicTypeDisposable;
+
+ emitChangeActiveEditorView(): void;
}
export class Workspace implements IWorkspace {
context: BasicContext;
+ enableAutoOpenFirstWindow: boolean;
+
private emitter: IEventBus = createModuleEventBus('workspace');
private _isActive = false;
@@ -69,33 +89,47 @@ export class Workspace implements IWorkspace {
@obx.ref window: IEditorWindow;
+ windowQueue: {
+ name: string;
+ title: string;
+ options: Object;
+ viewType?: string;
+ }[] = [];
+
constructor(
- readonly registryInnerPlugin: (designer: IDesigner, editor: Editor, plugins: IPublicApiPlugins) => Promise<void>,
+ readonly registryInnerPlugin: (designer: IDesigner, editor: IEditor, plugins: IPublicApiPlugins) => Promise<IPublicTypeDisposable>,
readonly shellModelFactory: any,
) {
- this.init();
+ this.context = new BasicContext(this, '', IPublicEnumPluginRegisterLevel.Workspace);
makeObservable(this);
}
- init() {
- this.initWindow();
- this.context = new BasicContext(this, '');
- }
-
- initWindow() {
- if (!this.defaultResourceType) {
+ checkWindowQueue() {
+ if (!this.windowQueue || !this.windowQueue.length) {
return;
}
- const title = this.defaultResourceType.name;
+
+ const windowInfo = this.windowQueue.shift();
+ if (windowInfo) {
+ this.openEditorWindow(windowInfo.name, windowInfo.title, windowInfo.options, windowInfo.viewType);
+ }
+ }
+
+ async initWindow() {
+ if (!this.defaultResourceType || this.enableAutoOpenFirstWindow === false) {
+ return;
+ }
+ const resourceName = this.defaultResourceType.name;
const resource = new Resource({
- resourceName: title,
+ resourceName,
options: {},
}, this.defaultResourceType, this);
this.window = new EditorWindow(resource, this, {
- title,
+ title: resource.title,
});
+ await this.window.init();
this.editorWindowMap.set(this.window.id, this.window);
- this.windows.push(this.window);
+ this.windows = [...this.windows, this.window];
this.emitChangeWindow();
this.emitChangeActiveWindow();
}
@@ -108,7 +142,7 @@ export class Workspace implements IWorkspace {
const resourceType = new ResourceType(resourceTypeModel);
this.resourceTypeMap.set(resourceTypeModel.resourceName, resourceType);
- if (!this.window && this.defaultResourceType) {
+ if (!this.window && this.defaultResourceType && this._isActive) {
this.initWindow();
}
}
@@ -129,6 +163,17 @@ export class Workspace implements IWorkspace {
};
}
+ onWindowRendererReady(fn: () => void): IPublicTypeDisposable {
+ this.emitter.on(EVENT.WINDOW_RENDER_READY, fn);
+ return () => {
+ this.emitter.off(EVENT.WINDOW_RENDER_READY, fn);
+ };
+ }
+
+ emitWindowRendererReady() {
+ this.emitter.emit(EVENT.WINDOW_RENDER_READY);
+ }
+
getResourceType(resourceName: string): IResourceType {
return this.resourceTypeMap.get(resourceName)!;
}
@@ -145,29 +190,44 @@ export class Workspace implements IWorkspace {
}
private remove(index: number) {
+ if (index < 0) {
+ return;
+ }
const window = this.windows[index];
this.windows.splice(index, 1);
if (this.window === window) {
this.window = this.windows[index] || this.windows[index + 1] || this.windows[index - 1];
+ if (this.window.sleep) {
+ this.window.init();
+ }
this.emitChangeActiveWindow();
}
this.emitChangeWindow();
}
- removeEditorWindow(resourceName: string) {
- const index = this.windows.findIndex(d => (d.resource?.name === resourceName && d.title));
+ removeEditorWindow(resourceName: string, title: string) {
+ const index = this.windows.findIndex(d => (d.resource?.name === resourceName && d.title === title));
this.remove(index);
}
- openEditorWindowById(id: string) {
+ async openEditorWindowById(id: string) {
const window = this.editorWindowMap.get(id);
if (window) {
this.window = window;
+ if (window.sleep) {
+ await window.init();
+ }
this.emitChangeActiveWindow();
}
}
- openEditorWindow(name: string, title: string, options: Object, viewType?: string) {
+ async openEditorWindow(name: string, title: string, options: Object, viewType?: string, sleep?: boolean) {
+ if (this.window && !this.window?.initReady && !sleep) {
+ this.windowQueue.push({
+ name, title, options, viewType,
+ });
+ return;
+ }
const resourceType = this.resourceTypeMap.get(name);
if (!resourceType) {
console.error(`${name} resourceType is not available`);
@@ -176,6 +236,11 @@ export class Workspace implements IWorkspace {
const filterWindows = this.windows.filter(d => (d.resource?.name === name && d.resource.title == title));
if (filterWindows && filterWindows.length) {
this.window = filterWindows[0];
+ if (!sleep && this.window.sleep) {
+ await this.window.init();
+ } else {
+ this.checkWindowQueue();
+ }
this.emitChangeActiveWindow();
return;
}
@@ -184,13 +249,18 @@ export class Workspace implements IWorkspace {
title,
options,
}, resourceType, this);
- this.window = new EditorWindow(resource, this, {
+ const window = new EditorWindow(resource, this, {
title,
options,
viewType,
+ sleep,
});
- this.windows = [...this.windows, this.window];
- this.editorWindowMap.set(this.window.id, this.window);
+ this.windows = [...this.windows, window];
+ this.editorWindowMap.set(window.id, window);
+ if (!sleep) {
+ this.window = window;
+ await this.window.init();
+ }
this.emitChangeWindow();
this.emitChangeActiveWindow();
}
@@ -202,12 +272,24 @@ export class Workspace implements IWorkspace {
};
}
+ onChangeActiveEditorView(fn: () => void) {
+ this.emitter.on(EVENT.CHANGE_ACTIVE_EDITOR_VIEW, fn);
+ return () => {
+ this.emitter.removeListener(EVENT.CHANGE_ACTIVE_EDITOR_VIEW, fn);
+ };
+ }
+
+ emitChangeActiveEditorView() {
+ this.emitter.emit(EVENT.CHANGE_ACTIVE_EDITOR_VIEW);
+ }
+
emitChangeWindow() {
this.emitter.emit(EVENT.CHANGE_WINDOW);
}
emitChangeActiveWindow() {
this.emitter.emit(EVENT.CHANGE_ACTIVE_WINDOW);
+ this.emitChangeActiveEditorView();
}
onChangeActiveWindow(fn: () => void) {