@ibiz-template/runtime 0.5.3-beta.1 → 0.5.3-beta.3

package/dist/index.esm.js

@@ -8955,8 +8955,9 @@ var DEActionMethod = class extends Method {
     if (configs.length > 0) {
       configs.forEach((config) => {
         if (config.parentAppDEFieldId) {
-          const { majorDECodeName, parentAppDEFieldId } = config;
-          const majorLowerCodeName = majorDECodeName.toLowerCase();
+          const { majorAppDataEntityId, parentAppDEFieldId } = config;
+          const majorDECodeName = calcDeCodeNameById(majorAppDataEntityId);
+          const majorLowerCodeName = majorDECodeName;
           const pickupLowerDEFName = parentAppDEFieldId.toLowerCase();
           const majorkey = context[majorLowerCodeName];
           if (majorkey && majorkey !== data.srfkey) {
@@ -10087,7 +10088,13 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
       );
     }
     const { openMode = "INDEXVIEWTAB" } = appView;
-    switch (opts.openMode || openMode) {
+    const viewOpenMode = opts.openMode || openMode;
+    if (viewOpenMode !== void 0 && viewOpenMode !== "INDEXVIEWTAB") {
+      if (context.toRouteDepth) {
+        delete context.toRouteDepth;
+      }
+    }
+    switch (viewOpenMode) {
       case "INDEXVIEWTAB":
         if (opts.noWaitRoute) {
           this.openIndexViewTab(appView, context, params);
@@ -12203,6 +12210,7 @@ var ViewController = class extends BaseController {
     (_a = this.scheduler) == null ? void 0 : _a.startTimerTrigger();
   }
   async onDestroyed() {
+    const srfSessionId = this.context.srfsessionid;
     await super.onDestroyed();
     if (this.engines.length) {
       await Promise.all(this.engines.map((engine) => engine.onDestroyed()));
@@ -12212,8 +12220,8 @@ var ViewController = class extends BaseController {
     if (this.scheduler) {
       this.scheduler.destroy();
     }
-    if (this.id === this.context.srfsessionid) {
-      ibiz.uiDomainManager.destroy(this.context.srfsessionid);
+    if (this.id === srfSessionId) {
+      ibiz.uiDomainManager.destroy(srfSessionId);
     }
     this.context.destroy();
     ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u9500\u6BC1"));
@@ -12401,6 +12409,8 @@ var WFStepTraceViewController = class extends ViewController {
 };
 
 // src/controller/common/editor/editor.controller.ts
+import { DataTypes as DataTypes3 } from "@ibiz-template/core";
+import dayjs2 from "dayjs";
 var EditorController = class {
   /**
    * Creates an instance of EditorController.
@@ -12446,6 +12456,26 @@ var EditorController = class {
   get readonly() {
     return !!this.model.readOnly;
   }
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2024-01-11 10:18:33
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get valueFormat() {
+    return this.parent.valueFormat;
+  }
+  /**
+   * 数据类型
+   * @author lxm
+   * @date 2024-01-11 10:18:55
+   * @readonly
+   * @type {(number  | undefined)}
+   */
+  get dataType() {
+    return this.parent.dataType;
+  }
   /**
    * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
    *
@@ -12528,6 +12558,31 @@ var EditorController = class {
   toBoolean(value) {
     return Object.is("true", value);
   }
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:18:11
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  formatValue(value = "") {
+    if (this.model.valueType !== "SIMPLE") {
+      return ValueExUtil.toText(this.model, value);
+    }
+    const strVal = "".concat(value);
+    if (!this.valueFormat) {
+      return strVal;
+    }
+    const isDate = DataTypes3.isDate(this.dataType);
+    if (isDate) {
+      const formatVal = dayjs2(strVal).format(this.valueFormat);
+      if (formatVal !== "Invalid Date") {
+        return formatVal;
+      }
+      return strVal;
+    }
+    return ibiz.util.text.format(strVal, this.valueFormat);
+  }
 };
 
 // src/controller/common/editor/code-list-editor.controller.ts
@@ -13590,7 +13645,7 @@ var AppMenuIconViewController = class extends AppMenuController {
 };
 
 // src/controller/control/calendar/calendar.controller.ts
-import dayjs2 from "dayjs";
+import dayjs3 from "dayjs";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError36 } from "@ibiz-template/core";
@@ -13748,9 +13803,9 @@ var CalendarController = class extends MDControlController {
         const x = a.beginTime;
         const y = b.beginTime;
         let result = 0;
-        if (dayjs2(x).isAfter(y)) {
+        if (dayjs3(x).isAfter(y)) {
           result = -1;
-        } else if (dayjs2(x).isBefore(y)) {
+        } else if (dayjs3(x).isBefore(y)) {
           result = 1;
         }
         return result;
@@ -13782,8 +13837,8 @@ var CalendarController = class extends MDControlController {
         1
       );
       return {
-        srfstartdate: dayjs2(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
-        srfenddate: dayjs2(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
+        srfstartdate: dayjs3(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
+        srfenddate: dayjs3(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
       };
     }
     return { srfstartdate, srfenddate };
@@ -13872,18 +13927,18 @@ import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
 import { plus, RuntimeModelError as RuntimeModelError27, toNumberOrNil } from "@ibiz-template/core";
-import dayjs3 from "dayjs";
+import dayjs4 from "dayjs";
 import minMax from "dayjs/plugin/minMax";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
 import { clone as clone17, isNil as isNil21, mergeDeepRight } from "ramda";
-dayjs3.extend(minMax);
-dayjs3.extend(isSameOrBefore);
-dayjs3.extend(quarterOfYear);
-dayjs3.extend(weekOfYear);
-dayjs3.extend(isoWeek);
+dayjs4.extend(minMax);
+dayjs4.extend(isSameOrBefore);
+dayjs4.extend(quarterOfYear);
+dayjs4.extend(weekOfYear);
+dayjs4.extend(isoWeek);
 var DEFAULT_GROUP = "$default_group";
 var BaseSeriesGenerator = class {
   /**
@@ -14168,25 +14223,25 @@ var BaseSeriesGenerator = class {
             format = "YYYY-MM";
           }
           if (singleData[this.catalogField]) {
-            const formattedDate = dayjs3(singleData[this.catalogField]).format(
+            const formattedDate = dayjs4(singleData[this.catalogField]).format(
               format
             );
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "QUARTER") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs3(
+            const formattedDate = "".concat(dayjs4(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs3(
+            ).format("YYYY"), "-").concat(dayjs4(
               singleData[this.catalogField]
             ).quarter());
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "YEARWEEK") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs3(
+            const formattedDate = "".concat(dayjs4(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs3(singleData[this.catalogField]).week());
+            ).format("YYYY"), "-").concat(dayjs4(singleData[this.catalogField]).week());
             singleData[this.catalogField] = formattedDate;
           }
         }
@@ -14208,7 +14263,7 @@ var BaseSeriesGenerator = class {
       let sortedKeys = [];
       if (groupMode === "DAY" || groupMode === "YEAR" || groupMode === "MONTH") {
         sortedKeys = Array.from(dateMap.keys()).sort(
-          (a, b) => dayjs3(a).diff(dayjs3(b))
+          (a, b) => dayjs4(a).diff(dayjs4(b))
         );
       } else if (groupMode === "QUARTER" || groupMode === "YEARWEEK") {
         sortedKeys = Array.from(dateMap.keys()).sort((a, b) => {
@@ -14242,11 +14297,11 @@ var BaseSeriesGenerator = class {
     const dates = [];
     Object.keys(data).forEach((key) => {
       data[key].forEach((_val, date) => {
-        dates.push(dayjs3(date));
+        dates.push(dayjs4(date));
       });
     });
-    const maxDate = dayjs3.max(dates);
-    const minDate = dayjs3.min(dates);
+    const maxDate = dayjs4.max(dates);
+    const minDate = dayjs4.min(dates);
     if (groupMode === "DAY") {
       let currentDate = minDate;
       const endDate = maxDate;
@@ -14328,7 +14383,7 @@ var BaseSeriesGenerator = class {
       const [minYear] = minYearWeek.split("-");
       const [maxYear] = maxYearWeek.split("-");
       for (let year = parseInt(minYear, 10); year <= parseInt(maxYear, 10); year++) {
-        const numWeeks = dayjs3("".concat(year, "-12-31")).isoWeek();
+        const numWeeks = dayjs4("".concat(year, "-12-31")).isoWeek();
         for (let week = 1; week <= numWeeks; week++) {
           const yearWeek = "".concat(year, "-").concat(week);
           Object.keys(data).forEach((key) => {
@@ -14992,7 +15047,7 @@ var ChartController = class extends MDControlController {
     if (!this.options) {
       throw new RuntimeError38("options\u8FD8\u6CA1\u8BA1\u7B97");
     }
-    this.chart.setOption(this.options);
+    this.chart.setOption(this.options, { notMerge: true });
     this.resizeChart();
   }
   /**
@@ -16992,8 +17047,14 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
    * @param {IUILogicParams} args
    * @return {*}
    */
-  async executeDataImport(action, _args) {
+  async executeDataImport(action, args) {
     var _a;
+    const { resultParams } = await this.handleParams(
+      action,
+      args.context,
+      args.data,
+      args.params
+    );
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId,
       action.appId
@@ -17011,7 +17072,8 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         {
           dismiss: () => modal.dismiss(),
           appDataEntity,
-          dataImport: appDEDataImport
+          dataImport: appDEDataImport,
+          params: resultParams
         },
         {
           width: "auto",
@@ -23456,8 +23518,8 @@ var GridController = class extends MDControlController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
-import { DataTypes as DataTypes3, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
-import dayjs4 from "dayjs";
+import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
+import dayjs5 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
 import { clone as clone24, isNil as isNil23 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
@@ -23721,9 +23783,9 @@ var GridFieldColumnController = class extends GridColumnController {
     if (!this.valueFormat) {
       return strVal;
     }
-    const isDate = DataTypes3.isDate(this.dataType);
+    const isDate = DataTypes4.isDate(this.dataType);
     if (isDate) {
-      const formatVal = dayjs4(strVal).format(this.valueFormat);
+      const formatVal = dayjs5(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }