@ibiz-template/runtime 0.5.7-alpha.8 → 0.6.0-alpha.0

package/dist/index.esm.js

@@ -1243,6 +1243,15 @@ async function getDERedirectToView(appView, context, params = {}, opts = {}) {
   if (rdTag.startsWith("view://")) {
     const url = new URL(rdTag);
     if (url.searchParams.size > 0) {
+      const navCtx = url.searchParams.get("srfnavctx");
+      if (navCtx) {
+        try {
+          Object.assign(context, JSON.parse(navCtx));
+        } catch (error) {
+          ibiz.log.error("\u91CD\u5B9A\u5411[".concat(rdTag, "] \u4E2D srfnavctx \u53C2\u6570\u89E3\u6790\u5931\u8D25"), error);
+        }
+        url.searchParams.delete("srfnavctx");
+      }
       url.searchParams.forEach((value, _key) => {
         params[_key] = value;
       });
@@ -7199,7 +7208,26 @@ var SearchFilter = class {
 
 // src/service/utils/util/util.ts
 function fieldValueToBoolean(value) {
-  return [1, "1", true, "true"].includes(value);
+  if (typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "number") {
+    return value > 0;
+  }
+  if (typeof value === "string") {
+    switch (value) {
+      case "true":
+        return true;
+      case "false":
+        return false;
+      default: {
+        const num = Number(value);
+        return Number.isNaN(num) ? false : num > 0;
+      }
+    }
+  } else {
+    return !!value;
+  }
 }
 
 // src/service/utils/dyna-sys-params/dyna-sys-params.ts
@@ -7216,15 +7244,15 @@ async function calcDynaSysParams(appDataEntityId, context, opts = {}) {
       loadModelParams.srfkey = srfkey;
     }
   }
-  if (viewParams.srfparentkey && viewParams.srfparentdeanme) {
+  if (viewParams.srfparentkey && viewParams.srfparentdename) {
     loadModelParams.srfparentkey = viewParams.srfparentkey;
-    loadModelParams.srfparentdeanme = viewParams.srfparentdeanme;
+    loadModelParams.srfparentdename = viewParams.srfparentdename;
   } else {
     const match = getMatchResPath(context, appDe);
     if (match && match.keys.length > 1) {
       const parentDeKey = match.keys[match.keys.length - 2];
       loadModelParams.srfparentkey = viewParams.srfparentkey || context[parentDeKey];
-      loadModelParams.srfparentdeanme = viewParams.srfparentdeanme || parentDeKey;
+      loadModelParams.srfparentdename = viewParams.srfparentdename || parentDeKey;
     }
   }
   return loadModelParams;
@@ -8402,10 +8430,10 @@ var DEService = class {
    * @param {IParams} [params2={}] 查询参数
    * @return {*}  {Promise<IHttpResponse>}
    */
-  async exec(id, context, params, params2) {
+  async exec(id, context, params, params2, header) {
     const method = await this.getMethod(id);
     if (method) {
-      return method.exec(context, params, params2);
+      return method.exec(context, params, params2, header);
     }
     throw new RuntimeError19("".concat(this.model.codeName, "\u672A\u652F\u6301\u300C").concat(id, "\u300D\u65B9\u6CD5"));
   }
@@ -8820,15 +8848,32 @@ var ControlService = class {
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async exec(methodName, context, data, params) {
+    const header = this.handleCustomRequestHeader();
     const res = await this.app.deService.exec(
       this.model.appDataEntityId,
       methodName,
       context,
       data,
-      params
+      params,
+      header
     );
     return res;
   }
+  /**
+   * 处理自定义请求头
+   *
+   * @author zk
+   * @date 2024-02-02 11:02:55
+   * @memberof ControlService
+   */
+  handleCustomRequestHeader() {
+    const customHeader = {};
+    const { enableItemPrivilege } = this.model;
+    if (enableItemPrivilege) {
+      Object.assign(customHeader, { srfdataaccaction: true });
+    }
+    return customHeader;
+  }
   /**
    * 处理响应
    *
@@ -9557,7 +9602,7 @@ var Method = class {
    * @param {IParams} params
    * @return {*}  {Promise<HttpResponse<any>>}
    */
-  async request(path2, context, data, params) {
+  async request(path2, context, data, params, header) {
     const { actionType, requestMethod } = this.method;
     if (actionType === "REMOTE") {
       const methodName = this.method.codeName.toLowerCase();
@@ -9566,19 +9611,22 @@ var Method = class {
         case "POST":
           res = await this.app.net.post(
             this.mergeRequestPath(path2, methodName),
-            data || params || {}
+            data || params || {},
+            header
           );
           break;
         case "GET":
           res = await this.app.net.get(
             this.mergeRequestPath(path2, methodName),
-            data || params
+            data || params,
+            header
           );
           break;
         case "PUT": {
           res = await this.app.net.put(
             this.mergeRequestPath(path2, methodName),
-            data || params || {}
+            data || params || {},
+            header
           );
           break;
         }
@@ -10757,7 +10805,7 @@ var DEActionMethod = class extends Method {
     }
     return this.input.handle(context, data);
   }
-  async exec(context, data, params) {
+  async exec(context, data, params, header) {
     let result;
     if (data && !["READ", "GETDRAFT"].includes(this.method.actionMode)) {
       await execFieldLogics(this.entity, "change", context, data, params);
@@ -10774,19 +10822,19 @@ var DEActionMethod = class extends Method {
       }
       switch (this.method.codeName) {
         case "Create":
-          result = await this.create(context, data, params || {});
+          result = await this.create(context, data, params || {}, header);
           break;
         case "Get":
-          result = await this.get(context, params);
+          result = await this.get(context, params, header);
           break;
         case "GetDraft":
-          result = await this.getDraft(context, params);
+          result = await this.getDraft(context, params, header);
           break;
         case "Remove":
           result = await this.remove(context, params);
           break;
         case "Update":
-          result = await this.update(context, data, params);
+          result = await this.update(context, data, params, header);
           break;
         case "CreateTemp":
           result = await this.createTemp(context, data);
@@ -10812,7 +10860,7 @@ var DEActionMethod = class extends Method {
             }
             path2 = "".concat(path2, "/").concat(srfkey);
           }
-          const res = await this.request(path2, context, data, params);
+          const res = await this.request(path2, context, data, params, header);
           res.data = await this.result.handle(context, res.data);
           result = res;
         }
@@ -10838,7 +10886,7 @@ var DEActionMethod = class extends Method {
    * @param {IData} data
    * @return {*}  {Promise<IHttpResponse<IData>>}
    */
-  async create(context, data, params) {
+  async create(context, data, params, header) {
     if (!data) {
       throw new RuntimeError23("create\u884C\u4E3A\u6CA1\u6709\u4F20data");
     }
@@ -10846,7 +10894,7 @@ var DEActionMethod = class extends Method {
       return this.createTemp(context, this.createEntity(data));
     }
     const path2 = this.calcPath(context);
-    const res = await this.app.net.post(path2, data, params);
+    const res = await this.app.net.post(path2, data, params, header);
     res.data = await this.result.handle(context, res.data);
     return res;
   }
@@ -10859,14 +10907,15 @@ var DEActionMethod = class extends Method {
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
-  async remove(context, params) {
+  async remove(context, params, header) {
     if (this.isLocalMode) {
       return this.removeTemp(context, params);
     }
     const path2 = this.calcPath(context);
     const res = await this.app.net.delete(
       "".concat(path2, "/").concat(context[this.entity.codeName.toLowerCase()]),
-      params
+      params,
+      header
     );
     return res;
   }
@@ -10880,7 +10929,7 @@ var DEActionMethod = class extends Method {
    * @param {IParams} [params={}]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
-  async update(context, data, params) {
+  async update(context, data, params, header) {
     if (!data) {
       throw new RuntimeError23("update\u884C\u4E3A\u6CA1\u6709\u4F20data");
     }
@@ -10891,7 +10940,8 @@ var DEActionMethod = class extends Method {
     const res = await this.app.net.put(
       "".concat(path2, "/").concat(context[this.entity.codeName.toLowerCase()]),
       data,
-      params
+      params,
+      header
     );
     res.data = await this.result.handle(context, res.data);
     return res;
@@ -10905,14 +10955,15 @@ var DEActionMethod = class extends Method {
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
-  async get(context, params = {}) {
+  async get(context, params = {}, header = {}) {
     if (this.isLocalMode) {
       return this.getTemp(context, params);
     }
     const path2 = this.calcPath(context);
     const res = await this.app.net.get(
       "".concat(path2, "/").concat(context[this.entity.codeName.toLowerCase()]),
-      params
+      params,
+      header
     );
     res.data = await this.result.handle(context, res.data);
     return res;
@@ -10926,12 +10977,12 @@ var DEActionMethod = class extends Method {
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getDraft(context, params) {
+  async getDraft(context, params, header) {
     if (this.isLocalMode) {
       return this.getDraftTemp(context, params);
     }
     const path2 = this.calcPath(context);
-    const res = await this.app.net.get("".concat(path2, "/getdraft"), params);
+    const res = await this.app.net.get("".concat(path2, "/getdraft"), params, header);
     res.data = await this.result.handle(context, res.data);
     return res;
   }
@@ -11232,7 +11283,7 @@ import { isArray as isArray7 } from "lodash-es";
 import { clone as clone15, isEmpty as isEmpty7, isNil as isNil11 } from "ramda";
 import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
-  async exec(context, params, params2) {
+  async exec(context, params, params2, header) {
     const searchParams = params && !isArray7(params) ? params : params2 || {};
     let res;
     if (this.isLocalMode) {
@@ -11250,7 +11301,7 @@ var FetchMethod = class extends Method {
         case "REMOTE":
           {
             const path2 = this.calcPath(context);
-            res = await this.request(path2, context, params, params2);
+            res = await this.request(path2, context, params, params2, header);
           }
           break;
         default:
@@ -11428,17 +11479,73 @@ var InternalMessageService = class {
     const res = await ibiz.net.get("".concat(this.baseUrl, "/").concat(messageId));
     return res;
   }
+  /**
+   * 设置已读
+   * @author lxm
+   * @date 2024-02-04 03:59:52
+   * @param {string} messageId
+   * @return {*}  {Promise<void>}
+   */
+  async markRead(messageId) {
+    await ibiz.net.post("".concat(this.baseUrl, "/").concat(messageId, "/mark_read"), {});
+  }
+  /**
+   * 获取未读数据的总条数
+   * @author lxm
+   * @date 2024-02-04 09:34:32
+   * @return {*}  {Promise<number>}
+   */
+  async getUnreadNum() {
+    const res = await ibiz.net.post("".concat(this.baseUrl, "/fetch_cur_receiver"), {
+      page: 0,
+      size: 1,
+      sort: "update_time,desc",
+      searchconds: [
+        {
+          condtype: "GROUP",
+          condop: "AND",
+          bnotmode: false,
+          searchconds: [
+            {
+              condop: "EQ",
+              condtype: "DEFIELD",
+              fieldname: "status",
+              value: "RECEIVED"
+            }
+          ]
+        }
+      ]
+    });
+    if (res.headers["x-total"]) {
+      return Number(res.headers["x-total"]);
+    }
+    return 0;
+  }
 };
 
 // src/service/service/mark-open-data/mark-open-data.service.ts
 var MarkOpenDataService = class {
   constructor() {
+    /**
+     * 回调集合
+     * @author lxm
+     * @date 2024-02-01 04:41:45
+     */
+    this.callbackMap = /* @__PURE__ */ new Map();
     /**
      * 基础路径
      * @author lxm
      * @date 2024-01-23 02:06:47
      */
     this.baseUrl = "/portal/markopendata";
+    ibiz.mc.command.markOpenData.on((msg) => {
+      const data = msg.data;
+      const { entity, key } = data;
+      const tag = "".concat(entity, "_").concat(key);
+      if (this.callbackMap.has(tag)) {
+        this.callbackMap.get(tag).forEach((cb) => cb(data));
+      }
+    });
   }
   async action(deName, key, action) {
     const res = await ibiz.net.get(
@@ -11446,6 +11553,37 @@ var MarkOpenDataService = class {
     );
     return res;
   }
+  /**
+   * 监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:45:31
+   * @param {string} deName
+   * @param {string} key
+   * @param {MarkOpenDataCallbackFun} callback
+   */
+  subscribe(deName, key, callback) {
+    const tag = "".concat(deName, "_").concat(key);
+    const callbacks = this.callbackMap.get(tag) || [];
+    callbacks.push(callback);
+    this.callbackMap.set(tag, callbacks);
+  }
+  /**
+   * 取消监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:48:19
+   * @param {string} deName
+   * @param {string} key
+   * @param {MarkOpenDataCallbackFun} callback
+   */
+  unsubscribe(deName, key, callback) {
+    const tag = "".concat(deName, "_").concat(key);
+    const callbacks = this.callbackMap.get(tag) || [];
+    const index = callbacks.indexOf(callback);
+    if (index > -1) {
+      callbacks.splice(index, 1);
+      this.callbackMap.set(tag, callbacks);
+    }
+  }
 };
 
 // src/service/vo/tree-node-data/tree-node-data.ts
@@ -11577,6 +11715,8 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     this._textHtml = this.calcTextHtml(model);
     if (model.leafFlagAppDEFieldId) {
       this._leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
+    } else if (model.childCntAppDEFieldId) {
+      this._leaf = !fieldValueToBoolean(data[model.childCntAppDEFieldId]);
     }
     const dataItemKeyMap = /* @__PURE__ */ new Map();
     const dataItemDefaultMap = /* @__PURE__ */ new Map();
@@ -12449,9 +12589,9 @@ var _DEServiceUtil = class _DEServiceUtil {
    * @param {(IParams | undefined)} [params2] 视图参数
    * @return {*}  {Promise<IHttpResponse<IData>>}
    */
-  async exec(appDataEntityId, methodName, context, params, params2) {
+  async exec(appDataEntityId, methodName, context, params, params2, header) {
     const service = await this.getService(context, appDataEntityId);
-    return service.exec(methodName, context, params, params2);
+    return service.exec(methodName, context, params, params2, header);
   }
 };
 /**
@@ -12530,7 +12670,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
       case "POPUPAPP":
         throw new ModelError15(appView, "\u672A\u652F\u6301\u7684\u89C6\u56FE\u6253\u5F00\u6A21\u5F0F: POPUPAPP");
       case "POPOVER":
-        return this.openPopover(appView, opts.event, context, params);
+        return this.openPopover(appView, context, params, opts);
       case "DRAWER_LEFT":
       case "DRAWER_RIGHT":
       case "DRAWER_TOP":
@@ -12594,11 +12734,14 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @param {IParams} [params={}]
    * @return {*}  {Promise<IModalData>}
    */
-  async openPopover(appView, event, context, params = {}) {
+  async openPopover(appView, context, params = {}, opts = {}) {
+    const { event, modalOption } = opts;
     if (!event) {
       throw new RuntimeError25("\u6C14\u6CE1\u6253\u5F00\u7F3A\u5C11event");
     }
-    return ibiz.openView.popover(appView.id, event, context, params);
+    return ibiz.openView.popover(appView.id, event, context, params, {
+      ...modalOption
+    });
   }
   /**
    * 抽屉模式打开
@@ -12937,7 +13080,6 @@ var Application = class {
         this.model.appId
       );
       this.mqtt.evt.on("message", (message) => {
-        console.log("message", message);
         ibiz.mc.command.next(message);
       });
       await this.mqtt.connect();
@@ -13003,6 +13145,32 @@ var AppViewConfigService = class {
     }
     return id;
   }
+  /**
+   * 获取视图自定义Option
+   *
+   * @author zk
+   * @date 2024-01-31 11:01:20
+   * @protected
+   * @param {IAppView} model
+   * @return {*}  {IData}
+   * @memberof AppViewConfigService
+   */
+  getCustomOption(model) {
+    var _a;
+    const { appViewParams } = model;
+    const optionProperty = (_a = appViewParams == null ? void 0 : appViewParams.find(
+      (item) => item.id === "modaloption"
+    )) == null ? void 0 : _a.value;
+    let modalOption = {};
+    if (optionProperty) {
+      try {
+        modalOption = JSON.parse(optionProperty);
+      } catch (error) {
+        ibiz.log.error("\u89C6\u56FE\u53C2\u6570modalOption \u89E3\u6790\u5931\u8D25\uFF1A".concat(error));
+      }
+    }
+    return { modalOption };
+  }
   has(key) {
     const id = this.calcAppViewId(key);
     return this.viewConfigs.has(id);
@@ -13027,7 +13195,8 @@ var AppViewConfigService = class {
         width: model.width,
         height: model.height,
         appDataEntityId: model.appDataEntityId,
-        redirectView: model.redirectView
+        redirectView: model.redirectView,
+        ...this.getCustomOption(model)
       });
     }
     return this.viewConfigs.get(id);
@@ -18919,8 +19088,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
     uiLogicMap.set(deUILogic, new UILogic(deUILogic));
   }
   const uiLogic = uiLogicMap.get(deUILogic);
-  await uiLogic.exec(parameters);
-  return null;
+  return uiLogic.exec(parameters);
 }
 
 // src/ui-action/uiaction-util.ts
@@ -19428,12 +19596,13 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
           data,
           params
         );
+        const options = this.handleViewOptionParams(resultParams);
         const res = await ibiz.commands.execute(
           OpenAppViewCommand.TAG,
           frontPSAppView,
           resultContext,
           resultParams,
-          { event, noWaitRoute }
+          { event, noWaitRoute, ...options }
         );
         if (!(res == null ? void 0 : res.ok)) {
           actionResult.cancel = true;
@@ -19465,6 +19634,27 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     }
     return actionResult;
   }
+  /**
+   * 处理打开视图配置自定义参数 modalOption
+   *
+   * @author zk
+   * @date 2024-02-01 01:02:28
+   * @param {IData} param
+   * @return {*}  {IData}
+   * @memberof FrontUIActionProvider
+   */
+  handleViewOptionParams(param) {
+    if (param.modaloption) {
+      try {
+        const modalOption = JSON.parse(param.modaloption);
+        delete param.modaloption;
+        return { modalOption };
+      } catch (error) {
+        ibiz.log.error("\u89C6\u56FE\u53C2\u6570modalOption \u89E3\u6790\u5931\u8D25\uFF1A".concat(error));
+      }
+    }
+    return {};
+  }
   /**
    * 处理模式：用户自定义
    * @author lxm
@@ -25862,10 +26052,9 @@ var GridController = class extends MDControlController {
       var _a2;
       const type = (_a2 = _args.params) == null ? void 0 : _a2.type;
       let data2 = [];
-      if (type === "activatedPage") {
+      if (!type || type === "activatedPage") {
         data2 = this.state.rows.map((row) => row.data);
-      }
-      if (type === "maxRowCount" || type === "customPage") {
+      } else if (type === "maxRowCount" || type === "customPage") {
         const { size } = this.state;
         const { startPage, endPage } = _args.params;
         const params = type === "customPage" ? {
@@ -25874,8 +26063,7 @@ var GridController = class extends MDControlController {
           size: (endPage - startPage + 1) * size
         } : { size: 1e3, page: 0 };
         data2 = await this.loadData({ viewParam: params });
-      }
-      if (type === "selectedRows") {
+      } else if (type === "selectedRows") {
         data2 = this.getData();
       }
       if (data2.length === 0) {
@@ -27602,8 +27790,9 @@ var PickupViewPanelController = class extends ControlController {
 };
 
 // src/controller/control/search-bar/search-bar.controller.ts
-import { mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
-import { clone as clone28 } from "ramda";
+import { mergeInLeft as mergeInLeft3, recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
+import { clone as clone28, isNil as isNil26 } from "ramda";
+import { isString as isString2 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
 import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
@@ -27611,10 +27800,11 @@ var ExcludeOPs = [
   "ISNULL" /* IS_NULL */,
   "ISNOTNULL" /* IS_NOT_NULL */
 ];
+var ScriptValueRegex = /\$\{[^}]*\}/;
 var SearchBarFilterController = class {
-  constructor(model, appDataEntity, context, params) {
+  constructor(model, searchbar) {
     this.model = model;
-    this.appDataEntity = appDataEntity;
+    this.searchbar = searchbar;
     /**
      * 不需要编辑器
      * @author lxm
@@ -27623,17 +27813,34 @@ var SearchBarFilterController = class {
      */
     this.noEditor = false;
     var _a;
-    this.context = context;
-    this.params = params;
     let field;
     if (model.appDEFieldId) {
-      field = findFieldById(appDataEntity, model.appDEFieldId);
+      field = findFieldById(this.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
+   * @date 2024-02-04 06:25:42
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get valueItem() {
+    return this.editor ? this.editor.valueItem : void 0;
+  }
+  get appDataEntity() {
+    return this.searchbar.appDataEntity;
+  }
   /**
    * 初始化
    * @author lxm
@@ -27654,6 +27861,60 @@ var SearchBarFilterController = class {
       }
     }
   }
+  /**
+   * 格式化给多数据查询接口的值
+   * @author lxm
+   * @date 2024-02-04 11:31:32
+   * @param {*} value
+   * @return {*}  {*}
+   */
+  formatValue(node) {
+    const { value, valueItem } = node;
+    if (this.valueItem && valueItem) {
+      delete node.valueItem;
+      return valueItem;
+    }
+    if (ScriptValueRegex.test(value)) {
+      return ScriptFactory.execSingleLine("`".concat(value, "`"), {
+        ...this.searchbar.getEventArgs()
+      });
+    }
+    return value;
+  }
+  /**
+   * 计算要递给编辑器的参数
+   * @author lxm
+   * @date 2024-02-04 06:35:28
+   * @param {IFilterLeafNode} node
+   * @return {*}  {{ value: unknown; data: IData }}
+   */
+  calcEditorProps(node) {
+    const tempData = {};
+    let editorValue = node.value;
+    if (node.disabled && ScriptValueRegex.test(editorValue)) {
+      editorValue = editorValue.replace("${context.srfpersonid}", "\u5F53\u524D\u7528\u6237");
+      editorValue = editorValue.replace("${context.srforgid}", "\u5F53\u524D\u7EC4\u7EC7");
+    }
+    if (this.valueItem) {
+      tempData[this.valueItem] = node.valueItem;
+    }
+    return { value: editorValue, data: tempData };
+  }
+  /**
+   * 编辑器值变更处理
+   * @author lxm
+   * @date 2024-02-04 06:42:04
+   * @param {IFilterLeafNode} node
+   * @param {unknown} value
+   * @param {string} [name]
+   */
+  onEditorChange(node, value, name) {
+    if (this.valueItem && name === this.valueItem) {
+      node.valueItem = value;
+    } else {
+      node.value = value;
+    }
+  }
 };
 
 // src/controller/control/search-bar/search-bar.service.ts
@@ -28018,12 +28279,17 @@ function formatFilters(node) {
       searchconds: node.children.map((item) => formatFilters(item))
     };
   }
-  return {
+  const leafNode = node;
+  const temp = {
     condtype: "DEFIELD",
     fieldname: node.field,
     condop: node.valueOP,
     value: node.value
   };
+  if (leafNode.valueItem) {
+    temp.valueItem = leafNode.valueItem;
+  }
+  return temp;
 }
 function parseFilters(data) {
   if (data.condtype === "GROUP") {
@@ -28040,7 +28306,8 @@ function parseFilters(data) {
       leaf: true,
       field: data.fieldname || null,
       valueOP: data.condop || null,
-      value: data.value || null
+      value: data.value || null,
+      valueItem: data.valueItem || void 0
     };
   }
   throw new RuntimeError58("\u65E0\u6548\u7684condtype:".concat(data.condtype));
@@ -28064,6 +28331,7 @@ function calcSearchConds(filterNodes) {
 }
 
 // src/controller/control/search-bar/search-bar.controller.ts
+var ScriptValueRegex2 = /\$\{[^}]*\}/;
 var SearchBarController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -28134,7 +28402,7 @@ var SearchBarController = class extends ControlController {
    * @Date: 2023-12-22 13:50:16
    */
   get grid() {
-    return this.ctx.getController("grid");
+    return this.ctx.getController("grid") || this.ctx.getController("treegrid");
   }
   initState() {
     super.initState();
@@ -28259,6 +28527,22 @@ var SearchBarController = class extends ControlController {
   onSearch() {
     this.evt.emit("onSearch", void 0);
   }
+  /**
+   * 找到过滤项控制器
+   * @author lxm
+   * @date 2024-02-04 11:29:31
+   * @param {(string | null)} fieldName
+   * @param {(string | null)} valueOP
+   * @return {*}  {(SearchBarFilterController | undefined)}
+   */
+  findFilterController(fieldName, valueOP) {
+    return this.filterControllers.find((item) => {
+      if (item.fieldName === fieldName) {
+        return item.valueOP ? item.valueOP === valueOP : true;
+      }
+      return false;
+    });
+  }
   /**
    * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
    * @author lxm
@@ -28304,12 +28588,7 @@ 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.appDataEntity,
-          this.context,
-          this.params
-        );
+        const filterController = new SearchBarFilterController(item, this);
         this.filterControllers.push(filterController);
       });
       await Promise.all(
@@ -28323,11 +28602,28 @@ var SearchBarController = class extends ControlController {
    * @date 2023-10-13 05:53:35
    * @return {*}  {IData}
    */
-  calcFilters() {
+  calcFilters(valueFormat = true) {
     if (!this.enableFilter) {
       return;
     }
     const searchconds = calcSearchConds(this.state.filterNodes);
+    if (valueFormat && searchconds) {
+      recursiveIterate10(
+        searchconds[0],
+        (node) => {
+          if (node.condtype === "DEFIELD" && !isNil26(node.value)) {
+            const controller = this.findFilterController(
+              node.fieldname,
+              node.condop
+            );
+            if (controller) {
+              node.value = controller.formatValue(node);
+            }
+          }
+        },
+        { childrenFields: ["searchconds"] }
+      );
+    }
     return searchconds;
   }
   /**
@@ -28443,7 +28739,7 @@ var SearchBarController = class extends ControlController {
    */
   async handleSave() {
     if (this.grid && this.state.selectedSearchGroupItem) {
-      const filters = this.calcFilters();
+      const filters = this.calcFilters(false);
       const saveParams = {
         searchconds: filters,
         sort: this.grid.state.sortQuery,
@@ -28497,6 +28793,13 @@ var SearchBarController = class extends ControlController {
     } else {
       this.state.filterNodes = getOriginFilterNodes();
     }
+    recursiveIterate10(this.state.filterNodes[0], (node) => {
+      if (node.leaf) {
+        if (node.field && node.valueOP && isString2(node.value) && ScriptValueRegex2.test(node.value)) {
+          node.disabled = true;
+        }
+      }
+    });
     if (this.grid && groupItem && groupItem.searchGroupData) {
       this.grid.setGroupParams(groupItem.searchGroupData);
       await this.grid.load({ isInitialLoad: true });
@@ -28744,7 +29047,7 @@ var TabExpPanelController = class extends ControlController {
 import {
   RuntimeError as RuntimeError59,
   RuntimeModelError as RuntimeModelError64,
-  recursiveIterate as recursiveIterate10
+  recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
 
 // src/controller/control/tree/tree.service.ts
@@ -29203,7 +29506,7 @@ var TreeController = class extends MDControlController {
       if ((_a2 = contextMenu == null ? void 0 : contextMenu.detoolbarItems) == null ? void 0 : _a2.length) {
         let itemNum = 0;
         const items = [];
-        recursiveIterate10(
+        recursiveIterate11(
           contextMenu,
           (item) => {
             if (item.itemType === "DEUIACTION") {
@@ -29295,7 +29598,7 @@ var TreeController = class extends MDControlController {
    */
   async afterLoadNodes(nodes) {
     this.state.items = [];
-    recursiveIterate10(
+    recursiveIterate11(
       { _children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -29479,7 +29782,7 @@ var TreeController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [...this.state.expandedKeys];
-    recursiveIterate10(
+    recursiveIterate11(
       { _children: nodes },
       (node) => {
         var _a;
@@ -30097,7 +30400,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
-import { isNil as isNil26 } from "ramda";
+import { isNil as isNil27 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -30324,7 +30627,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil26(groupVal)) {
+        if (isNil27(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -30401,7 +30704,7 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError61, RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
-import { isNil as isNil27 } from "ramda";
+import { isNil as isNil28 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -30486,7 +30789,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil27(sortValue)) {
+      if (isNil28(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -30593,7 +30896,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil27(groupVal)) {
+        if (isNil28(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -30923,7 +31226,7 @@ import {
   RuntimeError as RuntimeError62,
   RuntimeModelError as RuntimeModelError67,
   awaitTimeout as awaitTimeout3,
-  recursiveIterate as recursiveIterate11
+  recursiveIterate as recursiveIterate12
 } from "@ibiz-template/core";
 import { clone as clone29 } from "ramda";
 
@@ -31145,7 +31448,7 @@ var TreeGridExController = class extends TreeController {
   }
   async afterLoadNodes(nodes) {
     await super.afterLoadNodes(nodes);
-    recursiveIterate11(
+    recursiveIterate12(
       { _children: nodes },
       (node) => {
         this.state.rows[node._uuid] = new TreeGridExRowState(node, this);
@@ -33201,10 +33504,13 @@ var HubController = class {
   }
 };
 
+// src/controller/notification/notice.controller.ts
+import { QXEvent as QXEvent9 } from "qx-util";
+
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent7 } from "qx-util";
 import { clone as clone31 } from "ramda";
-import { isNil as isNil28, isNumber as isNumber2 } from "lodash-es";
+import { isNil as isNil29, isNumber as isNumber2 } from "lodash-es";
 import dayjs7 from "dayjs";
 var AsyncActionController = class {
   constructor() {
@@ -33279,14 +33585,14 @@ var AsyncActionController = class {
         data[key] = dayjs7(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil28(data.actionresult)) {
+    if (!isNil29(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil28(data.completionrate)) {
+    if (!isNil29(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -33343,10 +33649,17 @@ var AsyncActionController = class {
 
 // src/controller/notification/internal-message.controller.ts
 import { QXEvent as QXEvent8 } from "qx-util";
+function isHTML(str) {
+  if (str === "")
+    return false;
+  const doc = new DOMParser().parseFromString(str, "text/html");
+  return Array.from(doc.body.childNodes).some((node) => node.nodeType === 1);
+}
 var InternalMessageController = class {
   constructor() {
     this.evt = new QXEvent8();
     this.total = 0;
+    this.unreadCount = 0;
     /**
      * 当前分页
      * @author lxm
@@ -33356,18 +33669,47 @@ var InternalMessageController = class {
     this.page = 0;
     this.size = 20;
     this.messages = [];
+    this.unreadOnly = false;
     this.service = new InternalMessageService();
   }
   async init() {
-    this.load();
+    await this.load();
     this.listenMqtt();
+    await this.refreshUnreadCount();
   }
   async load() {
-    await this.fetch(false);
+    try {
+      await this.fetch(false);
+    } catch (error) {
+      ibiz.log.error(error);
+    }
   }
   async loadMore() {
     await this.fetch(true);
   }
+  async refreshUnreadCount() {
+    try {
+      this.unreadCount = await this.service.getUnreadNum();
+      this.evt.emit("unreadCountChange", this.unreadCount);
+    } catch (error) {
+      ibiz.log.error(error);
+    }
+  }
+  /**
+   * 切换是否只读
+   * @author lxm
+   * @date 2024-02-04 10:21:22
+   * @param {val} [boolean] 是否只读
+   */
+  toggleUnReadOnly(val) {
+    const nextVal = val === void 0 ? !this.unreadOnly : val;
+    if (this.unreadOnly === nextVal) {
+      return;
+    }
+    this.unreadOnly = nextVal;
+    this.evt.emit("unreadOnlyChange", this.unreadOnly);
+    this.load();
+  }
   async fetch(loadMore = false) {
     if (loadMore === false) {
       this.page = 0;
@@ -33379,6 +33721,23 @@ var InternalMessageController = class {
       size: this.size,
       sort: "update_time,desc"
     };
+    if (this.unreadOnly) {
+      fetchParams.searchconds = [
+        {
+          condtype: "GROUP",
+          condop: "AND",
+          bnotmode: false,
+          searchconds: [
+            {
+              condop: "EQ",
+              condtype: "DEFIELD",
+              fieldname: "status",
+              value: "RECEIVED"
+            }
+          ]
+        }
+      ];
+    }
     const res = await this.service.fetch(fetchParams);
     this.total = res.total;
     if (loadMore) {
@@ -33400,14 +33759,44 @@ var InternalMessageController = class {
       if (msg.subtype !== "INTERNALMESSAGE") {
         return;
       }
-      ibiz.notification.info({ desc: msg.content, position: "bottom-right" });
+      if (msg.content) {
+        ibiz.notification.info({
+          isHtmlDesc: isHTML(msg.content),
+          desc: msg.content,
+          position: "bottom-right"
+        });
+      }
     });
   }
+  async markRead(message) {
+    if (message.status !== "RECEIVED") {
+      return;
+    }
+    const find = this.messages.find((msg) => msg.id === message.id);
+    if (!find) {
+      return;
+    }
+    await this.service.markRead(message.id);
+    this.evt.emit("unreadCountChange", this.unreadCount);
+    this.evt.emit("dataChange");
+  }
+  /**
+   * 获取完整信息
+   * @author lxm
+   * @date 2024-01-30 05:03:25
+   * @param {string} id
+   * @return {*}  {Promise<IInternalMessage>}
+   */
+  async get(id) {
+    const res = await this.service.get(id);
+    return res.data;
+  }
 };
 
 // src/controller/notification/notice.controller.ts
 var NoticeController = class {
   constructor() {
+    this.evt = new QXEvent9();
     this.total = 0;
     this.asyncAction = new AsyncActionController();
     this.internalMessage = new InternalMessageController();
@@ -33415,6 +33804,10 @@ var NoticeController = class {
   async init() {
     await this.internalMessage.init();
     await this.asyncAction.init();
+    this.internalMessage.evt.on("unreadCountChange", () => {
+      this.total = this.internalMessage.unreadCount;
+      this.evt.emit("totalChange", this.total);
+    });
   }
 };
 
@@ -34690,7 +35083,7 @@ var AppDEUILogicExecutor = class extends LogicExecutor {
     if (!appDEUILogicId) {
       throw new RuntimeModelError71(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
-    execUILogic(appDEUILogicId, appDataEntityId, executeParams);
+    return execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
 };
 
@@ -35250,7 +35643,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       openView,
       tempContext,
       tempParams,
-      rest
+      { ...rest, openMode: openViewRef.openMode }
     );
   }
   async calcOpenViewRef(appUILogic, parameters) {
@@ -35355,7 +35748,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       newViewRef.refAppViewId,
       tempContext,
       tempParams,
-      rest
+      { ...rest, openMode: newViewRef.openMode }
     );
     if (enableBatchAdd && result.data) {
       await this.doBatchAdd(