@ibiz-template/runtime 0.5.7-alpha.8 → 0.5.7-alpha.9

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;
       });
@@ -7216,15 +7225,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;
@@ -11433,12 +11442,26 @@ var InternalMessageService = class {
 // 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 +11469,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
@@ -12530,7 +12584,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 +12648,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 +12994,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 +13059,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 +13109,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);
@@ -19428,12 +19511,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 +19549,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 +25967,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 +25978,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 +27705,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";
@@ -28064,6 +28168,7 @@ function calcSearchConds(filterNodes) {
 }
 
 // src/controller/control/search-bar/search-bar.controller.ts
+var ScriptValueRegex = /\$\{[^}]*\}/;
 var SearchBarController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -28134,7 +28239,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();
@@ -28328,6 +28433,19 @@ var SearchBarController = class extends ControlController {
       return;
     }
     const searchconds = calcSearchConds(this.state.filterNodes);
+    if (searchconds) {
+      recursiveIterate10(
+        searchconds[0],
+        (node) => {
+          if (node.condtype === "DEFIELD" && !isNil26(node.value) && ScriptValueRegex.test(node.value)) {
+            node.value = ScriptFactory.execSingleLine("`".concat(node.value, "`"), {
+              ...this.getEventArgs()
+            });
+          }
+        },
+        { childrenFields: ["searchconds"] }
+      );
+    }
     return searchconds;
   }
   /**
@@ -28497,6 +28615,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) && ScriptValueRegex.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 +28869,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 +29328,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 +29420,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 +29604,7 @@ var TreeController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [...this.state.expandedKeys];
-    recursiveIterate10(
+    recursiveIterate11(
       { _children: nodes },
       (node) => {
         var _a;
@@ -30097,7 +30222,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 +30449,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 +30526,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 +30611,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 +30718,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 +31048,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 +31270,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);
@@ -33204,7 +33329,7 @@ var HubController = class {
 // 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 +33404,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;