Merge remote-tracking branch 'origin/develop' into release/1.1.7-beta

package.json

@@ -52,7 +52,7 @@
     "yarn": "^1.22.17",
     "rimraf": "^3.0.2",
     "@types/react-router": "5.1.18",
-    "build-plugin-component": "^1.12.0",
+    "@alilc/build-plugin-lce": "^0.0.3",
     "babel-jest": "^26.5.2",
     "@alilc/lowcode-test-mate": "^1.0.1"
   },

packages/designer/build.json

@@ -1,5 +1,5 @@
 {
   "plugins": [
-    "build-plugin-component"
+    "@alilc/build-plugin-lce"
   ]
 }

packages/designer/build.test.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "@alilc/lowcode-test-mate/plugin/index.ts"
   ],
   "babelPlugins": [

packages/designer/package.json

@@ -9,7 +9,7 @@
     "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"
   },

packages/editor-core/build.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "build-plugin-fusion",
     "./build.plugin.js"
   ]

packages/editor-core/package.json

@@ -10,7 +10,7 @@
     "es"
   ],
   "scripts": {
-    "build": "build-scripts build --skip-demo"
+    "build": "build-scripts build"
   },
   "dependencies": {
     "@alifd/next": "^1.19.16",

packages/editor-skeleton/build.json

@@ -1,9 +1,9 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "build-plugin-fusion",
     ["build-plugin-moment-locales", {
       "locales": ["zh-cn"]
     }]
   ]
-}
+}

