Merge branch 'refactor/code-style' into release/0.9.18

.editorconfig

@@ -1,9 +1,9 @@
-# http://editorconfig.org
 root = true
 
 [*]
 indent_style = space
 indent_size = 2
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.eslintignore

@@ -1,7 +1,13 @@
-.idea/
+# 忽略目录
-.vscode/
+node_modules
-build/
+build
+dist
+es
+lib
 .*
 ~*
-node_modules
 
+# 忽略文件
+**/*.min.js
+**/*-min.js
+**/*.bundle.js

.eslintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "./node_modules/@ali/lowcode-config/.eslintrc"
-}

.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: 'eslint-config-ali/typescript/react',
+};

.prettierignore

@@ -1,4 +0,0 @@
-**/test/**/*.ts
-**/test/**/*.js
-**/template/**/*.template
-**/template/**/*.tpl

.prettierrc

@@ -1,8 +0,0 @@
-{
-  "trailingComma": "all",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "printWidth": 120,
-  "arrowParens": "always"
-}

.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  printWidth: 100,
+  tabWidth: 2,
+  semi: true,
+  singleQuote: true,
+  trailingComma: 'all',
+};

.stylelintignore

@@ -0,0 +1,9 @@
+# 忽略目录
+node_modules/
+build/
+dist/
+
+# 忽略文件
+**/*.min.css
+**/*-min.css
+**/*.bundle.css

.stylelintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: 'stylelint-config-ali',
+};

README.md

@@ -1,22 +1,20 @@
 ## Ali Lowcode Engine（阿里低代码引擎）
 
-[Lerna](https://github.com/lerna/lerna) + [TS](https://www.typescriptlang.org/)
-
 ## 开发
 
-#### 创建新包：
+#### 创建新包
 
 - `./scripts/create.sh <package-name>`
 
-#### 跑起来：
+#### 运行示例
 
 - `npm run setup`
 - `npm start`
 
-#### 开发提交：
+#### 开发提交
 
 - `git add <your-files>`
-- `npm run commit` # 在根目录
+- `git commit -a "feat: xxx"`
 
 ## 发布
 
@@ -24,7 +22,6 @@
 
 ## 注意
 
-- Commit 动作尽量使用 `npm run commit`，其内部调用了 `git cz`，方便按语义化版本自动递增，以及自动生成 `CHANGELOG.md`
 - `packages` 工程里一些开发时公共依赖（比如：`typescript`、`ava` 等）会放到工程顶层
 - 工程里的 `.md`、`test/` 等文件修改不会产生新的发布
 - 当工程里存在多个 ts 文件的目录时，最终产生的文件会按文件夹形式放到 `lib` 下

commitlint.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: ['ali'],
+};

package.json

@@ -12,40 +12,33 @@
   "scripts": {
     "build": "./scripts/build.sh",
     "clean": "rm -rf ./packages/*/lib ./packages/*/es ./packages/*/dist ./packages/*/build",
-    "commit": "git-cz",
     "pub": "lerna publish --force-publish --cd-version prepatch",
     "setup": "./scripts/setup.sh",
     "start": "./scripts/start.sh",
     "start:server": "./scripts/start-server.sh",
     "test": "lerna run test --stream",
-    "test:snapshot": "lerna run test:snapshot"
+    "test:snapshot": "lerna run test:snapshot",
+    "xima:fix": "xima fix",
+    "xima:scan": "xima scan",
+    "lint": "eslint --ext .ts,.tsx,.js,.jsx ./ --quiet",
+    "lint:fix": "eslint --ext .ts,.tsx,.js,.jsx ./ --quiet --fix"
   },
-  "lint-staged": {
+  "husky": {
-    "*.{tsx,ts}": [
+    "hooks": {
-      "eslint --quiet",
+      "commit-msg": "xima exec commitlint -E HUSKY_GIT_PARAMS"
-      "git add"
-    ]
-  },
-  "config": {
-    "commitizen": {
-      "path": "node_modules/cz-conventional-changelog"
     }
   },
+  "lint-staged": {
+    "**/*.{css,scss,less}": "xima exec stylelint",
+    "**/*.{js,jsx,ts,tsx}": "xima exec eslint"
+  },
   "devDependencies": {
-    "@ali/lowcode-config": "^2.0.5",
     "ava": "^1.0.1",
-    "babel-eslint": "^10.0.3",
-    "commitizen": "^3.0.5",
-    "cz-conventional-changelog": "^2.1.0",
-    "eslint": "^6.5.1",
-    "git-cz": "^4.3.1",
-    "husky": "^4.2.3",
     "lerna": "^2.11.0",
-    "lint-staged": "^8.1.0",
-    "prettier": "^1.15.3",
     "ts-node": "^7.0.1",
     "tslib": "^1.9.3",
-    "typescript": "^3.2.2"
+    "typescript": "^3.2.2",
+    "xima": "^0.2.15"
   },
   "engines": {
     "node": ">=10.0.0"

packages/code-generator/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.8-0"></a>
+## [1.0.8-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-code-generator@1.0.7-0...@ali/lowcode-code-generator@1.0.8-0) (2020-09-09)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-code-generator
+
 <a name="1.0.7-0"></a>
 ## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-code-generator@1.0.6-0...@ali/lowcode-code-generator@1.0.7-0) (2020-09-02)
 

packages/code-generator/demo/demo.js

@@ -59,7 +59,7 @@ function main() {
 
   builder.generateProject(schemaJson).then((result) => {
     displayResultInConsole(result);
-    writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)),);
+    writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)));
     return result;
   });
 }
@@ -160,7 +160,7 @@ function exportProject() {
 
   builder.generateProject(schemaJson).then((result) => {
     displayResultInConsole(result);
-    writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)),);
+    writeResultToDisk(result, 'output/lowcodeDemo').then((response) => console.log('Write to disk: ', JSON.stringify(response)));
     return result;
   });
 }

