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

package/dist/index.esm.js

@@ -9722,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
     );
@@ -9748,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
@@ -9786,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
@@ -24931,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";
@@ -25229,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 [];
@@ -25259,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 = [];
@@ -25274,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;
@@ -25324,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 || [];
   }
   /**
    * 表格控制器
@@ -25346,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,
@@ -25372,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();
   }
@@ -25384,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(
@@ -25402,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;
+    }
   }
   /**
    * 计算快速搜索的占位
@@ -25517,7 +25555,7 @@ var SearchBarController = class extends ControlController {
    * @return {*}  {IData}
    */
   calcFilters() {
-    if (!this.model.enableFilter) {
+    if (!this.enableFilter) {
       return;
     }
     let hasFilter = false;
@@ -30216,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 {
   /**
    * 多数据部件名称
@@ -30424,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;
     }