@ibiz-template/runtime 0.5.0 → 0.5.1-dev.0

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;gBAGjB,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

@@ -9,22 +9,22 @@ import { createUUID } from 'qx-util';
 export class TreeNodeData {
     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;CAuCrD"}

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

@@ -15,30 +15,30 @@ export class TreeStaticNodeData extends TreeNodeData {
         const nodeValue = model.nodeValue === 'root' ? undefined : model.nodeValue;
         // id小写
         const selfId = `${model.id}`.toLowerCase();
-        Object.defineProperty(this, 'id', {
+        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",
+  "version": "0.5.1-dev.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.0",
-    "@ibiz/model-core": "^0.1.0",
+    "@ibiz-template/core": "^0.5.1-dev.0",
+    "@ibiz/model-core": "^0.1.1",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.0",
+    "@ibiz/model-core": "^0.1.1",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "84126d4a93b6641962d688ef6d92fce3bea7c2d1"
+  "gitHead": "c54e4d6aef0c43875f83272fed9126b0265236e0"
 }

package/src/constant/view-type.ts

@@ -827,4 +827,9 @@ export enum ViewType {
    * 实体向导视图
    */
   DE_WIZARD_VIEW = 'DEWIZARDVIEW',
+
+  /**
+   * 实体向导视图
+   */
+  DE_SUB_APP_REF_VIEW = 'DESUBAPPREFVIEW',
 }

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

@@ -53,7 +53,7 @@ export class TreeExpBarController
    * @date 2023-07-10 03:07:11
    * @memberof TreeExpBarController
    */
-  navKeyName = 'id' as const;
+  navKeyName = '_id' as const;
 
   /**
    * 有导航视图的节点模型标识集合
@@ -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/tree/tree.controller.ts

@@ -305,7 +305,7 @@ export class TreeController<
 
     // 有父节点绑定到父节点数据上，无父节点替换rootNodes
     if (parentNode) {
-      parentNode.children = nodes;
+      parentNode._children = nodes;
     } else {
       this.state.rootNodes = nodes;
     }
@@ -326,10 +326,11 @@ export class TreeController<
     // 更新items
     this.state.items = [];
     recursiveIterate(
-      { children: this.state.rootNodes },
+      { _children: this.state.rootNodes },
       (node: ITreeNodeData) => {
         this.state.items.push(node);
       },
+      { childrenFields: ['_children'] },
     );
 
     // 重新计算展开节点标识
@@ -349,7 +350,7 @@ export class TreeController<
   ): Promise<void> {
     // 节点有配置常用操作的上下文菜单时，触发界面行为，后续逻辑都不走
     const clickActionItem =
-      this.contextMenuInfos[nodeData.nodeId]?.clickTBUIActionItem;
+      this.contextMenuInfos[nodeData._nodeId]?.clickTBUIActionItem;
     if (clickActionItem) {
       return this.doUIAction(
         clickActionItem.uiactionId!,
@@ -361,7 +362,7 @@ export class TreeController<
 
     // 导航的时候，没有导航视图的时候，节点后续点击逻辑都不走，也不选中
     if (this.state.navigational) {
-      const nodeModel = this.getNodeModel(nodeData.nodeId);
+      const nodeModel = this.getNodeModel(nodeData._nodeId);
       if (!nodeModel?.navAppViewId) {
         return;
       }
@@ -372,7 +373,7 @@ export class TreeController<
       // 选中相关处理
       const { selectedData } = this.state;
       // 选中里没有则添加，有则删除
-      const filterArr = selectedData.filter(item => item.id !== nodeData.id);
+      const filterArr = selectedData.filter(item => item._id !== nodeData._id);
       if (filterArr.length === selectedData.length) {
         this.setSelection(
           this.state.singleSelect
@@ -398,11 +399,11 @@ export class TreeController<
    * @param {boolean} isExpand true为展开，false为折叠
    */
   onExpandChange(nodeData: ITreeNodeData, isExpand: boolean): void {
-    const hasKey = this.state.expandedKeys.includes(nodeData.id);
+    const hasKey = this.state.expandedKeys.includes(nodeData._id);
     if (isExpand && !hasKey) {
-      this.state.expandedKeys.push(nodeData.id);
+      this.state.expandedKeys.push(nodeData._id);
     } else if (!isExpand && hasKey) {
-      const index = this.state.expandedKeys.indexOf(nodeData.id);
+      const index = this.state.expandedKeys.indexOf(nodeData._id);
       if (index !== -1) {
         this.state.expandedKeys.splice(index, 1);
       }
@@ -427,13 +428,13 @@ export class TreeController<
     return this._evt.emit('onActive', { ...nodeParams, nodeData: item });
   }
 
-  setSelection(selection: IData[]): void {
+  setSelection(selection: { _id: string }[]): void {
     // todo 当自己点选中时，父节点选不选中，如果选中需要在这边优化
 
     // 通过id过滤出原始的树节点数据，避免外部使用的时候传入的选中数据有问题。
-    const selectionIds = selection.map(item => item.id);
+    const selectionIds = selection.map(item => item._id);
     const filterArr = this.state.items.filter(item =>
-      selectionIds.includes(item.id),
+      selectionIds.includes(item._id),
     );
     super.setSelection(filterArr);
   }
@@ -453,11 +454,11 @@ export class TreeController<
    * 通过标识获取节点数据
    * @author lxm
    * @date 2023-12-22 02:21:38
-   * @param {string} id 可以是节点id也可以是_uuid
+   * @param {string} key 可以是节点_id也可以是_uuid
    * @return {*}  {(ITreeNodeData | undefined)}
    */
   getNodeData(key: string): ITreeNodeData | undefined {
-    const find = this.state.items.find(item => item.id === key);
+    const find = this.state.items.find(item => item._id === key);
     if (find) {
       return find;
     }
@@ -526,9 +527,9 @@ export class TreeController<
     params: IParams;
   } {
     return {
-      data: [{ ...nodeData, ...(nodeData.deData || {}) }],
-      context: Object.assign(this.context.clone(), nodeData.context || {}),
-      params: { ...this.params, ...(nodeData.params || {}) },
+      data: [{ ...nodeData, ...(nodeData._deData || {}) }],
+      context: Object.assign(this.context.clone(), nodeData._context || {}),
+      params: { ...this.params, ...(nodeData._params || {}) },
     };
   }
 
@@ -545,11 +546,15 @@ export class TreeController<
     let expandedKeys: string[] = [...this.state.expandedKeys];
 
     // 计算加载回来的里面带的默认展开
-    recursiveIterate({ children: nodes }, (node: ITreeNodeData) => {
-      if (node.children?.length) {
-        expandedKeys.push(node.id);
-      }
-    });
+    recursiveIterate(
+      { _children: nodes },
+      (node: ITreeNodeData) => {
+        if (node._children?.length) {
+          expandedKeys.push(node._id);
+        }
+      },
+      { childrenFields: ['_children'] },
+    );
 
     // 去重
     expandedKeys = Array.from(new Set(expandedKeys));
@@ -565,10 +570,10 @@ export class TreeController<
    * @return {*}  {Promise<void>}
    */
   async refreshNodeChildren(
-    nodeData: ITreeNodeData | IData,
+    nodeData: { _id?: string; srfkey?: string },
     refreshParent = 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],
     );
@@ -579,18 +584,18 @@ export class TreeController<
 
     // 刷新父，但是没父，刷新根
     if (refreshParent) {
-      const { parent } = currentNode;
+      const { _parent } = currentNode;
       // 没有父，或者父是不显示的根节点，那么刷新所有
       if (
-        !parent ||
-        (!this.model.rootVisible && this.state.rootNodes.includes(parent))
+        !_parent ||
+        (!this.model.rootVisible && this.state.rootNodes.includes(_parent))
       ) {
         await this.refresh();
         return;
       }
     }
 
-    const targetNode = refreshParent ? currentNode.parent! : currentNode;
+    const targetNode = refreshParent ? currentNode._parent! : currentNode;
 
     const nodes = await this.loadNodes(targetNode);
     this._evt.emit('onAfterRefreshParent', {
@@ -609,7 +614,7 @@ export class TreeController<
 
     // 找到已存在的要展开的节点
     const existNodes = this.state.items.filter(item =>
-      noExpandKeys.includes(item.id),
+      noExpandKeys.includes(item._id),
     );
 
     // 补充所有未展开的节点标识，查询过程中会自动加载后续展开
@@ -634,7 +639,7 @@ export class TreeController<
    * @return {*}  {boolean}
    */
   calcAllowDrag(draggingNode: ITreeNodeData): boolean {
-    const nodeModel = this.getNodeModel(draggingNode.nodeId);
+    const nodeModel = this.getNodeModel(draggingNode._nodeId);
     return nodeModel?.allowDrag === true;
   }
 
@@ -652,30 +657,30 @@ export class TreeController<
     dropNode: ITreeNodeData,
     type: 'inner' | 'prev' | 'next',
   ): boolean {
-    const draggingNodeModel = this.getNodeModel(draggingNode.nodeId)!;
+    const draggingNodeModel = this.getNodeModel(draggingNode._nodeId)!;
     // * 移入的情况
     if (type === 'inner') {
       return !!this.findDropNodeRS(
-        dropNode.nodeId!,
+        dropNode._nodeId!,
         draggingNodeModel.appDataEntityId!,
       );
     }
     // * 前后的情况
 
     // 父相同的情况下,就是排序，看当前节点是否能排序
-    if (draggingNode.parent?.id === dropNode.parent?.id) {
-      const currentNodeModel = this.getNodeModel(dropNode.nodeId)!;
+    if (draggingNode._parent?._id === dropNode._parent?._id) {
+      const currentNodeModel = this.getNodeModel(dropNode._nodeId)!;
       return currentNodeModel?.allowOrder === true;
     }
 
     // 没有父就是根节点，根节点没有上层关系，无法换父
-    if (!dropNode.parent) {
+    if (!dropNode._parent) {
       return false;
     }
 
     // 父不一样的时候需要判断能否移入到对方的父节点内
     return !!this.findDropNodeRS(
-      dropNode.parent!.nodeId!,
+      dropNode._parent!._nodeId!,
       draggingNodeModel.appDataEntityId!,
     );
   }
@@ -714,31 +719,31 @@ export class TreeController<
   ): Promise<void> {
     if (
       dropType === 'inner' &&
-      !dropNode.leaf &&
-      dropNode.children === undefined
+      !dropNode._leaf &&
+      dropNode._children === undefined
     ) {
-      await this.expandNodeByKey([dropNode.id]);
+      await this.expandNodeByKey([dropNode._id]);
     }
 
     /** 修改的树节点数据 */
     const modifiedNodeDatas: ITreeNodeData[] = [];
-    const draggingNodeModel = this.getNodeModel(draggingNode.nodeId)!;
-    const dropInNode = dropType === 'inner' ? dropNode : dropNode.parent!;
-    const isChangedParent = dropNode?.id !== draggingNode.parent?.id;
-    let orderNodeModel = this.getNodeModel(dropNode.nodeId)!;
+    const draggingNodeModel = this.getNodeModel(draggingNode._nodeId)!;
+    const dropInNode = dropType === 'inner' ? dropNode : dropNode._parent!;
+    const isChangedParent = dropNode?._id !== draggingNode._parent?._id;
+    let orderNodeModel = this.getNodeModel(dropNode._nodeId)!;
 
     // * 处理切换父节点
     if (
       dropType === 'inner' ||
-      dropNode.parent?.id !== draggingNode.parent?.id
+      dropNode._parent?._id !== draggingNode._parent?._id
     ) {
       const dropNodeRs = this.findDropNodeRS(
-        dropInNode.nodeId,
+        dropInNode._nodeId,
         draggingNodeModel.appDataEntityId!,
       );
       if (dropNodeRs) {
         // 修改关系属性的值为父节点的主键和树节点id
-        draggingNode.deData![dropNodeRs.pickupDEFName] = dropInNode.value;
+        draggingNode._deData![dropNodeRs.pickupDEFName] = dropInNode._value;
         modifiedNodeDatas.push(draggingNode);
         orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId)!;
       }
@@ -746,33 +751,33 @@ export class TreeController<
 
     // *修改节点数据
     // 所有情况都先从原来的父的子集合里删除自己
-    const originArr = draggingNode.parent!.children!;
+    const originArr = draggingNode._parent!._children!;
     originArr.splice(originArr.indexOf(draggingNode), 1);
 
     if (dropType === 'inner') {
       // 移入时放到最后
-      if (!dropNode.children) {
-        dropNode.children = [];
-        dropNode.leaf = true;
-        this.state.expandedKeys.push(dropNode.id);
+      if (!dropNode._children) {
+        dropNode._children = [];
+        dropNode._leaf = true;
+        this.state.expandedKeys.push(dropNode._id);
       }
 
-      dropNode.children.push(draggingNode);
+      dropNode._children.push(draggingNode);
     } else {
       // 非插入时，放入指定节点前后
-      let insertIndex = dropInNode.children!.indexOf(dropNode);
+      let insertIndex = dropInNode._children!.indexOf(dropNode);
       if (dropType === 'next') {
         insertIndex += 1;
       }
-      dropInNode.children!.splice(insertIndex, 0, draggingNode);
+      dropInNode._children!.splice(insertIndex, 0, draggingNode);
     }
 
     //* 变更父节点后的，拖动节点调整
     if (dropType === 'inner' || isChangedParent) {
       // 更改父节点
-      draggingNode.parent = dropInNode;
+      draggingNode._parent = dropInNode;
       // 修改指向的节点模型
-      draggingNode.nodeId = orderNodeModel.id!;
+      draggingNode._nodeId = orderNodeModel.id!;
       // 维护拖拽的节点和其子孙的展开，维护拖入节点的展开
       this.state.expandedKeys = this.calcExpandedKeys([dropInNode]);
     }
@@ -788,7 +793,7 @@ export class TreeController<
       const sortField = sortAppDEFieldId.toLowerCase();
       const isAsc = sortDir === 'ASC';
 
-      const changedArr = [...dropInNode.children!];
+      const changedArr = [...dropInNode._children!];
 
       // 降序把数组反转,保证两个数组都是从小到大排
       if (!isAsc) {
@@ -812,7 +817,7 @@ export class TreeController<
 
       let lastSort: number;
       changedArr.forEach((item, index) => {
-        const deData = item.deData!;
+        const deData = item._deData!;
         if (lastSort === undefined) {
           // 第一次出现要调整顺序的时候一定是从拖拽节点开始
           if (item === draggingNode) {
@@ -821,7 +826,7 @@ export class TreeController<
               lastSort = 100;
             } else {
               // 最后一个时，把前一个的排序值加100
-              lastSort = getNextSort(getSort(changedArr[index - 1].deData!));
+              lastSort = getNextSort(getSort(changedArr[index - 1]._deData!));
             }
             deData[sortField] = lastSort;
 
@@ -859,8 +864,8 @@ export class TreeController<
     const app = ibiz.hub.getApp(this.context.srfappid);
     await Promise.all(
       nodeDatas.map(async node => {
-        const model = this.getNodeModel(node.nodeId)!;
-        const deData = node.deData!;
+        const model = this.getNodeModel(node._nodeId)!;
+        const deData = node._deData!;
         // 往上下文添加主键
         const deName = calcDeCodeNameById(model.appDataEntityId!);
         const tempContext = this.context.clone();
@@ -876,7 +881,7 @@ export class TreeController<
 
         // 更新完之后更新state里的数据。
         if (res.data) {
-          node.deData = res.data;
+          node._deData = res.data;
         }
       }),
     );
@@ -891,15 +896,15 @@ export class TreeController<
    * @return {*}  {Promise<void>}
    */
   async modifyNodeText(nodeData: ITreeNodeData, text: string): Promise<void> {
-    const model = this.getNodeModel(nodeData.nodeId)! as IDETreeDataSetNode;
+    const model = this.getNodeModel(nodeData._nodeId)! as IDETreeDataSetNode;
     if (!model.allowEditText) {
       throw new RuntimeModelError(model, '树节点没有配置编辑模式：名称');
     }
-    if (!nodeData.deData) {
+    if (!nodeData._deData) {
       throw new RuntimeError('不是实体树节点数据');
     }
-    nodeData.text = text;
-    nodeData.deData[model.textAppDEFieldId!] = text;
+    nodeData._text = text;
+    nodeData._deData[model.textAppDEFieldId!] = text;
     await this.updateDeNodeData([nodeData]);
   }
 }

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

@@ -99,7 +99,7 @@ export class TreeService<
     } else {
       // 有父节点的计算节点关系查询对应节点数据并合并
       const childNodeRSs = getChildNodeRSs(this.model, {
-        parentId: parentNodeData?.nodeId,
+        parentId: parentNodeData?._nodeId,
         hasQuery,
       });
 
@@ -201,14 +201,14 @@ export class TreeService<
             (expanded && // 全展开合只展开首节点expanded都为true
               (!expandFirstOnly || (expandFirstOnly && index === 0))) ||
             (opts.defaultExpandedKeys?.length &&
-              opts.defaultExpandedKeys.includes(childNode.id)) || // 外部回显给的默认展开节点集合有的展开
+              opts.defaultExpandedKeys.includes(childNode._id)) || // 外部回显给的默认展开节点集合有的展开
             isExpandedRoot
           ) {
             const subChildrenNodes = await this.fetchChildNodes(
               childNode,
               opts,
             );
-            childNode.children = subChildrenNodes;
+            childNode._children = subChildrenNodes;
           }
         }),
       );
@@ -275,7 +275,7 @@ export class TreeService<
     // 合并部件上下文和父节点资源上下文
     const context = {
       ...opts.context,
-      ...(parentNodeData?.context || {}),
+      ...(parentNodeData?._context || {}),
     };
 
     // 计算关系过滤用到的实体数据
@@ -285,18 +285,18 @@ export class TreeService<
     if (parentNodeData) {
       parentData = parentNodeData;
       for (let index = 1; index < parentValueLevel!; index++) {
-        parentData = parentData?.parent;
+        parentData = parentData?._parent;
       }
     }
     let derValue;
     let deName;
     if (parentData) {
-      data = parentData.deData || {};
-      const parentNodeModel = getTreeNode(this.model, parentData.nodeId);
+      data = parentData._deData || {};
+      const parentNodeModel = getTreeNode(this.model, parentData._nodeId);
       if (parentNodeModel.appDataEntityId) {
         deName = calcDeCodeNameById(parentNodeModel.appDataEntityId);
       }
-      derValue = parentData.value;
+      derValue = parentData._value;
     }
 
     // 导航相关参数处理