packages/code-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ali/lowcode-code-generator",
-  "version": "1.0.7-0",
+  "version": "1.0.8-0",
   "description": "出码引擎 for LowCode Engine",
   "main": "lib/index.js",
   "files": [

packages/code-generator/src/@types/ali__my-prettier/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+// / <reference types="node" />
 
 declare module '@ali/my-prettier' {
   function format(text: string, type: string): string;

packages/code-generator/src/const/generator.ts

@@ -109,6 +109,6 @@ export const DEFAULT_LINK_AFTER = {
   [COMMON_CHUNK_NAME.StyleDepsImport]: [],
   [COMMON_CHUNK_NAME.StyleCssContent]: [COMMON_CHUNK_NAME.StyleDepsImport],
   [COMMON_CHUNK_NAME.HtmlContent]: [],
-}
+};
 
 export const COMMON_SUB_MODULE_NAME = 'index';

packages/code-generator/src/const/index.ts

@@ -1,4 +1,4 @@
-export const NATIVE_ELE_PKG: string = 'native';
+export const NATIVE_ELE_PKG = 'native';
 
 export const CONTAINER_TYPE = {
   COMPONENT: 'Component',

packages/code-generator/src/generator/CodeBuilder.ts

@@ -58,7 +58,7 @@ export default class Builder implements ICodeBuilder {
       const { type, content, name } = unprocessedChunks[indexToRemove];
       const compiledContent = this.generateByType(type, content);
       if (compiledContent) {
-        resultingString.push(compiledContent + '\n');
+        resultingString.push(`${compiledContent }\n`);
       }
 
       unprocessedChunks.splice(indexToRemove, 1);
@@ -95,8 +95,6 @@ export default class Builder implements ICodeBuilder {
   // remove invalid chunks (which did not end up being created) from the linkAfter fields
   // one use-case is when you want to remove the import plugin
   private cleanupInvalidChunks(linkAfter: string[], chunks: ICodeChunk[]) {
-    return linkAfter.filter(chunkName =>
+    return linkAfter.filter(chunkName => chunks.some(chunk => chunk.name === chunkName));
-      chunks.some(chunk => chunk.name === chunkName),
-    );
   }
 }

packages/code-generator/src/generator/ModuleBuilder.ts

@@ -51,7 +51,7 @@ export function createModuleBuilder(
 
     if (options.postProcessors.length > 0) {
       files = files.map((file) => {
-        let content = file.content;
+        let { content } = file;
         const type = file.ext;
         options.postProcessors.forEach((processer) => {
           content = processer(content, type);

packages/code-generator/src/generator/ProjectBuilder.ts

@@ -40,7 +40,9 @@ function getDirFromRoot(root: IResultDir, path: string[]): IResultDir {
 
 export class ProjectBuilder implements IProjectBuilder {
   private template: IProjectTemplate;
+
   private plugins: IProjectPlugins;
+
   private postProcessors: PostProcessor[];
 
   constructor({

packages/code-generator/src/model/ResultDir.ts

@@ -2,7 +2,9 @@ import { CodeGeneratorError, IResultDir, IResultFile } from '../types';
 
 export default class ResultDir implements IResultDir {
   public name: string;
+
   public dirs: IResultDir[];
+
   public files: IResultFile[];
 
   constructor(name: string) {

packages/code-generator/src/model/ResultFile.ts

@@ -2,10 +2,12 @@ import { IResultFile } from '../types';
 
 export default class ResultFile implements IResultFile {
   public name: string;
+
   public ext: string;
+
   public content: string;
 
-  constructor(name: string, ext: string = 'jsx', content: string = '') {
+  constructor(name: string, ext = 'jsx', content = '') {
     this.name = name;
     this.ext = ext;
     this.content = content;

packages/code-generator/src/parser/SchemaParser.ts

@@ -95,7 +95,7 @@ class SchemaParser implements ISchemaParser {
         });
       }
     } else {
-      throw new CodeGeneratorError(`Can't find anything to generate.`);
+      throw new CodeGeneratorError('Can\'t find anything to generate.');
     }
 
     // 建立所有容器的内部依赖索引

packages/code-generator/src/plugins/common/requireUtils.ts

@@ -19,7 +19,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       type: ChunkType.STRING,
       fileType: FileType.JSX,
       name: COMMON_CHUNK_NAME.InternalDepsImport,
-      content: `import * from 'react';`,
+      content: 'import * from \'react\';',
       linkAfter: [],
     });
 

packages/code-generator/src/plugins/component/react/containerClass.ts

@@ -35,7 +35,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       type: ChunkType.STRING,
       fileType: FileType.JSX,
       name: CLASS_DEFINE_CHUNK_NAME.End,
-      content: `}`,
+      content: '}',
       linkAfter: [CLASS_DEFINE_CHUNK_NAME.Start, REACT_CHUNK_NAME.ClassRenderEnd],
     });
 

packages/code-generator/src/plugins/component/react/containerDataSource.ts

@@ -29,7 +29,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
     const ir = next.ir as IContainerInfo;
 
     if (ir.state) {
-      const state = ir.state;
+      const { state } = ir;
       const fields = Object.keys(state).map<string>((stateName) => {
         const value = generateCompositeType(state[stateName]);
         return `${stateName}: ${value},`;

packages/code-generator/src/plugins/component/react/containerInitState.ts

@@ -31,7 +31,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
     const ir = next.ir as IContainerInfo;
 
     if (ir.state) {
-      const state = ir.state;
+      const { state } = ir;
       const fields = Object.keys(state).map<string>((stateName) => {
         const value = generateCompositeType(state[stateName]);
         return `${stateName}: ${value},`;

packages/code-generator/src/plugins/component/react/containerInjectUtils.ts

@@ -10,7 +10,7 @@ import {
 
 type PluginConfig = {
   fileType: string;
-}
+};
 
 const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => {
   const cfg: PluginConfig = {
@@ -27,7 +27,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
       type: ChunkType.STRING,
       fileType: cfg.fileType,
       name: CLASS_DEFINE_CHUNK_NAME.ConstructorContent,
-      content: `this.utils = utils;`,
+      content: 'this.utils = utils;',
       linkAfter: [CLASS_DEFINE_CHUNK_NAME.ConstructorStart],
     });
 

packages/code-generator/src/plugins/component/react/containerLifeCycle.ts

@@ -35,7 +35,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
     const ir = next.ir as IContainerInfo;
 
     if (ir.lifeCycles) {
-      const lifeCycles = ir.lifeCycles;
+      const { lifeCycles } = ir;
       const chunks = Object.keys(lifeCycles).map<ICodeChunk>((lifeCycleName) => {
         const normalizeName = cfg.normalizeNameMapping[lifeCycleName] || lifeCycleName;
         const exportName = cfg.exportNameMapping[lifeCycleName] || lifeCycleName;

packages/code-generator/src/plugins/component/react/containerMethod.ts

@@ -30,7 +30,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
     const ir = next.ir as IContainerInfo;
 
     if (ir.methods) {
-      const methods = ir.methods;
+      const { methods } = ir;
       const chunks = Object.keys(methods).map<ICodeChunk>((methodName) => ({
         type: ChunkType.STRING,
         fileType: cfg.fileType,

packages/code-generator/src/plugins/component/react/jsx.ts

@@ -14,7 +14,7 @@ import { createReactNodeGenerator } from '../../../utils/nodeToJSX';
 type PluginConfig = {
   fileType?: string;
   nodeTypeMapping?: Record<string, string>;
-}
+};
 
 const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => {
   const cfg = {

packages/code-generator/src/plugins/component/react/reactCommonDeps.ts

@@ -19,7 +19,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       type: ChunkType.STRING,
       fileType: FileType.JSX,
       name: COMMON_CHUNK_NAME.ExternalDepsImport,
-      content: `import React from 'react';`,
+      content: 'import React from \'react\';',
       linkAfter: [],
     });
 

packages/code-generator/src/plugins/component/recore/pageFrame.ts

@@ -21,7 +21,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       type: ChunkType.STRING,
       fileType: FileType.TS,
       name: COMMON_CHUNK_NAME.ExternalDepsImport,
-      content: `import { BaseController } from '@ali/recore-renderer';`,
+      content: 'import { BaseController } from \'@ali/recore-renderer\';',
       linkAfter: [],
     });
 
@@ -37,7 +37,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       type: ChunkType.STRING,
       fileType: FileType.TS,
       name: CLASS_DEFINE_CHUNK_NAME.End,
-      content: `}`,
+      content: '}',
       linkAfter: [...DEFAULT_LINK_AFTER[CLASS_DEFINE_CHUNK_NAME.End]],
     });
 

packages/code-generator/src/plugins/component/recore/pageVmHeader.ts

@@ -17,7 +17,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       type: ChunkType.STRING,
       fileType: 'vx',
       name: COMMON_CHUNK_NAME.CustomContent,
-      content: `<div {...globalProps.div} className="recore-loading" x-if={this.__loading} />`,
+      content: '<div {...globalProps.div} className="recore-loading" x-if={this.__loading} />',
       linkAfter: [],
     });
 

packages/code-generator/src/plugins/component/style/css.ts

@@ -12,7 +12,7 @@ import {
 type PluginConfig = {
   fileType: string;
   moduleFileType: string;
-}
+};
 
 const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) => {
   const cfg: PluginConfig = {

packages/code-generator/src/plugins/project/framework/icejs/plugins/router.ts

@@ -38,15 +38,15 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
             component: BasicLayout,
             children: [
               ${ir.routes
-                .map(
+    .map(
-                  route => `
+      route => `
                     {
                       path: '${route.path}',
                       component: ${route.componentName},
                     }
                   `,
-                )
+    )
-                .join(',')}
+    .join(',')}
             ],
           },
         ];

packages/code-generator/src/plugins/project/framework/recore/template/files/abc.json.ts

@@ -25,4 +25,3 @@ export default function getFile(): [string[], IResultFile] {
 
   return [[], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/build.json.ts

@@ -29,4 +29,3 @@ export default function getFile(): [string[], IResultFile] {
 
   return [[], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/package.json.ts

@@ -63,4 +63,3 @@ export default function getFile(): [string[], IResultFile] {
 
   return [[], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/public/index.html.ts

@@ -48,4 +48,3 @@ export default function getFile(): [string[], IResultFile] {
 
   return [['public'], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/src/config/app.ts.ts

@@ -72,6 +72,5 @@ export default {
     `,
   );
 
-  return [['src','config'], file];
+  return [['src', 'config'], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/src/config/components.ts.ts

@@ -38,6 +38,5 @@ export default componentsMap;
     `,
   );
 
-  return [['src','config'], file];
+  return [['src', 'config'], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/src/config/utils.ts.ts

@@ -24,6 +24,5 @@ export default {
     `,
   );
 
-  return [['src','config'], file];
+  return [['src', 'config'], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/src/index.ts.ts

@@ -98,4 +98,3 @@ app.run();
 
   return [['src'], file];
 }
-  

packages/code-generator/src/plugins/project/framework/recore/template/files/tsconfig.json.ts

@@ -50,4 +50,3 @@ export default function getFile(): [string[], IResultFile] {
 
   return [[], file];
 }
-  

packages/code-generator/src/postprocessor/prettier/index.ts

@@ -7,7 +7,7 @@ const PARSERS = ['css', 'scss', 'less', 'json', 'html', 'vue'];
 
 type ProcessorConfig = {
   customFileTypeParser: Record<string, string>;
-}
+};
 
 const factory: PostProcessorFactory<ProcessorConfig> = (config?: ProcessorConfig) => {
   const cfg: ProcessorConfig = {
@@ -23,7 +23,7 @@ const factory: PostProcessorFactory<ProcessorConfig> = (config?: ProcessorConfig
       parser = 'typescript';
     } else if (PARSERS.indexOf(fileType) >= 0) {
       parser = fileType as prettier.BuiltInParserName;
-    } else if (cfg.customFileTypeParser[fileType]){
+    } else if (cfg.customFileTypeParser[fileType]) {
       parser = cfg.customFileTypeParser[fileType] as prettier.BuiltInParserName;
     } else if (fileType === 'vx') {
       return mypretter(content, fileType);

packages/code-generator/src/publisher/disk/index.ts

@@ -19,8 +19,8 @@ export interface IDiskPublisher extends IPublisher<IDiskFactoryParams, string> {
 }
 
 export const createDiskPublisher: PublisherFactory<
-  IDiskFactoryParams,
+IDiskFactoryParams,
-  IDiskPublisher
+IDiskPublisher
 > = (params: IDiskFactoryParams = {}): IDiskPublisher => {
   let { project, outputPath = './' } = params;
 

packages/code-generator/src/publisher/disk/utils.ts

@@ -61,7 +61,7 @@ const createDirectory = (pathToDir: string): Promise<void> => {
 const writeContentToFile = (
   filePath: string,
   fileContent: string,
-  encoding: string = 'utf8',
+  encoding = 'utf8',
 ): Promise<void> => {
   return new Promise((resolve, reject) => {
     writeFile(filePath, fileContent, encoding, err => {

packages/code-generator/src/publisher/zip/index.ts

@@ -5,7 +5,7 @@ import {
   IPublisherFactoryParams,
   PublisherError,
 } from '../../types';
-import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils'
+import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils';
 
 // export type ZipBuffer = Buffer | Blob;
 export type ZipBuffer = Buffer;
@@ -30,12 +30,12 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
   const getProject = () => project;
   const setProject = (projectToSet: IResultDir) => {
     project = projectToSet;
-  }
+  };
 
   const getOutputPath = () => outputPath;
   const setOutputPath = (path: string) => {
     outputPath = path;
-  }
+  };
 
   const publish = async (options: ZipFactoryParams = {}) => {
     const projectToPublish = options.project || project;
@@ -57,7 +57,7 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
     } catch (error) {
       throw new PublisherError(error);
     }
-  }
+  };
 
   return {
     publish,
@@ -66,4 +66,4 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
     getOutputPath,
     setOutputPath,
   };
-}
+};

packages/code-generator/src/publisher/zip/utils.ts

@@ -8,7 +8,7 @@ export const isNodeProcess = (): boolean => {
     typeof process.versions === 'object' &&
     typeof process.versions.node !== 'undefined'
   );
-}
+};
 
 export const writeZipToDisk = (
   zipFolderPath: string,
@@ -27,7 +27,7 @@ export const writeZipToDisk = (
   const writeStream = fs.createWriteStream(zipPath);
   writeStream.write(content);
   writeStream.end();
-}
+};
 
 export const generateProjectZip = async (project: IResultDir): Promise<ZipBuffer> => {
   let zip = new JSZip();
@@ -35,12 +35,12 @@ export const generateProjectZip = async (project: IResultDir): Promise<ZipBuffer
   // const zipType = isNodeProcess() ? 'nodebuffer' : 'blob';
   const zipType = 'nodebuffer'; // 目前先只支持 node 调用
   return zip.generateAsync({ type: zipType });
-}
+};
 
 const writeFolderToZip = (
   folder: IResultDir,
   parentFolder: JSZip,
-  ignoreFolder: boolean = false,
+  ignoreFolder = false,
 ) => {
   const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name);
   if (zipFolder !== null) {
@@ -57,4 +57,4 @@ const writeFolderToZip = (
   }
 
   return parentFolder;
-}
+};

packages/code-generator/src/utils/nodeToJSX.ts

@@ -236,7 +236,7 @@ export function linkPieces(pieces: CodePiece[]): string {
     .map((p) => p.value)
     .join(' ');
 
-  attrsParts = !!attrsParts ? ` ${attrsParts}` : '';
+  attrsParts = attrsParts ? ` ${attrsParts}` : '';
 
   if (childrenParts) {
     return `${beforeParts}<${tagName}${attrsParts}>${childrenParts}</${tagName}>${afterParts}`;

packages/code-generator/tools/createTemplate.js

@@ -1,4 +1,4 @@
-const fs = require("fs");
+const fs = require('fs');
 const path = require('path');
 
 console.log(process.argv);
@@ -15,7 +15,7 @@ if (!root) {
 function cloneStr(str, times) {
   let count = times;
   const arr = [];
-  while(count > 0) {
+  while (count > 0) {
     arr.push(str);
     count -= 1;
   }
@@ -23,7 +23,7 @@ function cloneStr(str, times) {
 }
 
 function createTemplateFile(root, internalPath, fileName) {
-  //不是文件夹,则添加type属性为文件后缀名
+  // 不是文件夹,则添加type属性为文件后缀名
   const fileTypeSrc = path.extname(fileName);
   const fileType = fileTypeSrc.substring(1);
   const baseName = path.basename(fileName, fileTypeSrc);
@@ -62,24 +62,24 @@ ${content}
 function fileDisplay(root, internalPath) {
   const dirPath = path.join(root, internalPath);
   const filesList = fs.readdirSync(dirPath);
-  for(let i = 0; i < filesList.length; i++){
+  for (let i = 0; i < filesList.length; i++) {
-    //描述此文件/文件夹的对象
+    // 描述此文件/文件夹的对象
     const fileName = filesList[i];
-    //拼接当前文件的路径(上一层路径+当前file的名字)
+    // 拼接当前文件的路径(上一层路径+当前file的名字)
     const filePath = path.join(dirPath, fileName);
-    //根据文件路径获取文件信息，返回一个fs.Stats对象
+    // 根据文件路径获取文件信息，返回一个fs.Stats对象
     const stats = fs.statSync(filePath);
-    if(stats.isDirectory()){
+    if (stats.isDirectory()) {
-      //递归调用
+      // 递归调用
       fileDisplay(root, path.join(internalPath, fileName));
-    }else{
+    } else {
       createTemplateFile(root, internalPath, fileName);
     }
   }
 }
 
-//调用函数遍历根目录，同时传递 文件夹路径和对应的数组
+// 调用函数遍历根目录，同时传递 文件夹路径和对应的数组
-//请使用同步读取
+// 请使用同步读取
 fileDisplay(root, '');
-//读取完毕则写入到txt文件中
+// 读取完毕则写入到txt文件中
 // fs.writeFileSync('./data.txt', JSON.stringify(arr));

packages/demo-server/.eslintrc.js

@@ -1,24 +0,0 @@
-module.exports = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
-  },
-  plugins: ['@typescript-eslint/eslint-plugin'],
-  extends: [
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'prettier/@typescript-eslint',
-  ],
-  root: true,
-  env: {
-    node: true,
-    jest: true,
-  },
-  rules: {
-    '@typescript-eslint/interface-name-prefix': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-  },
-};

packages/demo-server/.prettierrc

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all"
-}

packages/demo-server/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.8-0"></a>
+## [1.0.8-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo-server@1.0.7-0...@ali/lowcode-demo-server@1.0.8-0) (2020-09-09)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo-server
+
 <a name="1.0.7-0"></a>
 ## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo-server@1.0.6-0...@ali/lowcode-demo-server@1.0.7-0) (2020-09-02)
 

packages/demo-server/package.json

@@ -1,12 +1,10 @@
 {
   "name": "@ali/lowcode-demo-server",
-  "version": "1.0.7-0",
+  "version": "1.0.8-0",
   "private": true,
   "description": "低代码引擎 DEMO Server 端",
   "scripts": {
     "prebuild": "rimraf dist",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "start": "nest start",
     "start:debug": "nest start --debug --watch",
     "start:dev": "nest start --watch",
@@ -49,13 +47,7 @@
     "@types/jest": "25.2.3",
     "@types/node": "^13.9.1",
     "@types/supertest": "^2.0.8",
-    "@typescript-eslint/eslint-plugin": "3.0.2",
-    "@typescript-eslint/parser": "3.0.2",
-    "eslint": "7.1.0",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.20.1",
     "jest": "26.0.1",
-    "prettier": "^1.19.1",
     "supertest": "^4.0.2",
     "ts-jest": "26.1.0",
     "ts-loader": "^6.2.1",

packages/demo-server/src/api/api.controller.ts

@@ -5,7 +5,7 @@ import { GenerateProjectDto } from '../dto/generate-project.dto';
 
 @Controller('api')
 export class ApiController {
-  constructor(private readonly apiService: ApiService) {}
+  private readonly apiService: ApiService;
 
   @Get('generate/test')
   generateTest() {

packages/demo-server/src/app.controller.ts

@@ -3,7 +3,7 @@ import { AppService } from './app.service';
 
 @Controller()
 export class AppController {
-  constructor(private readonly appService: AppService) {}
+  private readonly appService: AppService;
 
   @Get()
   getHello(): string {

packages/demo-server/src/publisher/index.ts

@@ -1,5 +1,5 @@
 import { IResultDir } from '@ali/lowcode-code-generator';
-import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils'
+import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils';
 
 export type PublisherFactory<T, U> = (configuration?: Partial<T>) => U;
 
@@ -17,7 +17,7 @@ export interface IPublisherResponse<T> {
   payload?: T;
 }
 
-declare type ZipPublisherResponse = string | Buffer | Blob
+declare type ZipPublisherResponse = string | Buffer | Blob;
 
 export interface ZipFactoryParams extends IPublisherFactoryParams {
   outputPath?: string
@@ -32,39 +32,39 @@ export interface ZipPublisher extends IPublisher<ZipFactoryParams, ZipPublisherR
 export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher> = (
   params: ZipFactoryParams = {}
 ): ZipPublisher => {
-  let { project, outputPath } = params
+  let { project, outputPath } = params;
 
-  const getProject = () => project
+  const getProject = () => project;
   const setProject = (projectToSet: IResultDir) => {
-    project = projectToSet
+    project = projectToSet;
-  }
+  };
 
-  const getOutputPath = () => outputPath
+  const getOutputPath = () => outputPath;
   const setOutputPath = (path: string) => {
-    outputPath = path
+    outputPath = path;
-  }
+  };
 
   const publish = async (options: ZipFactoryParams = {}) => {
-    const projectToPublish = options.project || project
+    const projectToPublish = options.project || project;
     if (!projectToPublish) {
       throw new Error('MissingProject');
     }
 
-    const zipName = options.projectSlug || params.projectSlug || projectToPublish.name
+    const zipName = options.projectSlug || params.projectSlug || projectToPublish.name;
 
     try {
-      const zipContent = await generateProjectZip(projectToPublish)
+      const zipContent = await generateProjectZip(projectToPublish);
 
       // If not output path is provided, zip is not written to disk
-      const projectOutputPath = options.outputPath || outputPath
+      const projectOutputPath = options.outputPath || outputPath;
       if (projectOutputPath && isNodeProcess()) {
-        await writeZipToDisk(projectOutputPath, zipContent, zipName)
+        await writeZipToDisk(projectOutputPath, zipContent, zipName);
       }
-      return { success: true, payload: zipContent }
+      return { success: true, payload: zipContent };
     } catch (error) {
       throw new Error('ZipUnexpected');
     }
-  }
+  };
 
   return {
     publish,
@@ -72,5 +72,5 @@ export const createZipPublisher: PublisherFactory<ZipFactoryParams, ZipPublisher
     setProject,
     getOutputPath,
     setOutputPath,
-  }
+  };
-}
+};

packages/demo-server/src/publisher/utils.ts

@@ -6,52 +6,52 @@ export const isNodeProcess = (): boolean => {
     typeof process === 'object' &&
     typeof process.versions === 'object' &&
     typeof process.versions.node !== 'undefined'
-  )
+  );
-}
+};
 
 export const writeZipToDisk = (
   zipFolderPath: string,
   content: Buffer | Blob,
   zipName: string
 ): void => {
-  const fs = require('fs')
+  const fs = require('fs');
-  const path = require('path')
+  const path = require('path');
 
   if (!fs.existsSync(zipFolderPath)) {
-    fs.mkdirSync(zipFolderPath, { recursive: true })
+    fs.mkdirSync(zipFolderPath, { recursive: true });
   }
 
-  const zipPath = path.join(zipFolderPath, `${zipName}.zip`)
+  const zipPath = path.join(zipFolderPath, `${zipName}.zip`);
 
-  const writeStream = fs.createWriteStream(zipPath)
+  const writeStream = fs.createWriteStream(zipPath);
-  writeStream.write(content)
+  writeStream.write(content);
-  writeStream.end()
+  writeStream.end();
-}
+};
 
 export const generateProjectZip = async (project: IResultDir): Promise<Buffer | Blob> => {
-  let zip = new JSZip()
+  let zip = new JSZip();
-  zip = writeFolderToZip(project, zip, true)
+  zip = writeFolderToZip(project, zip, true);
-  const zipType = isNodeProcess() ? 'nodebuffer' : 'blob'
+  const zipType = isNodeProcess() ? 'nodebuffer' : 'blob';
-  return zip.generateAsync({ type: zipType })
+  return zip.generateAsync({ type: zipType });
-}
+};
 
 const writeFolderToZip = (
   folder: IResultDir,
   parentFolder: JSZip,
-  ignoreFolder: boolean = false
+  ignoreFolder = false
 ) => {
-  const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name)
+  const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name);
 
   folder.files.forEach((file: IResultFile) => {
     // const options = file.contentEncoding === 'base64' ? { base64: true } : {}
     const options = {};
-    const fileName = file.ext ? `${file.name}.${file.ext}` : file.name
+    const fileName = file.ext ? `${file.name}.${file.ext}` : file.name;
-    zipFolder.file(fileName, file.content, options)
+    zipFolder.file(fileName, file.content, options);
-  })
+  });
 
   folder.dirs.forEach((subFolder: IResultDir) => {
-    writeFolderToZip(subFolder, zipFolder)
+    writeFolderToZip(subFolder, zipFolder);
-  })
+  });
 
-  return parentFolder
+  return parentFolder;
-}
+};

packages/demo/CHANGELOG.md

@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.8-0"></a>
+## [1.0.8-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.65...@ali/lowcode-demo@1.0.8-0) (2020-09-09)
+
+
+### Bug Fixes
+
+* 🐛 更改复杂类型生成工具的接口形式，减少调用复杂度 ([ce616b5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/ce616b5))
+* 🐛 after event name & TabItem parent limitation ([76fb0b3](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/76fb0b3))
+* 🐛 Card component's settings ([f44e7ab](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f44e7ab))
+* 🐛 Cascader init status ([e4a28c4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/e4a28c4))
+* 🐛 codeout btn fix ([afda7d4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/afda7d4))
+* 🐛 Collapse render error ([6fed968](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6fed968))
+* 🐛 fix Menu & MenuButton assets cfg ([3d40aa2](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3d40aa2))
+* 🐛 Menu Items ([5ecacef](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/5ecacef))
+* 🐛 save and generator last page ([3e4254c](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3e4254c))
+* 🐛 Tab & TabItem assets config ([0cc08fb](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/0cc08fb))
+* 🐛 Tag assets ([b460dcf](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/b460dcf))
+* 🐛 Tag components setting ([de941da](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/de941da))
+* 🐛 Timeline asset config ([436dadd](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/436dadd))
+* 🐛 use JsonSetter as dataSource Setter ([553f924](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/553f924))
+* 😈 table 无法选中问题 ([34825f8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/34825f8))
+* 适配Nav组件 ([7e9829f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7e9829f))
+* 修改插件面板配置 ([f9ceda5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f9ceda5))
+* 修改js面板的保存schema问题 ([0ee8892](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/0ee8892))
+* demo 中引入locode-editor-general ([1f03857](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1f03857))
+* dropdown and menu schema ([ae1d125](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/ae1d125))
+* fix mixsetter style ([0ecce83](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/0ecce83))
+* fix NextTable callback function ([ce77375](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/ce77375))
+* fix source edit bug ([047247c](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/047247c))
+
+
+### Features
+
+* 🎸 add demo-server ([df35c6a](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/df35c6a))
+* 🎸 Box config edit ([49b49ee](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/49b49ee))
+* 🎸 Button update ([7969273](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7969273))
+* 🎸 Collapse component update ([c682cc5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c682cc5))
+* 🎸 Collapse.panel has drop in Collapse ([d4d41e4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/d4d41e4))
+* 🎸 pagination update ([f13b3ab](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f13b3ab))
+* 🎸 saveload btn for demo ([f91da66](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f91da66))
+* 🎸 update upload component ([10abef5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/10abef5))
+* 🎸 upload update ([f81932b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f81932b))
+* 适配TreeNode节点 ([8c36928](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/8c36928))
+* 新增分隔符物料配置 ([af39c17](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/af39c17))
+* 新增simulatorurl，可以设置cdn使用simulator ([1f45b05](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1f45b05))
+* 增加出码按钮 ([6f7b066](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6f7b066))
+* 主设置面板里深层次界面通过 stagebox 进行过渡 ([783e945](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/783e945))
+* demo 构造 componentsMap ([f445ffe](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f445ffe))
+* tree 组件修改 ([7efa52f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7efa52f))
+
+
+
+
 <a name="1.0.7-0"></a>
 ## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@1.0.6-0...@ali/lowcode-demo@1.0.7-0) (2020-09-02)
 

packages/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ali/lowcode-demo",
-  "version": "1.0.7-0",
+  "version": "1.0.8-0",
   "private": true,
   "description": "低代码引擎 DEMO",
   "scripts": {
@@ -9,21 +9,21 @@
   },
   "config": {},
   "dependencies": {
-    "@ali/lowcode-editor-core": "^1.0.7-0",
+    "@ali/lowcode-editor-core": "^1.0.8-0",
-    "@ali/lowcode-editor-skeleton": "^1.0.7-0",
+    "@ali/lowcode-editor-skeleton": "^1.0.8-0",
-    "@ali/lowcode-plugin-components-pane": "^1.0.7-0",
+    "@ali/lowcode-plugin-components-pane": "^1.0.8-0",
-    "@ali/lowcode-plugin-designer": "^1.0.7-0",
+    "@ali/lowcode-plugin-designer": "^1.0.8-0",
-    "@ali/lowcode-plugin-event-bind-dialog": "^1.0.7-0",
+    "@ali/lowcode-plugin-event-bind-dialog": "^1.0.8-0",
-    "@ali/lowcode-plugin-outline-pane": "^1.0.7-0",
+    "@ali/lowcode-plugin-outline-pane": "^1.0.8-0",
-    "@ali/lowcode-plugin-sample-logo": "^1.0.7-0",
+    "@ali/lowcode-plugin-sample-logo": "^1.0.8-0",
-    "@ali/lowcode-plugin-sample-preview": "^1.0.7-0",
+    "@ali/lowcode-plugin-sample-preview": "^1.0.8-0",
     "@ali/lowcode-plugin-settings-pane": "^0.8.8",
-    "@ali/lowcode-plugin-undo-redo": "^1.0.7-0",
+    "@ali/lowcode-plugin-undo-redo": "^1.0.8-0",
-    "@ali/lowcode-plugin-variable-bind-dialog": "^1.0.7-0",
+    "@ali/lowcode-plugin-variable-bind-dialog": "^1.0.8-0",
-    "@ali/lowcode-plugin-zh-en": "^1.0.7-0",
+    "@ali/lowcode-plugin-zh-en": "^1.0.8-0",
-    "@ali/lowcode-react-renderer": "^1.0.7-0",
+    "@ali/lowcode-react-renderer": "^1.0.8-0",
-    "@ali/lowcode-runtime": "^1.0.7-0",
+    "@ali/lowcode-runtime": "^1.0.8-0",
-    "@ali/lowcode-utils": "^1.0.7-0",
+    "@ali/lowcode-utils": "^1.0.8-0",
     "@ali/ve-action-pane": "^4.7.0-beta.0",
     "@ali/ve-datapool-pane": "^6.4.3",
     "@ali/ve-history-pane": "4.0.0",

packages/demo/public/assets.json

@@ -13107,30 +13107,6 @@
     }
   ],
   "componentList": [
-    {
-      "title": "Util",
-      "children": [
-        {
-          "componentName": "Dropdown",
-          "title": "下拉菜单",
-          "icon": "",
-          "package": "@alifd/next",
-          "library": "Next",
-          "snippets": [
-            {
-              "title": "下拉菜单",
-              "screenshot": "",
-              "schema": {
-                "componentName": "Dropdown",
-                "props": {  "trigger": [{    "componentName": "Button",    "props": {      "type": "primary"    },    "children": "确定"  }],  "triggerType": "click"},
-                "children": [{  "componentName": "Menu",  "props": {    "style": {      "width": 200    }  },  "children": [{    "componentName": "Menu.Item",    "props": {},    "children": "Option 1"  }, {    "componentName": "Menu.Item",    "props": {      "disabled": false    },    "children": "option 2"  }, {    "componentName": "Menu.Item",    "props": {      "disabled": false    },    "children": "option 3"  }]}]
-              }
-            }
-          ]
-        }
-      ],
-      "icon": ""
-    },
     {
       "title": "DataDisplay",
       "children": [
@@ -15388,5 +15364,31 @@
       ],
       "icon": ""
     }
+  ],
+  "bizComponentList": [
+    {
+      "title": "Util",
+      "children": [
+        {
+          "componentName": "Dropdown",
+          "title": "下拉菜单",
+          "icon": "",
+          "package": "@alifd/next",
+          "library": "Next",
+          "snippets": [
+            {
+              "title": "下拉菜单",
+              "screenshot": "",
+              "schema": {
+                "componentName": "Dropdown",
+                "props": {  "trigger": [{    "componentName": "Button",    "props": {      "type": "primary"    },    "children": "确定"  }],  "triggerType": "click"},
+                "children": [{  "componentName": "Menu",  "props": {    "style": {      "width": 200    }  },  "children": [{    "componentName": "Menu.Item",    "props": {},    "children": "Option 1"  }, {    "componentName": "Menu.Item",    "props": {      "disabled": false    },    "children": "option 2"  }, {    "componentName": "Menu.Item",    "props": {      "disabled": false    },    "children": "option 3"  }]}]
+              }
+            }
+          ]
+        }
+      ],
+      "icon": ""
+    }
   ]
 }

packages/demo/src/app/plugins/provider.ts

@@ -34,7 +34,7 @@ export default class Preview extends ReactProvider {
       containerId,
       components: { ...builtInComps, ...buildComponents({ '@alifd/next': 'Next' }, componentsMap) },
       componentsMap,
-      utils: utils,
+      utils,
       constants,
     };
   }
@@ -44,7 +44,7 @@ export default class Preview extends ReactProvider {
     const appSchemaStr = localStorage.getItem('lce-dev-store');
     const appSchema = JSON.parse(appSchemaStr || '');
     const idx = appSchema.componentsTree.findIndex(
-      (page: any, idx: number) => (page.fileName || `page${idx}`) === pageId,
+      (page: any, index: number) => (page.fileName || `page${index}`) === pageId,
     );
     const schema = appSchema.componentsTree[idx];
     return schema;

packages/demo/src/editor/components.ts

@@ -2,7 +2,7 @@ import logo from '@ali/lowcode-plugin-sample-logo';
 import samplePreview from '@ali/lowcode-plugin-sample-preview';
 import undoRedo from '@ali/lowcode-plugin-undo-redo';
 import componentsPane from '@ali/lowcode-plugin-components-pane';
-import outline, { OutlinePane } from '@ali/lowcode-plugin-outline-pane';
+import outline from '@ali/lowcode-plugin-outline-pane';
 import zhEn from '@ali/lowcode-plugin-zh-en';
 import eventBindDialog from '@ali/lowcode-plugin-event-bind-dialog';
 import variableBindDialog from '@ali/lowcode-plugin-variable-bind-dialog';

packages/demo/src/editor/config.ts

@@ -123,9 +123,6 @@ export default {
       const simulatorUrl = [
         'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.css',
         'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.js',
-        //  for debug simulator
-        // 'http://localhost:3333/js/react-simulator-renderer.js', 
-   
       ];
       editor.set('simulatorUrl', simulatorUrl);
       // editor.set('renderEnv', 'rax');

packages/demo/src/editor/index.tsx

@@ -1,5 +1,5 @@
 import { render } from 'react-dom';
-import GeneralWorkbench, { editor } from '@ali/lowcode-editor-preset-general';
+import GeneralWorkbench from '@ali/lowcode-editor-preset-general';
 import config from './config';
 import components from './components';
 import './global.scss';

packages/demo/src/editor/plugins/codeout.tsx

@@ -28,7 +28,7 @@ const Codeout = ({ editor }: PluginProps) => {
     const designer = editor.get(Designer);
     if (designer) {
       const assets = editor.get('assets') as { components: BasicSection[] };
-      const components = assets.components;
+      const { components } = assets;
 
       const componentsMap = components
         .filter((c) => !!c.npm)

packages/demo/src/editor/plugins/saveload.tsx

@@ -22,10 +22,7 @@ interface BasicSection {
 
 const Codeout = ({ editor }: PluginProps) => {
   const handleSaveClick = () => {
-
+    const schema = editor.get('designer').project.getSchema();
-    debugger;
-
-    let schema = editor.get('designer').project.getSchema();
     console.log(schema);
 
 

packages/demo/src/vision/module.d.ts

@@ -9,5 +9,5 @@ declare module '@ali/ve-page-history';
 declare module '@ali/ve-i18n-manage-pane';
 declare module '@ali/ve-action-pane';
 declare module '@ali/vu-legao-design-fetch-context';
-declare module "@ali/vu-function-parser";
+declare module '@ali/vu-function-parser';
-declare module "compare-versions";
+declare module 'compare-versions';

packages/designer/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.8-0"></a>
+## [1.0.8-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.55...@ali/lowcode-designer@1.0.8-0) (2020-09-09)
+
+
+### Bug Fixes
+
+* 不应该限定 parent 才做解绑操作 ([2e616e3](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/2e616e3))
+* 合并master分支 ([bd2c6ad](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/bd2c6ad))
+* 兼容modal模式 ([1092ee9](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1092ee9))
+* 解决 set('schema') 后 componentsTree 越来越多的 bug ([a171d3e](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/a171d3e))
+* 优化树子节点删除逻辑 ([47e814f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/47e814f))
+
+
+### Features
+
+* 🎸 支持设置模拟器的 viewport 的宽高和缩放级别 ([3a54241](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3a54241))
+* 新增simulatorurl，可以设置cdn使用simulator ([1f45b05](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1f45b05))
+
+
+
+
 <a name="1.0.7-0"></a>
 ## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@1.0.6-0...@ali/lowcode-designer@1.0.7-0) (2020-09-02)
 

packages/designer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ali/lowcode-designer",
-  "version": "1.0.7-0",
+  "version": "1.0.8-0",
   "description": "Designer for Ali LowCode Engine",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -15,9 +15,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@ali/lowcode-editor-core": "^1.0.7-0",
+    "@ali/lowcode-editor-core": "^1.0.8-0",
-    "@ali/lowcode-types": "^1.0.7-0",
+    "@ali/lowcode-types": "^1.0.8-0",
-    "@ali/lowcode-utils": "^1.0.7-0",
+    "@ali/lowcode-utils": "^1.0.8-0",
     "classnames": "^2.2.6",
     "event": "^1.0.0",
     "react": "^16",

packages/designer/src/builtin-simulator/bem-tools/border-detecting.tsx

@@ -56,10 +56,10 @@ export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> {
   }
 
   @computed get current() {
-    const host = this.props.host;
+    const { host } = this.props;
     const doc = host.document;
-    const selection = doc.selection;
+    const { selection } = doc;
-    const current = host.designer.detecting.current;
+    const { current } = host.designer.detecting;
     if (!current || current.document !== doc || selection.has(current.id)) {
       return null;
     }
@@ -67,8 +67,8 @@ export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> {
   }
 
   render() {
-    const host = this.props.host;
+    const { host } = this.props;
-    const current = this.current;
+    const { current } = this;
     if (!current || host.viewport.scrolling || host.liveEditing.editing) {
       return null;
     }

packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx

@@ -23,7 +23,7 @@ export default class BoxResizing extends Component<{ host: BuiltinSimulatorHost
     if (doc.suspensed) {
       return null;
     }
-    const selection = doc.selection;
+    const { selection } = doc;
     return this.dragging ? selection.getTopNodes() : selection.getNodes();
   }
 
@@ -37,7 +37,7 @@ export default class BoxResizing extends Component<{ host: BuiltinSimulatorHost
   }
 
   render() {
-    const selecting = this.selecting;
+    const { selecting } = this;
     if (!selecting || selecting.length < 1) {
       // DIRTY FIX, recore has a bug!
       return <Fragment />;
@@ -79,7 +79,7 @@ export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost;
   render() {
     const { instances } = this;
     const { node } = this.props;
-    const designer = this.host.designer;
+    const { designer } = this.host;
 
     if (!instances || instances.length < 1) {
       return null;
@@ -112,8 +112,11 @@ export class BoxResizingInstance extends Component<{
 }> {
   // private outline: any;
   private willUnbind: () => any;
+
   private outlineRight: any;
+
   private outlineLeft: any;
+
   private dragEngine: DragResizeEngine;
 
   constructor(props: any) {

packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx

@@ -59,6 +59,7 @@ class Toolbar extends Component<{ observed: OffsetObserver }> {
   shouldComponentUpdate() {
     return false;
   }
+
   render() {
     const { observed } = this.props;
     const { height, width } = observed.viewport;
@@ -169,7 +170,7 @@ export class BorderSelectingForNode extends Component<{ host: BuiltinSimulatorHo
   render() {
     const { instances } = this;
     const { node } = this.props;
-    const designer = this.host.designer;
+    const { designer } = this.host;
 
     if (!instances || instances.length < 1) {
       return null;
@@ -206,7 +207,7 @@ export class BorderSelecting extends Component<{ host: BuiltinSimulatorHost }> {
     if (doc.suspensed || this.host.liveEditing.editing) {
       return null;
     }
-    const selection = doc.selection;
+    const { selection } = doc;
     return this.dragging ? selection.getTopNodes() : selection.getNodes();
   }
 
@@ -215,7 +216,7 @@ export class BorderSelecting extends Component<{ host: BuiltinSimulatorHost }> {
   }
 
   render() {
-    const selecting = this.selecting;
+    const { selecting } = this;
     if (!selecting || selecting.length < 1) {
       return null;
     }

packages/designer/src/builtin-simulator/bem-tools/drag-resize-engine.ts

@@ -35,6 +35,7 @@ function makeEventsHandler(
 // 拖动缩放
 export default class DragResizeEngine {
   private emitter: EventEmitter;
+
   private dragResizing = false;
 
   constructor(readonly designer: Designer) {

packages/designer/src/builtin-simulator/bem-tools/index.tsx

@@ -15,7 +15,7 @@ export class BemTools extends Component<{ host: BuiltinSimulatorHost }> {
   }
 
   render() {
-    const host = this.props.host;
+    const { host } = this.props;
     const { scrollX, scrollY, scale } = host.viewport;
     return (
       <div className="lc-bem-tools" style={{ transform: `translate(${-scrollX * scale}px,${-scrollY * scale}px)` }}>

packages/designer/src/builtin-simulator/bem-tools/insertion.tsx

@@ -7,9 +7,9 @@ import {
   Rect,
   isLocationChildrenDetail,
   LocationChildrenDetail,
-  isVertical
+  isVertical,
 } from '../../designer';
-import { ISimulatorHost, } from '../../simulator';
+import { ISimulatorHost } from '../../simulator';
 import { ParentalNode } from '../../document';
 import './insertion.less';
 

packages/designer/src/builtin-simulator/create-simulator.ts

@@ -8,8 +8,8 @@ import {
   isAssetItem,
   AssetType,
   assetItem,
-} from '@ali/lowcode-utils';
+  isCSSUrl } from '@ali/lowcode-utils';
-import { isCSSUrl } from '@ali/lowcode-utils';
+
 import { BuiltinSimulatorRenderer } from './renderer';
 
 export function createSimulator(
@@ -65,7 +65,7 @@ export function createSimulator(
 
   const styleFrags = Object.keys(styles)
     .map((key) => {
-      return styles[key].join('\n') + `<meta level="${key}" />`;
+      return `${styles[key].join('\n') }<meta level="${key}" />`;
     })
     .join('');
   const scriptFrags = Object.keys(scripts)

packages/designer/src/builtin-simulator/host-view.tsx

@@ -22,25 +22,29 @@ type SimulatorHostProps = BuiltinSimulatorProps & {
 
 export class BuiltinSimulatorHostView extends Component<SimulatorHostProps> {
   readonly host: BuiltinSimulatorHost;
+
   constructor(props: any) {
     super(props);
     const { documentContext } = this.props;
     this.host = (documentContext.simulator as BuiltinSimulatorHost) || new BuiltinSimulatorHost(documentContext);
     this.host.setProps(this.props);
   }
+
   shouldComponentUpdate(nextProps: BuiltinSimulatorProps) {
     this.host.setProps(nextProps);
     return false;
   }
+
   componentDidMount() {
     if (this.props.onMount) {
       this.props.onMount(this.host);
     }
   }
+
   render() {
     return (
       <div className="lc-simulator">
-        {/*progressing.visible ? <PreLoaderView /> : null*/}
+        {/* progressing.visible ? <PreLoaderView /> : null */}
         <Canvas host={this.host} />
       </div>
     );
@@ -73,7 +77,7 @@ class Canvas extends Component<{ host: BuiltinSimulatorHost }> {
 class Content extends Component<{ host: BuiltinSimulatorHost }> {
   render() {
     const sim = this.props.host;
-    const viewport = sim.viewport;
+    const { viewport } = sim;
     const frameStyle = {
       transform: `scale(${viewport.scale})`,
       height: viewport.contentHeight,

packages/designer/src/builtin-simulator/host.ts

@@ -144,18 +144,21 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   @obx.ref _props: BuiltinSimulatorProps = {};
+
   /**
    * @see ISimulator
    */
   setProps(props: BuiltinSimulatorProps) {
     this._props = props;
   }
+
   set(key: string, value: any) {
     this._props = {
       ...this._props,
       [key]: value,
     };
   }
+
   get(key: string): any {
     return this._props[key];
   }
@@ -173,6 +176,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   readonly viewport = new Viewport();
+
   readonly scroller = this.designer.createScroller(this.viewport);
 
   mountViewport(viewport: Element | null) {
@@ -180,16 +184,19 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   @obx.ref private _contentWindow?: Window;
+
   get contentWindow() {
     return this._contentWindow;
   }
 
   @obx.ref private _contentDocument?: Document;
+
   get contentDocument() {
     return this._contentDocument;
   }
 
   private _renderer?: BuiltinSimulatorRenderer;
+
   get renderer() {
     return this._renderer;
   }
@@ -203,6 +210,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   readonly libraryMap: { [key: string]: string } = {};
 
   private _iframe?: HTMLIFrameElement;
+
   async mountContentFrame(iframe: HTMLIFrameElement | null) {
     if (!iframe || this._iframe === iframe) {
       return;
@@ -279,8 +287,8 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
 
   setupDragAndClick() {
     const documentModel = this.document;
-    const selection = documentModel.selection;
+    const { selection } = documentModel;
-    const designer = documentModel.designer;
+    const { designer } = documentModel;
     const doc = this.contentDocument!;
 
     // TODO: think of lock when edit a node
@@ -312,7 +320,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
         const checkSelect = (e: MouseEvent) => {
           doc.removeEventListener('mouseup', checkSelect, true);
           if (!isShaken(downEvent, e)) {
-            const id = node.id;
+            const { id } = node;
             designer.activeTracker.track({ node, instance: nodeInst?.instance });
             if (isMulti && !isRootNode(node) && selection.has(id)) {
               selection.remove(id);
@@ -411,12 +419,13 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   private disableHovering?: () => void;
+
   /**
    * 设置悬停处理
    */
   setupDetecting() {
     const doc = this.contentDocument!;
-    const detecting = this.document.designer.detecting;
+    const { detecting } = this.document.designer;
     const hover = (e: MouseEvent) => {
       if (!detecting.enable) {
         return;
@@ -448,6 +457,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   readonly liveEditing = new LiveEditing();
+
   setupLiveEditing() {
     const doc = this.contentDocument!;
     // cause edit
@@ -567,6 +577,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   @obx.val private instancesMap = new Map<string, ComponentInstance[]>();
+
   setInstance(id: string, instances: ComponentInstance[] | null) {
     if (instances == null) {
       this.instancesMap.delete(id);
@@ -719,6 +730,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   private tryScrollAgain: number | null = null;
+
   /**
    * @see ISimulator
    */
@@ -744,7 +756,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
         if (y < bounds.top || y > bounds.bottom) {
           scroll = true;
         }
-      }*/
+      } */
     } else {
       /*
       const rect = this.document.computeRect(node);
@@ -768,7 +780,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       if (rect.width > width ? rect.left > right || rect.right < left : rect.left < left || rect.right > right) {
         opt.left = Math.min(rect.left + rect.width / 2 + sl - left - width / 2, scrollWidth - width);
         scroll = true;
-      }*/
+      } */
     }
 
     if (scroll && this.scroller) {
@@ -783,18 +795,21 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   setNativeSelection(enableFlag: boolean) {
     this.renderer?.setNativeSelection(enableFlag);
   }
+
   /**
    * @see ISimulator
    */
   setDraggingState(state: boolean) {
     this.renderer?.setDraggingState(state);
   }
+
   /**
    * @see ISimulator
    */
   setCopyState(state: boolean) {
     this.renderer?.setCopyState(state);
   }
+
   /**
    * @see ISimulator
    */
@@ -803,6 +818,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   private _sensorAvailable = true;
+
   /**
    * @see ISensor
    */
@@ -851,6 +867,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
   }
 
   private sensing = false;
+
   /**
    * @see ISensor
    */
@@ -905,7 +922,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       return null;
     }
 
-    const children = container.children;
+    const { children } = container;
 
     const detail: LocationChildrenDetail = {
       type: LocationDetailType.Children,
@@ -916,7 +933,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     const locationData = {
       target: container,
       detail,
-      source: 'simulator' + this.document.id,
+      source: `simulator${ this.document.id}`,
       event: e,
     };
 
@@ -934,7 +951,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
           index: 0,
           valid: true,
         },
-        source: 'simulator' + this.document.id,
+        source: `simulator${ this.document.id}`,
         event: e,
       });
     }
@@ -1014,7 +1031,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       if (!row && nearDistance !== 0) {
         const edgeDistance = distanceToEdge(e as any, edge);
         if (edgeDistance.distance < nearDistance!) {
-          const nearAfter = edgeDistance.nearAfter;
+          const { nearAfter } = edgeDistance;
           if (minTop == null) {
             minTop = edge.top;
           }
@@ -1077,7 +1094,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     // TODO: renderengine support pointerEvents: none for acceleration
     const drillDownExcludes = new Set<Node>();
     if (isDragNodeObject(dragObject)) {
-      const nodes = dragObject.nodes;
+      const { nodes } = dragObject;
       let i = nodes.length;
       let p: any = container;
       while (i-- > 0) {
@@ -1139,7 +1156,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
           container = upward;
           upward = null;
         }
-      }*/
+      } */
         container = res;
         upward = null;
       }

packages/designer/src/builtin-simulator/live-editing/live-editing.ts

@@ -34,13 +34,15 @@ function addLiveEditingSpecificRule(rule: SpecificRule) {
 
 export class LiveEditing {
   static addLiveEditingSpecificRule = addLiveEditingSpecificRule;
+
   static addLiveEditingSaveHandler = addLiveEditingSaveHandler;
 
   @obx.ref private _editing: Prop | null = null;
+
   apply(target: EditingTarget) {
     const { node, event, rootElement } = target;
     const targetElement = event.target as HTMLElement;
-    const liveTextEditing = node.componentMeta.liveTextEditing;
+    const { liveTextEditing } = node.componentMeta;
 
     const editor = globalContext.get(Editor);
     const npm = node?.componentMeta?.npm;
@@ -64,14 +66,14 @@ export class LiveEditing {
             return false;
           }
           setterPropElement = queryPropElement(rootElement, targetElement, config.selector);
-          return setterPropElement ? true : false;
+          return !!setterPropElement;
         });
         propTarget = matched?.propTarget;
       }
     } else {
       specificRules.some((rule) => {
         matched = rule(target);
-        return matched ? true : false;
+        return !!matched;
       });
       if (matched) {
         propTarget = matched.propTarget;
@@ -147,8 +149,6 @@ export class LiveEditing {
     // TODO: process enter | esc events & joint the FocusTracker
 
     // TODO: upward testing for b/i/a html elements
-
-    
   }
 
   get editing() {
@@ -156,7 +156,9 @@ export class LiveEditing {
   }
 
   private _dispose?: () => void;
+
   private _save?: () => void;
+
   saveAndDispose() {
     if (this._save) {
       this._save();

packages/designer/src/builtin-simulator/node-selector/index.tsx

@@ -58,16 +58,19 @@ export default class InstanceNodeSelector extends React.Component<IProps, IState
       });
     }
   };
+
   onMouseOver = (node: Node) => (_: any, flag = true) => {
     if (node && typeof node.hover === 'function') {
       node.hover(flag);
     }
   };
+
   onMouseOut = (node: Node) => (_: any, flag = false) => {
     if (node && typeof node.hover === 'function') {
       node.hover(flag);
     }
   };
+
   renderNodes = (node: Node) => {
     const nodes = this.state.parentNodes || [];
     const children = nodes.map((node, key) => {

packages/designer/src/builtin-simulator/resource-consumer.ts

@@ -21,9 +21,11 @@ export type RendererConsumer<T> = (renderer: BuiltinSimulatorRenderer, data: T)
 
 export default class ResourceConsumer<T = any> {
   private emitter = new EventEmitter();
+
   @obx.ref private _data: T | typeof UNSET = UNSET;
 
   private _providing?: () => void;
+
   constructor(provider: () => T, private consumer?: RendererConsumer<T>) {
     this._providing = autorun(() => {
       this._data = provider();
@@ -31,6 +33,7 @@ export default class ResourceConsumer<T = any> {
   }
 
   private _consuming?: () => void;
+
   consume(consumerOrRenderer: BuiltinSimulatorRenderer | ((data: T) => any)) {
     if (this._consuming) {
       return;
@@ -72,6 +75,7 @@ export default class ResourceConsumer<T = any> {
   }
 
   private _firstConsumed = false;
+
   private resovleFirst?: () => void;
 
   waitFirstConsume(): Promise<any> {

packages/designer/src/builtin-simulator/utils/parse-metadata.ts

@@ -136,7 +136,7 @@ export function parseProps(component: any): PropConfig[] {
   Object.keys(propTypes).forEach(key => {
     const propTypeItem = propTypes[key];
     const defaultValue = defaultProps[key];
-    const lowcodeType = propTypeItem.lowcodeType;
+    const { lowcodeType } = propTypeItem;
     if (lowcodeType) {
       result[key] = {
         name: key,

packages/designer/src/builtin-simulator/utils/path.ts

@@ -158,7 +158,7 @@ export function joinPath(...segments: string[]) {
       if (path === '') {
         path += seg;
       } else {
-        path += '/' + seg;
+        path += `/${ seg}`;
       }
     }
   }

packages/designer/src/builtin-simulator/viewport.ts

@@ -4,7 +4,9 @@ import { AutoFit, IViewport } from '../simulator';
 
 export default class Viewport implements IViewport {
   @obx.ref private rect?: DOMRect;
+
   private _bounds?: DOMRect;
+
   get bounds(): DOMRect {
     if (this._bounds) {
       return this._bounds;
@@ -17,12 +19,13 @@ export default class Viewport implements IViewport {
   }
 
   get contentBounds(): DOMRect {
-    const bounds = this.bounds;
+    const { bounds } = this;
-    const scale = this.scale;
+    const { scale } = this;
     return new DOMRect(0, 0, bounds.width / scale, bounds.height / scale);
   }
 
   private viewportElement?: HTMLElement;
+
   mount(viewportElement: HTMLElement | null) {
     if (!viewportElement || this.viewportElement === viewportElement) {
       return;
@@ -67,7 +70,7 @@ export default class Viewport implements IViewport {
     }
   }
 
-  @obx.ref private _scale: number = 1;
+  @obx.ref private _scale = 1;
 
   /**
    * 缩放比例
@@ -87,6 +90,7 @@ export default class Viewport implements IViewport {
   }
 
   @obx.ref private _contentWidth: number | AutoFit = AutoFit;
+
   @obx.ref private _contentHeight: number | AutoFit = AutoFit;
 
   @computed get contentHeight(): number | AutoFit {
@@ -106,15 +110,19 @@ export default class Viewport implements IViewport {
   }
 
   @obx.ref private _scrollX = 0;
+
   @obx.ref private _scrollY = 0;
+
   get scrollX() {
     return this._scrollX;
   }
+
   get scrollY() {
     return this._scrollY;
   }
 
   private _scrollTarget?: ScrollTarget;
+
   /**
    * 滚动对象
    */
@@ -123,6 +131,7 @@ export default class Viewport implements IViewport {
   }
 
   @obx private _scrolling = false;
+
   get scrolling(): boolean {
     return this._scrolling;
   }

packages/designer/src/component-meta.ts

@@ -63,45 +63,62 @@ function buildFilter(rule?: string | string[] | RegExp | NestingFilter) {
 
 export class ComponentMeta {
   readonly isComponentMeta = true;
+
   private _npm?: NpmInfo;
+
   get npm() {
     return this._npm;
   }
+
   private _componentName?: string;
+
   get componentName(): string {
     return this._componentName!;
   }
+
   private _isContainer?: boolean;
+
   get isContainer(): boolean {
     return this._isContainer! || this.isRootComponent();
   }
+
   private _isModal?: boolean;
+
   get isModal(): boolean {
     return this._isModal!;
   }
+
   private _descriptor?: string;
+
   get descriptor(): string | undefined {
     return this._descriptor;
   }
+
   private _rootSelector?: string;
+
   get rootSelector(): string | undefined {
     return this._rootSelector;
   }
+
   private _transformedMetadata?: TransformedComponentMetadata;
+
   get configure() {
     const config = this._transformedMetadata?.configure;
     return config?.combined || config?.props || [];
   }
 
   private _liveTextEditing?: LiveTextEditingConfig[];
+
   get liveTextEditing() {
     return this._liveTextEditing;
   }
 
   private parentWhitelist?: NestingFilter | null;
+
   private childWhitelist?: NestingFilter | null;
 
   private _title?: TitleContent;
+
   get title(): string | I18nData | ReactElement {
     // TODO: 标记下。这块需要康师傅加一下API，页面正常渲染。
     // string | i18nData | ReactElement
@@ -123,6 +140,7 @@ export class ComponentMeta {
   }
 
   private _acceptable?: boolean;
+
   get acceptable(): boolean {
     return this._acceptable!;
   }
@@ -145,7 +163,7 @@ export class ComponentMeta {
     // 额外转换逻辑
     this._transformedMetadata = this.transformMetadata(metadata);
 
-    const title = this._transformedMetadata.title;
+    const { title } = this._transformedMetadata;
     if (title) {
       this._title =
         typeof title === 'string'
@@ -182,8 +200,8 @@ export class ComponentMeta {
 
     const { component } = configure;
     if (component) {
-      this._isContainer = component.isContainer ? true : false;
+      this._isContainer = !!component.isContainer;
-      this._isModal = component.isModal ? true : false;
+      this._isModal = !!component.isModal;
       this._descriptor = component.descriptor;
       this._rootSelector = component.rootSelector;
       if (component.nestingRule) {
@@ -208,7 +226,7 @@ export class ComponentMeta {
     return result as any;
   }
 
-  isRootComponent(includeBlock: boolean = true) {
+  isRootComponent(includeBlock = true) {
     return this.componentName === 'Page' || this.componentName === 'Component' || (includeBlock && this.componentName === 'Block');
   }
 

packages/designer/src/designer/active-tracker.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import { LocationDetail } from './location';
-import { Node,  isNode } from '../document/node/node';
+import { Node, isNode } from '../document/node/node';
 import { ComponentInstance } from '../simulator';
 import { obx } from '@ali/lowcode-editor-core';
 

packages/designer/src/designer/builtin-hotkey.ts

@@ -107,7 +107,7 @@ hotkey.bind(['command+c', 'ctrl+c', 'command+x', 'ctrl+x'], (e, action) => {
   let selected = doc.selection.getTopNodes(true);
   selected = selected.filter((node) => {
     return node.canPerformAction('copy');
-  })
+  });
   if (!selected || selected.length < 1) {
     return;
   }
@@ -242,7 +242,6 @@ hotkey.bind(['option+left', 'option+right'], (e, action) => {
       parent.insertAfter(firstNode, silbing);
     }
     firstNode?.select();
-    return;
   }
 });
 
@@ -275,7 +274,6 @@ hotkey.bind(['option+up'], (e, action) => {
       parent.insertBefore(firstNode, silbing);
     }
     firstNode?.select();
-    return;
   } else {
     const place = parent.getSuitablePlace(firstNode, null); // upwards
     if (place) {
@@ -315,7 +313,6 @@ hotkey.bind(['option+down'], (e, action) => {
       parent.insertAfter(firstNode, silbing);
     }
     firstNode?.select();
-    return;
   } else {
     const place = parent.getSuitablePlace(firstNode, null); // upwards
     if (place) {

packages/designer/src/designer/clipboard.ts

@@ -1,5 +1,5 @@
 function getDataFromPasteEvent(event: ClipboardEvent) {
-  const clipboardData = event.clipboardData;
+  const { clipboardData } = event;
   if (!clipboardData) {
     return null;
   }
@@ -14,7 +14,7 @@ function getDataFromPasteEvent(event: ClipboardEvent) {
       return data;
     } else if (data.componentName) {
       return {
-        componentsTree: [ data ]
+        componentsTree: [data],
       };
     }
   } catch (error) {
@@ -34,12 +34,13 @@ function getDataFromPasteEvent(event: ClipboardEvent) {
     return {
       code: clipboardData.getData('text/plain'),
       maps: {},
-    };*/
+    }; */
   }
 }
 
 class Clipboard {
   private copyPasters: HTMLTextAreaElement[] = [];
+
   private waitFn?: (data: any, e: ClipboardEvent) => void;
 
   isCopyPasteEvent(e: Event) {

packages/designer/src/designer/designer-view.tsx

@@ -24,7 +24,7 @@ export class DesignerView extends Component<DesignerProps & {
 
   shouldComponentUpdate(nextProps: DesignerProps) {
     this.designer.setProps(nextProps);
-    const props = this.props;
+    const { props } = this;
     if (
       nextProps.className !== props.className ||
       nextProps.style !== props.style ||
@@ -40,7 +40,7 @@ export class DesignerView extends Component<DesignerProps & {
     if (onMount) {
       onMount(this.designer);
     }
-    clipboard.injectCopyPaster(document)
+    clipboard.injectCopyPaster(document);
     this.designer.postEvent('mount', this.designer);
   }
 

packages/designer/src/designer/designer.ts

@@ -44,9 +44,13 @@ export interface DesignerProps {
 
 export class Designer {
   readonly dragon = new Dragon(this);
+
   readonly activeTracker = new ActiveTracker();
+
   readonly detecting = new Detecting();
+
   readonly project: Project;
+
   readonly editor: IEditor;
 
   get currentDocument() {
@@ -173,7 +177,7 @@ export class Designer {
       }
       this.postEvent('selection.change', this.currentSelection);
       if (this.currentSelection) {
-        const currentSelection = this.currentSelection;
+        const { currentSelection } = this;
         selectionDispose = currentSelection.onSelectionChange(() => {
           this.postEvent('selection.change', currentSelection);
         });
@@ -187,7 +191,7 @@ export class Designer {
       }
       this.postEvent('history.change', this.currentHistory);
       if (this.currentHistory) {
-        const currentHistory = this.currentHistory;
+        const { currentHistory } = this;
         historyDispose = currentHistory.onStateChange(() => {
           this.postEvent('history.change', currentHistory);
         });
@@ -217,6 +221,7 @@ export class Designer {
   get dropLocation() {
     return this._dropLocation;
   }
+
   /**
    * 创建插入位置，考虑放到 dragon 中
    */
@@ -246,6 +251,7 @@ export class Designer {
   }
 
   private oobxList: OffsetObserver[] = [];
+
   createOffsetObserver(nodeInstance: INodeSelector): OffsetObserver | null {
     const oobx = createOffsetObserver(nodeInstance);
     this.clearOobxList();
@@ -302,6 +308,7 @@ export class Designer {
   }
 
   private props?: DesignerProps;
+
   setProps(nextProps: DesignerProps) {
     const props = this.props ? { ...this.props, ...nextProps } : nextProps;
     if (this.props) {
@@ -380,6 +387,7 @@ export class Designer {
   }
 
   @obx.val private _componentMetasMap = new Map<string, ComponentMeta>();
+
   private _lostComponentMetasMap = new Map<string, ComponentMeta>();
 
   private buildComponentMetasMap(metas: ComponentMetadata[]) {
@@ -451,6 +459,7 @@ export class Designer {
   }
 
   private propsReducers = new Map<TransformStage, PropsReducer[]>();
+
   transformProps(props: CompositeObject | PropsList, node: Node, stage: TransformStage) {
     if (Array.isArray(props)) {
       // current not support, make this future
@@ -464,7 +473,7 @@ export class Designer {
 
     return reducers.reduce((xprops, reducer) => {
       try {
-        return reducer(xprops, node)
+        return reducer(xprops, node);
       } catch (e) {
         // todo: add log
         console.warn(e);

packages/designer/src/designer/detecting.ts

@@ -3,18 +3,22 @@ import { Node, DocumentModel } from '../document';
 
 export class Detecting {
   @obx.ref private _enable = true;
+
   get enable() {
     return this._enable;
   }
+
   set enable(flag: boolean) {
     this._enable = flag;
     if (!flag) {
       this._current = null;
     }
   }
+
   @obx.ref xRayMode = false;
 
   @obx.ref private _current: Node | null = null;
+
   get current() {
     return this._current;
   }

packages/designer/src/designer/drag-ghost/index.tsx

@@ -9,9 +9,13 @@ type offBinding = () => any;
 @observer
 export default class DragGhost extends Component<{ designer: Designer }> {
   private dispose: offBinding[] = [];
+
   @obx.ref private dragObject: DragObject | null = null;
+
   @obx.ref private x = 0;
+
   @obx.ref private y = 0;
+
   private dragon = this.props.designer.dragon;
 
   constructor(props: any) {
@@ -48,7 +52,7 @@ export default class DragGhost extends Component<{ designer: Designer }> {
   }
 
   renderGhostGroup() {
-    const dragObject = this.dragObject;
+    const { dragObject } = this;
     if (isDragNodeObject(dragObject)) {
       return dragObject.nodes.map(node => {
         const ghost = (

packages/designer/src/designer/dragon.ts

@@ -191,11 +191,13 @@ export class Dragon {
    * current actived sensor, 可用于感应区高亮
    */
   @obx.ref private _activeSensor: ISensor | undefined;
+
   get activeSensor(): ISensor | undefined {
     return this._activeSensor;
   }
 
   @obx.ref private _dragging = false;
+
   get dragging(): boolean {
     return this._dragging;
   }
@@ -238,7 +240,7 @@ export class Dragon {
    * @param boostEvent 拖拽初始时事件
    */
   boost(dragObject: DragObject, boostEvent: MouseEvent | DragEvent) {
-    const designer = this.designer;
+    const { designer } = this;
     const masterSensors = this.getMasterSensors();
     const handleEvents = makeEventsHandler(boostEvent, masterSensors);
     const newBie = !isDragNodeObject(dragObject);

packages/designer/src/designer/index.ts

@@ -1,4 +1,5 @@
 import './builtin-hotkey';
+
 export * from './designer';
 export * from './designer-view';
 export * from './dragon';