@ibiz-template/runtime 0.5.0 → 0.5.1-beta.2

package/dist/index.esm.js

@@ -2419,6 +2419,7 @@ var ViewType = /* @__PURE__ */ ((ViewType2) => {
   ViewType2["DE_WF_PROXY_START_VIEW"] = "DEWFPROXYSTARTVIEW";
   ViewType2["DE_WF_START_VIEW"] = "DEWFSTARTVIEW";
   ViewType2["DE_WIZARD_VIEW"] = "DEWIZARDVIEW";
+  ViewType2["DE_SUB_APP_REF_VIEW"] = "DESUBAPPREFVIEW";
   return ViewType2;
 })(ViewType || {});
 
@@ -7048,11 +7049,22 @@ import { RuntimeModelError as RuntimeModelError9 } from "@ibiz-template/core";
 // src/service/dto/method.dto.ts
 import { ModelError as ModelError7 } from "@ibiz-template/core";
 var MethodDto = class _MethodDto {
-  constructor(service, entity, isLocalMode, dto) {
+  /**
+   * Creates an instance of MethodDto.
+   * @author lxm
+   * @date 2024-01-04 05:39:07
+   * @param {IAppDEService} service
+   * @param {IAppDataEntity} entity
+   * @param {boolean} [isLocalMode]
+   * @param {IAppDEMethodDTO} [dto]
+   * @param {boolean} [inSelfLoop] 是否在自关系循环中
+   */
+  constructor(service, entity, isLocalMode, dto, inSelfLoop) {
     this.service = service;
     this.entity = entity;
     this.isLocalMode = isLocalMode;
     this.dto = dto;
+    this.inSelfLoop = inSelfLoop;
     this.dtoMap = /* @__PURE__ */ new Map();
     /**
      * 当前 DTO 是否已经计算过关系相关逻辑
@@ -7185,7 +7197,7 @@ var MethodDto = class _MethodDto {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context, data) {
-    if (this.isLocalMode) {
+    if (this.isLocalMode && !this.inSelfLoop) {
       this.service.local.clear();
     }
     await this.calcRs(context);
@@ -7287,9 +7299,10 @@ var MethodDto = class _MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId
     );
+    const inSelfLoop = this.entity.codeName === entity.codeName;
     const service = await this.app.deService.getService(context, entity.id);
     service.isLocalMode = true;
-    const dto = new _MethodDto(service, entity, true, methodDto);
+    const dto = new _MethodDto(service, entity, true, methodDto, inSelfLoop);
     this.dtoMap.set(field.codeName, dto);
     return dto;
   }
@@ -9135,20 +9148,20 @@ import { createUUID as createUUID5 } from "qx-util";
 var TreeNodeData = class {
   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;
   }
   /**
    * 计算节点图标
@@ -9178,25 +9191,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();
-    Object.defineProperty(this, "id", {
+    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);
   }
 };
 
@@ -9207,46 +9220,46 @@ 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", {
+    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 dataItemKeyMap = /* @__PURE__ */ new Map();
+    dataItemKeyMap.set("srfkey", "srfkey");
+    dataItemKeyMap.set("srfmajortext", "srfmajortext");
     const dataItemDefaults = {};
     (_a = model.detreeNodeDataItems) == null ? void 0 : _a.forEach((dataItem) => {
       const uiKey = dataItem.id.toLowerCase();
       const deFieldKey = dataItem.appDEFieldId.toLowerCase();
-      dataItemkeyMap.set(uiKey, deFieldKey);
+      dataItemKeyMap.set(uiKey, deFieldKey);
       if (dataItem.defaultValue) {
         dataItemDefaults[uiKey] = dataItem.defaultValue;
       }
     });
     return new Proxy(this, {
       set(target, 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;
+        if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
+          target._deData[p] = value;
+        } else if (dataItemKeyMap.has(p)) {
+          target._deData[dataItemKeyMap.get(p)] = value;
         } else {
           target[p] = value;
         }
@@ -9256,19 +9269,19 @@ var TreeDataSetNodeData = class extends TreeNodeData {
         if (target[p] !== void 0) {
           return target[p];
         }
-        if (dataItemkeyMap.has(p)) {
-          return target.deData[dataItemkeyMap.get(p)] || dataItemDefaults[p];
+        if (dataItemKeyMap.has(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) {
         const allKeys = [
           .../* @__PURE__ */ new Set([
             ...Object.keys(target),
-            ...dataItemkeyMap.keys(),
-            ...Object.keys(target.deData)
+            ...dataItemKeyMap.keys(),
+            ...Object.keys(target._deData)
           ])
         ];
         updateKeyDefine(target, allKeys);
@@ -9279,11 +9292,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) {
@@ -9302,7 +9315,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
@@ -9336,28 +9349,28 @@ var TreeStaticNodeData = class extends TreeNodeData {
     super(model, parentNodeData, opts);
     const nodeValue = model.nodeValue === "root" ? void 0 : model.nodeValue;
     const selfId = "".concat(model.id).toLowerCase();
-    Object.defineProperty(this, "id", {
+    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);
   }
 };
 
@@ -9709,21 +9722,24 @@ var calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
 var GanttStaticNodeData = class extends TreeStaticNodeData {
   constructor(model, nodeModel, parentNodeData, opts) {
     super(nodeModel, parentNodeData, opts);
-    this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
-    this.beginDataItemValue = calcDataItemValue(
+    this._sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
+    this._beginDataItemValue = calcDataItemValue(
       model.beginDataItemName,
       nodeModel
     );
-    this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel);
-    this.prevDataItemValue = calcDataItemValue(
+    this._endDataItemValue = calcDataItemValue(
+      model.endDataItemName,
+      nodeModel
+    );
+    this._prevDataItemValue = calcDataItemValue(
       model.prevDataItemName,
       nodeModel
     );
-    this.finishDataItemValue = calcDataItemValue(
+    this._finishDataItemValue = calcDataItemValue(
       model.finishDataItemName,
       nodeModel
     );
-    this.totalDataItemValue = calcDataItemValue(
+    this._totalDataItemValue = calcDataItemValue(
       model.totalDataItemName,
       nodeModel
     );
@@ -9735,32 +9751,32 @@ var GanttDataSetNodeData = class extends TreeDataSetNodeData {
   constructor(model, nodeModel, parentNodeData, opts) {
     super(nodeModel, parentNodeData, opts);
     const { data } = opts;
-    this.sndataIteValue = calcDataItemValue(
+    this._sndataIteValue = calcDataItemValue(
       model.sndataItemName,
       nodeModel,
       data
     );
-    this.beginDataItemValue = calcDataItemValue(
+    this._beginDataItemValue = calcDataItemValue(
       model.beginDataItemName,
       nodeModel,
       data
     );
-    this.endDataItemValue = calcDataItemValue(
+    this._endDataItemValue = calcDataItemValue(
       model.endDataItemName,
       nodeModel,
       data
     );
-    this.prevDataItemValue = calcDataItemValue(
+    this._prevDataItemValue = calcDataItemValue(
       model.prevDataItemName,
       nodeModel,
       data
     );
-    this.finishDataItemValue = calcDataItemValue(
+    this._finishDataItemValue = calcDataItemValue(
       model.finishDataItemName,
       nodeModel,
       data
     );
-    this.totalDataItemValue = calcDataItemValue(
+    this._totalDataItemValue = calcDataItemValue(
       model.totalDataItemName,
       nodeModel,
       data
@@ -9773,32 +9789,32 @@ var GanttCodeListNodeData = class extends TreeCodeListNodeData {
   constructor(model, nodeModel, parentNodeData, opts) {
     super(nodeModel, parentNodeData, opts);
     const { data } = opts;
-    this.sndataIteValue = calcDataItemValue(
+    this._sndataIteValue = calcDataItemValue(
       model.sndataItemName,
       nodeModel,
       data
     );
-    this.beginDataItemValue = calcDataItemValue(
+    this._beginDataItemValue = calcDataItemValue(
       model.beginDataItemName,
       nodeModel,
       data
     );
-    this.endDataItemValue = calcDataItemValue(
+    this._endDataItemValue = calcDataItemValue(
       model.endDataItemName,
       nodeModel,
       data
     );
-    this.prevDataItemValue = calcDataItemValue(
+    this._prevDataItemValue = calcDataItemValue(
       model.prevDataItemName,
       nodeModel,
       data
     );
-    this.finishDataItemValue = calcDataItemValue(
+    this._finishDataItemValue = calcDataItemValue(
       model.finishDataItemName,
       nodeModel,
       data
     );
-    this.totalDataItemValue = calcDataItemValue(
+    this._totalDataItemValue = calcDataItemValue(
       model.totalDataItemName,
       nodeModel,
       data
@@ -18691,7 +18707,7 @@ var TreeExpBarController = class extends ExpBarControlController {
      * @date 2023-07-10 03:07:11
      * @memberof TreeExpBarController
      */
-    this.navKeyName = "id";
+    this.navKeyName = "_id";
     /**
      * 有导航视图的节点模型标识集合
      * @author lxm
@@ -18734,7 +18750,6 @@ var TreeExpBarController = class extends ExpBarControlController {
    *
    * @author zk
    * @date 2023-05-29 03:05:36
-   * @param {IData} data
    * @memberof ExpBarControlController
    */
   xDataActive(event) {
@@ -18751,11 +18766,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;
@@ -18775,7 +18790,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;
@@ -24919,7 +24934,7 @@ import {
   mergeInLeft as mergeInLeft3,
   recursiveIterate as recursiveIterate9
 } from "@ibiz-template/core";
-import { isNil as isNil23 } from "ramda";
+import { clone as clone24, isNil as isNil23 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
 import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
@@ -25217,7 +25232,21 @@ function initDefaultEditor() {
   });
 }
 initDefaultEditor();
-function calcFilterModelBySchema(json, c) {
+function getEditor(field, op) {
+  if (field.enumSource) {
+    return {
+      appId,
+      editorType: "DROPDOWNLIST",
+      singleSelect: true,
+      valueType: "SIMPLE",
+      appCodeListId: field.enumSource,
+      id: "".concat(field.key, "_").concat(op)
+    };
+  }
+  const editorModel = EditorsMap["".concat(field.type, "_").concat(op)];
+  return editorModel;
+}
+async function calcFilterModelBySchema(json, c) {
   var _a;
   if (!json.properties) {
     return [];
@@ -25247,11 +25276,16 @@ function calcFilterModelBySchema(json, c) {
     addFields.push({
       key,
       description: properties[key].description,
-      type
+      type,
+      enumSource: properties[key].enumSource
     });
   });
   const codeNameToId = {};
-  (_a = c.appDataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
+  const dataEntity = await ibiz.hub.getAppDataEntity(
+    c.model.appDataEntityId,
+    c.model.appId
+  );
+  (_a = dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
     codeNameToId[field.codeName.toLowerCase()] = field.id;
   });
   const addSearchBarFilters = [];
@@ -25262,18 +25296,18 @@ function calcFilterModelBySchema(json, c) {
       return;
     }
     ops.forEach((op) => {
-      const editorModel = EditorsMap["".concat(item.type, "_").concat(op)];
-      addSearchBarFilters.push({
-        appId,
-        appDEFieldId: codeNameToId[item.key],
-        id: item.key,
-        caption: item.description,
-        defsearchMode: {
+      if (item)
+        addSearchBarFilters.push({
           appId,
-          valueOP: op
-        },
-        editor: editorModel
-      });
+          appDEFieldId: codeNameToId[item.key],
+          id: item.key,
+          caption: item.description,
+          defsearchMode: {
+            appId,
+            valueOP: op
+          },
+          editor: getEditor(item, op)
+        });
     });
   });
   return addSearchBarFilters;
@@ -25312,12 +25346,29 @@ var SearchBarController = class extends ControlController {
      */
     this.isBackendSearchGroup = this.model.searchBarStyle === "SEARCHBAR2";
     /**
-     * 启用自定义过滤项
+     * 是否启用根据实体的JSON Schema生成过滤项
      * @author lxm
-     * @date 2023-12-29 04:15:34
-     * @type {boolean}
+     * @date 2024-01-05 10:10:37
      */
-    this.enableFilter = this.model.enableFilter === true;
+    this.addSchemaFilters = false;
+  }
+  /**
+   * 启用自定义过滤项
+   * @author lxm
+   * @date 2023-12-29 04:15:34
+   * @type {boolean}
+   */
+  get enableFilter() {
+    return this.model.enableFilter === true;
+  }
+  /**
+   * 最终使用的searchBarFilters
+   * @author lxm
+   * @date 2023-12-29 06:55:13
+   * @type {ISearchBarFilter[]}
+   */
+  get searchBarFilters() {
+    return this.model.searchBarFilters || [];
   }
   /**
    * 表格控制器
@@ -25334,19 +25385,11 @@ var SearchBarController = class extends ControlController {
     this.state.selectedGroupItem = null;
     this.state.searchBarGroups = [];
     this.state.selectedSearchGroupItem = null;
-    this.initFilterState();
-  }
-  /**
-   * 初始化Filter相关的属性
-   * @author lxm
-   * @date 2023-12-29 04:18:02
-   * @protected
-   */
-  initFilterState() {
     this.resetFilter();
     this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.enableFilter);
   }
   async onCreated() {
+    await this.initByEntitySchema();
     await super.onCreated();
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
@@ -25360,7 +25403,6 @@ var SearchBarController = class extends ControlController {
       this.service = new SearchBarService(this.model, this.view.model.codeName);
       await this.service.init(this.context);
     }
-    await this.initByEntitySchema();
     await this.initSearchBarFilters();
     await this.initSearBarGroups();
   }
@@ -25372,12 +25414,17 @@ var SearchBarController = class extends ControlController {
    */
   async initByEntitySchema() {
     var _a;
-    this.enableFilter = true;
-    const json = await getEntitySchema(this.appDataEntity.id, this.context);
+    if (!this.addSchemaFilters) {
+      return;
+    }
+    const json = await getEntitySchema(
+      this.model.appDataEntityId,
+      this.context
+    );
     if (!json) {
       return;
     }
-    const addSearchBarFilters = calcFilterModelBySchema(json, this);
+    const addSearchBarFilters = await calcFilterModelBySchema(json, this);
     const mergeFilters = [];
     (_a = this.model.searchBarFilters) == null ? void 0 : _a.forEach((filter) => {
       const findindex = addSearchBarFilters.findIndex(
@@ -25390,8 +25437,11 @@ var SearchBarController = class extends ControlController {
         mergeFilters.push(filter);
       }
     });
-    addSearchBarFilters.push(...mergeFilters);
-    this.searchBarFilters = addSearchBarFilters;
+    if (addSearchBarFilters.length > 0) {
+      this.model = clone24(this.model);
+      this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
+      this.model.enableFilter = true;
+    }
   }
   /**
    * 计算快速搜索的占位
@@ -25505,7 +25555,7 @@ var SearchBarController = class extends ControlController {
    * @return {*}  {IData}
    */
   calcFilters() {
-    if (!this.model.enableFilter) {
+    if (!this.enableFilter) {
       return;
     }
     let hasFilter = false;
@@ -26000,7 +26050,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) {
@@ -26086,13 +26136,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;
           }
         })
       );
@@ -26136,25 +26186,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(
       {
@@ -26476,7 +26526,7 @@ var TreeController = class extends MDControlController {
       this.state.isLoading = false;
     }
     if (parentNode) {
-      parentNode.children = nodes;
+      parentNode._children = nodes;
     } else {
       this.state.rootNodes = nodes;
     }
@@ -26493,10 +26543,11 @@ var TreeController = class extends MDControlController {
   async afterLoadNodes(nodes) {
     this.state.items = [];
     recursiveIterate10(
-      { children: this.state.rootNodes },
+      { _children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
-      }
+      },
+      { childrenFields: ["_children"] }
     );
     this.state.expandedKeys = this.calcExpandedKeys(nodes);
   }
@@ -26509,7 +26560,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,
@@ -26519,14 +26570,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])
@@ -26547,11 +26598,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);
       }
@@ -26574,9 +26625,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);
   }
@@ -26595,11 +26646,11 @@ var TreeController = class extends MDControlController {
    * 通过标识获取节点数据
    * @author lxm
    * @date 2023-12-22 02:21:38
-   * @param {string} id 可以是节点id也可以是_uuid
+   * @param {string} key 可以是节点_id也可以是_uuid
    * @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;
     }
@@ -26654,9 +26705,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 || {} }
     };
   }
   /**
@@ -26669,12 +26720,16 @@ var TreeController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [...this.state.expandedKeys];
-    recursiveIterate10({ children: nodes }, (node) => {
-      var _a;
-      if ((_a = node.children) == null ? void 0 : _a.length) {
-        expandedKeys.push(node.id);
-      }
-    });
+    recursiveIterate10(
+      { _children: nodes },
+      (node) => {
+        var _a;
+        if ((_a = node._children) == null ? void 0 : _a.length) {
+          expandedKeys.push(node._id);
+        }
+      },
+      { childrenFields: ["_children"] }
+    );
     expandedKeys = Array.from(new Set(expandedKeys));
     return expandedKeys;
   }
@@ -26687,7 +26742,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]
     );
@@ -26696,13 +26751,13 @@ var TreeController = class extends MDControlController {
       return;
     }
     if (refreshParent) {
-      const { parent } = currentNode;
-      if (!parent || !this.model.rootVisible && this.state.rootNodes.includes(parent)) {
+      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,
@@ -26717,7 +26772,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) {
@@ -26737,7 +26792,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;
   }
   /**
@@ -26751,22 +26806,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
     );
   }
@@ -26795,44 +26850,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;
@@ -26842,7 +26897,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();
       }
@@ -26854,13 +26909,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) {
@@ -26891,8 +26946,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;
@@ -26903,7 +26958,7 @@ var TreeController = class extends MDControlController {
           deData
         );
         if (res.data) {
-          node.deData = res.data;
+          node._deData = res.data;
         }
       })
     );
@@ -26917,15 +26972,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]);
   }
 };
@@ -28301,9 +28356,13 @@ var TreeGridExController = class extends TreeController {
   }
   async afterLoadNodes(nodes) {
     await super.afterLoadNodes(nodes);
-    recursiveIterate11({ children: nodes }, (node) => {
-      this.state.rows[node._uuid] = new TreeGridExRowState(node, this);
-    });
+    recursiveIterate11(
+      { _children: nodes },
+      (node) => {
+        this.state.rows[node._uuid] = new TreeGridExRowState(node, this);
+      },
+      { childrenFields: ["_children"] }
+    );
   }
   /**
    * 转换各类多语言
@@ -29309,7 +29368,7 @@ var GanttService = class extends TreeService {
       );
     } else {
       const childNodeRSs = getChildNodeRSs(this.model, {
-        parentId: parentNodeData.nodeId,
+        parentId: parentNodeData._nodeId,
         hasQuery
       });
       if (childNodeRSs.length === 0) {
@@ -29400,7 +29459,7 @@ var GanttService = class extends TreeService {
               childNode,
               opts
             );
-            childNode.children = subChildrenNodes;
+            childNode._children = subChildrenNodes;
           }
         })
       );
@@ -29588,7 +29647,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]
     );
@@ -29596,7 +29655,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) {
@@ -30195,7 +30254,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
-import { clone as clone24 } from "ramda";
+import { clone as clone25 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -30403,7 +30462,7 @@ var MDViewEngine = class extends ViewEngineBase {
     if (!openAppViewLogic) {
       throw new RuntimeModelError66(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone24(this.view.params);
+    const params = clone25(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }