Merge pull request #3050 from alibaba/chore/update-codeowners

chore: update code owners

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence
-* @liujuping @JackLian
+* @liujuping @1ncounter
 
 /modules/material-parser @akirakai
 /modules/code-generator @qingniaotonghua

.github/workflows/publish engine.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     if: >-
       contains(github.ref, 'refs/heads/release/') &&
-      (github.actor == 'JackLian' || github.actor == 'liujuping')
+      (github.actor == '1ncounter' || github.actor == 'liujuping')
     steps:
       - uses: actions/checkout@v2
       - name: Setup Node.js

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "4.0.0",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

packages/designer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-designer",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Designer for Ali LowCode Engine",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -15,9 +15,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@alilc/lowcode-editor-core": "1.3.1",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-editor-core": "1.3.2",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "classnames": "^2.2.6",
     "react": "^16",
     "react-dom": "^16.7.0",

packages/editor-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-editor-core",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Core Api for Ali lowCode engine",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@alifd/next": "^1.19.16",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "classnames": "^2.2.6",
     "debug": "^4.1.1",
     "intl-messageformat": "^9.3.1",

packages/editor-skeleton/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-editor-skeleton",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "alibaba lowcode editor skeleton",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -19,10 +19,10 @@
   ],
   "dependencies": {
     "@alifd/next": "^1.20.12",
-    "@alilc/lowcode-designer": "1.3.1",
-    "@alilc/lowcode-editor-core": "1.3.1",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-designer": "1.3.2",
+    "@alilc/lowcode-editor-core": "1.3.2",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "classnames": "^2.2.6",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"

packages/engine/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-engine",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "An enterprise-class low-code technology stack with scale-out design / 一套面向扩展设计的企业级低代码技术体系",
   "main": "lib/engine-core.js",
   "module": "es/engine-core.js",
@@ -19,16 +19,16 @@
   "license": "MIT",
   "dependencies": {
     "@alifd/next": "^1.19.12",
-    "@alilc/lowcode-designer": "1.3.1",
-    "@alilc/lowcode-editor-core": "1.3.1",
-    "@alilc/lowcode-editor-skeleton": "1.3.1",
+    "@alilc/lowcode-designer": "1.3.2",
+    "@alilc/lowcode-editor-core": "1.3.2",
+    "@alilc/lowcode-editor-skeleton": "1.3.2",
     "@alilc/lowcode-engine-ext": "^1.0.0",
-    "@alilc/lowcode-plugin-designer": "1.3.1",
-    "@alilc/lowcode-plugin-outline-pane": "1.3.1",
-    "@alilc/lowcode-shell": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
-    "@alilc/lowcode-workspace": "1.3.1",
-    "@alilc/lowcode-plugin-command": "1.3.1",
+    "@alilc/lowcode-plugin-command": "1.3.2",
+    "@alilc/lowcode-plugin-designer": "1.3.2",
+    "@alilc/lowcode-plugin-outline-pane": "1.3.2",
+    "@alilc/lowcode-shell": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
+    "@alilc/lowcode-workspace": "1.3.2",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },

packages/ignitor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-ignitor",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "点火器，bootstrap lce project",
   "main": "lib/index.js",
   "private": true,

packages/plugin-command/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-plugin-command",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "> TODO: description",
   "author": "liujuping <liujup@foxmail.com>",
   "homepage": "https://github.com/alibaba/lowcode-engine#readme",
@@ -30,8 +30,8 @@
     "url": "https://github.com/alibaba/lowcode-engine/issues"
   },
   "dependencies": {
-    "@alilc/lowcode-types": "^1.3.1",
-    "@alilc/lowcode-utils": "^1.3.1"
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2"
   },
   "devDependencies": {
     "@alib/build-scripts": "^0.1.18"

packages/plugin-designer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-plugin-designer",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "alibaba lowcode editor designer plugin",
   "files": [
     "es",
@@ -18,9 +18,9 @@
   ],
   "author": "xiayang.xy",
   "dependencies": {
-    "@alilc/lowcode-designer": "1.3.1",
-    "@alilc/lowcode-editor-core": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-designer": "1.3.2",
+    "@alilc/lowcode-editor-core": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },

packages/plugin-outline-pane/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-plugin-outline-pane",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Outline pane for Ali lowCode engine",
   "files": [
     "es",
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@alifd/next": "^1.19.16",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "classnames": "^2.2.6",
     "react": "^16",
     "react-dom": "^16.7.0",

packages/react-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-react-renderer",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "react renderer for ali lowcode engine",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -22,7 +22,7 @@
   ],
   "dependencies": {
     "@alifd/next": "^1.21.16",
-    "@alilc/lowcode-renderer-core": "1.3.1"
+    "@alilc/lowcode-renderer-core": "1.3.2"
   },
   "devDependencies": {
     "@alib/build-scripts": "^0.1.18",

packages/react-simulator-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-react-simulator-renderer",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "react simulator renderer for alibaba lowcode designer",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -17,10 +17,10 @@
     "test:cov": "build-scripts test --config build.test.json --jest-coverage"
   },
   "dependencies": {
-    "@alilc/lowcode-designer": "1.3.1",
-    "@alilc/lowcode-react-renderer": "1.3.1",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-designer": "1.3.2",
+    "@alilc/lowcode-react-renderer": "1.3.2",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "classnames": "^2.2.6",
     "mobx": "^6.3.0",
     "mobx-react": "^7.2.0",

packages/renderer-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-renderer-core",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "renderer core",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@alilc/lowcode-datasource-engine": "^1.0.0",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "classnames": "^2.2.6",
     "debug": "^4.1.1",
     "fetch-jsonp": "^1.1.3",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@alib/build-scripts": "^0.1.18",
     "@alifd/next": "^1.26.0",
-    "@alilc/lowcode-designer": "1.3.1",
+    "@alilc/lowcode-designer": "1.3.2",
     "@babel/plugin-transform-typescript": "^7.16.8",
     "@testing-library/react": "^11.2.2",
     "@types/classnames": "^2.2.11",

packages/shell/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-shell",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Shell Layer for AliLowCodeEngine",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -13,12 +13,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@alilc/lowcode-designer": "1.3.1",
-    "@alilc/lowcode-editor-core": "1.3.1",
-    "@alilc/lowcode-editor-skeleton": "1.3.1",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
-    "@alilc/lowcode-workspace": "1.3.1",
+    "@alilc/lowcode-designer": "1.3.2",
+    "@alilc/lowcode-editor-core": "1.3.2",
+    "@alilc/lowcode-editor-skeleton": "1.3.2",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
+    "@alilc/lowcode-workspace": "1.3.2",
     "classnames": "^2.2.6",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.5",

packages/shell/src/api/material.ts

@@ -3,7 +3,7 @@ import {
   IDesigner,
   isComponentMeta,
 } from '@alilc/lowcode-designer';
-import { IPublicTypeAssetsJson } from '@alilc/lowcode-utils';
+import { IPublicTypeAssetsJson, getLogger } from '@alilc/lowcode-utils';
 import {
   IPublicTypeComponentAction,
   IPublicTypeComponentMetadata,
@@ -21,6 +21,8 @@ import { editorSymbol, designerSymbol } from '../symbols';
 import { ComponentMeta as ShellComponentMeta } from '../model';
 import { ComponentType } from 'react';
 
+const logger = getLogger({ level: 'warn', bizName: 'shell-material' });
+
 const innerEditorSymbol = Symbol('editor');
 export class Material implements IPublicApiMaterial {
   private readonly [innerEditorSymbol]: IPublicModelEditor;
@@ -31,6 +33,10 @@ export class Material implements IPublicApiMaterial {
     }
     const workspace: InnerWorkspace = globalContext.get('workspace');
     if (workspace.isActive) {
+      if (!workspace.window.editor) {
+        logger.error('Material api 调用时机出现问题，请检查');
+        return this[innerEditorSymbol];
+      }
       return workspace.window.editor;
     }
 

packages/shell/src/model/window.ts

@@ -48,8 +48,8 @@ export class Window implements IPublicModelWindow {
   }
 
   get currentEditorView() {
-    if (this[windowSymbol].editorView) {
-      return new EditorView(this[windowSymbol].editorView).toProxy() as any;
+    if (this[windowSymbol]._editorView) {
+      return new EditorView(this[windowSymbol]._editorView).toProxy() as any;
     }
     return null;
   }

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-types",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Types for Ali lowCode engine",
   "files": [
     "es",

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-utils",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Utils for Ali lowCode engine",
   "files": [
     "lib",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@alifd/next": "^1.19.16",
-    "@alilc/lowcode-types": "1.3.1",
+    "@alilc/lowcode-types": "1.3.2",
     "lodash": "^4.17.21",
     "mobx": "^6.3.0",
     "prop-types": "^15.8.1",

packages/workspace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-workspace",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Shell Layer for AliLowCodeEngine",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -15,11 +15,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@alilc/lowcode-designer": "1.3.1",
-    "@alilc/lowcode-editor-core": "1.3.1",
-    "@alilc/lowcode-editor-skeleton": "1.3.1",
-    "@alilc/lowcode-types": "1.3.1",
-    "@alilc/lowcode-utils": "1.3.1",
+    "@alilc/lowcode-designer": "1.3.2",
+    "@alilc/lowcode-editor-core": "1.3.2",
+    "@alilc/lowcode-editor-skeleton": "1.3.2",
+    "@alilc/lowcode-types": "1.3.2",
+    "@alilc/lowcode-utils": "1.3.2",
     "classnames": "^2.2.6",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.5",

packages/workspace/src/window.ts

@@ -17,7 +17,7 @@ export interface IEditorWindow extends Omit<IPublicModelWindow<IResource>, 'chan
 
   editorViews: Map<string, IViewContext>;
 
-  editorView: IViewContext;
+  _editorView: IViewContext;
 
   changeViewName: (name: string, ignoreEmit?: boolean) => void;
 
@@ -54,7 +54,7 @@ export class EditorWindow implements IEditorWindow {
 
   url: string | undefined;
 
-  @obx.ref editorView: Context;
+  @obx.ref _editorView: Context;
 
   @obx editorViews: Map<string, Context> = new Map<string, Context>();
 
@@ -62,6 +62,13 @@ export class EditorWindow implements IEditorWindow {
 
   sleep: boolean | undefined;
 
+  get editorView() {
+    if (!this._editorView) {
+      return this.editorViews.values().next().value;
+    }
+    return this._editorView;
+  }
+
   constructor(readonly resource: IResource, readonly workspace: IWorkspace, private config: IWindowCOnfig) {
     makeObservable(this);
     this.title = config.title;
@@ -75,10 +82,10 @@ export class EditorWindow implements IEditorWindow {
   updateState(state: WINDOW_STATE): void {
     switch (state) {
       case WINDOW_STATE.active:
-        this.editorView?.setActivate(true);
+        this._editorView?.setActivate(true);
         break;
       case WINDOW_STATE.inactive:
-        this.editorView?.setActivate(false);
+        this._editorView?.setActivate(false);
         break;
       case WINDOW_STATE.destroyed:
         break;
@@ -146,7 +153,7 @@ export class EditorWindow implements IEditorWindow {
     for (let i = 0; i < editorViews.length; i++) {
       const name = editorViews[i].viewName;
       await this.initViewType(name);
-      if (!this.editorView) {
+      if (!this._editorView) {
         this.changeViewName(name);
       }
     }
@@ -190,14 +197,14 @@ export class EditorWindow implements IEditorWindow {
   };
 
   changeViewName = (name: string, ignoreEmit: boolean = true) => {
-    this.editorView?.setActivate(false);
-    this.editorView = this.editorViews.get(name)!;
+    this._editorView?.setActivate(false);
+    this._editorView = this.editorViews.get(name)!;
 
-    if (!this.editorView) {
+    if (!this._editorView) {
       return;
     }
 
-    this.editorView.setActivate(true);
+    this._editorView.setActivate(true);
 
     if (!ignoreEmit) {
       this.emitter.emit('window.change.view.type', name);