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

package/dist/index.esm.js

@@ -3247,8 +3247,8 @@ var baseStyle = {
   position: "fixed",
   zIndex: "10000"
 };
-function cloneElement(clone32, teleport = document.body, isRemoveChild = true) {
-  const element = getAnimationElement(clone32);
+function cloneElement(clone33, teleport = document.body, isRemoveChild = true) {
+  const element = getAnimationElement(clone33);
   if (element == null) {
     throw new Error("Cannot clone a null or undefined element.");
   }
@@ -3667,11 +3667,11 @@ function arrayContains(arr, val) {
   });
 }
 function cloneObject(o) {
-  var clone32 = {};
+  var clone33 = {};
   for (var p in o) {
-    clone32[p] = o[p];
+    clone33[p] = o[p];
   }
-  return clone32;
+  return clone33;
 }
 function replaceObjectProps(o1, o2) {
   var o = cloneObject(o1);
@@ -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
@@ -16081,6 +16095,7 @@ import dayjs3 from "dayjs";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError38 } from "@ibiz-template/core";
+import { clone as clone19 } from "ramda";
 var CalendarService = class extends MDControlService {
   /**
    * 执行查询多条数据的方法
@@ -16100,10 +16115,15 @@ var CalendarService = class extends MDControlService {
     const promises = sysCalendarItems.map(
       async (item) => {
         const fetchAction = item.appDEDataSetId || "fetchdefault";
+        const tempContext = context.clone();
+        const tempParams = clone19(params);
+        if (item.maxSize) {
+          tempParams.size = item.maxSize;
+        }
         return this.exec2(
           fetchAction,
-          context,
-          params,
+          tempContext,
+          tempParams,
           void 0,
           item.appDataEntityId
         );
@@ -16365,7 +16385,7 @@ import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone19, isNil as isNil22, mergeDeepRight } from "ramda";
+import { clone as clone20, isNil as isNil22, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax2);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -16640,7 +16660,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone19(singleData));
+      tempData.push(clone20(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -17691,7 +17711,7 @@ import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError32 }
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError18 } from "@ibiz-template/core";
-import { clone as clone20 } from "ramda";
+import { clone as clone21 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -17718,7 +17738,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone20(ibiz.env);
+      value = clone21(ibiz.env);
       break;
     default:
       throw new ModelError18(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -18077,7 +18097,7 @@ var EndNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
 import { ModelError as ModelError22, RuntimeError as RuntimeError41 } from "@ibiz-template/core";
-import { clone as clone21 } from "ramda";
+import { clone as clone22 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -18166,7 +18186,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone21(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone22(srcVal);
   }
   /**
    * 绑定参数
@@ -18393,7 +18413,7 @@ var ResetParamNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
-import { clone as clone22 } from "ramda";
+import { clone as clone23 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
@@ -18404,7 +18424,7 @@ var CopyParamNode2 = class extends UILogicNode {
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone22(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone23(srcVal);
   }
 };
 
@@ -23562,7 +23582,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
 import { ModelError as ModelError28 } from "@ibiz-template/core";
-import { clone as clone23 } from "ramda";
+import { clone as clone24 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -23646,7 +23666,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone23(tempForm);
+    this.repeatedForm = clone24(tempForm);
   }
   /**
    * 设置重复器数据（修改主表单里重复器对应属性）
@@ -23810,7 +23830,7 @@ import {
 } from "@ibiz-template/core";
 import { debounce as debounce2 } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
-import { clone as clone24 } from "ramda";
+import { clone as clone25 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -24175,8 +24195,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone24(this.context);
-    const queryParams = clone24(this.params);
+    const context = clone25(this.context);
+    const queryParams = clone25(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -24233,7 +24253,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone24(params);
+    const queryParams = clone25(params);
     let res;
     try {
       await this.startLoading();
@@ -24801,7 +24821,7 @@ import {
   RuntimeError as RuntimeError55,
   RuntimeModelError as RuntimeModelError61
 } from "@ibiz-template/core";
-import { clone as clone25 } from "ramda";
+import { clone as clone26 } from "ramda";
 
 // src/controller/control/grid/grid/grid.service.ts
 import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
@@ -25111,7 +25131,7 @@ var GridController = class extends MDControlController {
     const result = await calcColumnModelBySchema(json, this);
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
-      this.model = clone25(this.model);
+      this.model = clone26(this.model);
       this.model.degridColumns = [
         ...(this.model.degridColumns || []).filter((item) => {
           return degridColumns.findIndex((x) => x.id === item.id) === -1;
@@ -25626,7 +25646,7 @@ var GridController = class extends MDControlController {
         throw new RuntimeError55("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone25(row.data);
+        row.cacheData = clone26(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -25795,7 +25815,7 @@ var GridController = class extends MDControlController {
           }
         });
       }
-      const cloneData = clone25(
+      const cloneData = clone26(
         data2.map((item) => {
           return item.getOrigin();
         })
@@ -26033,7 +26053,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
 import dayjs5 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
-import { clone as clone26, isNil as isNil24 } from "ramda";
+import { clone as clone27, isNil as isNil24 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -26171,7 +26191,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone26(this.params);
+    const tempParams = clone27(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -27557,12 +27577,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 clone28 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
 import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
@@ -27571,9 +27587,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 +27598,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 +27905,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 +27941,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 +27972,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 +28082,7 @@ var SearchBarController = class extends ControlController {
      * @author lxm
      * @date 2024-01-05 10:10:37
      */
-    this.addSchemaFilters = false;
+    this.addSchemaFilters = true;
   }
   /**
    * 启用自定义过滤项
@@ -28081,7 +28159,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(
@@ -28095,7 +28177,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (addSearchBarFilters.length > 0) {
-      this.model = clone27(this.model);
+      this.model = clone28(this.model);
       this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
       this.model.enableFilter = true;
     }
@@ -28183,7 +28265,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 +28279,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 +28302,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 +28466,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);
@@ -30891,7 +30900,7 @@ import {
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
-import { clone as clone28 } from "ramda";
+import { clone as clone29 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -31327,7 +31336,7 @@ var TreeGridExController = class extends TreeController {
         throw new RuntimeError62("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data._deData.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone28(row.data);
+        row.cacheData = clone29(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -31440,7 +31449,7 @@ import {
   RuntimeError as RuntimeError63,
   RuntimeModelError as RuntimeModelError68
 } from "@ibiz-template/core";
-import { clone as clone29 } from "ramda";
+import { clone as clone30 } from "ramda";
 import dayjs6 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
@@ -31649,7 +31658,7 @@ var TreeGridExNodeColumnController = class {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone29(this.params);
+    const tempParams = clone30(this.params);
     const { userParam } = this.nodeColumn;
     if (userParam) {
       const { navigateContexts, navigateParams } = parseUserParams(userParam);
@@ -33169,7 +33178,7 @@ var HubController = class {
 
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent7 } from "qx-util";
-import { clone as clone30 } from "ramda";
+import { clone as clone31 } from "ramda";
 import { isNil as isNil28, isNumber as isNumber2 } from "lodash-es";
 import dayjs7 from "dayjs";
 var AsyncActionController = class {
@@ -33277,7 +33286,7 @@ var AsyncActionController = class {
     } else {
       this.noticeResult(action);
     }
-    this.evt.emit("add", clone30(action));
+    this.evt.emit("add", clone31(action));
     this.evt.emit("dataChange");
   }
   /**
@@ -33299,7 +33308,7 @@ var AsyncActionController = class {
       }
       this.noticeResult(action);
     }
-    this.evt.emit("change", clone30(action));
+    this.evt.emit("change", clone31(action));
     this.evt.emit("dataChange");
   }
   noticeResult(action) {
@@ -33326,6 +33335,7 @@ var InternalMessageController = class {
   }
   async init() {
     this.load();
+    this.listenMqtt();
   }
   async load() {
     await this.fetch(false);
@@ -33353,6 +33363,21 @@ var InternalMessageController = class {
     }
     this.evt.emit("dataChange");
   }
+  /**
+   * 监听mqtt消息
+   * @author lxm
+   * @date 2024-01-30 01:53:44
+   * @protected
+   */
+  listenMqtt() {
+    ibiz.mc.command.internalMessage.on(async (msg) => {
+      ibiz.log.debug("mqtt internalMessage: ", msg);
+      if (msg.subtype !== "INTERNALMESSAGE") {
+        return;
+      }
+      ibiz.notification.info({ desc: msg.content, position: "bottom-right" });
+    });
+  }
 };
 
 // src/controller/notification/notice.controller.ts
