@ibiz-template/runtime 0.2.5 → 0.2.7

package/dist/index.esm.js

@@ -22170,13 +22170,15 @@ var DECache = class {
 };
 
 // src/service/utils/res-path/res-path.ts
-var reg = new RegExp("(?<=\\$\\{)(.*?)(?=\\})", "g");
+var reg = /\$\{(.*?)\}/g;
 function getMatchResPath(context, entity) {
   const pathItems = entity.requestPaths || [];
   const items = pathItems.map((str) => {
+    const match = str.match(reg);
+    const keys = (match == null ? void 0 : match.map((item) => item.substring(2, item.length - 1))) || [];
     return {
       path: str,
-      keys: str.match(reg) || []
+      keys
     };
   });
   const filterItems = items.filter((item) => {
@@ -25337,10 +25339,10 @@ var ControlVO = class _ControlVO {
       if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
         Object.defineProperty(this, key, {
           get() {
-            return this.$origin.srfkey;
+            return this.$origin[key];
           },
           set(val) {
-            this.$origin.srfkey = val;
+            this.$origin[key] = val;
           },
           enumerable: false,
           configurable: true
@@ -28753,7 +28755,7 @@ var CodeListEditorController = class extends EditorController {
 };
 
 // src/controller/common/control/control.controller.ts
-import { NoticeError } from "@ibiz-template/core";
+import { IBizContext as IBizContext3, IBizParams, NoticeError } from "@ibiz-template/core";
 import { isNil as isNil18 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
@@ -28767,7 +28769,12 @@ var ControlController = class extends BaseController {
    * @param {IParams} [params={}]
    */
   constructor(model, context, params, ctx) {
-    super(model, context, params, ctx);
+    super(
+      model,
+      IBizContext3.create({}, context),
+      new IBizParams({}, params),
+      ctx
+    );
     /**
      * 部件参数
      *
@@ -28791,6 +28798,7 @@ var ControlController = class extends BaseController {
     if (panelModel) {
       this.controlPanel = panelModel;
     }
+    this.updateContextParams({});
   }
   get _evt() {
     return this.evt;
@@ -28855,6 +28863,33 @@ var ControlController = class extends BaseController {
     if (this.scheduler) {
       this.scheduler.destroy();
     }
+    this.params.destroy();
+  }
+  /**
+   * 处理上下文和导航参数相关的，如自定义导航参数的处理
+   *
+   * @author lxm
+   * @date 2022-09-08 15:09:47
+   * @protected
+   */
+  updateContextParams(opts) {
+    if (opts.context) {
+      this.context.reset({}, opts.context);
+    }
+    if (opts.params) {
+      this.params.reset({}, opts.params);
+    }
+    const { controlNavContexts, controlNavParams } = this.model;
+    let context = {};
+    if (notNilEmpty7(controlNavContexts)) {
+      context = convertNavData(controlNavContexts, this.params, this.context);
+    }
+    Object.assign(this.context, context);
+    let params = {};
+    if (notNilEmpty7(controlNavParams)) {
+      params = convertNavData(controlNavParams, this.params, this.context);
+    }
+    Object.assign(this.params, params);
   }
   /**
    * 获取部件类型
@@ -29176,6 +29211,9 @@ var MDControlController = class extends ControlController {
     } finally {
       await this.endLoading();
     }
+    this.state.items.forEach((item, index) => {
+      item.srfserialnum = index + 1;
+    });
     this.actionNotification("FETCHSUCCESS");
     return this.state.items;
   }
@@ -30246,11 +30284,15 @@ var FunnelSeriesGenerator = class extends BaseSeriesGenerator {
     return options;
   }
   calcSeriesData(catalogData) {
-    return Object.keys(catalogData).map((catalog) => {
+    const temData = [];
+    catalogData.forEach((catalog, key) => {
       var _a;
-      const data = catalogData.get(catalog);
-      return { name: catalog, value: [data.value, (_a = data.deData) == null ? void 0 : _a.srfkey] };
+      temData.push({
+        name: key,
+        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+      });
     });
+    return temData;
   }
   getSrfkeyByParams(params) {
     return params.value[1];
@@ -30266,11 +30308,15 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
     return options;
   }
   calcSeriesData(catalogData) {
-    return Object.keys(catalogData).map((catalog) => {
+    const temData = [];
+    catalogData.forEach((catalog, key) => {
       var _a;
-      const data = catalogData.get(catalog);
-      return { name: catalog, value: [data.value, (_a = data.deData) == null ? void 0 : _a.srfkey] };
+      temData.push({
+        name: key,
+        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+      });
     });
+    return temData;
   }
   getSrfkeyByParams(params) {
     return params.value[1];
@@ -30379,8 +30425,8 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
     }
     const radar = this.chartGenerator.radarMap.get(this.catalogField);
     Object.values(groupData).forEach((catalogData) => {
-      Object.keys(catalogData).forEach((catalog) => {
-        radar.updateIndicator(catalog, catalogData.get(catalog).value);
+      catalogData.forEach((catalog, key) => {
+        radar.updateIndicator(key, catalog.value);
       });
     });
   }
@@ -30549,13 +30595,9 @@ var ChartOptionsGenerator2 = class {
     return titleOption;
   }
   calcLegendOption(chartLegend) {
-    var _a;
     const { showLegend, legendPos } = chartLegend;
     const legendOption = {};
     legendOption.show = showLegend;
-    if (((_a = this.model.dechartSerieses) == null ? void 0 : _a.length) === 1) {
-      legendOption.show = false;
-    }
     const position = legendPos == null ? void 0 : legendPos.toLowerCase();
     if (position === "left" || position === "right") {
       legendOption.left = position;
@@ -30690,6 +30732,9 @@ var ChartOptionsGenerator2 = class {
       }
     });
     this.options.series = seriesOption;
+    if (this.seriesGenerators.length === 1 && this.seriesGenerators[0].groupData && Object.keys(this.seriesGenerators[0].groupData).length === 1 && seriesOption[0].type && ["bar", "line", "scatter"].includes(seriesOption[0].type) && this.staticOptions.legend) {
+      this.staticOptions.legend.show = false;
+    }
     this.options = mergeDeepRight3(
       this.staticOptions,
       this.options
@@ -32914,10 +32959,16 @@ var DashboardController = class extends ControlController {
     if (!(portletModels == null ? void 0 : portletModels.length)) {
       return;
     }
+    const ignorePortletTypes = [
+      "CHART" /* CHART */,
+      "APPMENU" /* APP_MENU */,
+      "TOOLBAR" /* TOOLBAR */,
+      "LIST" /* LIST */
+    ];
     await Promise.all(
       portletModels.map(async (portlet) => {
         var _a;
-        if (portlet.controlType === "CHART" /* CHART */) {
+        if (portlet.controlType && ignorePortletTypes.includes(portlet.controlType)) {
           return;
         }
         const provider = await getPortletProvider(portlet);
@@ -33269,6 +33320,22 @@ var MenuPortletController = class extends PortletPartController {
 var ChartPortletController = class extends PortletPartController {
 };
 
+// src/controller/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.controller.ts
+var ActionBarPortletController = class extends PortletPartController {
+};
+
+// src/controller/control/dashboard/portlet/html-portlet/html-portlet.controller.ts
+var HtmlPortletController = class extends PortletPartController {
+};
+
+// src/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.ts
+var ListPortletController = class extends PortletPartController {
+};
+
+// src/controller/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.controller.ts
+var RawItemPortletController = class extends PortletPartController {
+};
+
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 import { isNil as isNil20 } from "ramda";
@@ -35798,10 +35865,17 @@ var FormMDCtrlContentTypeController = class {
   async initData() {
     const name = this.model.appDEFieldId || this.model.fieldName || this.model.id;
     if (name) {
+      const data = this.parent.data[name];
       if (this.model.contentType === "REPEATER" && this.model.detailStyle === "STYLE3") {
-        this.parent.state.contentCtrlData = this.parent.data[name] || {};
+        if (Array.isArray(data)) {
+          this.parent.state.contentCtrlData = {};
+        } else {
+          this.parent.state.contentCtrlData = data || {};
+        }
+      } else if (!Array.isArray(data)) {
+        this.parent.state.contentCtrlData = [];
       } else {
-        this.parent.state.contentCtrlData = this.parent.data[name] || [];
+        this.parent.state.contentCtrlData = data || [];
       }
     }
   }
@@ -37268,6 +37342,15 @@ var FormMDCtrlController = class extends FormDetailController {
     if (this.mdCtrlContentController) {
       await this.mdCtrlContentController.onInit();
     }
+    if (this.form.state.isLoaded) {
+      this.mdCtrlContentController.initData();
+    }
+    this.form.evt.on("onLoadDraftSuccess", () => {
+      this.mdCtrlContentController.initData();
+    });
+    this.form.evt.on("onLoadSuccess", () => {
+      this.mdCtrlContentController.initData();
+    });
   }
   /**
    * 手动通知外部表单值变更
@@ -37282,16 +37365,6 @@ var FormMDCtrlController = class extends FormDetailController {
       this.form.setDataValue(name, this.state.contentCtrlData);
     }
   }
-  /**
-   * 加载数据，要在表单加载完成之后再去加载
-   *
-   * @author zk
-   * @date 2023-07-28 11:07:09
-   * @memberof FormMDCtrlController
-   */
-  async loadData() {
-    await this.mdCtrlContentController.initData();
-  }
   /**
    * 表单校验，通知子表单进行校验
    *
@@ -37959,9 +38032,7 @@ var GridController = class extends MDControlController {
    */
   afterRemove(data) {
     super.afterRemove(data);
-    const index = this.state.rows.findIndex(
-      (item) => item.data.srfkey === data.srfkey
-    );
+    const index = this.findRowStateIndex(data);
     this.state.rows.splice(index, 1);
     this.state.groups.forEach((item) => {
       if (item.children.length) {
@@ -37982,13 +38053,16 @@ var GridController = class extends MDControlController {
    */
   async newRow() {
     const { enableRowEdit, enableRowNew } = this.model;
-    if (!enableRowEdit || !enableRowNew || ibiz.config.grid.editShowMode !== "row") {
+    const { editShowMode } = ibiz.config.grid;
+    if (!enableRowEdit || !enableRowNew || !["row", "all"].includes(editShowMode)) {
       ibiz.log.error("\u4E0D\u652F\u6301\u65B0\u5EFA\u884C");
       return;
     }
-    const editingRow = this.state.rows.find((item) => item.showRowEdit);
-    if (editingRow) {
-      throw new RuntimeError45("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+    if (editShowMode === "row") {
+      const editingRow = this.state.rows.find((item) => item.showRowEdit);
+      if (editingRow) {
+        throw new RuntimeError45("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+      }
     }
     const queryParams = { ...this.params };
     const defaultData = this.calcDefaultValue({}, true);
@@ -38008,7 +38082,9 @@ var GridController = class extends MDControlController {
     const newRow = new GridRowState(draftData, this);
     this.state.rows.unshift(newRow);
     this.gridStateNotify(newRow, "DRAFT" /* DRAFT */);
-    this.switchRowEdit(this.state.rows[0], true);
+    if (editShowMode === "row") {
+      this.switchRowEdit(this.state.rows[0], true);
+    }
     this.actionNotification("GETDRAFTSUCCESS", { data: draftData });
   }
   /**
@@ -38023,9 +38099,8 @@ var GridController = class extends MDControlController {
     if (this.state.isSimple) {
       return;
     }
-    const rowState = this.state.rows.find(
-      (item) => item.data.srfkey === data.srfkey
-    );
+    const isCreate = data.srfuf === 0 /* CREATE */;
+    const rowState = this.findRowState(data);
     if (!rowState) {
       throw new RuntimeError45("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
@@ -38043,7 +38118,6 @@ var GridController = class extends MDControlController {
     }
     await this.startLoading();
     let res;
-    const isCreate = data.srfuf === 0 /* CREATE */;
     const deName = calcDeCodeNameById(this.model.appDataEntityId);
     const tempContext = this.context.clone();
     tempContext[deName] = data.srfkey;
@@ -38059,9 +38133,7 @@ var GridController = class extends MDControlController {
     } finally {
       await this.endLoading();
     }
-    const index = this.state.items.findIndex(
-      (item) => item.srfkey === data.srfkey
-    );
+    const index = this.findRowStateIndex(data);
     this.state.items.splice(index, 1, res.data);
     rowState.data = res.data;
     rowState.modified = false;
@@ -38504,6 +38576,31 @@ var GridController = class extends MDControlController {
     });
     return result;
   }
+  /**
+   * 查找rowState
+   * @author lxm
+   * @date 2023-10-27 07:27:48
+   * @param {IData} data
+   * @return {*}  {(IGridRowState)}
+   */
+  findRowStateIndex(data) {
+    const isCreate = data.srfuf === 0 /* CREATE */;
+    const compareKey = isCreate ? "tempsrfkey" : "srfkey";
+    return this.state.rows.findIndex(
+      (item) => item.data[compareKey] === data[compareKey]
+    );
+  }
+  /**
+   * 查找rowState
+   * @author lxm
+   * @date 2023-10-27 07:27:48
+   * @param {IData} data
+   * @return {*}  {(IGridRowState | undefined)}
+   */
+  findRowState(data) {
+    const index = this.findRowStateIndex(data);
+    return index !== -1 ? this.state.rows[index] : void 0;
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
@@ -38745,7 +38842,11 @@ var GridFieldColumnController = class extends GridColumnController {
     }
     const isDate = DataTypes3.isDate(this.dataType);
     if (isDate) {
-      return dayjs4(strVal).format(this.valueFormat);
+      const formatVal = dayjs4(strVal).format(this.valueFormat);
+      if (formatVal !== "Invalid Date") {
+        return formatVal;
+      }
+      return strVal;
     }
     return ibiz.util.text.format(strVal, this.valueFormat);
   }
@@ -39914,6 +40015,9 @@ var PickupViewPanelController = class extends ControlController {
   async onCreated() {
     await super.onCreated();
     this.mountCounter.enroll(this.model.embeddedAppDEViewId);
+  }
+  updateContextParams(opts) {
+    super.updateContextParams(opts);
     this.initNavParam();
   }
   /**
@@ -44635,6 +44739,7 @@ var RemotePluginItem = class {
 };
 export {
   APP_COUNTER_PROVIDER_PREFIX,
+  ActionBarPortletController,
   ActivityCounter,
   AppCounter,
   AppDECounter,
@@ -44733,11 +44838,13 @@ export {
   GridService,
   GridUAColumnController,
   HandlebarsUtil,
+  HtmlPortletController,
   HubController,
   KanbanController,
   KanbanService,
   LayoutPanelUtil,
   ListController,
+  ListPortletController,
   ListService,
   LoadingState,
   MDControlController,
@@ -44766,6 +44873,7 @@ export {
   PortletPartController,
   PortletPartState,
   QXEventEx,
+  RawItemPortletController,
   RawValueUtil,
   RegisterCenter,
   RemotePluginItem,