@ibiz-template/runtime 0.5.1-beta.1 → 0.5.1-dev.0

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;
   }
@@ -9133,8 +9146,6 @@ 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;
@@ -9183,9 +9194,9 @@ var TreeCodeListNodeData = class extends TreeNodeData {
     this._text = data.text;
     this._value = data.value;
     const selfId = "".concat(model.id, "@").concat(this._value).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
@@ -9213,9 +9224,9 @@ var TreeDataSetNodeData = class extends TreeNodeData {
     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
@@ -9231,12 +9242,14 @@ var TreeDataSetNodeData = class extends TreeNodeData {
     if (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;
       }
@@ -9245,8 +9258,8 @@ var TreeDataSetNodeData = class extends TreeNodeData {
       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;
+        } else if (dataItemKeyMap.has(p)) {
+          target._deData[dataItemKeyMap.get(p)] = value;
         } else {
           target[p] = value;
         }
@@ -9256,8 +9269,8 @@ 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];
@@ -9267,7 +9280,7 @@ var TreeDataSetNodeData = class extends TreeNodeData {
         const allKeys = [
           .../* @__PURE__ */ new Set([
             ...Object.keys(target),
-            ...dataItemkeyMap.keys(),
+            ...dataItemKeyMap.keys(),
             ...Object.keys(target._deData)
           ])
         ];
@@ -9336,9 +9349,9 @@ 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
@@ -18691,7 +18704,7 @@ var TreeExpBarController = class extends ExpBarControlController {
      * @date 2023-07-10 03:07:11
      * @memberof TreeExpBarController
      */
-    this.navKeyName = "id";
+    this.navKeyName = "_id";
     /**
      * 有导航视图的节点模型标识集合
      * @author lxm
@@ -26492,10 +26505,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);
   }
@@ -26594,7 +26608,7 @@ 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) {
@@ -26668,12 +26682,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;
   }
@@ -28300,9 +28318,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"] }
+    );
   }
   /**
    * 转换各类多语言