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

package/dist/index.esm.js

@@ -7208,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
@@ -8411,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"));
   }
@@ -8829,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;
+  }
   /**
    * 处理响应
    *
@@ -9566,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();
@@ -9575,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;
         }
@@ -10766,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);
@@ -10783,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);
@@ -10821,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;
         }
@@ -10847,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");
     }
@@ -10855,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;
   }
@@ -10868,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;
   }
@@ -10889,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");
     }
@@ -10900,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;
@@ -10914,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;
@@ -10935,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;
   }
@@ -11241,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) {
@@ -11259,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:
@@ -11437,6 +11479,48 @@ 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
@@ -11631,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();
@@ -12503,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);
   }
 };
 /**
@@ -19002,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
@@ -27715,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
@@ -27727,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
@@ -27758,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
@@ -28122,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") {
@@ -28144,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));
@@ -28168,7 +28331,7 @@ function calcSearchConds(filterNodes) {
 }
 
 // src/controller/control/search-bar/search-bar.controller.ts
-var ScriptValueRegex = /\$\{[^}]*\}/;
+var ScriptValueRegex2 = /\$\{[^}]*\}/;
 var SearchBarController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -28364,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
@@ -28409,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(
@@ -28428,19 +28602,23 @@ 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 (searchconds) {
+    if (valueFormat && 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()
-            });
+          if (node.condtype === "DEFIELD" && !isNil26(node.value)) {
+            const controller = this.findFilterController(
+              node.fieldname,
+              node.condop
+            );
+            if (controller) {
+              node.value = controller.formatValue(node);
+            }
           }
         },
         { childrenFields: ["searchconds"] }
@@ -28561,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,
@@ -28617,7 +28795,7 @@ var SearchBarController = class extends ControlController {
     }
     recursiveIterate10(this.state.filterNodes[0], (node) => {
       if (node.leaf) {
-        if (node.field && node.valueOP && isString2(node.value) && ScriptValueRegex.test(node.value)) {
+        if (node.field && node.valueOP && isString2(node.value) && ScriptValueRegex2.test(node.value)) {
           node.disabled = true;
         }
       }
@@ -33326,6 +33504,9 @@ 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";
@@ -33468,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
@@ -33481,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;
@@ -33504,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) {
@@ -33525,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();
@@ -33540,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);
+    });
   }
 };
 
@@ -34815,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);
   }
 };
 
@@ -35375,7 +35643,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       openView,
       tempContext,
       tempParams,
-      rest
+      { ...rest, openMode: openViewRef.openMode }
     );
   }
   async calcOpenViewRef(appUILogic, parameters) {
@@ -35480,7 +35748,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       newViewRef.refAppViewId,
       tempContext,
       tempParams,
-      rest
+      { ...rest, openMode: newViewRef.openMode }
     );
     if (enableBatchAdd && result.data) {
       await this.doBatchAdd(