diff --git a/lerna.json b/lerna.json index 98ef80f13..117030917 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "4.0.0", - "version": "1.2.3", + "version": "1.2.5", "npmClient": "yarn", "useWorkspaces": true, "packages": [ diff --git a/packages/designer/package.json b/packages/designer/package.json index e961451d8..0e6e67e88 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-designer", - "version": "1.2.3", + "version": "1.2.5", "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", @@ -15,9 +15,9 @@ }, "license": "MIT", "dependencies": { - "@alilc/lowcode-editor-core": "1.2.3", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-editor-core": "1.2.5", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "classnames": "^2.2.6", "react": "^16", "react-dom": "^16.7.0", diff --git a/packages/designer/src/document/node/node-children.ts b/packages/designer/src/document/node/node-children.ts index bf982cbfa..65210fe62 100644 --- a/packages/designer/src/document/node/node-children.ts +++ b/packages/designer/src/document/node/node-children.ts @@ -462,6 +462,9 @@ export class NodeChildren implements INodeChildren { const node: INode = this.owner.document?.createNode(child); this.children.push(node); node.internalSetParent(this.owner); + /* istanbul ignore next */ + const editor = node.document?.designer.editor; + editor?.eventBus.emit('node.add', { node }); }); changed = true; } diff --git a/packages/editor-core/package.json b/packages/editor-core/package.json index 345783c80..087558450 100644 --- a/packages/editor-core/package.json +++ b/packages/editor-core/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-editor-core", - "version": "1.2.3", + "version": "1.2.5", "description": "Core Api for Ali lowCode engine", "license": "MIT", "main": "lib/index.js", @@ -14,8 +14,8 @@ }, "dependencies": { "@alifd/next": "^1.19.16", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "classnames": "^2.2.6", "debug": "^4.1.1", "intl-messageformat": "^9.3.1", diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index fa5c1e13e..648ed5be1 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-editor-skeleton", - "version": "1.2.3", + "version": "1.2.5", "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", @@ -19,10 +19,10 @@ ], "dependencies": { "@alifd/next": "^1.20.12", - "@alilc/lowcode-designer": "1.2.3", - "@alilc/lowcode-editor-core": "1.2.3", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-designer": "1.2.5", + "@alilc/lowcode-editor-core": "1.2.5", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "classnames": "^2.2.6", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx index a68647ed0..747a2ea1d 100644 --- a/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx @@ -65,8 +65,10 @@ export class SettingsPrimaryPane extends Component - x {settings.nodes.length} +
+ + <span> x {settings.nodes.length}</span> + </div> </div> ); } diff --git a/packages/engine/package.json b/packages/engine/package.json index c9eef3534..4caf32c00 100644 --- a/packages/engine/package.json +++ b/packages/engine/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-engine", - "version": "1.2.3", + "version": "1.2.5", "description": "An enterprise-class low-code technology stack with scale-out design / 一套面向扩展设计的企业级低代码技术体系", "main": "lib/engine-core.js", "module": "es/engine-core.js", @@ -19,15 +19,15 @@ "license": "MIT", "dependencies": { "@alifd/next": "^1.19.12", - "@alilc/lowcode-designer": "1.2.3", - "@alilc/lowcode-editor-core": "1.2.3", - "@alilc/lowcode-editor-skeleton": "1.2.3", + "@alilc/lowcode-designer": "1.2.5", + "@alilc/lowcode-editor-core": "1.2.5", + "@alilc/lowcode-editor-skeleton": "1.2.5", "@alilc/lowcode-engine-ext": "^1.0.0", - "@alilc/lowcode-plugin-designer": "1.2.3", - "@alilc/lowcode-plugin-outline-pane": "1.2.3", - "@alilc/lowcode-shell": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", - "@alilc/lowcode-workspace": "1.2.3", + "@alilc/lowcode-plugin-designer": "1.2.5", + "@alilc/lowcode-plugin-outline-pane": "1.2.5", + "@alilc/lowcode-shell": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", + "@alilc/lowcode-workspace": "1.2.5", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/ignitor/package.json b/packages/ignitor/package.json index 71a21484c..f131dc14c 100644 --- a/packages/ignitor/package.json +++ b/packages/ignitor/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-ignitor", - "version": "1.2.3", + "version": "1.2.5", "description": "点火器,bootstrap lce project", "main": "lib/index.js", "private": true, diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index 500c0c961..d764f7d9e 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-plugin-designer", - "version": "1.2.3", + "version": "1.2.5", "description": "alibaba lowcode editor designer plugin", "files": [ "es", @@ -18,9 +18,9 @@ ], "author": "xiayang.xy", "dependencies": { - "@alilc/lowcode-designer": "1.2.3", - "@alilc/lowcode-editor-core": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-designer": "1.2.5", + "@alilc/lowcode-editor-core": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index 5a2ef38a4..f864356fc 100644 --- a/packages/plugin-outline-pane/package.json +++ b/packages/plugin-outline-pane/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-plugin-outline-pane", - "version": "1.2.3", + "version": "1.2.5", "description": "Outline pane for Ali lowCode engine", "files": [ "es", @@ -13,8 +13,8 @@ }, "dependencies": { "@alifd/next": "^1.19.16", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "classnames": "^2.2.6", "react": "^16", "react-dom": "^16.7.0", diff --git a/packages/plugin-outline-pane/src/views/tree.tsx b/packages/plugin-outline-pane/src/views/tree.tsx index 675f70c2b..8428ec944 100644 --- a/packages/plugin-outline-pane/src/views/tree.tsx +++ b/packages/plugin-outline-pane/src/views/tree.tsx @@ -40,7 +40,7 @@ export default class TreeView extends PureComponent<{ return; } const node = this.getTreeNodeFromEvent(e)?.node; - detecting?.capture(node as any); + node?.id && detecting?.capture(node.id); } private onClick = (e: ReactMouseEvent) => { diff --git a/packages/rax-renderer/package.json b/packages/rax-renderer/package.json index 837aebc85..8173d6e4e 100644 --- a/packages/rax-renderer/package.json +++ b/packages/rax-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-rax-renderer", - "version": "1.2.3", + "version": "1.2.5", "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.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-renderer-core": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "rax-find-dom-node": "^1.0.1" }, "devDependencies": { diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index dc9b7b147..f264380ec 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.2.3", + "version": "1.2.5", "description": "rax simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -13,10 +13,10 @@ "build:umd": "build-scripts build --config build.umd.json" }, "dependencies": { - "@alilc/lowcode-designer": "1.2.3", - "@alilc/lowcode-rax-renderer": "1.2.3", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-designer": "1.2.5", + "@alilc/lowcode-rax-renderer": "1.2.5", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "classnames": "^2.2.6", "driver-universal": "^3.1.3", "history": "^5.0.0", diff --git a/packages/react-renderer/package.json b/packages/react-renderer/package.json index 1dceb9c2e..2970e9341 100644 --- a/packages/react-renderer/package.json +++ b/packages/react-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-react-renderer", - "version": "1.2.3", + "version": "1.2.5", "description": "react renderer for ali lowcode engine", "main": "lib/index.js", "module": "es/index.js", @@ -22,7 +22,7 @@ ], "dependencies": { "@alifd/next": "^1.21.16", - "@alilc/lowcode-renderer-core": "1.2.3" + "@alilc/lowcode-renderer-core": "1.2.5" }, "devDependencies": { "@alib/build-scripts": "^0.1.18", diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 8935c92ee..030a19708 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.2.3", + "version": "1.2.5", "description": "react simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -17,10 +17,10 @@ "test:cov": "build-scripts test --config build.test.json --jest-coverage" }, "dependencies": { - "@alilc/lowcode-designer": "1.2.3", - "@alilc/lowcode-react-renderer": "1.2.3", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-designer": "1.2.5", + "@alilc/lowcode-react-renderer": "1.2.5", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "classnames": "^2.2.6", "mobx": "^6.3.0", "mobx-react": "^7.2.0", diff --git a/packages/renderer-core/package.json b/packages/renderer-core/package.json index 4774ae368..fab0d3f13 100644 --- a/packages/renderer-core/package.json +++ b/packages/renderer-core/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-renderer-core", - "version": "1.2.3", + "version": "1.2.5", "description": "renderer core", "license": "MIT", "main": "lib/index.js", @@ -16,8 +16,8 @@ }, "dependencies": { "@alilc/lowcode-datasource-engine": "^1.0.0", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "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.2.3", + "@alilc/lowcode-designer": "1.2.5", "@babel/plugin-transform-typescript": "^7.16.8", "@testing-library/react": "^11.2.2", "@types/classnames": "^2.2.11", diff --git a/packages/shell/package.json b/packages/shell/package.json index 2ebf14bbc..86c4c7d11 100644 --- a/packages/shell/package.json +++ b/packages/shell/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-shell", - "version": "1.2.3", + "version": "1.2.5", "description": "Shell Layer for AliLowCodeEngine", "main": "lib/index.js", "module": "es/index.js", @@ -13,12 +13,12 @@ }, "license": "MIT", "dependencies": { - "@alilc/lowcode-designer": "1.2.3", - "@alilc/lowcode-editor-core": "1.2.3", - "@alilc/lowcode-editor-skeleton": "1.2.3", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", - "@alilc/lowcode-workspace": "1.2.3", + "@alilc/lowcode-designer": "1.2.5", + "@alilc/lowcode-editor-core": "1.2.5", + "@alilc/lowcode-editor-skeleton": "1.2.5", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", + "@alilc/lowcode-workspace": "1.2.5", "classnames": "^2.2.6", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", diff --git a/packages/types/package.json b/packages/types/package.json index c0b8e203f..52a5e03ae 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-types", - "version": "1.2.3", + "version": "1.2.5", "description": "Types for Ali lowCode engine", "files": [ "es", diff --git a/packages/utils/package.json b/packages/utils/package.json index 00efffb8d..976b76341 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-utils", - "version": "1.2.3", + "version": "1.2.5", "description": "Utils for Ali lowCode engine", "files": [ "lib", @@ -14,7 +14,7 @@ }, "dependencies": { "@alifd/next": "^1.19.16", - "@alilc/lowcode-types": "1.2.3", + "@alilc/lowcode-types": "1.2.5", "lodash": "^4.17.21", "mobx": "^6.3.0", "react": "^16" diff --git a/packages/utils/src/create-icon.tsx b/packages/utils/src/create-icon.tsx index 0a5d6c1ff..621b5c7ab 100644 --- a/packages/utils/src/create-icon.tsx +++ b/packages/utils/src/create-icon.tsx @@ -30,7 +30,10 @@ export function createIcon( return cloneElement(icon, { ...props }); } if (isReactComponent(icon)) { - return createElement(icon, { ...props }); + return createElement(icon, { + class: props?.className, + ...props, + }); } return <Icon {...icon} {...props} />; diff --git a/packages/workspace/package.json b/packages/workspace/package.json index 8c09a93b6..cbc31f379 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-workspace", - "version": "1.2.3", + "version": "1.2.5", "description": "Shell Layer for AliLowCodeEngine", "main": "lib/index.js", "module": "es/index.js", @@ -15,11 +15,11 @@ }, "license": "MIT", "dependencies": { - "@alilc/lowcode-designer": "1.2.3", - "@alilc/lowcode-editor-core": "1.2.3", - "@alilc/lowcode-editor-skeleton": "1.2.3", - "@alilc/lowcode-types": "1.2.3", - "@alilc/lowcode-utils": "1.2.3", + "@alilc/lowcode-designer": "1.2.5", + "@alilc/lowcode-editor-core": "1.2.5", + "@alilc/lowcode-editor-skeleton": "1.2.5", + "@alilc/lowcode-types": "1.2.5", + "@alilc/lowcode-utils": "1.2.5", "classnames": "^2.2.6", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5",