@ibiz-template/runtime 0.5.7-alpha.4 → 0.5.7-alpha.5

package/dist/index.esm.js

@@ -9336,6 +9336,7 @@ var V7AuthService = class {
               true
             );
           }
+          await this.loadAppData();
           ibiz.hub.getAllApps().forEach((app) => {
             app.initMqtt();
           });
@@ -9352,6 +9353,19 @@ var V7AuthService = class {
       isAnonymous
     } : void 0;
   }
+  /**
+   * 加载应用数据
+   *
+   * @author chitanda
+   * @date 2022-07-20 20:07:50
+   * @return {*}  {Promise<void>}
+   */
+  async loadAppData() {
+    const res = await ibiz.net.get("/appdata");
+    if (res.ok) {
+      ibiz.appData = res.data;
+    }
+  }
 };
 
 // src/service/service/async-action/async-action.service.ts
@@ -27557,12 +27571,8 @@ var PickupViewPanelController = class extends ControlController {
 };
 
 // src/controller/control/search-bar/search-bar.controller.ts
-import {
-  RuntimeError as RuntimeError58,
-  mergeInLeft as mergeInLeft3,
-  recursiveIterate as recursiveIterate9
-} from "@ibiz-template/core";
-import { clone as clone27, isNil as isNil25 } from "ramda";
+import { mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
+import { clone as clone27 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
 import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
@@ -27571,9 +27581,9 @@ var ExcludeOPs = [
   "ISNOTNULL" /* IS_NOT_NULL */
 ];
 var SearchBarFilterController = class {
-  constructor(model, searchBar) {
+  constructor(model, appDataEntity, context, params) {
     this.model = model;
-    this.searchBar = searchBar;
+    this.appDataEntity = appDataEntity;
     /**
      * 不需要编辑器
      * @author lxm
@@ -27582,21 +27592,17 @@ var SearchBarFilterController = class {
      */
     this.noEditor = false;
     var _a;
+    this.context = context;
+    this.params = params;
     let field;
     if (model.appDEFieldId) {
-      field = findFieldById(searchBar.appDataEntity, model.appDEFieldId);
+      field = findFieldById(appDataEntity, model.appDEFieldId);
     }
     this.fieldName = field ? field.codeName.toLowerCase() : model.id;
     this.label = model.caption || (field == null ? void 0 : field.logicName) || model.id;
     this.valueOP = (_a = model.defsearchMode) == null ? void 0 : _a.valueOP;
     this.noEditor = this.valueOP ? ExcludeOPs.includes(this.valueOP) : !this.model.editor;
   }
-  get context() {
-    return this.searchBar.context;
-  }
-  get params() {
-    return this.searchBar.params;
-  }
   /**
    * 初始化
    * @author lxm
@@ -27893,7 +27899,7 @@ function getEditor(field, op) {
   const editorModel = EditorsMap["".concat(field.type, "_").concat(op)];
   return editorModel;
 }
-async function calcFilterModelBySchema(json, c) {
+async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
   var _a;
   if (!json.properties) {
     return [];
@@ -27929,8 +27935,8 @@ async function calcFilterModelBySchema(json, c) {
   });
   const codeNameToId = {};
   const dataEntity = await ibiz.hub.getAppDataEntity(
-    c.model.appDataEntityId,
-    c.model.appId
+    appDataEntityId,
+    modelAppId
   );
   (_a = dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
     codeNameToId[field.codeName.toLowerCase()] = field.id;
@@ -27960,6 +27966,72 @@ async function calcFilterModelBySchema(json, c) {
   return addSearchBarFilters;
 }
 
+// src/controller/control/search-bar/use-searchcond.ts
+import { RuntimeError as RuntimeError58, recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
+import { isNil as isNil25 } from "ramda";
+function getOriginFilterNodes() {
+  return [
+    {
+      leaf: false,
+      logicType: "AND",
+      children: [{ leaf: true, field: null, valueOP: null, value: null }]
+    }
+  ];
+}
+function formatFilters(node) {
+  if (!node.leaf) {
+    return {
+      condtype: "GROUP",
+      condop: node.logicType,
+      bnotmode: false,
+      searchconds: node.children.map((item) => formatFilters(item))
+    };
+  }
+  return {
+    condtype: "DEFIELD",
+    fieldname: node.field,
+    condop: node.valueOP,
+    value: node.value
+  };
+}
+function parseFilters(data) {
+  if (data.condtype === "GROUP") {
+    return {
+      leaf: false,
+      logicType: data.condop === "AND" ? "AND" : "OR",
+      children: (data.searchconds || []).map(
+        (item) => parseFilters(item)
+      )
+    };
+  }
+  if (data.condtype === "DEFIELD") {
+    return {
+      leaf: true,
+      field: data.fieldname || null,
+      valueOP: data.condop || null,
+      value: data.value || null
+    };
+  }
+  throw new RuntimeError58("\u65E0\u6548\u7684condtype:".concat(data.condtype));
+}
+function calcSearchConds(filterNodes) {
+  let hasFilter = false;
+  let hasError = false;
+  recursiveIterate9(filterNodes[0], (node) => {
+    if (node.leaf) {
+      if (node.field && node.valueOP && !isNil25(node.value)) {
+        hasFilter = true;
+      } else {
+        hasError = true;
+      }
+    }
+  });
+  if (hasFilter && !hasError) {
+    const filter = [formatFilters(filterNodes[0])];
+    return filter;
+  }
+}
+
 // src/controller/control/search-bar/search-bar.controller.ts
 var SearchBarController = class extends ControlController {
   constructor() {
@@ -28004,7 +28076,7 @@ var SearchBarController = class extends ControlController {
      * @author lxm
      * @date 2024-01-05 10:10:37
      */
-    this.addSchemaFilters = false;
+    this.addSchemaFilters = true;
   }
   /**
    * 启用自定义过滤项
@@ -28081,7 +28153,11 @@ var SearchBarController = class extends ControlController {
     if (!json) {
       return;
     }
-    const addSearchBarFilters = await calcFilterModelBySchema(json, this);
+    const addSearchBarFilters = await calcFilterModelBySchema(
+      json,
+      this.model.appDataEntityId,
+      this.model.appId
+    );
     const mergeFilters = [];
     (_a = this.model.searchBarFilters) == null ? void 0 : _a.forEach((filter) => {
       const findindex = addSearchBarFilters.findIndex(
@@ -28183,7 +28259,7 @@ var SearchBarController = class extends ControlController {
    * @date 2023-10-16 03:52:44
    */
   resetFilter() {
-    this.state.filterNodes = this.getOriginFilterNodes();
+    this.state.filterNodes = getOriginFilterNodes();
     this.evt.emit("onSearch", void 0);
   }
   /**
@@ -28197,7 +28273,12 @@ var SearchBarController = class extends ControlController {
     var _a;
     if ((_a = this.searchBarFilters) == null ? void 0 : _a.length) {
       this.searchBarFilters.forEach((item) => {
-        const filterController = new SearchBarFilterController(item, this);
+        const filterController = new SearchBarFilterController(
+          item,
+          this.appDataEntity,
+          this.context,
+          this.params
+        );
         this.filterControllers.push(filterController);
       });
       await Promise.all(
@@ -28215,86 +28296,8 @@ var SearchBarController = class extends ControlController {
     if (!this.enableFilter) {
       return;
     }
-    let hasFilter = false;
-    let hasError = false;
-    recursiveIterate9(this.state.filterNodes[0], (node) => {
-      if (node.leaf) {
-        if (node.field && node.valueOP && !isNil25(node.value)) {
-          hasFilter = true;
-        } else {
-          hasError = true;
-        }
-      }
-    });
-    if (hasFilter && !hasError) {
-      const filter = [this.formatFilters(this.state.filterNodes[0])];
-      return filter;
-    }
-  }
-  /**
-   * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
-   * @author lxm
-   * @date 2023-10-16 03:45:41
-   * @param {IFilterNode} node
-   * @return {*}  {IData}
-   */
-  formatFilters(node) {
-    if (!node.leaf) {
-      return {
-        condtype: "GROUP",
-        condop: node.logicType,
-        bnotmode: false,
-        searchconds: node.children.map((item) => this.formatFilters(item))
-      };
-    }
-    return {
-      condtype: "DEFIELD",
-      fieldname: node.field,
-      condop: node.valueOP,
-      value: node.value
-    };
-  }
-  /**
-   * 根据格式化后的过滤项反推出过滤项树节点数据集合
-   * @param {IData} data
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-12-28 09:47:45
-   */
-  parseFilters(data) {
-    if (data.condtype === "GROUP") {
-      return {
-        leaf: false,
-        logicType: data.condop === "AND" ? "AND" : "OR",
-        children: (data.searchconds || []).map(
-          (item) => this.parseFilters(item)
-        )
-      };
-    }
-    if (data.condtype === "DEFIELD") {
-      return {
-        leaf: true,
-        field: data.fieldname || null,
-        valueOP: data.condop || null,
-        value: data.value || null
-      };
-    }
-    throw new RuntimeError58("\u65E0\u6548\u7684condtype:".concat(data.condtype));
-  }
-  /**
-   * 获取初始过滤项树节点数据集合
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-12-21 17:29:47
-   */
-  getOriginFilterNodes() {
-    return [
-      {
-        leaf: false,
-        logicType: "AND",
-        children: [{ leaf: true, field: null, valueOP: null, value: null }]
-      }
-    ];
+    const searchconds = calcSearchConds(this.state.filterNodes);
+    return searchconds;
   }
   /**
    * 初始化搜索栏分组项(获取后台分组清单并合并模型)
@@ -28457,11 +28460,11 @@ var SearchBarController = class extends ControlController {
     }
     if (groupItem.searchGroupData && groupItem.searchGroupData.searchconds && groupItem.searchGroupData.searchconds.length > 0) {
       const filterNodes = groupItem.searchGroupData.searchconds.map(
-        (item) => this.parseFilters(item)
+        (item) => parseFilters(item)
       );
       this.state.filterNodes = filterNodes;
     } else {
-      this.state.filterNodes = this.getOriginFilterNodes();
+      this.state.filterNodes = getOriginFilterNodes();
     }
     if (this.grid && groupItem && groupItem.searchGroupData) {
       this.grid.setGroupParams(groupItem.searchGroupData);
@@ -35796,11 +35799,13 @@ export {
   calcDeCodeNameById,
   calcDynaClass,
   calcDynaSysParams,
+  calcFilterModelBySchema,
   calcGridLayoutPos,
   calcLayoutHeightWidth,
   calcMainStateOPPrivsStrs,
   calcNavParams,
   calcResPath,
+  calcSearchConds,
   compare,
   compareNumber,
   contains,
@@ -35821,6 +35826,7 @@ export {
   findEditItem,
   findFieldById,
   findModelChild,
+  formatFilters,
   formatMultiData,
   generateEditorRules,
   generateRules,
@@ -35845,6 +35851,7 @@ export {
   getInternalMessageProvider,
   getMatchResPath,
   getOriginData,
+  getOriginFilterNodes,
   getPFPlugin,
   getPanelItemProvider,
   getPlatformProvider,
@@ -35873,6 +35880,7 @@ export {
   isValueChange,
   matchMainState,
   openRedirectView,
+  parseFilters,
   parseUserParams,
   presetAppCounterProvider,
   presetDEMethodProvider,