Compare commits

..

19 Commits

Author SHA1 Message Date
GitHub Action
5fd0b67495 chore(release): publish 1.3.2-beta.6 2024-02-04 08:50:00 +00:00
liujuping
36f21edb97 Merge branch 'develop' into release/1.3.2-beta 2024-02-04 16:43:29 +08:00
GitHub Action
19db466aaf chore(release): publish 1.3.2-beta.5 2024-02-01 08:40:07 +00:00
JackLian
170a45d949 chore: merge from develop 2024-02-01 16:27:27 +08:00
GitHub Action
719dfc0e68 chore(release): publish 1.3.2-beta.4 2024-02-01 06:58:38 +00:00
liujuping
8e3529f2a2 feat: update test package.yaml 2024-02-01 14:50:05 +08:00
liujuping
07dccbea6b refactor(plugin-command): add plugin-command package 2024-02-01 14:45:59 +08:00
liujuping
e093a42c4a refactor(plugin-command): add plugin-command package 2024-02-01 12:55:30 +08:00
GitHub Action
8934813efa chore(release): publish 1.3.2-beta.3 2024-02-01 01:11:45 +00:00
liujuping
238828c6d4 feat: update ts defined 2024-02-01 09:05:23 +08:00
liujuping
ac1d462dc5 fix(workspace): fix workspace.plugins.xxx api is invalid 2024-02-01 09:05:22 +08:00
GitHub Action
588ff54268 chore(release): publish 1.3.2-beta.2 2024-01-30 08:47:52 +00:00
liujuping
1ae217df8d Merge branch 'develop' into release/1.3.2-beta 2024-01-30 16:41:37 +08:00
GitHub Action
4a167ddcb2 chore(release): publish 1.3.2-beta.1 2024-01-26 09:42:53 +00:00
liujuping
7f6fde759b feat(setter): add field ts 2024-01-26 17:18:50 +08:00
GitHub Action
cbe27a7b1e chore(docs): publish documentation 2024-01-26 17:18:50 +08:00
liujuping
cb3e79f756 docs(demo): add dialog use desc 2024-01-26 17:18:50 +08:00
GitHub Action
add1767509 chore(release): publish 1.3.2-beta.0 2024-01-25 09:10:13 +00:00
JackLian
b0e5b4e6f8 chore(docs): minor change of readme 2024-01-25 17:04:02 +08:00
22 changed files with 76 additions and 88 deletions

2
.github/CODEOWNERS vendored
View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-designer",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-editor-core": "1.3.2-beta.6",
"@alilc/lowcode-types": "1.3.2-beta.6",
"@alilc/lowcode-utils": "1.3.2-beta.6",
"classnames": "^2.2.6",
"react": "^16",
"react-dom": "^16.7.0",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-editor-core",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-types": "1.3.2-beta.6",
"@alilc/lowcode-utils": "1.3.2-beta.6",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"intl-messageformat": "^9.3.1",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-editor-skeleton",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-designer": "1.3.2-beta.6",
"@alilc/lowcode-editor-core": "1.3.2-beta.6",
"@alilc/lowcode-types": "1.3.2-beta.6",
"@alilc/lowcode-utils": "1.3.2-beta.6",
"classnames": "^2.2.6",
"react": "^16.8.1",
"react-dom": "^16.8.1"

View File

@ -174,5 +174,6 @@ About Pull Request:
Special thanks to everyone who contributed to this project.
<p>
<a href="https://github.com/alibaba/lowcode-engine/graphs/contributors"><img src="https://contrib.rocks/image?repo=alibaba/lowcode-engine" /></a>
</p>

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-engine",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-editor-skeleton": "1.3.2",
"@alilc/lowcode-designer": "1.3.2-beta.6",
"@alilc/lowcode-editor-core": "1.3.2-beta.6",
"@alilc/lowcode-editor-skeleton": "1.3.2-beta.6",
"@alilc/lowcode-engine-ext": "^1.0.0",
"@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",
"@alilc/lowcode-plugin-command": "1.3.1",
"@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",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-plugin-command",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-utils": "1.3.2"
"@alilc/lowcode-types": "^1.3.1",
"@alilc/lowcode-utils": "^1.3.1"
},
"devDependencies": {
"@alib/build-scripts": "^0.1.18"

View File

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

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-react-renderer",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2"
"@alilc/lowcode-renderer-core": "1.3.2-beta.6"
},
"devDependencies": {
"@alib/build-scripts": "^0.1.18",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-react-simulator-renderer",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-react-renderer": "1.3.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-designer": "1.3.2-beta.6",
"@alilc/lowcode-react-renderer": "1.3.2-beta.6",
"@alilc/lowcode-types": "1.3.2-beta.6",
"@alilc/lowcode-utils": "1.3.2-beta.6",
"classnames": "^2.2.6",
"mobx": "^6.3.0",
"mobx-react": "^7.2.0",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-renderer-core",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-types": "1.3.2-beta.6",
"@alilc/lowcode-utils": "1.3.2-beta.6",
"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.2",
"@alilc/lowcode-designer": "1.3.2-beta.6",
"@babel/plugin-transform-typescript": "^7.16.8",
"@testing-library/react": "^11.2.2",
"@types/classnames": "^2.2.11",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-shell",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.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",
"@alilc/lowcode-designer": "1.3.2-beta.6",
"@alilc/lowcode-editor-core": "1.3.2-beta.6",
"@alilc/lowcode-editor-skeleton": "1.3.2-beta.6",
"@alilc/lowcode-types": "1.3.2-beta.6",
"@alilc/lowcode-utils": "1.3.2-beta.6",
"@alilc/lowcode-workspace": "1.3.2-beta.6",
"classnames": "^2.2.6",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",

View File

@ -3,7 +3,7 @@ import {
IDesigner,
isComponentMeta,
} from '@alilc/lowcode-designer';
import { IPublicTypeAssetsJson, getLogger } from '@alilc/lowcode-utils';
import { IPublicTypeAssetsJson } from '@alilc/lowcode-utils';
import {
IPublicTypeComponentAction,
IPublicTypeComponentMetadata,
@ -21,8 +21,6 @@ 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;
@ -33,10 +31,6 @@ 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;
}

View File

@ -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;
}

View File

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

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-workspace",
"version": "1.3.2",
"version": "1.3.2-beta.6",
"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.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-designer": "1.3.2-beta.6",
"@alilc/lowcode-editor-core": "1.3.2-beta.6",
"@alilc/lowcode-editor-skeleton": "1.3.2-beta.6",
"@alilc/lowcode-types": "1.3.2-beta.6",
"@alilc/lowcode-utils": "1.3.2-beta.6",
"classnames": "^2.2.6",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",

View File

@ -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,13 +62,6 @@ 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;
@ -82,10 +75,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;
@ -153,7 +146,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);
}
}
@ -197,14 +190,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);