Skip to content

Commit

Permalink
Merge branch 'alibaba:main' into feat/reset-attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChiZng
ChiZng authored Jan 11, 2024
2 parents 7baa505 + b2abb67 commit 4c95af5
Show file tree
Hide file tree
Showing 21 changed files with 77 additions and 69 deletions.
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "4.0.0",
"version": "1.2.3",
"version": "1.2.5",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
Expand Down
8 changes: 4 additions & 4 deletions packages/designer/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions packages/designer/src/document/node/node-children.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions packages/editor-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions packages/editor-skeleton/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ export class SettingsPrimaryPane extends Component<ISettingsPrimaryPaneProps, {
{createIcon(settings.componentMeta?.icon, {
className: 'lc-settings-navigator-icon',
})}
<Title title={settings.componentMeta!.title} />
<span> x {settings.nodes.length}</span>
<div style={{ marginLeft: '5px' }}>
<Title title={settings.componentMeta!.title} />
<span> x {settings.nodes.length}</span>
</div>
</div>
);
}
Expand Down
18 changes: 9 additions & 9 deletions packages/engine/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ignitor/package.json
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 4 additions & 4 deletions packages/plugin-designer/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/plugin-outline-pane/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-outline-pane/src/views/tree.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
6 changes: 3 additions & 3 deletions packages/rax-renderer/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions packages/rax-simulator-renderer/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-renderer/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions packages/react-simulator-renderer/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/renderer-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions packages/shell/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-types",
"version": "1.2.3",
"version": "1.2.5",
"description": "Types for Ali lowCode engine",
"files": [
"es",
Expand Down
4 changes: 2 additions & 2 deletions packages/utils/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-utils",
"version": "1.2.3",
"version": "1.2.5",
"description": "Utils for Ali lowCode engine",
"files": [
"lib",
Expand All @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion packages/utils/src/create-icon.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} />;
Expand Down
12 changes: 6 additions & 6 deletions packages/workspace/package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 4c95af5

Please sign in to comment.