@ibiz-template/runtime 0.7.6 → 0.7.7

package/dist/index.esm.js

@@ -97,6 +97,8 @@ var DefaultErrorHandler = class {
     } else if (error instanceof HttpError) {
       if (error.status === 401) {
         ibiz.message.error("\u6CA1\u6709\u6CE8\u518C\u65E0\u6743\u9650\u9519\u8BEF\u5904\u7406\u5668");
+      } else if (error.status === 404) {
+        ibiz.mc.error.send(error);
       } else {
         ibiz.notification.error({
           title: "",
@@ -6693,10 +6695,12 @@ var DynamicCodeListCache = class {
      */
     this.commonKeys = ["query", "queryconds"];
     this.codeList = codeList;
-    this.codelistChange = this.codelistChange.bind(this);
-    const { appDataEntityId, appDEDataSetId } = this.codeList;
-    if (appDataEntityId && appDEDataSetId) {
-      ibiz.mc.command.change.on(this.codelistChange);
+    if (this.codeList.enableCache) {
+      this.codelistChange = this.codelistChange.bind(this);
+      const { appDataEntityId, appDEDataSetId } = this.codeList;
+      if (appDataEntityId && appDEDataSetId) {
+        ibiz.mc.command.change.on(this.codelistChange);
+      }
     }
   }
   /**
@@ -6710,7 +6714,7 @@ var DynamicCodeListCache = class {
    */
   setParams(context, params) {
     if (context) {
-      this.context = clone4(context);
+      this.context = IBizContext2.create({}, { ...context });
     }
     if (params) {
       this.params = clone4(params);
@@ -7036,7 +7040,7 @@ var DynamicCodeListCache = class {
    */
   destroy() {
     const { appDataEntityId, appDEDataSetId } = this.codeList;
-    if (appDataEntityId && appDEDataSetId) {
+    if (appDataEntityId && appDEDataSetId && this.codeList.enableCache) {
       ibiz.mc.command.change.off(this.codelistChange);
     }
   }
@@ -12589,6 +12593,7 @@ var UtilService = class {
 
 // src/service/vo/tree-node-data/tree-node-data.ts
 import { createUUID as createUUID5 } from "qx-util";
+import { isBase64Image } from "@ibiz-template/core";
 var TreeNodeData = class {
   constructor(model, parentNodeData, opts) {
     this._uuid = createUUID5();
@@ -12635,7 +12640,11 @@ var TreeNodeData = class {
         icon.imagePath = sysImage.imagePath;
       }
       if (sysImage.rawContent) {
-        icon.htmlStr = sysImage.rawContent;
+        if (isBase64Image(sysImage.rawContent)) {
+          icon.imagePath = sysImage.rawContent;
+        } else {
+          icon.htmlStr = sysImage.rawContent;
+        }
       }
     }
     return Object.values(icon).length > 0 ? icon : void 0;
@@ -13482,7 +13491,7 @@ var MqttService = class {
 };
 
 // src/service/de-service-util.ts
-import { RuntimeError as RuntimeError24 } from "@ibiz-template/core";
+import { HttpError as HttpError6, RuntimeError as RuntimeError24 } from "@ibiz-template/core";
 var _DEServiceUtil = class _DEServiceUtil {
   /**
    * Creates an instance of DEServiceUtil.
@@ -13634,7 +13643,21 @@ var _DEServiceUtil = class _DEServiceUtil {
    */
   async exec(appDataEntityId, methodName, context, params, params2, header) {
     const service = await this.getService(context, appDataEntityId);
-    return service.exec(methodName, context, params, params2, header);
+    try {
+      const result = await service.exec(
+        methodName,
+        context,
+        params,
+        params2,
+        header
+      );
+      return result;
+    } catch (error) {
+      if (error instanceof HttpError6) {
+        error.tag = context.srfviewid;
+      }
+      throw error;
+    }
   }
 };
 /**
@@ -14322,7 +14345,11 @@ var TreeGridExNotifyState = /* @__PURE__ */ ((TreeGridExNotifyState2) => {
 
 // src/controller/common/view/view.controller.ts
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
-import { IBizContext as IBizContext3, RuntimeError as RuntimeError34 } from "@ibiz-template/core";
+import {
+  HttpError as HttpError7,
+  IBizContext as IBizContext3,
+  RuntimeError as RuntimeError34
+} from "@ibiz-template/core";
 import { isEmpty as isEmpty9, isNil as isNil22, isNotNil as isNotNil2 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
@@ -16014,6 +16041,7 @@ var ViewController = class extends BaseController {
     this.modal = new Modal({});
     this.providers = {};
     this.engines = [];
+    this.error = {};
     this.slotProps = {};
     this.counters = {};
     /**
@@ -16037,6 +16065,7 @@ var ViewController = class extends BaseController {
     }
     this.ctx.init(this);
     this.initEngines();
+    this.handleViewError = this.handleViewError.bind(this);
   }
   get _evt() {
     return this.evt;
@@ -16148,6 +16177,7 @@ var ViewController = class extends BaseController {
     this.state.srfactiveviewdata = null;
     this.state.viewMessages = {};
     this.state.isClosing = false;
+    this.state.hasError = false;
   }
   async onCreated() {
     await super.onCreated();
@@ -16192,6 +16222,7 @@ var ViewController = class extends BaseController {
     if (this.engines.length) {
       await Promise.all(this.engines.map((engine2) => engine2.onCreated()));
     }
+    ibiz.mc.error.on(this.handleViewError);
   }
   async onMounted() {
     var _a;
@@ -16218,6 +16249,7 @@ var ViewController = class extends BaseController {
     }
     this.context.destroy();
     ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u9500\u6BC1"));
+    ibiz.mc.error.off(this.handleViewError);
   }
   /**
    * 处理上下文和导航参数相关的，如自定义导航参数的处理
@@ -16232,6 +16264,7 @@ var ViewController = class extends BaseController {
       const domain = ibiz.uiDomainManager.create(this.id);
       this.context.srfsessionid = domain.id;
     }
+    this.context.srfviewid = this.id;
     const navContexts = this.model.appViewNavContexts;
     let context = {};
     if (notNilEmpty7(navContexts)) {
@@ -16388,6 +16421,21 @@ var ViewController = class extends BaseController {
       );
     }
   }
+  /**
+   * 处理视图错误
+   *
+   * @author tony001
+   * @date 2024-04-28 12:04:27
+   * @protected
+   * @param {IPortalMessage} msg
+   */
+  handleViewError(msg) {
+    const { type, data } = msg;
+    if (type === "ERROR" && data instanceof HttpError7 && data.tag === this.id) {
+      this.error = data;
+      this.state.hasError = true;
+    }
+  }
 };
 
 // src/controller/common/view/app-data-upload-view.controller.ts
@@ -16708,7 +16756,7 @@ var CodeListEditorController = class extends EditorController {
 
 // src/controller/common/control/control.controller.ts
 import {
-  HttpError as HttpError6,
+  HttpError as HttpError8,
   IBizContext as IBizContext4,
   IBizParams,
   NoticeError as NoticeError2,
@@ -17075,7 +17123,7 @@ var ControlController = class extends BaseController {
       return;
     }
     if (opts == null ? void 0 : opts.error) {
-      if (opts.error instanceof HttpError6 && opts.error.status !== 500) {
+      if (opts.error instanceof HttpError8 && opts.error.status !== 500) {
         throw opts.error;
       }
       ibiz.log.error(opts.error);
@@ -22250,7 +22298,6 @@ var DashboardController = class extends ControlController {
 };
 
 // src/controller/control/dashboard/custom-dashboard.controller.ts
-import { merge } from "lodash-es";
 var CustomDashboardController = class {
   /**
    * Creates an instance of BaseController.
@@ -22407,7 +22454,7 @@ var CustomDashboardController = class {
    * @Date: 2023-09-20 16:22:49
    */
   async saveCustomModelData(model, config = {}) {
-    merge(this.portletConfig, config);
+    Object.assign(this.portletConfig, config);
     let res;
     const data = {
       model,
@@ -22439,7 +22486,7 @@ var CustomDashboardController = class {
 };
 
 // src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts
-import { merge as merge2 } from "lodash-es";
+import { merge } from "lodash-es";
 import { IBizContext as IBizContext5, IBizParams as IBizParams2 } from "@ibiz-template/core";
 
 // src/controller/control/dashboard/portlet/portlet-part/portlet-part.state.ts
@@ -22581,10 +22628,11 @@ var PortletPartController = class {
    * @memberof PortletPartController
    */
   async setConfig(config) {
-    merge2(this.config, config);
-    this.state.title = this.config.srftitle;
-    delete config.srftitle;
-    merge2(this.params, config);
+    this.config = config;
+    if (config.srftitle) {
+      this.state.title = config.srftitle;
+    }
+    merge(this.params, config);
     this.dashboard.evt.emit("onConfigChange", {
       name: this.model.id,
       config: this.config
@@ -37682,6 +37730,15 @@ var AppHub = class {
      * @type {Map<string, IAppView>}
      */
     this.views = /* @__PURE__ */ new Map();
+    /**
+     * 子应用dr部件模型
+     *
+     * @author tony001
+     * @date 2024-04-29 15:04:24
+     * @protected
+     * @type {Map<string, IModel[]>}
+     */
+    this.drcontrols = /* @__PURE__ */ new Map();
     /**
      * 应用实体实例模型
      *
@@ -37746,6 +37803,21 @@ var AppHub = class {
   registerAppView(model) {
     this.views.set(model.codeName.toLowerCase(), model);
   }
+  /**
+   *  注册子应用dedrcontrols模型
+   *
+   * @author tony001
+   * @date 2024-04-29 15:04:36
+   * @param {string} appId
+   * @param {IModel} model
+   */
+  registerSubAppDrControls(appId2, model) {
+    if (!this.drcontrols.has(appId2)) {
+      this.drcontrols.set(appId2, []);
+    }
+    const targetAppDrControls = this.drcontrols.get(appId2);
+    targetAppDrControls == null ? void 0 : targetAppDrControls.push(model);
+  }
   /**
    * 注册应用实体
    *
@@ -37768,9 +37840,12 @@ var AppHub = class {
    * @date 2024-01-15 15:01:41
    * @param {string} tag 视图 codeName 或者视图 id
    * @param {string} [appId=ibiz.env.appId]
-   * @param {number} [priority=-1] 视图的优先级，值越小优先级越高。1为最高优先级
+   * @param {number} [priority=-1] 视图的优先级，值越小优先级越高。10为最高优先级
    */
   setAppView(tag, appId2 = ibiz.env.appId, priority = -1) {
+    if (priority <= 0) {
+      priority = 50;
+    }
     const id = this.calcAppViewId(tag);
     if (this.view2appMap.has(id)) {
       const _priority = this.view2appPriorityMap.get(id);
@@ -37833,6 +37908,24 @@ var AppHub = class {
     }
     throw new RuntimeError67("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
+  /**
+   * 根据DrControl的名称和子应用标识获取模型
+   *
+   * @author tony001
+   * @date 2024-04-29 15:04:25
+   * @param {string} tag
+   * @param {string} appId
+   * @return {*}  {Promise<IModel | undefined>}
+   */
+  getSubAppDrControl(tag, appId2) {
+    if (!this.drcontrols.has(appId2)) {
+      return void 0;
+    }
+    const targetAppDrControls = this.drcontrols.get(appId2);
+    return targetAppDrControls.find((item) => {
+      return item.uniqueTag === tag;
+    });
+  }
   /**
    * 根据视图模型路径，加参数重新计算视图模型
    *
@@ -38507,7 +38600,10 @@ var MDViewEngine = class extends ViewEngineBase {
    * @return {*}  {Promise<void>}
    */
   async onXDataActive(event) {
-    await this.openData(event);
+    const res = await this.openData(event);
+    if (!res.cancel) {
+      this.refresh();
+    }
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {