@ibiz-template/runtime 0.6.4 → 0.6.7

package/dist/index.esm.js

@@ -804,6 +804,33 @@ function getControlPanel(control) {
   }
   return layoutPanel;
 }
+function findAppDEMethod(appDataEntity, id) {
+  const models = appDataEntity.appDEMethods;
+  if (models && id) {
+    const model = findModelChild(models, id);
+    if (model) {
+      return model;
+    }
+    const model2 = models.find((item) => {
+      switch (item.methodType) {
+        case "DEACTION": {
+          const { actionTag } = item;
+          return (actionTag == null ? void 0 : actionTag.toLowerCase()) === id.toLowerCase();
+        }
+        case "FETCH": {
+          const { dataSetTag } = item;
+          return "fetch".concat(dataSetTag == null ? void 0 : dataSetTag.toLowerCase()) === id.toLowerCase();
+        }
+        default:
+          return false;
+      }
+    });
+    if (model2) {
+      return model2;
+    }
+  }
+  return null;
+}
 
 // src/model/layout/layout.ts
 import { isArray as isArray2, isObject, isString } from "lodash-es";
@@ -6101,6 +6128,7 @@ var AppCounter = class {
      * @type {IData}
      */
     this.data = {};
+    this.countChange = this.countChange.bind(this);
   }
   /**
    * 计数器是否已经销毁
@@ -6125,6 +6153,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();
+      }
+    }
   }
   /**
    * 设置上下文以及查询参数
@@ -6241,6 +6289,7 @@ var AppCounter = class {
     this.context.destroy();
     this.destroyInterval();
     this.evt.reset();
+    ibiz.mc.command.change.on(this.countChange);
   }
 };
 
@@ -7273,6 +7322,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 = {}) {
@@ -7930,7 +7993,7 @@ var FileService = class {
    */
   exportData(dataExport, fetchAction, context, params) {
     const resPath = calcResPath(context, this.model);
-    const exportUrl = "".concat(resPath, "/").concat(this.model.codeName2.toLowerCase(), "/exportdata/").concat(fetchAction.toLowerCase(), "/?srfexporttag=").concat(dataExport.codeName);
+    const exportUrl = "".concat(resPath, "/").concat(this.model.deapicodeName2, "/exportdata/").concat(fetchAction.toLowerCase(), "/?srfexporttag=").concat(dataExport.codeName);
     return ibiz.net.request(exportUrl, {
       method: "post",
       data: params,
@@ -8460,7 +8523,7 @@ var DEService = class {
     if (this.methodMap.has(cacheId)) {
       return this.methodMap.get(cacheId);
     }
-    const model = findModelChild(this.model.appDEMethods, id);
+    const model = findAppDEMethod(this.model, id);
     if (!model) {
       throw new RuntimeModelError10(this.model, "\u672A\u627E\u5230\u670D\u52A1\u65B9\u6CD5: ".concat(id));
     }
@@ -8613,7 +8676,7 @@ var DEService = class {
    */
   calcSsePath(context, isHistories = false) {
     const srfkey = context[this.model.codeName.toLowerCase()];
-    const curPath = "/".concat(this.model.codeName2.toLowerCase(), "/ssechatcompletion").concat(isHistories ? "/histories" : "").concat(srfkey ? "/".concat(srfkey) : "");
+    const curPath = "/".concat(this.model.deapicodeName2, "/ssechatcompletion").concat(isHistories ? "/histories" : "").concat(srfkey ? "/".concat(srfkey) : "");
     const resPath = calcResPath(context, this.model);
     return resPath + curPath;
   }
@@ -9136,8 +9199,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,
@@ -9662,13 +9728,14 @@ var Method = class {
   async request(path2, context, data, params, header) {
     const { actionType, requestMethod } = this.method;
     if (actionType === "REMOTE") {
-      const methodName = this.method.codeName.toLowerCase();
+      const methodName = this.method.requestPath;
       let res = null;
       switch (requestMethod) {
         case "POST":
           res = await this.app.net.post(
             this.mergeRequestPath(path2, methodName),
             data || params || {},
+            {},
             header
           );
           break;
@@ -9707,8 +9774,15 @@ var Method = class {
     }
     throw new RuntimeModelError11(this.method, "\u672A\u652F\u6301\u7684\u884C\u4E3A\u7C7B\u578B[".concat(actionType, "]"));
   }
+  /**
+   * 合并请求路径
+   * @author lionlau
+   * @param path
+   * @param methodName 方法名，以 / 开始
+   * @returns
+   */
   mergeRequestPath(path2, methodName) {
-    return "".concat(path2, "/").concat(methodName);
+    return methodName ? "".concat(path2).concat(methodName) : "".concat(path2);
   }
   /**
    * 根据上下文计算当前请求路径
@@ -9720,7 +9794,7 @@ var Method = class {
    * @return {*}  {string} 拼接结果说明: /祖父实体/祖父实体主键/爷爷实体/爷爷实体主键/父实体/父实体主键/当前实体
    */
   calcPath(context) {
-    const curPath = "/".concat(this.entity.codeName2.toLowerCase());
+    const curPath = "/".concat(this.entity.deapicodeName2);
     const resPath = calcResPath(context, this.entity);
     return resPath + curPath;
   }
@@ -10971,35 +11045,36 @@ var DEActionMethod = class extends Method {
       if (data && !this.isLocalMode) {
         data = await this.inputHandle(context, data);
       }
-      switch (this.method.codeName) {
-        case "Create":
+      const methodTag = this.method.actionTag ? this.method.actionTag.toUpperCase() : this.method.codeName.toUpperCase();
+      switch (methodTag) {
+        case "CREATE":
           result = await this.create(context, data, params || {}, header);
           break;
-        case "Get":
+        case "GET":
           result = await this.get(context, params, header);
           break;
-        case "GetDraft":
+        case "GETDRAFT":
           result = await this.getDraft(context, params, header);
           break;
-        case "Remove":
+        case "REMOVE":
           result = await this.remove(context, params);
           break;
-        case "Update":
+        case "UPDATE":
           result = await this.update(context, data, params, header);
           break;
-        case "CreateTemp":
+        case "CREATETEMP":
           result = await this.createTemp(context, data);
           break;
-        case "GetTemp":
+        case "GETTEMP":
           result = await this.getTemp(context, data);
           break;
-        case "GetDraftTemp":
+        case "GETDRAFTTEMP":
           result = await this.getDraftTemp(context, params);
           break;
-        case "RemoveTemp":
+        case "REMOVETEMP":
           result = await this.removeTemp(context, data);
           break;
-        case "UpdateTemp":
+        case "UPDATETEMP":
           result = await this.updateTemp(context, data);
           break;
         default: {
@@ -11133,7 +11208,11 @@ var DEActionMethod = class extends Method {
       return this.getDraftTemp(context, params);
     }
     const path2 = this.calcPath(context);
-    const res = await this.app.net.get("".concat(path2, "/getdraft"), params, header);
+    const res = await this.app.net.get(
+      this.mergeRequestPath(path2, this.method.requestPath),
+      params,
+      header
+    );
     res.data = await this.result.handle(context, res.data);
     return res;
   }
@@ -14340,13 +14419,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.deapicodeName2, "/").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,
@@ -14358,13 +14441,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.deapicodeName2, "/").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,
@@ -16272,7 +16359,10 @@ var MDControlController = class extends ControlController {
       importName,
       {
         dismiss: () => modal.dismiss(),
-        appDataEntity
+        dataImport,
+        appDataEntity,
+        context: this.context,
+        params: this.params
       },
       {
         width: "auto",
@@ -20141,7 +20231,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
    * @return {*}
    */
   async executePrint(action, args) {
-    var _a, _b, _c;
+    var _a, _b;
     const { resultContext, resultParams } = await this.handleParams(
       action,
       args.context,
@@ -20158,7 +20248,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     if (appDEPrint) {
       let requestUrl = "";
       if (resultContext && resultContext[appDataEntity.codeName.toLowerCase()]) {
-        requestUrl += "/".concat((_b = appDataEntity.codeName2) == null ? void 0 : _b.toLowerCase(), "/printdata/").concat(resultContext[appDataEntity.codeName.toLowerCase()]);
+        requestUrl += "/".concat(appDataEntity.deapicodeName2, "/printdata/").concat(resultContext[appDataEntity.codeName.toLowerCase()]);
       } else {
         throw new RuntimeError48("\u6CA1\u6709\u627E\u5230\u6570\u636E\u4E3B\u952E");
       }
@@ -20173,7 +20263,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       if (res.ok) {
         if (resultParams && resultParams.srfcontenttype) {
           const disposition = res.headers["content-disposition"];
-          const filename = (_c = disposition.split(";").find((str) => str.indexOf("filename=") !== -1)) == null ? void 0 : _c.slice(9);
+          const filename = (_b = disposition.split(";").find((str) => str.indexOf("filename=") !== -1)) == null ? void 0 : _b.slice(9);
           const href = URL.createObjectURL(res.data);
           const a = document.createElement("a");
           a.href = href;
@@ -20251,7 +20341,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
    * @return {*}
    */
   async executeDataExport(action, args) {
-    var _a, _b;
+    var _a;
     const { resultParams } = await this.handleParams(
       action,
       args.context,
@@ -20266,7 +20356,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       return dataExport.id === action.appDEDataExportId;
     });
     if (appDEDataExport) {
-      const url = "/".concat((_b = appDataEntity.codeName2) == null ? void 0 : _b.toLowerCase(), "/exportdata/fetchdefault?srfexporttag=").concat(appDEDataExport.codeName);
+      const url = "/".concat(appDataEntity.deapicodeName2, "/exportdata/fetchdefault?srfexporttag=").concat(appDEDataExport.codeName);
       const params = {
         page: 0,
         size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1e3,
@@ -20428,7 +20518,7 @@ var ToolbarController = class extends ControlController {
           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") {
+            if (controlLogic.itemName === item.id && controlLogic.triggerType === "ITEMVISIBLE" && itemState) {
               itemState.visible = false;
               break;
             }
@@ -33476,12 +33566,11 @@ var ReportPanelService = class extends ControlService {
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(context, params = {}) {
-    var _a;
     this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
     );
-    const url = "".concat((_a = this.dataEntity.codeName2) == null ? void 0 : _a.toLowerCase(), "/report?srfreporttag=").concat(this.model.codeName);
+    const url = "".concat(this.dataEntity.deapicodeName2, "/report?srfreporttag=").concat(this.model.codeName);
     let res = await ibiz.net.request(url, {
       method: "post",
       data: params
@@ -37422,6 +37511,7 @@ export {
   fieldValueToBoolean,
   filterFieldLogics,
   filterValueRules,
+  findAppDEMethod,
   findChildFormDetails,
   findDELogic,
   findEditItem,