Compare commits

...

22 Commits

Author SHA1 Message Date
liujuping
456742eeac chore(release): publish 1.0.16-beta.7 2022-11-07 12:11:00 +08:00
liujuping
600b468ef2 Merge branch 'feat/autoRepaintNode' into release/1.0.16-beta 2022-11-07 11:50:25 +08:00
liujuping
e8fde6189c feat: add common.utils.startTransaction API to change multi nodes 2022-11-07 11:48:31 +08:00
liujuping
7a0faa48ee chore(release): publish 1.0.16-beta.6 2022-11-04 10:38:27 +08:00
liujuping
944d630e39 Merge branch 'feat/autoRepaintNode' into release/1.0.16-beta 2022-11-04 10:28:11 +08:00
liujuping
d2046cd225 feat: add common.utils.startTransaction API to change multi nodes 2022-11-04 10:27:46 +08:00
liujuping
727d04f23c Merge branch 'develop' into release/1.0.16-beta 2022-11-02 19:58:34 +08:00
liujuping
74ac483d42 chore(release): publish 1.0.16-beta.5 2022-11-02 19:53:08 +08:00
liujuping
fe5b848044 Merge branch feat/autoRepaintNode into release/1.0.16-beta 2022-11-02 19:47:03 +08:00
liujuping
3653f6a970 feat: add common.utils.startTransaction API to change multi nodes 2022-11-02 18:45:11 +08:00
liujuping
2d40d0bd07 feat: add common.utils.startTransaction API to change multi nodes 2022-11-02 18:40:37 +08:00
liujuping
e1af5a2644 chore(release): publish 1.0.16-beta.4 2022-10-31 11:10:32 +08:00
liujuping
d98b90e365 Merge branch 'develop' into release/1.0.16-beta 2022-10-31 10:59:42 +08:00
liujuping
1833160038 chore(release): publish 1.0.16-beta.3 2022-10-28 10:32:53 +08:00
liujuping
b537b92f44 Merge branch 'develop' into release/1.0.16-beta 2022-10-28 10:23:38 +08:00
liujuping
64d3de701b Merge branch 'develop' into release/1.0.16-beta 2022-10-27 20:48:26 +08:00
liujuping
42b40d244a Merge branch 'develop' into release/1.0.16-beta 2022-10-27 20:27:18 +08:00
liujuping
f9b33adc8b chore(release): publish 1.0.16-beta.2 2022-10-27 11:18:06 +08:00
liujuping
b0014ecdb9 Merge branch 'develop' into release/1.0.16-beta 2022-10-27 11:11:45 +08:00
LeoYuan 袁力皓
49194b41f2 chore(release): publish 1.0.16-beta.1 2022-10-24 15:12:56 +08:00
LeoYuan 袁力皓
298cef6f96 Merge branch 'develop' into release/1.0.16-beta 2022-10-24 15:09:16 +08:00
liujuping
67ec788f03 chore(release): publish 1.0.16-beta.0 2022-10-18 18:21:57 +08:00
28 changed files with 196 additions and 97 deletions

View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "@alilc/lowcode-designer", "name": "@alilc/lowcode-designer",
"version": "1.0.15", "version": "1.0.16-beta.7",
"description": "Designer for Ali LowCode Engine", "description": "Designer for Ali LowCode Engine",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -15,10 +15,10 @@
}, },
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@alilc/lowcode-editor-core": "1.0.15", "@alilc/lowcode-editor-core": "1.0.16-beta.7",
"@alilc/lowcode-shell": "1.0.15", "@alilc/lowcode-shell": "1.0.16-beta.7",
"@alilc/lowcode-types": "1.0.15", "@alilc/lowcode-types": "1.0.16-beta.7",
"@alilc/lowcode-utils": "1.0.15", "@alilc/lowcode-utils": "1.0.16-beta.7",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"enzyme": "^3.11.0", "enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5", "enzyme-adapter-react-16": "^1.15.5",

View File

