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

package/dist/index.esm.js

@@ -6898,8 +6898,8 @@ var AuthorityService = class {
 import { CoreConst } from "@ibiz-template/core";
 import { clearCookie, getCookie, setCookie } from "qx-util";
 var V7AuthService = class {
-  constructor() {
-    this.isAnonymous = false;
+  get isAnonymous() {
+    return getCookie(CoreConst.IS_ANONYMOUS) === "1";
   }
   async anonymousLogin() {
     const { anonymousUser, anonymousPwd } = ibiz.env;
@@ -6909,7 +6909,13 @@ var V7AuthService = class {
     }
     const result = await this.login(anonymousUser, anonymousPwd);
     if (result) {
-      this.isAnonymous = true;
+      setCookie(CoreConst.IS_ANONYMOUS, "1", 0, true);
+      const token = getCookie(CoreConst.TOKEN);
+      const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+      const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+      setCookie(CoreConst.TOKEN, token, 0, true);
+      setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
+      setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
     }
     return result;
   }
@@ -6933,6 +6939,7 @@ var V7AuthService = class {
           remember ? 7 : 0,
           true
         );
+        clearCookie(CoreConst.IS_ANONYMOUS);
       }
       return true;
     } catch (err) {
@@ -6949,6 +6956,7 @@ var V7AuthService = class {
       clearCookie(CoreConst.TOKEN);
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
+      clearCookie(CoreConst.IS_ANONYMOUS);
       return true;
     } catch (err) {
       ibiz.notification.error({
@@ -6959,6 +6967,9 @@ var V7AuthService = class {
     return false;
   }
   async extendLogin() {
+    if (this.isAnonymous) {
+      return;
+    }
     const token = getCookie(CoreConst.TOKEN);
     const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
     const remember = getCookie(CoreConst.TOKEN_REMEMBER);
@@ -6982,6 +6993,14 @@ var V7AuthService = class {
       }, wait);
     }
   }
+  getAuthInfo() {
+    const token = getCookie(CoreConst.TOKEN);
+    const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);
+    return token ? {
+      token,
+      isAnonymous
+    } : void 0;
+  }
 };
 
 // src/service/service/async-action/async-action.service.ts
@@ -8837,6 +8856,7 @@ var DEActionMethod = class extends Method {
     try {
       let key = null;
       if (params) {
+        key = params[this.entity.keyAppDEFieldId.toLowerCase()];
       }
       if (!key && context) {
         key = context[this.entity.codeName.toLowerCase()];
@@ -8896,6 +8916,7 @@ var DEActionMethod = class extends Method {
     try {
       let key = null;
       if (params) {
+        key = params[this.entity.keyAppDEFieldId.toLowerCase()];
       }
       if (!key && context) {
         key = context[this.entity.codeName.toLowerCase()];
@@ -8939,7 +8960,7 @@ var DEActionMethod = class extends Method {
         const majorLowerCodeName = majorDECodeName.toLowerCase();
         const pickupLowerDEFName = pickupDEFName.toLowerCase();
         const majorkey = context[majorLowerCodeName];
-        if (majorkey) {
+        if (majorkey && majorkey !== data.srfkey) {
           data[pickupLowerDEFName] = majorkey;
         }
       });
@@ -9112,22 +9133,24 @@ function presetDEMethodProvider() {
 // src/service/vo/tree-node-data/tree-node-data.ts
 import { createUUID as createUUID5 } from "qx-util";
 var TreeNodeData = class {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // [key: string | symbol]: any;
   constructor(model, parentNodeData, opts) {
     this._uuid = createUUID5();
-    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 = { ...this.parent.context };
+    if (this._parent) {
+      this._context = { ...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 = { ...opts.navParams };
+      this._params = { ...opts.navParams };
     }
-    this.nodeId = model.id;
+    this._nodeId = model.id;
   }
   /**
    * 计算节点图标
@@ -9157,25 +9180,25 @@ var TreeCodeListNodeData = class extends TreeNodeData {
   constructor(model, parentNodeData, opts) {
     super(model, parentNodeData, opts);
     const { data } = opts;
-    this.text = data.text;
-    this.value = data.value;
-    const selfId = "".concat(model.id, "@").concat(this.value).toLowerCase();
+    this._text = data.text;
+    this._value = data.value;
+    const selfId = "".concat(model.id, "@").concat(this._value).toLowerCase();
     Object.defineProperty(this, "id", {
       get() {
-        return this.parent ? "".concat(this.parent.id, ":").concat(selfId) : selfId;
+        return this._parent ? "".concat(this._parent.id, ":").concat(selfId) : selfId;
       },
       enumerable: true,
       configurable: true
     });
     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);
   }
 };
 
@@ -9186,29 +9209,27 @@ var TreeDataSetNodeData = class extends TreeNodeData {
     var _a;
     super(model, parentNodeData, opts);
     const { data } = opts;
-    this.deData = data;
-    this.text = model.textAppDEFieldId ? data[model.textAppDEFieldId] : data.srfmajortext;
-    this.value = model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
+    this._deData = data;
+    this._text = model.textAppDEFieldId ? data[model.textAppDEFieldId] : data.srfmajortext;
+    this._value = model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
     const selfId = "".concat(model.id, "@").concat(data.srfkey).toLowerCase();
     Object.defineProperty(this, "id", {
       get() {
-        return this.parent ? "".concat(this.parent.id, ":").concat(selfId) : selfId;
+        return this._parent ? "".concat(this._parent.id, ":").concat(selfId) : selfId;
       },
       enumerable: true,
       configurable: true
     });
     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);
     if (model.leafFlagAppDEFieldId) {
-      this.leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
+      this._leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
     }
     const dataItemkeyMap = /* @__PURE__ */ new Map();
     const dataItemDefaults = {};
@@ -9222,10 +9243,10 @@ var TreeDataSetNodeData = class 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;
         }
@@ -9236,10 +9257,10 @@ var TreeDataSetNodeData = class 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] !== void 0) {
-          return target.deData[p];
+        if (target._deData[p] !== void 0) {
+          return target._deData[p];
         }
       },
       ownKeys(target) {
@@ -9247,7 +9268,7 @@ var TreeDataSetNodeData = class extends TreeNodeData {
           .../* @__PURE__ */ new Set([
             ...Object.keys(target),
             ...dataItemkeyMap.keys(),
-            ...Object.keys(target.deData)
+            ...Object.keys(target._deData)
           ])
         ];
         updateKeyDefine(target, allKeys);
@@ -9258,11 +9279,11 @@ var TreeDataSetNodeData = class 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 ? void 0 : detreeNodeDataItems.find((item) => item.id === "icon");
     if (iconDataItem) {
@@ -9281,7 +9302,7 @@ var TreeDataSetNodeData = class extends TreeNodeData {
   calcDataItemScript(dataItem) {
     if (dataItem.customCode && dataItem.scriptCode) {
       return ScriptFactory.execScriptFn(
-        { data: this.deData },
+        { data: this._deData },
         dataItem.scriptCode,
         {
           isAsync: false
@@ -9317,26 +9338,26 @@ var TreeStaticNodeData = class extends TreeNodeData {
     const selfId = "".concat(model.id).toLowerCase();
     Object.defineProperty(this, "id", {
       get() {
-        return this.parent ? "".concat(this.parent.id, ":").concat(selfId) : selfId;
+        return this._parent ? "".concat(this._parent.id, ":").concat(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 ? void 0 : parent.parent;
+        parent = parent == null ? void 0 : parent._parent;
       }
-      if (parent == null ? void 0 : parent.deData) {
-        this.deData = parent.deData;
+      if (parent == null ? void 0 : parent._deData) {
+        this._deData = parent._deData;
       }
-      this.value = nodeValue || (parent == null ? void 0 : parent.value);
+      this._value = nodeValue || (parent == null ? void 0 : parent._value);
     }
-    this.srfkey = ((_a = this.deData) == null ? void 0 : _a.srfkey) || this.value;
-    this.srfmajortext = ((_b = this.deData) == null ? void 0 : _b.srfmajortext) || this.text;
-    this.icon = this.calcIcon(model);
+    this.srfkey = ((_a = this._deData) == null ? void 0 : _a.srfkey) || this._value;
+    this.srfmajortext = ((_b = this._deData) == null ? void 0 : _b.srfmajortext) || this._text;
+    this._icon = this.calcIcon(model);
   }
 };
 
@@ -18713,7 +18734,6 @@ var TreeExpBarController = class extends ExpBarControlController {
    *
    * @author zk
    * @date 2023-05-29 03:05:36
-   * @param {IData} data
    * @memberof ExpBarControlController
    */
   xDataActive(event) {
@@ -18730,11 +18750,11 @@ var TreeExpBarController = class extends ExpBarControlController {
    * @memberof TabExpPanelController
    */
   getNavViewMsg(node, context, params) {
-    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 RuntimeError49("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
+      throw new RuntimeError49("\u627E\u4E0D\u5230".concat(node._nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -18754,7 +18774,7 @@ var TreeExpBarController = class extends ExpBarControlController {
       if (this.state.noNeedNavView) {
         return true;
       }
-      return this.navNodeModelIds.includes(node.nodeId);
+      return this.navNodeModelIds.includes(node._nodeId);
     });
     if (!data) {
       return;
@@ -22406,6 +22426,9 @@ var GridController = class extends MDControlController {
      */
     this.aggTitle = "\u5408\u8BA1";
   }
+  get _evt() {
+    return this.evt;
+  }
   /**
    * 分组代码表项集合
    * @author lxm
@@ -22775,7 +22798,7 @@ var GridController = class extends MDControlController {
     try {
       res = isCreate ? await this.service.create(tempContext, data) : await this.service.update(tempContext, data);
     } catch (error) {
-      await this.evt.emit("onSaveError", void 0);
+      await this._evt.emit("onSaveError", void 0);
       this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
         error,
         data: rowState.data
@@ -22787,7 +22810,7 @@ var GridController = class extends MDControlController {
     rowState.data = res.data;
     rowState.modified = false;
     this.gridStateNotify(rowState, "SAVE" /* SAVE */);
-    await this.evt.emit("onSaveSuccess", void 0);
+    await this._evt.emit("onSaveSuccess", void 0);
   }
   async saveAll() {
     const needSaveData = this.state.rows.filter((row) => row.modified).map((row) => row.data);
@@ -22912,7 +22935,7 @@ var GridController = class extends MDControlController {
     row.processing = true;
     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;
         })
@@ -22987,7 +23010,7 @@ var GridController = class extends MDControlController {
         await this.save(row.data);
       } else if (row.data.srfuf === 0 /* 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) {
         row.data = row.cacheData;
@@ -23008,7 +23031,7 @@ var GridController = class extends MDControlController {
     Object.values(this.editColumns).forEach((column) => {
       row.editColStates[column.fieldName].editable = toState;
     });
-    this.evt.emit("onRowEditChange", { row });
+    this._evt.emit("onRowEditChange", { row });
   }
   /**
    * 获取部件默认排序模型
@@ -25976,7 +25999,7 @@ var TreeService = class extends MDControlService {
       );
     } else {
       const childNodeRSs = getChildNodeRSs(this.model, {
-        parentId: parentNodeData == null ? void 0 : parentNodeData.nodeId,
+        parentId: parentNodeData == null ? void 0 : parentNodeData._nodeId,
         hasQuery
       });
       if (childNodeRSs.length === 0) {
@@ -26062,13 +26085,13 @@ var TreeService = class extends MDControlService {
         result.map(async (childNode, index) => {
           var _a;
           if (expanded && // 全展开合只展开首节点expanded都为true
-          (!expandFirstOnly || expandFirstOnly && index === 0) || ((_a = opts.defaultExpandedKeys) == null ? void 0 : _a.length) && opts.defaultExpandedKeys.includes(childNode.id) || // 外部回显给的默认展开节点集合有的展开
+          (!expandFirstOnly || expandFirstOnly && index === 0) || ((_a = opts.defaultExpandedKeys) == null ? void 0 : _a.length) && opts.defaultExpandedKeys.includes(childNode._id) || // 外部回显给的默认展开节点集合有的展开
           isExpandedRoot) {
             const subChildrenNodes = await this.fetchChildNodes(
               childNode,
               opts
             );
-            childNode.children = subChildrenNodes;
+            childNode._children = subChildrenNodes;
           }
         })
       );
@@ -26112,25 +26135,25 @@ var TreeService = class extends MDControlService {
     const params = { ...opts.params };
     const context = {
       ...opts.context,
-      ...(parentNodeData == null ? void 0 : parentNodeData.context) || {}
+      ...(parentNodeData == null ? void 0 : parentNodeData._context) || {}
     };
     let data = {};
     let parentData;
     if (parentNodeData) {
       parentData = parentNodeData;
       for (let index = 1; index < parentValueLevel; index++) {
-        parentData = parentData == null ? void 0 : parentData.parent;
+        parentData = parentData == null ? void 0 : 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;
     }
     const { resultContext, resultParams } = calcNavParams(
       {
@@ -26452,7 +26475,7 @@ var TreeController = class extends MDControlController {
       this.state.isLoading = false;
     }
     if (parentNode) {
-      parentNode.children = nodes;
+      parentNode._children = nodes;
     } else {
       this.state.rootNodes = nodes;
     }
@@ -26485,7 +26508,7 @@ var TreeController = class extends MDControlController {
    */
   async onTreeNodeClick(nodeData, event) {
     var _a;
-    const clickActionItem = (_a = this.contextMenuInfos[nodeData.nodeId]) == null ? void 0 : _a.clickTBUIActionItem;
+    const clickActionItem = (_a = this.contextMenuInfos[nodeData._nodeId]) == null ? void 0 : _a.clickTBUIActionItem;
     if (clickActionItem) {
       return this.doUIAction(
         clickActionItem.uiactionId,
@@ -26495,14 +26518,14 @@ var TreeController = class extends MDControlController {
       );
     }
     if (this.state.navigational) {
-      const nodeModel = this.getNodeModel(nodeData.nodeId);
+      const nodeModel = this.getNodeModel(nodeData._nodeId);
       if (!(nodeModel == null ? void 0 : nodeModel.navAppViewId)) {
         return;
       }
     }
     if (this.state.singleSelect) {
       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 ? [nodeData] : selectedData.concat([nodeData])
@@ -26523,11 +26546,11 @@ var TreeController = class extends MDControlController {
    * @param {boolean} isExpand true为展开，false为折叠
    */
   onExpandChange(nodeData, isExpand) {
-    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);
       }
@@ -26550,9 +26573,9 @@ var TreeController = class extends MDControlController {
     return this._evt.emit("onActive", { ...nodeParams, nodeData: item });
   }
   setSelection(selection) {
-    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)
+      (item) => selectionIds.includes(item._id)
     );
     super.setSelection(filterArr);
   }
@@ -26575,7 +26598,7 @@ var TreeController = class extends MDControlController {
    * @return {*}  {(ITreeNodeData | undefined)}
    */
   getNodeData(key) {
-    const find = this.state.items.find((item) => item.id === key);
+    const find = this.state.items.find((item) => item._id === key);
     if (find) {
       return find;
     }
@@ -26630,9 +26653,9 @@ var TreeController = class extends MDControlController {
    */
   parseTreeNodeData(nodeData) {
     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 || {} }
     };
   }
   /**
@@ -26647,8 +26670,8 @@ var TreeController = class extends MDControlController {
     let expandedKeys = [...this.state.expandedKeys];
     recursiveIterate10({ children: nodes }, (node) => {
       var _a;
-      if ((_a = node.children) == null ? void 0 : _a.length) {
-        expandedKeys.push(node.id);
+      if ((_a = node._children) == null ? void 0 : _a.length) {
+        expandedKeys.push(node._id);
       }
     });
     expandedKeys = Array.from(new Set(expandedKeys));
@@ -26663,7 +26686,7 @@ var TreeController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   async refreshNodeChildren(nodeData, refreshParent = false) {
-    const key = nodeData.srfkey ? "srfkey" : "id";
+    const key = nodeData.srfkey ? "srfkey" : "_id";
     const currentNode = this.state.items.find(
       (item) => item[key] === nodeData[key]
     );
@@ -26672,13 +26695,13 @@ var TreeController = class extends MDControlController {
       return;
     }
     if (refreshParent) {
-      const { parent } = currentNode;
-      if (!parent || !this.model.rootVisible && this.state.rootNodes.includes(parent)) {
-        this.refresh();
+      const { _parent } = currentNode;
+      if (!_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", {
       parentNode: targetNode,
@@ -26693,7 +26716,7 @@ var TreeController = class extends MDControlController {
       return;
     }
     const existNodes = this.state.items.filter(
-      (item) => noExpandKeys.includes(item.id)
+      (item) => noExpandKeys.includes(item._id)
     );
     this.state.expandedKeys.push(...noExpandKeys);
     if (existNodes.length === 0) {
@@ -26713,7 +26736,7 @@ var TreeController = class extends MDControlController {
    * @return {*}  {boolean}
    */
   calcAllowDrag(draggingNode) {
-    const nodeModel = this.getNodeModel(draggingNode.nodeId);
+    const nodeModel = this.getNodeModel(draggingNode._nodeId);
     return (nodeModel == null ? void 0 : nodeModel.allowDrag) === true;
   }
   /**
@@ -26727,22 +26750,22 @@ var TreeController = class extends MDControlController {
    */
   calcAllowDrop(draggingNode, dropNode, type) {
     var _a, _b;
-    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 (((_a = draggingNode.parent) == null ? void 0 : _a.id) === ((_b = dropNode.parent) == null ? void 0 : _b.id)) {
-      const currentNodeModel = this.getNodeModel(dropNode.nodeId);
+    if (((_a = draggingNode._parent) == null ? void 0 : _a._id) === ((_b = dropNode._parent) == null ? void 0 : _b._id)) {
+      const currentNodeModel = this.getNodeModel(dropNode._nodeId);
       return (currentNodeModel == null ? void 0 : currentNodeModel.allowOrder) === true;
     }
-    if (!dropNode.parent) {
+    if (!dropNode._parent) {
       return false;
     }
     return !!this.findDropNodeRS(
-      dropNode.parent.nodeId,
+      dropNode._parent._nodeId,
       draggingNodeModel.appDataEntityId
     );
   }
@@ -26771,44 +26794,44 @@ var TreeController = class extends MDControlController {
    */
   async onNodeDrop(draggingNode, dropNode, dropType) {
     var _a, _b, _c;
-    if (dropType === "inner" && !dropNode.leaf && dropNode.children === void 0) {
-      await this.expandNodeByKey([dropNode.id]);
+    if (dropType === "inner" && !dropNode._leaf && dropNode._children === void 0) {
+      await this.expandNodeByKey([dropNode._id]);
     }
     const modifiedNodeDatas = [];
-    const draggingNodeModel = this.getNodeModel(draggingNode.nodeId);
-    const dropInNode = dropType === "inner" ? dropNode : dropNode.parent;
-    const isChangedParent = (dropNode == null ? void 0 : dropNode.id) !== ((_a = draggingNode.parent) == null ? void 0 : _a.id);
-    let orderNodeModel = this.getNodeModel(dropNode.nodeId);
-    if (dropType === "inner" || ((_b = dropNode.parent) == null ? void 0 : _b.id) !== ((_c = draggingNode.parent) == null ? void 0 : _c.id)) {
+    const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
+    const dropInNode = dropType === "inner" ? dropNode : dropNode._parent;
+    const isChangedParent = (dropNode == null ? void 0 : dropNode._id) !== ((_a = draggingNode._parent) == null ? void 0 : _a._id);
+    let orderNodeModel = this.getNodeModel(dropNode._nodeId);
+    if (dropType === "inner" || ((_b = dropNode._parent) == null ? void 0 : _b._id) !== ((_c = draggingNode._parent) == null ? void 0 : _c._id)) {
       const dropNodeRs = this.findDropNodeRS(
-        dropInNode.nodeId,
+        dropInNode._nodeId,
         draggingNodeModel.appDataEntityId
       );
       if (dropNodeRs) {
-        draggingNode.deData[dropNodeRs.pickupDEFName] = dropInNode.value;
+        draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
         modifiedNodeDatas.push(draggingNode);
         orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
       }
     }
-    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.nodeId = orderNodeModel.id;
+      draggingNode._parent = dropInNode;
+      draggingNode._nodeId = orderNodeModel.id;
       this.state.expandedKeys = this.calcExpandedKeys([dropInNode]);
     }
     const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
@@ -26818,7 +26841,7 @@ var TreeController = class extends MDControlController {
       }
       const sortField = sortAppDEFieldId.toLowerCase();
       const isAsc = sortDir === "ASC";
-      const changedArr = [...dropInNode.children];
+      const changedArr = [...dropInNode._children];
       if (!isAsc) {
         changedArr.reverse();
       }
@@ -26830,13 +26853,13 @@ var TreeController = class extends MDControlController {
       };
       let lastSort;
       changedArr.forEach((item, index) => {
-        const deData = item.deData;
+        const deData = item._deData;
         if (lastSort === void 0) {
           if (item === draggingNode) {
             if (index === 0) {
               lastSort = 100;
             } else {
-              lastSort = getNextSort(getSort(changedArr[index - 1].deData));
+              lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
             }
             deData[sortField] = lastSort;
             if (modifiedNodeDatas.indexOf(item) === -1) {
@@ -26867,8 +26890,8 @@ var TreeController = class extends MDControlController {
     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();
         tempContext[deName] = deData.srfkey;
@@ -26879,7 +26902,7 @@ var TreeController = class extends MDControlController {
           deData
         );
         if (res.data) {
-          node.deData = res.data;
+          node._deData = res.data;
         }
       })
     );
@@ -26893,15 +26916,15 @@ var TreeController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   async modifyNodeText(nodeData, text) {
-    const model = this.getNodeModel(nodeData.nodeId);
+    const model = this.getNodeModel(nodeData._nodeId);
     if (!model.allowEditText) {
       throw new RuntimeModelError61(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
     }
-    if (!nodeData.deData) {
+    if (!nodeData._deData) {
       throw new RuntimeError57("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
     }
-    nodeData.text = text;
-    nodeData.deData[model.textAppDEFieldId] = text;
+    nodeData._text = text;
+    nodeData._deData[model.textAppDEFieldId] = text;
     await this.updateDeNodeData([nodeData]);
   }
 };
@@ -28451,7 +28474,67 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
 };
 
 // src/controller/control/tree-grid/tree-grid.controller.ts
+import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
 var TreeGridController = class extends GridController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 树表格值属性名称
+     *
+     */
+    this.treeGridValueField = "";
+    /**
+     * 树表格父属性名称
+     *
+     */
+    this.treeGridParentField = "";
+  }
+  initState() {
+    super.initState();
+    this.state.showTreeGrid = true;
+  }
+  /**
+   * 初始化方法
+   *
+   * @author lxm
+   * @date 2022-08-18 22:08:17
+   * @protected
+   * @returns {*}  {Promise<void>}
+   */
+  async onCreated() {
+    await super.onCreated();
+    this.initTreeGridField();
+  }
+  /**
+   * 初始化树表格字段
+   * @return {*}
+   * @author: zhujiamin
+   */
+  initTreeGridField() {
+    var _a, _b;
+    const treeGridParent = (_a = this.model.degridColumns) == null ? void 0 : _a.find((item) => {
+      return item.treeColumnMode === 4 || item.treeColumnMode === 12;
+    });
+    const treeGridValue = (_b = this.model.degridColumns) == null ? void 0 : _b.find((item) => {
+      return item.treeColumnMode === 2 || item.treeColumnMode === 3;
+    });
+    if (!treeGridParent) {
+      throw new RuntimeModelError65(this.model, "\u6811\u8868\u683C\u65E0\u503C\u5217\u6A21\u5F0F");
+    }
+    if (!treeGridValue) {
+      throw new RuntimeModelError65(this.model, "\u6811\u8868\u683C\u65E0\u7236\u503C\u5217\u6A21\u5F0F");
+    }
+    this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
+    this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
+  }
+  /**
+   * 切换树表格显示
+   * @return {*}
+   * @author: zhujiamin
+   */
+  switchTreeGridShow() {
+    this.state.showTreeGrid = !this.state.showTreeGrid;
+  }
 };
 
 // src/controller/control/tree-grid/tree-grid.service.ts
@@ -29225,7 +29308,7 @@ var GanttService = class extends TreeService {
       );
     } else {
       const childNodeRSs = getChildNodeRSs(this.model, {
-        parentId: parentNodeData.nodeId,
+        parentId: parentNodeData._nodeId,
         hasQuery
       });
       if (childNodeRSs.length === 0) {
@@ -29316,7 +29399,7 @@ var GanttService = class extends TreeService {
               childNode,
               opts
             );
-            childNode.children = subChildrenNodes;
+            childNode._children = subChildrenNodes;
           }
         })
       );
@@ -29504,7 +29587,7 @@ var GanttController = class extends TreeGridExController {
    * @memberof GanttController
    */
   async updateNodeData(nodeData, data, isTransformData = false) {
-    const key = nodeData.srfkey ? "srfkey" : "id";
+    const key = nodeData.srfkey ? "srfkey" : "_id";
     const currentNode = this.state.items.find(
       (item) => item[key] === nodeData[key]
     );
@@ -29512,7 +29595,7 @@ var GanttController = class extends TreeGridExController {
       ibiz.log.error("\u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u52A8\u6001\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E", nodeData);
       return;
     }
-    const nodeModel = this.getNodeModel(currentNode.nodeId);
+    const nodeModel = this.getNodeModel(currentNode._nodeId);
     if (nodeModel) {
       const newData = isTransformData ? this.transformNodeDataItem(nodeModel, data) : data;
       if (Object.keys(newData).length > 0) {
@@ -29845,6 +29928,10 @@ var AppHub = class {
     }
     return [];
   }
+  reset() {
+    this.appMap.clear();
+    this.configCache = void 0;
+  }
 };
 
 // src/engine/engine-factory.ts
@@ -30106,7 +30193,7 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
 import { clone as clone24 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
@@ -30290,7 +30377,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError65(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError66(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -30313,7 +30400,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError65(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError66(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
     const params = clone24(this.view.params);
     if (copyMode) {
@@ -30327,7 +30414,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError65(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError66(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -30638,13 +30725,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
 var AppDEUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     const { appDEUILogicId, appDataEntityId } = this.logic;
     if (!appDEUILogicId) {
-      throw new RuntimeModelError66(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError67(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -31102,7 +31189,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError66, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError66, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -31110,7 +31197,7 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError67(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
+      throw new RuntimeModelError68(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
@@ -31132,7 +31219,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError34,
   RuntimeError as RuntimeError67,
-  RuntimeModelError as RuntimeModelError68
+  RuntimeModelError as RuntimeModelError69
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -31178,7 +31265,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError68(
+        throw new RuntimeModelError69(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -31186,7 +31273,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -31216,7 +31303,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         appUILogic,
         "".concat(appDataEntity.codeName, "[\u591A\u8868\u5355\u5B9E\u4F53] or [\u7D22\u5F15\u5B9E\u4F53]\u7F3A\u5C11\u7C7B\u578B\u5C5E\u6027\u914D\u7F6E")
       );
@@ -31224,7 +31311,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError68(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError69(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
@@ -31266,7 +31353,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError68(
+        throw new RuntimeModelError69(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -31276,7 +31363,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError68(
+        throw new RuntimeModelError69(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -31334,7 +31421,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError68(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError69(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -31385,7 +31472,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError68(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError69(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName;
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
@@ -31484,12 +31571,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
 var AppDEUIActionExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     if (!this.logic.appDEUIActionId) {
-      throw new RuntimeModelError69(
+      throw new RuntimeModelError70(
         this.logic,
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );