@ibiz-template/runtime 0.5.0-beta.5 → 0.5.1-beta.1

package/out/service/vo/tree-node-data/tree-code-list-node-data.d.ts

@@ -10,9 +10,9 @@ import { TreeNodeData } from './tree-node-data';
  * @implements {ITreeNodeData}
  */
 export declare class TreeCodeListNodeData extends TreeNodeData implements ITreeNodeData {
-    text: string;
-    id: string;
-    value: string;
+    _text: string;
+    _id: string;
+    _value: string;
     constructor(model: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: {
         data: CodeListItem;
         leaf: boolean;

package/out/service/vo/tree-node-data/tree-code-list-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CA8BJ"}
+{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;gBAGb,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CA8BJ"}

package/out/service/vo/tree-node-data/tree-code-list-node-data.js

@@ -12,13 +12,13 @@ export class TreeCodeListNodeData extends TreeNodeData {
     constructor(model, parentNodeData, opts) {
         super(model, parentNodeData, opts);
         const { data } = opts;
-        this.text = data.text;
-        this.value = data.value;
+        this._text = data.text;
+        this._value = data.value;
         // id小写
-        const selfId = `${model.id}@${this.value}`.toLowerCase();
+        const selfId = `${model.id}@${this._value}`.toLowerCase();
         Object.defineProperty(this, 'id', {
             get() {
-                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+                return this._parent ? `${this._parent.id}:${selfId}` : selfId;
             },
             enumerable: true,
             configurable: true,
@@ -26,12 +26,12 @@ export class TreeCodeListNodeData extends TreeNodeData {
         // 实体节点额外添加上自己的实体上下文
         if (model.appDataEntityId) {
             const deName = calcDeCodeNameById(model.appDataEntityId);
-            this.context = Object.assign(this.context || {}, {
-                [deName]: this.value,
+            this._context = Object.assign(this._context || {}, {
+                [deName]: this._value,
             });
         }
-        this.srfkey = this.value;
-        this.srfmajortext = this.text;
-        this.icon = this.calcIcon(model);
+        this.srfkey = this._value;
+        this.srfmajortext = this._text;
+        this._icon = this.calcIcon(model);
     }
 }

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts

@@ -10,10 +10,10 @@ import { TreeNodeData } from './tree-node-data';
  * @implements {ITreeNodeData}
  */
 export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
-    text: string;
-    id: string;
-    value: string;
-    deData: IData;
+    _text: string;
+    _id: string;
+    _value: string;
+    _deData: IData;
     constructor(model: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: {
         data: IData;
         leaf: boolean;

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA6FH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA0FH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}

package/out/service/vo/tree-node-data/tree-data-set-node-data.js

@@ -16,18 +16,18 @@ export class TreeDataSetNodeData extends TreeNodeData {
         var _a;
         super(model, parentNodeData, opts);
         const { data } = opts;
-        this.deData = data;
-        this.text = model.textAppDEFieldId
+        this._deData = data;
+        this._text = model.textAppDEFieldId
             ? data[model.textAppDEFieldId]
             : data.srfmajortext;
-        this.value = model.idAppDEFieldId
+        this._value = model.idAppDEFieldId
             ? data[model.idAppDEFieldId]
             : data.srfkey;
         // id小写
         const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
         Object.defineProperty(this, 'id', {
             get() {
-                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+                return this._parent ? `${this._parent.id}:${selfId}` : selfId;
             },
             enumerable: true,
             configurable: true,
@@ -35,17 +35,15 @@ export class TreeDataSetNodeData extends TreeNodeData {
         // 实体节点额外添加上自己的实体上下文
         if (model.appDataEntityId) {
             const deName = calcDeCodeNameById(model.appDataEntityId);
-            this.context = Object.assign(this.context || {}, {
+            this._context = Object.assign(this._context || {}, {
                 [deName]: data.srfkey,
             });
         }
-        this.srfkey = this.deData.srfkey;
-        this.srfmajortext = this.deData.srfmajortext;
-        this.icon = this.calcIcon(model);
-        this.textHtml = this.calcTextHtml(model);
+        this._icon = this.calcIcon(model);
+        this._textHtml = this.calcTextHtml(model);
         // 识别叶子节点标识属性，根据后台数据赋值leaf
         if (model.leafFlagAppDEFieldId) {
-            this.leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
+            this._leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
         }
         /** 数据项映射 */
         const dataItemkeyMap = new Map();
@@ -61,11 +59,11 @@ export class TreeDataSetNodeData extends TreeNodeData {
         });
         return new Proxy(this, {
             set(target, p, value) {
-                if (Object.prototype.hasOwnProperty.call(target.deData, p)) {
-                    target.deData[p] = value;
+                if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
+                    target._deData[p] = value;
                 }
                 else if (dataItemkeyMap.has(p)) {
-                    target.deData[dataItemkeyMap.get(p)] = value;
+                    target._deData[dataItemkeyMap.get(p)] = value;
                 }
                 else {
                     target[p] = value;
@@ -77,10 +75,10 @@ export class TreeDataSetNodeData extends TreeNodeData {
                     return target[p];
                 }
                 if (dataItemkeyMap.has(p)) {
-                    return target.deData[dataItemkeyMap.get(p)] || dataItemDefaults[p];
+                    return target._deData[dataItemkeyMap.get(p)] || dataItemDefaults[p];
                 }
-                if (target.deData[p] !== undefined) {
-                    return target.deData[p];
+                if (target._deData[p] !== undefined) {
+                    return target._deData[p];
                 }
             },
             ownKeys(target) {
@@ -89,7 +87,7 @@ export class TreeDataSetNodeData extends TreeNodeData {
                     ...new Set([
                         ...Object.keys(target),
                         ...dataItemkeyMap.keys(),
-                        ...Object.keys(target.deData),
+                        ...Object.keys(target._deData),
                     ]),
                 ];
                 updateKeyDefine(target, allKeys);
@@ -100,11 +98,11 @@ export class TreeDataSetNodeData extends TreeNodeData {
     calcIcon(model) {
         const icon = super.calcIcon(model) || {};
         const { iconAppDEFieldId, detreeNodeDataItems } = model;
-        if (iconAppDEFieldId && this.deData[iconAppDEFieldId]) {
-            icon.imagePath = this.deData[iconAppDEFieldId];
+        if (iconAppDEFieldId && this._deData[iconAppDEFieldId]) {
+            icon.imagePath = this._deData[iconAppDEFieldId];
         }
         if (icon) {
-            this.icon = icon;
+            this._icon = icon;
         }
         const iconDataItem = detreeNodeDataItems === null || detreeNodeDataItems === void 0 ? void 0 : detreeNodeDataItems.find(item => item.id === 'icon');
         if (iconDataItem) {
@@ -122,7 +120,7 @@ export class TreeDataSetNodeData extends TreeNodeData {
      */
     calcDataItemScript(dataItem) {
         if (dataItem.customCode && dataItem.scriptCode) {
-            return ScriptFactory.execScriptFn({ data: this.deData }, dataItem.scriptCode, {
+            return ScriptFactory.execScriptFn({ data: this._deData }, dataItem.scriptCode, {
                 isAsync: false,
             });
         }

package/out/service/vo/tree-node-data/tree-node-data.d.ts

@@ -10,21 +10,20 @@ import { IIcon, ITreeNodeData } from '../../../interface';
 export declare abstract class TreeNodeData implements ITreeNodeData {
     _uuid: string;
     _nodeType: string;
-    id: string;
-    value?: string | undefined;
-    text: string;
-    children?: ITreeNodeData[] | undefined;
-    deData?: IData | undefined;
+    _id: string;
+    _value?: string | undefined;
+    _text: string;
+    _children?: ITreeNodeData[] | undefined;
+    _deData?: IData | undefined;
     srfkey?: string | undefined;
     srfmajortext?: string | undefined;
-    nodeId: string;
-    leaf: boolean;
-    context?: IParams;
-    params?: IParams;
-    parent?: ITreeNodeData;
-    icon?: IIcon;
-    textHtml?: string;
-    [key: string | symbol]: any;
+    _nodeId: string;
+    _leaf: boolean;
+    _context?: IParams;
+    _params?: IParams;
+    _parent?: ITreeNodeData;
+    _icon?: IIcon;
+    _textHtml?: string;
     constructor(model: IDETreeNode, parentNodeData: ITreeNodeData | undefined, opts: {
         leaf: boolean;
         navContext?: IParams;

package/out/service/vo/tree-node-data/tree-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B,IAAI,EAAG,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEvC,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,OAAO,CAAS;IAEtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;gBAG1B,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAuBpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;CAa1D"}
+{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,KAAK,EAAG,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAExC,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,OAAO,CAAS;IAEvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;gBAMjB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAuBpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;CAa1D"}

package/out/service/vo/tree-node-data/tree-node-data.js

@@ -7,24 +7,26 @@ import { createUUID } from 'qx-util';
  * @class TreeNodeData
  */
 export class TreeNodeData {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // [key: string | symbol]: any;
     constructor(model, parentNodeData, opts) {
         this._uuid = createUUID();
-        this.leaf = false;
-        this.leaf = opts.leaf === true;
-        this.parent = parentNodeData;
+        this._leaf = false;
+        this._leaf = opts.leaf === true;
+        this._parent = parentNodeData;
         this._nodeType = model.treeNodeType;
         // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
-        if (this.parent) {
-            this.context = Object.assign({}, this.parent.context);
+        if (this._parent) {
+            this._context = Object.assign({}, this._parent._context);
         }
         // 附加导航上下文和视图参数
         if (opts.navContext) {
-            this.context = Object.assign(this.context || {}, opts.navContext);
+            this._context = Object.assign(this._context || {}, opts.navContext);
         }
         if (opts.navParams) {
-            this.params = Object.assign({}, opts.navParams);
+            this._params = Object.assign({}, opts.navParams);
         }
-        this.nodeId = model.id;
+        this._nodeId = model.id;
     }
     /**
      * 计算节点图标

package/out/service/vo/tree-node-data/tree-static-node-data.d.ts

@@ -10,10 +10,10 @@ import { TreeNodeData } from './tree-node-data';
  * @implements {ITreeNodeData}
  */
 export declare class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
-    text: string;
-    id: string;
-    value?: string;
-    deData?: IData;
+    _text: string;
+    _id: string;
+    _value?: string;
+    _deData?: IData;
     constructor(model: IDETreeStaticNode, parentNodeData: ITreeNodeData | undefined, opts: {
         parentValueLevel?: number;
         leaf: boolean;

package/out/service/vo/tree-node-data/tree-static-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsCrD"}
+{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,KAAK,CAAC;gBAGd,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsCrD"}

package/out/service/vo/tree-node-data/tree-static-node-data.js

@@ -17,28 +17,28 @@ export class TreeStaticNodeData extends TreeNodeData {
         const selfId = `${model.id}`.toLowerCase();
         Object.defineProperty(this, 'id', {
             get() {
-                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+                return this._parent ? `${this._parent.id}:${selfId}` : selfId;
             },
             enumerable: true,
             configurable: true,
         });
-        this.text = model.text;
-        this.value = nodeValue;
+        this._text = model.text;
+        this._value = nodeValue;
         // 静态节点数据去对应级别的父节点数据
         if (parentNodeData && opts.parentValueLevel) {
             // 根据父值级别查找父数据
             let parent = parentNodeData;
             for (let index = 1; index < opts.parentValueLevel; index++) {
-                parent = parent === null || parent === void 0 ? void 0 : parent.parent;
+                parent = parent === null || parent === void 0 ? void 0 : parent._parent;
             }
-            if (parent === null || parent === void 0 ? void 0 : parent.deData) {
-                this.deData = parent.deData;
+            if (parent === null || parent === void 0 ? void 0 : parent._deData) {
+                this._deData = parent._deData;
             }
             // 静态节点值不存在时，取父数据的值
-            this.value = nodeValue || (parent === null || parent === void 0 ? void 0 : parent.value);
+            this._value = nodeValue || (parent === null || parent === void 0 ? void 0 : parent._value);
         }
-        this.srfkey = ((_a = this.deData) === null || _a === void 0 ? void 0 : _a.srfkey) || this.value;
-        this.srfmajortext = ((_b = this.deData) === null || _b === void 0 ? void 0 : _b.srfmajortext) || this.text;
-        this.icon = this.calcIcon(model);
+        this.srfkey = ((_a = this._deData) === null || _a === void 0 ? void 0 : _a.srfkey) || this._value;
+        this.srfmajortext = ((_b = this._deData) === null || _b === void 0 ? void 0 : _b.srfmajortext) || this._text;
+        this._icon = this.calcIcon(model);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.0-beta.5",
+  "version": "0.5.1-beta.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.0-beta.5",
+    "@ibiz-template/core": "^0.5.0",
     "@ibiz/model-core": "^0.1.0",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "36616d6d81c619f3cc135c4c9c52cf607b357adc"
+  "gitHead": "b5eea7549eab1b5e4c302af72a095c7470313c8b"
 }

package/src/app-hub.ts

@@ -345,4 +345,10 @@ export class AppHub implements IAppHubService {
     }
     return [];
   }
+
+  reset(): void {
+    this.appMap.clear();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (this.configCache as any) = undefined;
+  }
 }

package/src/controller/control/exp-bar/tree-exp-bar.controller.ts

@@ -88,7 +88,6 @@ export class TreeExpBarController
    *
    * @author zk
    * @date 2023-05-29 03:05:36
-   * @param {IData} data
    * @memberof ExpBarControlController
    */
   xDataActive(event: ITreeEvent['onActive']['event']): void {
@@ -111,11 +110,11 @@ export class TreeExpBarController
     context: IContext,
     params: IParams,
   ): INavViewMsg {
-    const nodeId = node.id;
-    const deData = node.deData || node;
-    const nodeModel = this.getNodeModel(node.nodeId);
+    const nodeId = node._id;
+    const deData = node._deData || node;
+    const nodeModel = this.getNodeModel(node._nodeId);
     if (!nodeModel) {
-      throw new RuntimeError(`找不到${node.nodeId}的节点模型`);
+      throw new RuntimeError(`找不到${node._nodeId}的节点模型`);
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -142,7 +141,7 @@ export class TreeExpBarController
         return true;
       }
       // 需要导航视图的时候，返回第一个配置了导航视图的节点数据
-      return this.navNodeModelIds.includes(node.nodeId);
+      return this.navNodeModelIds.includes(node._nodeId);
     });
     if (!data) {
       return;

package/src/controller/control/gantt/gantt.controller.ts

@@ -109,7 +109,7 @@ export class GanttController
     data: IData,
     isTransformData: boolean = false,
   ): Promise<void> {
-    const key = nodeData.srfkey ? 'srfkey' : 'id';
+    const key = nodeData.srfkey ? 'srfkey' : '_id';
     const currentNode = this.state.items.find(
       item => item[key] === nodeData[key],
     );
@@ -117,7 +117,7 @@ export class GanttController
       ibiz.log.error('找不到对应的动态实体树节点数据', nodeData);
       return;
     }
-    const nodeModel = this.getNodeModel(currentNode.nodeId);
+    const nodeModel = this.getNodeModel(currentNode._nodeId);
     if (nodeModel) {
       const newData = isTransformData
         ? this.transformNodeDataItem(nodeModel, data)

package/src/controller/control/gantt/gantt.service.ts

@@ -78,7 +78,7 @@ export class GanttService extends TreeService {
     } else {
       // 有父节点的计算节点关系查询对应节点数据并合并
       const childNodeRSs = getChildNodeRSs(this.model, {
-        parentId: parentNodeData.nodeId,
+        parentId: parentNodeData._nodeId,
         hasQuery,
       });
 
@@ -185,7 +185,7 @@ export class GanttService extends TreeService {
               childNode,
               opts,
             );
-            childNode.children = subChildrenNodes;
+            childNode._children = subChildrenNodes;
           }
         }),
       );

package/src/controller/control/grid/grid/grid.controller.ts

@@ -41,6 +41,7 @@ import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
 import {
+  ControllerEvent,
   exportData,
   getDefaultValue,
   getEntitySchema,
@@ -58,9 +59,13 @@ import { calcColumnModelBySchema } from './entity-schema';
  * @class GridController
  * @extends {MDControlController<GridModel>}
  */
-export class GridController
-  extends MDControlController<IDEGrid, IGridState, IGridEvent>
-  implements IGridController
+export class GridController<
+    T extends IDEGrid = IDEGrid,
+    S extends IGridState = IGridState,
+    E extends IGridEvent = IGridEvent,
+  >
+  extends MDControlController<T, S, E>
+  implements IGridController<T, S, E>
 {
   /**
    * 表格部件服务
@@ -71,6 +76,10 @@ export class GridController
    */
   declare service: GridService;
 
+  protected get _evt(): ControllerEvent<IGridEvent> {
+    return this.evt;
+  }
+
   /**
    * 是否有配置宽度自适应列
    *
@@ -606,7 +615,7 @@ export class GridController
         ? await this.service.create(tempContext, data)
         : await this.service.update(tempContext, data);
     } catch (error) {
-      await this.evt.emit('onSaveError', undefined);
+      await this._evt.emit('onSaveError', undefined);
       this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
         error: error as Error,
         data: rowState.data,
@@ -620,7 +629,7 @@ export class GridController
     rowState.modified = false;
 
     this.gridStateNotify(rowState, GridNotifyState.SAVE);
-    await this.evt.emit('onSaveSuccess', undefined);
+    await this._evt.emit('onSaveSuccess', undefined);
   }
 
   async saveAll(): Promise<void> {
@@ -773,7 +782,7 @@ export class GridController
 
     try {
       await this.dataChangeNotify(row, [name]);
-      await this.evt.emit('onGridDataChange', {
+      await this._evt.emit('onGridDataChange', {
         data: this.state.rows.map(_row => {
           return _row.data;
         }),
@@ -866,7 +875,7 @@ export class GridController
       } else if (row.data.srfuf === Srfuf.CREATE) {
         // 新建的行取消时删除这一行的数据
         row.showRowEdit = false;
-        this.evt.emit('onRowEditChange', { row });
+        this._evt.emit('onRowEditChange', { row });
         return this.remove({ data: [row.data], silent: true });
       } else if (row.cacheData) {
         // 取消的时候，还原编辑前的数据
@@ -897,7 +906,7 @@ export class GridController
       row.editColStates[column.fieldName].editable = toState;
     });
 
-    this.evt.emit('onRowEditChange', { row });
+    this._evt.emit('onRowEditChange', { row });
   }
 
   /**