@ -36,6 +36,7 @@ import {
hasOwnProperty, hasOwnProperty,
UtilsMetadata, UtilsMetadata,
getClosestNode, getClosestNode,
transactionManager,
} from '@alilc/lowcode-utils'; } from '@alilc/lowcode-utils';
import { import {
DragObjectType, DragObjectType,
@ -59,9 +60,8 @@ import { getClosestClickableNode } from './utils/clickable';
import { import {
ComponentMetadata, ComponentMetadata,
ComponentSchema, ComponentSchema,
TransformStage,
ActivityData,
Package, Package,
TransitionType,
} from '@alilc/lowcode-types'; } from '@alilc/lowcode-types';
import { BuiltinSimulatorRenderer } from './renderer'; import { BuiltinSimulatorRenderer } from './renderer';
import clipboard from '../designer/clipboard'; import clipboard from '../designer/clipboard';
@ -181,6 +181,14 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
*/ */
autoRender = true; autoRender = true;
stopAutoRepaintNode() {
this.renderer?.stopAutoRepaintNode();
}
enableAutoRepaintNode() {
this.renderer?.enableAutoRepaintNode();
}
constructor(project: Project) { constructor(project: Project) {
makeObservable(this); makeObservable(this);
this.project = project; this.project = project;
@ -194,6 +202,13 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
i18n: this.project.i18n, i18n: this.project.i18n,
}; };
}); });
transactionManager.onStartTransaction(() => {
this.stopAutoRepaintNode();
}, TransitionType.REPAINT);
transactionManager.onEndTransaction(() => {
this.rerender();
this.enableAutoRepaintNode();
}, TransitionType.REPAINT);
} }
get currentDocument() { get currentDocument() {

View File

@ -13,6 +13,8 @@ export interface BuiltinSimulatorRenderer {
setCopyState(state: boolean): void; setCopyState(state: boolean): void;
loadAsyncLibrary(asyncMap: { [index: string]: any }): void; loadAsyncLibrary(asyncMap: { [index: string]: any }): void;
clearState(): void; clearState(): void;
stopAutoRepaintNode(): void;
enableAutoRepaintNode(): void;
run(): void; run(): void;
} }

View File

@ -1,5 +1,5 @@
import { EventEmitter } from 'events'; import { EventEmitter } from 'events';
import { autorun, reaction, mobx, untracked, globalContext, Editor } from '@alilc/lowcode-editor-core'; import { reaction, untracked, globalContext, Editor } from '@alilc/lowcode-editor-core';
import { NodeSchema } from '@alilc/lowcode-types'; import { NodeSchema } from '@alilc/lowcode-types';
import { History as ShellHistory } from '@alilc/lowcode-shell'; import { History as ShellHistory } from '@alilc/lowcode-shell';
@ -32,14 +32,14 @@ export class History<T = NodeSchema> {
this.currentSerialization = serialization; this.currentSerialization = serialization;
} }
constructor(dataFn: () => T, private redoer: (data: T) => void, private timeGap: number = 1000) { constructor(dataFn: () => T | null, private redoer: (data: T) => void, private timeGap: number = 1000) {
this.session = new Session(0, null, this.timeGap); this.session = new Session(0, null, this.timeGap);
this.records = [this.session]; this.records = [this.session];
reaction(() => { reaction((): any => {
if (this.asleep) return null;
return dataFn(); return dataFn();
}, (data: T) => { }, (data: T) => {
if (this.asleep) return;
untracked(() => { untracked(() => {
const log = this.currentSerialization.serialize(data); const log = this.currentSerialization.serialize(data);
if (this.session.isActive()) { if (this.session.isActive()) {
@ -56,7 +56,6 @@ export class History<T = NodeSchema> {
this.emitter.emit('statechange', currentState); this.emitter.emit('statechange', currentState);
} }
} }
// }
}); });
}, { fireImmediately: true }); }, { fireImmediately: true });
} }
@ -69,11 +68,11 @@ export class History<T = NodeSchema> {
return this.point !== this.session.cursor; return this.point !== this.session.cursor;
} }
private sleep() { sleep() {
this.asleep = true; this.asleep = true;
} }
private wakeup() { wakeup() {
this.asleep = false; this.asleep = false;
} }

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
import { isFormEvent, compatibleLegaoSchema, getNodeSchemaById } from '@alilc/lowcode-utils'; import { isFormEvent, compatibleLegaoSchema, getNodeSchemaById, transactionManager } from '@alilc/lowcode-utils';
import { isNodeSchema } from '@alilc/lowcode-types'; import { isNodeSchema } from '@alilc/lowcode-types';
import { getConvertedExtraKey, getOriginalExtraKey, isNode, isSettingField } from '@alilc/lowcode-designer'; import { getConvertedExtraKey, getOriginalExtraKey } from '@alilc/lowcode-designer';
const utils = { const utils = {
isNodeSchema, isNodeSchema,
@ -9,6 +9,7 @@ const utils = {
getNodeSchemaById, getNodeSchemaById,
getConvertedExtraKey, getConvertedExtraKey,
getOriginalExtraKey, getOriginalExtraKey,
startTransaction: transactionManager.startTransaction,
}; };
export default utils; export default utils;

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "@alilc/lowcode-rax-renderer", "name": "@alilc/lowcode-rax-renderer",
"version": "1.0.15", "version": "1.0.16-beta.7",
"description": "Rax renderer for Ali lowCode engine", "description": "Rax renderer for Ali lowCode engine",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -30,8 +30,8 @@
"build": "build-scripts build" "build": "build-scripts build"
}, },
"dependencies": { "dependencies": {
"@alilc/lowcode-renderer-core": "1.0.15", "@alilc/lowcode-renderer-core": "1.0.16-beta.7",
"@alilc/lowcode-utils": "1.0.15", "@alilc/lowcode-utils": "1.0.16-beta.7",
"rax-find-dom-node": "^1.0.1" "rax-find-dom-node": "^1.0.1"
}, },
"devDependencies": { "devDependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@alilc/lowcode-rax-simulator-renderer", "name": "@alilc/lowcode-rax-simulator-renderer",
"version": "1.0.15", "version": "1.0.16-beta.7",
"description": "rax simulator renderer for alibaba lowcode designer", "description": "rax simulator renderer for alibaba lowcode designer",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -13,10 +13,10 @@
"build:umd": "build-scripts build --config build.umd.json" "build:umd": "build-scripts build --config build.umd.json"
}, },
"dependencies": { "dependencies": {
"@alilc/lowcode-designer": "1.0.15", "@alilc/lowcode-designer": "1.0.16-beta.7",
"@alilc/lowcode-rax-renderer": "1.0.15", "@alilc/lowcode-rax-renderer": "1.0.16-beta.7",
"@alilc/lowcode-types": "1.0.15", "@alilc/lowcode-types": "1.0.16-beta.7",
"@alilc/lowcode-utils": "1.0.15", "@alilc/lowcode-utils": "1.0.16-beta.7",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"driver-universal": "^3.1.3", "driver-universal": "^3.1.3",
"history": "^5.0.0", "history": "^5.0.0",

View File

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

View File

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

View File

@ -349,6 +349,11 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer {
* *
*/ */
autoRender = true; autoRender = true;
/**
*
*/
autoRepaintNode = true;
/** /**
* *
*/ */
@ -491,6 +496,14 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer {
this._appContext = { ...this._appContext }; this._appContext = { ...this._appContext };
} }
stopAutoRepaintNode() {
this.autoRepaintNode = false;
}
enableAutoRepaintNode() {
this.autoRepaintNode = true;
}
dispose() { dispose() {
this.disposeFunctions.forEach(fn => fn()); this.disposeFunctions.forEach(fn => fn());
this.documentInstances.forEach(docInst => docInst.dispose()); this.documentInstances.forEach(docInst => docInst.dispose());

View File

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

View File

@ -102,14 +102,23 @@ function initRerenderEvent({
leaf, leaf,
dispose: [ dispose: [
leaf?.onPropChange?.(() => { leaf?.onPropChange?.(() => {
if (!container.autoRepaintNode) {
return;
}
__debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onPropsChange make rerender`); __debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onPropsChange make rerender`);
container.rerender(); container.rerender();
}), }),
leaf?.onChildrenChange?.(() => { leaf?.onChildrenChange?.(() => {
if (!container.autoRepaintNode) {
return;
}
__debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onChildrenChange make rerender`); __debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onChildrenChange make rerender`);
container.rerender(); container.rerender();
}) as Function, }) as Function,
leaf?.onVisibleChange?.(() => { leaf?.onVisibleChange?.(() => {
if (!container.autoRepaintNode) {
return;
}
__debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onVisibleChange make rerender`); __debug(`${schema.componentName}[${schema.id}] leaf not render in SimulatorRendererView, leaf onVisibleChange make rerender`);
container.rerender(); container.rerender();
}), }),
@ -213,14 +222,18 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
} }
componentDidMount() { componentDidMount() {
const _leaf = this.leaf;
this.initOnPropsChangeEvent(_leaf);
this.initOnChildrenChangeEvent(_leaf);
this.initOnVisibleChangeEvent(_leaf);
this.recordTime(); this.recordTime();
} }
get defaultState() { getDefaultState(nextProps: any) {
const { const {
hidden = false, hidden = false,
condition = true, condition = true,
} = this.leaf?.export?.(TransformStage.Render) || {}; } = nextProps.__inner__ || {};
return { return {
nodeChildren: null, nodeChildren: null,
childrenInState: false, childrenInState: false,
@ -236,11 +249,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
// 监听以下事件,当变化时更新自己 // 监听以下事件,当变化时更新自己
__debug(`${schema.componentName}[${this.props.componentId}] leaf render in SimulatorRendererView`); __debug(`${schema.componentName}[${this.props.componentId}] leaf render in SimulatorRendererView`);
clearRerenderEvent(componentCacheId); clearRerenderEvent(componentCacheId);
const _leaf = this.leaf; this.curEventLeaf = this.leaf;
this.initOnPropsChangeEvent(_leaf);
this.initOnChildrenChangeEvent(_leaf);
this.initOnVisibleChangeEvent(_leaf);
this.curEventLeaf = _leaf;
cache.ref.set(componentCacheId, { cache.ref.set(componentCacheId, {
makeUnitRender: this.makeUnitRender, makeUnitRender: this.makeUnitRender,
@ -248,7 +257,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
let cacheState = cache.state.get(componentCacheId); let cacheState = cache.state.get(componentCacheId);
if (!cacheState || cacheState.__tag !== props.__tag) { if (!cacheState || cacheState.__tag !== props.__tag) {
cacheState = this.defaultState; cacheState = this.getDefaultState(props);
} }
this.state = cacheState; this.state = cacheState;
@ -279,6 +288,10 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
singleRender?: boolean; singleRender?: boolean;
}; };
get autoRepaintNode() {
return container.autoRepaintNode;
}
judgeMiniUnitRender() { judgeMiniUnitRender() {
if (!this.renderUnitInfo) { if (!this.renderUnitInfo) {
this.getRenderUnitInfo(); this.getRenderUnitInfo();
@ -380,13 +393,16 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
const { const {
visible, visible,
...resetState ...resetState
} = this.defaultState; } = this.getDefaultState(nextProps);
this.setState(resetState); this.setState(resetState);
} }
/** 监听参数变化 */ /** 监听参数变化 */
initOnPropsChangeEvent(leaf = this.leaf): void { initOnPropsChangeEvent(leaf = this.leaf): void {
const dispose = leaf?.onPropChange?.(debounce((propChangeInfo: PropChangeOptions) => { const dispose = leaf?.onPropChange?.((propChangeInfo: PropChangeOptions) => {
if (!this.autoRepaintNode) {
return;
}
const { const {
key, key,
newValue = null, newValue = null,
@ -433,7 +449,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
}); });
this.judgeMiniUnitRender(); this.judgeMiniUnitRender();
}, 30)); });
dispose && this.disposeFunctions.push(dispose); dispose && this.disposeFunctions.push(dispose);
} }
@ -443,6 +459,9 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
*/ */
initOnVisibleChangeEvent(leaf = this.leaf) { initOnVisibleChangeEvent(leaf = this.leaf) {
const dispose = leaf?.onVisibleChange?.((flag: boolean) => { const dispose = leaf?.onVisibleChange?.((flag: boolean) => {
if (!this.autoRepaintNode) {
return;
}
if (this.state.visible === flag) { if (this.state.visible === flag) {
return; return;
} }
@ -463,6 +482,9 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
*/ */
initOnChildrenChangeEvent(leaf = this.leaf) { initOnChildrenChangeEvent(leaf = this.leaf) {
const dispose = leaf?.onChildrenChange?.((param): void => { const dispose = leaf?.onChildrenChange?.((param): void => {
if (!this.autoRepaintNode) {
return;
}
const { const {
type, type,
node, node,
@ -540,6 +562,8 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
ref: forwardedRef, ref: forwardedRef,
}; };
delete compProps.__inner__;
return engine.createElement(Comp, compProps, this.hasChildren ? this.children : null); return engine.createElement(Comp, compProps, this.hasChildren ? this.children : null);
} }
} }

View File

@ -670,7 +670,14 @@ export default function baseRendererFactory(): IBaseRenderComponent {
} }
} }
} }
return renderComp({ ...props, ...otherProps }); return renderComp({
...props,
...otherProps,
__inner__: {
hidden: schema.hidden,
condition,
},
});
} catch (e) { } catch (e) {
return engine.createElement(engine.getFaultComponent(), { return engine.createElement(engine.getFaultComponent(), {
error: e, error: e,

View File

@ -35,7 +35,8 @@ const baseRenderer: any = {
__container: { __container: {
rerender: () => { rerender: () => {
rerenderCount = 1 + rerenderCount; rerenderCount = 1 + rerenderCount;
} },
autoRepaintNode: true,
}, },
documentId: '01' documentId: '01'
}, },

View File

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

View File

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

View File

@ -21,3 +21,4 @@ export * from './code-result';
export * from './assets'; export * from './assets';
export * as GlobalEvent from './event'; export * as GlobalEvent from './event';
export * from './disposable'; export * from './disposable';
export * from './start-transaction';

View File

@ -0,0 +1,4 @@
export enum TransitionType {
/** 节点更新后重绘处理 */
REPAINT
}

View File

@ -1,6 +1,6 @@
{ {
"name": "@alilc/lowcode-utils", "name": "@alilc/lowcode-utils",
"version": "1.0.15", "version": "1.0.16-beta.7",
"description": "Utils for Ali lowCode engine", "description": "Utils for Ali lowCode engine",
"files": [ "files": [
"lib", "lib",
@ -14,7 +14,7 @@
}, },
"dependencies": { "dependencies": {
"@alifd/next": "^1.19.16", "@alifd/next": "^1.19.16",
"@alilc/lowcode-types": "1.0.15", "@alilc/lowcode-types": "1.0.16-beta.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"react": "^16", "react": "^16",
"zen-logger": "^1.1.0" "zen-logger": "^1.1.0"

View File

@ -26,3 +26,4 @@ export * from './node-helper';
export * from './clone-enumerable-property'; export * from './clone-enumerable-property';
export * from './logger'; export * from './logger';
export * as css from './css-helper'; export * as css from './css-helper';
export { transactionManager } from './start-transaction';

View File

@ -0,0 +1,31 @@
import { TransitionType } from '@alilc/lowcode-types';
import { transaction } from 'mobx';
import EventEmitter from 'events';
class TransactionManager {
emitter = new EventEmitter();
startTransaction = (fn: () => void, type: TransitionType = TransitionType.REPAINT): void => {
this.emitter.emit(`[${type}]startTransaction`);
transaction(fn);
this.emitter.emit(`[${type}]endTransaction`);
};
onStartTransaction = (fn: () => void, type: TransitionType = TransitionType.REPAINT): () => void => {
this.emitter.on(`[${type}]startTransaction`, fn);
return () => {
this.emitter.off(`[${type}]startTransaction`, fn);
};
};
onEndTransaction = (fn: () => void, type: TransitionType = TransitionType.REPAINT): () => void => {
this.emitter.on(`[${type}]endTransaction`, fn);
return () => {
this.emitter.off(`[${type}]endTransaction`, fn);
};
};
}
export const transactionManager = new TransactionManager();
export default transactionManager;