@ibiz-template/runtime 0.6.3 → 0.6.5

package/dist/index.esm.js

@@ -2720,11 +2720,11 @@ var Modal = class {
     this._dismiss = dismiss;
   }
   async dismiss(data = { ok: false, data: [] }) {
-    const context = { allowClose: true };
+    const context = {};
     if (this.ignoreDismissCheck !== true) {
       await this.hooks.shouldDismiss.call(context);
     }
-    if (!context.allowClose) {
+    if (context.allowClose === false) {
       ibiz.log.debug("shouldDismiss\u7ED3\u679C\u4E3Afalse,\u5173\u95ED\u4E2D\u65AD\u3002");
       return false;
     }
@@ -2985,8 +2985,7 @@ var UIDomain = class {
    * Creates an instance of UIDomain.
    *
    * @author chitanda
-   * @date 2023-12-22 16:12:03
-   * @param {string} appId
+   * @date 2024-03-04 13:03:29
    * @param {string} [id]
    */
   constructor(id) {
@@ -3024,12 +3023,37 @@ var UIDomain = class {
      * @type {Transaction}
      */
     this.transaction = new Transaction();
+    /**
+     * 界面域是否发生数据变更，在域下数据修改后改为 true ，在数据提交后改为 false
+     *
+     * @author chitanda
+     * @date 2024-03-04 13:03:08
+     */
+    this.dataModification = false;
     if (id) {
       this.id = id;
     } else {
       this.id = createUUID();
     }
   }
+  /**
+   * 界面域数据发生变更
+   *
+   * @author chitanda
+   * @date 2024-03-04 14:03:06
+   */
+  dataChange() {
+    this.dataModification = true;
+  }
+  /**
+   * 界面域数据变更已提交
+   *
+   * @author chitanda
+   * @date 2024-03-04 14:03:15
+   */
+  dataChangeCompleted() {
+    this.dataModification = false;
+  }
   /**
    * 设置当前界面域下，指定实体的相关父关系以及属性。在 DTO 包解析时设置此参数，销毁时清空
    *
@@ -6077,6 +6101,7 @@ var AppCounter = class {
      * @type {IData}
      */
     this.data = {};
+    this.countChange = this.countChange.bind(this);
   }
   /**
    * 计数器是否已经销毁
@@ -6101,6 +6126,26 @@ var AppCounter = class {
     this.setParams(context, params);
     this.interval();
     await this.load();
+    if (this.model.appDataEntityId) {
+      ibiz.mc.command.change.on(this.countChange);
+    }
+  }
+  /**
+   * 接受计数器实体数据变更，刷新计数器
+   *
+   * @author chitanda
+   * @date 2024-03-07 14:03:00
+   * @protected
+   * @param {IPortalMessage} msg
+   */
+  countChange(msg) {
+    const data = msg.data;
+    if (this.model.appDataEntityId) {
+      const codeName = calcDeCodeNameById(this.model.appDataEntityId);
+      if (data && data.srfdecodename === codeName) {
+        this.refresh();
+      }
+    }
   }
   /**
    * 设置上下文以及查询参数
@@ -6217,6 +6262,7 @@ var AppCounter = class {
     this.context.destroy();
     this.destroyInterval();
     this.evt.reset();
+    ibiz.mc.command.change.on(this.countChange);
   }
 };
 
@@ -7249,6 +7295,20 @@ function fieldValueToBoolean(value) {
     return !!value;
   }
 }
+function convertToObject(input) {
+  const result = {};
+  if (!input) {
+    return result;
+  }
+  const pairs = input.split(",");
+  if (pairs && pairs.length > 0) {
+    pairs.forEach((pair) => {
+      const [key, value] = pair.split(":");
+      result[key] = parseInt(value, 10);
+    });
+  }
+  return result;
+}
 
 // src/service/utils/dyna-sys-params/dyna-sys-params.ts
 async function calcDynaSysParams(appDataEntityId, context, opts = {}) {
@@ -8177,7 +8237,7 @@ var MethodDto = class {
    * @return {*}  {Promise<IData>}
    */
   async get(context, data, ignore = false) {
-    if (context.srfsimple === true) {
+    if (context.srfsimple === true && this.isLocalMode === false) {
       return data;
     }
     const params = {};
@@ -8264,7 +8324,7 @@ var MethodDto = class {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context, data) {
-    if (context.srfsimple === true) {
+    if (context.srfsimple === true && this.isLocalMode === false) {
       if (data && data.length > 0) {
         return data.map((item) => {
           return this.service.createEntity(item);
@@ -9112,8 +9172,11 @@ var DeAuthorityService = class {
    * @return {*}  {Promise<boolean>}
    */
   async calcByDataAccessAction(dataAccessAction, data) {
-    if (data.srfopprivs && !data.srfopprivs.includes(dataAccessAction)) {
-      return false;
+    if (data.srfdataaccaction) {
+      const dataAccactions = convertToObject(data.srfdataaccaction);
+      if (!dataAccactions[dataAccessAction]) {
+        return false;
+      }
     }
     const mainStateResult = await this.calcByDeMainState(
       dataAccessAction,
@@ -9585,6 +9648,7 @@ var MethodReturn = class {
         uiDomain.calcParentRs();
         uiDomain.state.rsInit = true;
       }
+      uiDomain.dataChangeCompleted();
       app.deService.clearTempCacheByRs(
         {
           srfappid: app.appId,
@@ -9644,6 +9708,7 @@ var Method = class {
           res = await this.app.net.post(
             this.mergeRequestPath(path2, methodName),
             data || params || {},
+            {},
             header
           );
           break;
@@ -11137,6 +11202,10 @@ var DEActionMethod = class extends Method {
           this.attach(context, addData)
         );
       }
+      const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+      if (uiDomain) {
+        uiDomain.dataChange();
+      }
       return new HttpResponse3(resultData);
     } catch (err) {
       throw new HttpError5(err);
@@ -11189,6 +11258,10 @@ var DEActionMethod = class extends Method {
       }
       const data = this.service.local.delete(context, key);
       if (data) {
+        const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+        if (uiDomain) {
+          uiDomain.dataChange();
+        }
         return new HttpResponse3(data);
       }
       return new HttpResponse3(data, 500);
@@ -11316,6 +11389,10 @@ var DEActionMethod = class extends Method {
         );
       }
       if (resultData) {
+        const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+        if (uiDomain) {
+          uiDomain.dataChange();
+        }
         return new HttpResponse3(resultData);
       }
       return new HttpResponse3(resultData, 500);
@@ -14303,13 +14380,17 @@ function listenAsyncAction(id) {
     ibiz.mc.command.asyncAction.on(callBack);
   });
 }
-async function asyncImportData(file, appDataEntity, dataImport) {
+async function asyncImportData(file, appDataEntity, dataImport, context) {
   const data = new FormData();
   data.append("file", file);
-  let url = "".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(asyncImportUrl);
+  let url = "/".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(asyncImportUrl);
   if (dataImport == null ? void 0 : dataImport.codeName) {
     url += "?srfimporttag=".concat(dataImport.codeName);
   }
+  if (context) {
+    const resPath = calcResPath(context, appDataEntity);
+    url = resPath + url;
+  }
   const res = await ibiz.net.request(url, {
     method: "post",
     data,
@@ -14321,13 +14402,17 @@ async function asyncImportData(file, appDataEntity, dataImport) {
     "OBJECTCREATED"
   );
 }
-async function importData(file, appDataEntity, dataImport) {
+async function importData(file, appDataEntity, dataImport, context) {
   const data = new FormData();
   data.append("file", file);
-  let url = "".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(importUrl);
+  let url = "/".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(importUrl);
   if (dataImport == null ? void 0 : dataImport.codeName) {
     url += "?srfimporttag=".concat(dataImport.codeName);
   }
+  if (context) {
+    const resPath = calcResPath(context, appDataEntity);
+    url = resPath + url;
+  }
   const res = await ibiz.net.request(url, {
     method: "post",
     data,
@@ -16235,7 +16320,10 @@ var MDControlController = class extends ControlController {
       importName,
       {
         dismiss: () => modal.dismiss(),
-        appDataEntity
+        dataImport,
+        appDataEntity,
+        context: this.context,
+        params: this.params
       },
       {
         width: "auto",
@@ -20387,6 +20475,16 @@ var ToolbarController = class extends ControlController {
           );
           this.state.buttonsState.addState(uiItem.id, buttonState);
         }
+        if (item.controlLogics) {
+          for (let i = 0; i < item.controlLogics.length; i++) {
+            const controlLogic = item.controlLogics[i];
+            const itemState = this.state.buttonsState[item.id];
+            if (controlLogic.itemName === item.id && controlLogic.triggerType === "ITEMVISIBLE") {
+              itemState.visible = false;
+              break;
+            }
+          }
+        }
       },
       { childrenFields: ["detoolbarItems"] }
     );
@@ -34590,9 +34688,6 @@ var AsyncActionController = class {
 };
 
 // src/controller/notification/internal-message.controller.ts
-import {
-  IBizContext as IBizContext4
-} from "@ibiz-template/core";
 import { QXEvent as QXEvent8 } from "qx-util";
 function isHTML(str) {
   if (str === "")
@@ -34616,6 +34711,8 @@ var InternalMessageController = class {
     this.messages = [];
     this.unreadOnly = false;
     this.service = new InternalMessageService();
+    this.ns = null;
+    this.provider = null;
   }
   async init() {
     this.listenMqtt();
@@ -34699,6 +34796,7 @@ var InternalMessageController = class {
    */
   listenMqtt() {
     ibiz.mc.command.internalMessage.on(async (msg) => {
+      var _a;
       ibiz.log.debug("mqtt internalMessage: ", msg);
       if (msg.subtype !== "INTERNALMESSAGE") {
         return;
@@ -34708,16 +34806,11 @@ var InternalMessageController = class {
           isHtmlDesc: isHTML(msg.content),
           desc: msg.content,
           position: "bottom-right",
+          class: (_a = this.ns) == null ? void 0 : _a.b("notice"),
           onClick: () => {
             const redirectUrl = ibiz.env.isMob ? msg.mobileurl : msg.url;
-            if (redirectUrl) {
-              const { viewId, context, params } = parseViewProtocol(redirectUrl);
-              ibiz.commands.execute(
-                OpenAppViewCommand.TAG,
-                viewId,
-                IBizContext4.create(context),
-                params
-              );
+            if (this.provider) {
+              this.provider.openViewByUrl(redirectUrl);
             }
           }
         });
@@ -35258,7 +35351,12 @@ var ViewEngineBase = class {
   init() {
   }
   async onCreated() {
-    const { childNames } = this.view;
+    const { childNames, modal } = this.view;
+    modal.hooks.shouldDismiss.tapPromise(async (context) => {
+      if (this.view.state.isLoading) {
+        context.allowClose = false;
+      }
+    });
     childNames.push("captionbar", "toolbar");
     this.calcDynamicLayout();
   }
@@ -36517,14 +36615,15 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
   }
   bindScriptExecutor(executor) {
     executor.init(
-      ["context", "viewparams", "data", "env"],
+      ["context", "viewparams", "data", "env", "view"],
       (executeParams) => {
-        const { context, params, data } = executeParams;
+        const { context, params, data, view } = executeParams;
         return {
           context,
           params,
           data: (data == null ? void 0 : data[0]) || {},
-          env: ibiz.env
+          env: ibiz.env,
+          view
         };
       },
       {