packages/editor-skeleton/build.test.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "@alilc/lowcode-test-mate/plugin/index.ts"
   ],
   "babelPlugins": [

packages/editor-skeleton/package.json

@@ -11,7 +11,7 @@
   ],
   "scripts": {
     "test": "build-scripts test --config build.test.json",
-    "build": "build-scripts build --skip-demo"
+    "build": "build-scripts build"
   },
   "keywords": [
     "lowcode",

packages/engine/build.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     [
       "build-plugin-fusion",
       {

packages/engine/build.test.json

@@ -1,7 +1,7 @@
 {
   "plugins": [
     [
-      "build-plugin-component",
+      "@alilc/build-plugin-lce",
       {
         "filename": "editor-preset-vision",
         "library": "LowcodeEditor",

packages/engine/package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "start": "build-scripts start",
     "version:update": "node ./scripts/version.js",
-    "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": "build-scripts test --config build.test.json --jest-passWithNoTests"
   },

packages/plugin-designer/build.json

@@ -1,5 +1,5 @@
 {
   "plugins": [
-    "build-plugin-component"
+    "@alilc/build-plugin-lce"
   ]
 }

packages/plugin-designer/package.json

@@ -10,7 +10,7 @@
   "module": "es/index.js",
   "stylePath": "style.js",
   "scripts": {
-    "build": "build-scripts build --skip-demo"
+    "build": "build-scripts build"
   },
   "keywords": [
     "lowcode",

packages/plugin-outline-pane/build.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "build-plugin-fusion",
     ["build-plugin-moment-locales", {
       "locales": ["zh-cn"]

packages/plugin-outline-pane/package.json

@@ -9,7 +9,7 @@
   "main": "lib/index.js",
   "module": "es/index.js",
   "scripts": {
-    "build": "build-scripts build --skip-demo"
+    "build": "build-scripts build"
   },
   "dependencies": {
     "@alifd/next": "^1.19.16",

packages/plugin-outline-pane/src/controllers/tree-node.ts

@@ -35,6 +35,8 @@ enum EVENT_NAMES {
   titleLabelChanged = 'titleLabelChanged',
 
   expandableChanged = 'expandableChanged',
+
+  conditionChanged = 'conditionChanged',
 }
 
 export default class TreeNode {
@@ -152,6 +154,10 @@ export default class TreeNode {
     return this.node.slots.map((node) => this.tree.getTreeNode(node));
   }
 
+  get condition(): boolean {
+    return this.node.hasCondition() && !this.node.conditionGroup;
+  }
+
   get children(): TreeNode[] | null {
     return this.node.children?.map((node) => this.tree.getTreeNode(node)) || null;
   }
@@ -203,6 +209,15 @@ export default class TreeNode {
       this.event.off(EVENT_NAMES.titleLabelChanged, fn);
     };
   }
+
+  onConditionChanged(fn: (treeNode: TreeNode) => void): IPublicTypeDisposable {
+    this.event.on(EVENT_NAMES.conditionChanged, fn);
+
+    return () => {
+      this.event.off(EVENT_NAMES.conditionChanged, fn);
+    };
+  }
+
   onExpandableChanged(fn: (expandable: boolean) => void): IPublicTypeDisposable {
     this.event.on(EVENT_NAMES.expandableChanged, fn);
     return () => {
@@ -221,6 +236,10 @@ export default class TreeNode {
     this.event.emit(EVENT_NAMES.titleLabelChanged, this.title);
   }
 
+  notifyConditionChanged(): void {
+    this.event.emit(EVENT_NAMES.conditionChanged, this.condition);
+  }
+
   setHidden(flag: boolean) {
     if (this.node.conditionGroup) {
       return;

packages/plugin-outline-pane/src/controllers/tree.ts

@@ -35,6 +35,9 @@ export class Tree {
       if (key === '___title___') {
         const treeNode = this.getTreeNodeById(node.id);
         treeNode?.notifyTitleLabelChanged();
+      } else if (key === '___condition___') {
+        const treeNode = this.getTreeNodeById(node.id);
+        treeNode?.notifyConditionChanged();
       }
     });
   }

packages/plugin-outline-pane/src/views/tree-title.tsx

@@ -27,6 +27,7 @@ export default class TreeTitle extends PureComponent<{
   state: {
     editing: boolean;
     title: string;
+    condition?: boolean;
   } = {
     editing: false,
     title: '',
@@ -80,12 +81,18 @@ 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,
+      });
+    });
   }
 
   render() {
@@ -188,7 +195,7 @@ export default class TreeTitle extends PureComponent<{
                   <Tip>{intlNode('Loop')}</Tip>
                 </a>
               )}
-              {node.hasCondition() && !node.conditionGroup && (
+              {this.state.condition && (
                 <a className="tree-node-tag cond">
                   {/* todo: click todo something */}
                   <IconCond />

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"]
 }

packages/rax-simulator-renderer/package.json

@@ -9,7 +9,7 @@
     "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": {

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"]

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"
   ]
 }

packages/react-renderer/package.json

@@ -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": [

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"]
 }

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"
   ]
 }

packages/react-simulator-renderer/package.json

@@ -12,7 +12,7 @@
   ],
   "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"
   },

packages/renderer-core/build.json

@@ -1,7 +1,7 @@
 {
   "plugins": [
     [
-      "build-plugin-component",
+      "@alilc/build-plugin-lce",
       {
         "babelPlugins": ["@babel/plugin-transform-typescript"]
       }

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"
   ]
 }

packages/renderer-core/package.json

@@ -10,7 +10,7 @@
     "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"
   },

packages/shell/build.json

@@ -1,5 +1,5 @@
 {
   "plugins": [
-    "build-plugin-component"
+    "@alilc/build-plugin-lce"
   ]
 }

packages/shell/build.test.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "@alilc/lowcode-test-mate/plugin/index.ts"
   ]
 }

packages/shell/package.json

@@ -9,9 +9,7 @@
     "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": {

packages/types/build.json

@@ -1,5 +1,5 @@
 {
   "plugins": [
-    "build-plugin-component"
+    "@alilc/build-plugin-lce"
   ]
 }

packages/types/package.json

@@ -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",

packages/utils/build.json

@@ -1,5 +1,5 @@
 {
   "plugins": [
-    "build-plugin-component"
+    "@alilc/build-plugin-lce"
   ]
 }

packages/utils/build.test.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "@alilc/lowcode-test-mate/plugin/index.ts"
   ]
 }

packages/utils/package.json

@@ -10,7 +10,7 @@
   "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",

packages/workspace/build.json

@@ -1,5 +1,5 @@
 {
   "plugins": [
-    "build-plugin-component"
+    "@alilc/build-plugin-lce"
   ]
 }

packages/workspace/build.test.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "build-plugin-component",
+    "@alilc/build-plugin-lce",
     "@alilc/lowcode-test-mate/plugin/index.ts"
   ]
 }