@ibiz-template/runtime 0.5.1-beta.1 → 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;
   }
@@ -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
@@ -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
@@ -24918,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";
@@ -25216,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 [];
@@ -25246,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 = [];
@@ -25261,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;
@@ -25311,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 || [];
   }
   /**
    * 表格控制器
@@ -25333,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,
@@ -25359,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();
   }
@@ -25371,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(
@@ -25389,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;
+    }
   }
   /**
    * 计算快速搜索的占位
@@ -25504,7 +25555,7 @@ var SearchBarController = class extends ControlController {
    * @return {*}  {IData}
    */
   calcFilters() {
-    if (!this.model.enableFilter) {
+    if (!this.enableFilter) {
       return;
     }
     let hasFilter = false;
@@ -26492,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);
   }
@@ -26594,7 +26646,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 +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;
   }
@@ -28300,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"] }
+    );
   }
   /**
    * 转换各类多语言
@@ -30194,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 {
   /**
    * 多数据部件名称
@@ -30402,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;
     }