@@ -33769,7 +33794,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError66, findRecursiveChild as findRecursiveChild3 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -33839,27 +33864,79 @@ var ViewEngineBase = class {
   async onCreated() {
     const { childNames } = this.view;
     childNames.push("captionbar", "toolbar");
+    this.calcDynamicLayout();
   }
-  async onMounted() {
-    var _a, _b;
-    const { model, childNames } = this.view;
-    ibiz.log.debug("".concat(model.id, "\u7684\u5B50\u7EC4\u4EF6\uFF1A").concat(childNames.join(";"), "\u90FD\u5DF2mounted"));
-    const showHeader = this.calcViewHeaderVisible();
-    if (!showHeader) {
-      const controller = (_a = this.viewLayoutPanel) == null ? void 0 : _a.panelItems.view_header;
-      if (controller) {
-        controller.state.visible = false;
-      }
+  /**
+   * 计算动态布局模型
+   *
+   * @author zk
+   * @date 2024-01-29 02:01:47
+   * @memberof ViewEngineBase
+   */
+  calcDynamicLayout() {
+    const names = this.calcRemoveLayoutModel();
+    ibiz.log.debug("".concat(this.view.model.codeName, "\u5220\u9664\u6A21\u578B\uFF1A").concat(names.join(";")));
+    this.removeLayoutModel(names);
+  }
+  /**
+   * 计算移除的模型名称
+   *
+   * @author zk
+   * @date 2024-01-29 02:01:21
+   * @return {*}  {string[]}
+   * @memberof ViewEngineBase
+   */
+  calcRemoveLayoutModel() {
+    const { model } = this.view;
+    const names = [];
+    if (model.showCaptionBar === false) {
+      names.push("view_captionbar");
     }
-    if (ibiz.env.isMob) {
-      const showFooter = this.calcViewFooterVisible();
-      if (!showFooter) {
-        const controller = (_b = this.viewLayoutPanel) == null ? void 0 : _b.panelItems.view_footer;
-        if (controller) {
-          controller.state.visible = false;
-        }
+    if (!getControl(model, "toolbar")) {
+      names.push("view_toolbar", "toolbar");
+    }
+    const toolBarList = ["lefttoolbar", "righttoolbar", "footertoolbar"];
+    toolBarList.forEach((name) => {
+      if (!getControl(model, name)) {
+        names.push(name);
       }
+    });
+    if (!this.calcViewHeaderVisible()) {
+      names.push("view_header");
     }
+    if (!this.calcViewFooterVisible()) {
+      names.push("view_footer");
+    }
+    return names;
+  }
+  /**
+   * 删除布局模型
+   *
+   * @author zk
+   * @date 2024-01-29 02:01:29
+   * @param {string[]} names
+   * @param {(IPanelContainer | undefined)} [container=this.view.model.viewLayoutPanel]
+   * @return {*}  {void}
+   * @memberof ViewEngineBase
+   */
+  removeLayoutModel(names, container = this.view.model.viewLayoutPanel) {
+    if (!container) {
+      return;
+    }
+    const items = container.rootPanelItems || container.panelItems || [];
+    const index = items.findIndex((item) => names.includes(item.id));
+    if (index !== -1) {
+      items.splice(index, 1);
+    }
+    items.forEach((item) => {
+      if (item.itemType === "CONTAINER") {
+        this.removeLayoutModel(names, item);
+      }
+    });
+  }
+  async onMounted() {
+    const { model, childNames } = this.view;
+    ibiz.log.debug("".concat(model.id, "\u7684\u5B50\u7EC4\u4EF6\uFF1A").concat(childNames.join(";"), "\u90FD\u5DF2mounted"));
   }
   async onDestroyed() {
   }
@@ -33895,44 +33972,45 @@ var ViewEngineBase = class {
    * @protected
    */
   calcViewHeaderVisible() {
-    var _a, _b, _c, _d;
     let showHeader = false;
     const { model } = this.view;
-    if (model.showCaptionBar === false) {
-      const controller = (_a = this.viewLayoutPanel) == null ? void 0 : _a.panelItems.view_captionbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
+    if (model.showCaptionBar) {
       showHeader = true;
     }
     if (ibiz.env.isMob) {
-      if (!this.leftToolbar) {
-        const controller = (_b = this.viewLayoutPanel) == null ? void 0 : _b.panelItems.lefttoolbar;
-        if (controller) {
-          controller.state.visible = false;
-        }
-      } else {
+      if (this.isExistAndInLayout("lefttoolbar")) {
         showHeader = true;
       }
-      if (!this.rightToolbar) {
-        const controller = (_c = this.viewLayoutPanel) == null ? void 0 : _c.panelItems.righttoolbar;
-        if (controller) {
-          controller.state.visible = false;
-        }
-      } else {
+      if (this.isExistAndInLayout("righttoolbar")) {
         showHeader = true;
       }
-    } else if (!this.toolbar) {
-      const controller = (_d = this.viewLayoutPanel) == null ? void 0 : _d.panelItems.view_toolbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
+    } else if (this.isExistAndInLayout("toolbar")) {
       showHeader = true;
     }
     return showHeader;
   }
+  /**
+   * 是否存在模型 并且 布局中有占位
+   *
+   * @author zk
+   * @date 2024-01-30 11:01:33
+   * @param {string} name
+   * @return {*}  {(IData | undefined)}
+   * @memberof ViewEngineBase
+   */
+  isExistAndInLayout(name) {
+    const layout = this.view.model.viewLayoutPanel;
+    if (!layout) {
+      return false;
+    }
+    const ins = findRecursiveChild3(layout, name, {
+      compareField: "id",
+      childrenFields: ["panelItems", "rootPanelItems"]
+    });
+    const { model } = this.view;
+    const has = getControl(model, name);
+    return !!(ins && has);
+  }
   /**
    * 计算底部的显示与否
    * @author lxm
@@ -33942,7 +34020,7 @@ var ViewEngineBase = class {
    */
   calcViewFooterVisible() {
     let showFooter = false;
-    if (this.footerToolbar) {
+    if (this.isExistAndInLayout("footertoolbar")) {
       showFooter = true;
     }
     return showFooter;
@@ -33979,7 +34057,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
-import { clone as clone31 } from "ramda";
+import { clone as clone32 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -34191,7 +34269,7 @@ var MDViewEngine = class extends ViewEngineBase {
     if (!openAppViewLogic) {
       throw new RuntimeModelError70(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone31(this.view.params);
+    const params = clone32(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -34292,17 +34370,38 @@ var MDViewEngine = class extends ViewEngineBase {
   async copy(args) {
     this.newData(Object.assign(args, { copyMode: true }));
   }
+  /**
+   * 计算头部显示
+   *
+   * @author zk
+   * @date 2024-01-29 05:01:30
+   * @protected
+   * @return {*}  {boolean}
+   * @memberof MDViewEngine
+   */
   calcViewHeaderVisible() {
-    let showHeader = super.calcViewHeaderVisible();
-    if (!this.searchBar || !this.searchBar.state.visible) {
-      const controller = this.viewLayoutPanel.panelItems.view_searchbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
-      showHeader = true;
+    const showHeader = super.calcViewHeaderVisible();
+    const visible = this.calcViewSearchBarVisible();
+    return visible || showHeader;
+  }
+  /**
+   * 计算搜索栏显示
+   *
+   * @author zk
+   * @date 2024-01-29 05:01:36
+   * @protected
+   * @return {*}  {boolean}
+   * @memberof MDViewEngine
+   */
+  calcViewSearchBarVisible() {
+    const { model } = this.view;
+    const has = this.isExistAndInLayout("searchbar");
+    if (!has) {
+      return has;
     }
-    return showHeader;
+    const searchBar = getControl(model, "searchbar");
+    const visible = !!(searchBar.enableQuickSearch || searchBar.enableGroup || searchBar.enableFilter === true);
+    return visible;
   }
   /**
    * 切换搜索表单的显示与否
@@ -34318,6 +34417,25 @@ var MDViewEngine = class extends ViewEngineBase {
       }
     }
   }
+  /**
+   * 计算移除的模型名称
+   *
+   * @author zk
+   * @date 2024-01-29 03:01:42
+   * @return {*}  {string[]}
+   * @memberof MDViewEngine
+   */
+  calcRemoveLayoutModel() {
+    const { model } = this.view;
+    const names = super.calcRemoveLayoutModel();
+    if (!getControl(model, "searchform")) {
+      names.push("searchform");
+    }
+    if (!this.calcViewSearchBarVisible()) {
+      names.push("view_searchbar");
+    }
+    return names;
+  }
 };
 
 // src/global/global-util/global-util.ts
@@ -35796,11 +35914,13 @@ export {
   calcDeCodeNameById,
   calcDynaClass,
   calcDynaSysParams,
+  calcFilterModelBySchema,
   calcGridLayoutPos,
   calcLayoutHeightWidth,
   calcMainStateOPPrivsStrs,
   calcNavParams,
   calcResPath,
+  calcSearchConds,
   compare,
   compareNumber,
   contains,
@@ -35821,6 +35941,7 @@ export {
   findEditItem,
   findFieldById,
   findModelChild,
+  formatFilters,
   formatMultiData,
   generateEditorRules,
   generateRules,
@@ -35845,6 +35966,7 @@ export {
   getInternalMessageProvider,
   getMatchResPath,
   getOriginData,
+  getOriginFilterNodes,
   getPFPlugin,
   getPanelItemProvider,
   getPlatformProvider,
@@ -35873,6 +35995,7 @@ export {
   isValueChange,
   matchMainState,
   openRedirectView,
+  parseFilters,
   parseUserParams,
   presetAppCounterProvider,
   presetDEMethodProvider,