@ibiz-template/runtime 0.7.41-alpha.102 → 0.7.41-alpha.104

package/dist/index.esm.js

@@ -20533,7 +20533,7 @@ var ValueOP = /* @__PURE__ */ ((ValueOP2) => {
   ValueOP2["IN"] = "IN";
   ValueOP2["NOT_IN"] = "NOTIN";
   ValueOP2["LIKE"] = "LIKE";
-  ValueOP2["LIFT_LIKE"] = "LIFTLIKE";
+  ValueOP2["LEFT_LIKE"] = "LEFTLIKE";
   ValueOP2["RIGHT_LIKE"] = "RIGHT_LIKE";
   ValueOP2["CHILD_OF"] = "CHILDOF";
   ValueOP2["USER_LIKE"] = "USERLIKE";
@@ -34332,9 +34332,10 @@ var UIActionProviderBase = class {
       });
     }
     const isMultiData = ["MULTIKEY", "MULTIDATA"].includes(action.actionTarget) && data.length > 0;
+    const singleNavData = action.actionTarget === "NONE" ? {} : data[0] || {};
     const tempContext = convertNavData(
       navContexts,
-      isMultiData ? formatMultiData(navContexts, data) : data[0] || {},
+      isMultiData ? formatMultiData(navContexts, data) : singleNavData,
       params,
       context
     );
@@ -34342,7 +34343,7 @@ var UIActionProviderBase = class {
     const navParams = action.navigateParams;
     const resultParams = convertNavData(
       navParams,
-      isMultiData ? formatMultiData(navParams, data) : data[0] || {},
+      isMultiData ? formatMultiData(navParams, data) : singleNavData,
       params,
       resultContext
     );
@@ -35630,6 +35631,17 @@ var CalendarController = class extends MDControlController {
       return this.controlParams.grouptimefield;
     return "beginTime";
   }
+  /**
+   * @description 时间范围模式
+   * @readonly
+   * @type {('custom' | 'quarter' | 'year' | 'halfYear')}
+   * @memberof CalendarController
+   */
+  get timeRangeMode() {
+    if (this.controlParams.timerangemode)
+      return this.controlParams.timerangemode;
+    return "year";
+  }
   /**
    * 初始化状态
    *
@@ -35651,6 +35663,7 @@ var CalendarController = class extends MDControlController {
     this.state.size = 1e3;
     this.state.legends = [];
     this.state.groups = [];
+    this.state.timeRange = [];
     this.state.calendarTitle = this.model.logicName || "";
     this.state.showDetail = false;
   }
@@ -35677,6 +35690,7 @@ var CalendarController = class extends MDControlController {
     this.state.showDetail = ((_d = (_c = this.model.controlParam) == null ? void 0 : _c.ctrlParams) == null ? void 0 : _d.SHOWDETAIL) || this.controlParams.showdetail === "true" || false;
     this.service = new CalendarService(this.model);
     await this.service.init(this.context);
+    this.initTimeRange();
     this.initViewScheduler();
     this.initCalendarLegends();
     (_e = this.model.sysCalendarItems) == null ? void 0 : _e.forEach((item) => {
@@ -35694,6 +35708,59 @@ var CalendarController = class extends MDControlController {
       Object.values(this.contextMenus).map((menu) => menu.created())
     );
   }
+  /**
+   * @description 初始化时间范围
+   * @protected
+   * @memberof CalendarController
+   */
+  initTimeRange() {
+    const { calendarStyle } = this.model;
+    if (calendarStyle !== "USER2")
+      return;
+    switch (this.timeRangeMode) {
+      case "year":
+        this.state.timeRange = [
+          dayjs3().startOf("year").toDate(),
+          dayjs3().endOf("year").toDate()
+        ];
+        break;
+      case "halfYear":
+        const year = dayjs3().year();
+        const isFirstHalf = dayjs3().month() < 6;
+        if (isFirstHalf) {
+          this.state.timeRange = [
+            dayjs3("".concat(year, "-01-01")).toDate(),
+            dayjs3("".concat(year, "-06-30")).toDate()
+          ];
+        } else {
+          this.state.timeRange = [
+            dayjs3("".concat(year, "-07-01")).toDate(),
+            dayjs3("".concat(year, "-12-31")).toDate()
+          ];
+        }
+        break;
+      case "quarter":
+        this.state.timeRange = [
+          dayjs3().startOf("quarter").toDate(),
+          dayjs3().endOf("quarter").toDate()
+        ];
+        break;
+      case "custom":
+        const { begintime } = this.controlParams;
+        const { endtime } = this.controlParams;
+        if (!begintime || !dayjs3(begintime).isValid() || !endtime || !dayjs3(endtime).isValid())
+          throw new RuntimeError30(
+            ibiz.i18n.t("runtime.controller.control.calendar.illegalTime")
+          );
+        this.state.timeRange = [
+          dayjs3(begintime).toDate(),
+          dayjs3(endtime).toDate()
+        ];
+        break;
+      default:
+        break;
+    }
+  }
   /**
    * @description 执行行为
    * @param {string} uiActionId
@@ -35730,19 +35797,18 @@ var CalendarController = class extends MDControlController {
    */
   initCalendarLegends() {
     const { sysCalendarItems } = this.model;
-    if (!sysCalendarItems) {
+    if (!sysCalendarItems)
       throw new RuntimeError30(
         ibiz.i18n.t("runtime.controller.control.calendar.noFoundModel")
       );
-    }
-    sysCalendarItems.forEach((calendarItem) => {
-      const { id, name: name2, bkcolor, color } = calendarItem;
-      this.state.legends.push({
-        id,
+    this.state.legends = sysCalendarItems.map((item) => {
+      const { itemType = "", name: name2 = "", bkcolor, color } = item;
+      return {
         name: name2,
+        color,
         bkcolor,
-        color
-      });
+        id: itemType
+      };
     });
   }
   /**
@@ -36023,7 +36089,7 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarController
    */
   getCurSelectDate(param) {
-    const { selectedDate } = this.state;
+    const { selectedDate, timeRange } = this.state;
     const { calendarStyle } = this.model;
     let { srfstartdate, srfenddate } = param;
     if (!srfstartdate || !srfenddate) {
@@ -36073,8 +36139,11 @@ var CalendarController = class extends MDControlController {
             ).getTime() - 1
           );
           break;
+        case "USER2":
+          srfstartdate = dayjs3(timeRange[0]).format("YYYY-MM-DD");
+          srfenddate = dayjs3(timeRange[1]).format("YYYY-MM-DD");
+          break;
         default:
-          ibiz.log.warn("\u65E5\u5386".concat(calendarStyle, "\u6837\u5F0F\u6682\u672A\u652F\u6301"));
           break;
       }
       return {
@@ -41088,7 +41157,7 @@ var typeToOPs = {
     "ISNOTNULL" /* IS_NOT_NULL */,
     "USERLIKE" /* USER_LIKE */,
     "LIKE" /* LIKE */,
-    "LIFTLIKE" /* LIFT_LIKE */,
+    "LEFTLIKE" /* LEFT_LIKE */,
     "RIGHT_LIKE" /* RIGHT_LIKE */
   ],
   number: [
@@ -53134,11 +53203,37 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   async triggerAction(row, event) {
     const actionId = this.model.deuiactionId;
+    const tempContext = this.context.clone();
+    const tempParams = clone33(this.params);
+    const { userParam } = this.model;
+    if (userParam) {
+      const { navigateContexts, navigateParams } = parseUserParams(userParam);
+      let selfContext = {};
+      if (navigateContexts && row.data) {
+        selfContext = convertNavData(
+          navigateContexts,
+          row.data,
+          tempParams,
+          tempContext
+        );
+      }
+      Object.assign(tempContext, selfContext);
+      let selfParams = {};
+      if (navigateParams && row.data) {
+        selfParams = convertNavData(
+          navigateParams,
+          row.data,
+          tempParams,
+          tempContext
+        );
+      }
+      Object.assign(tempParams, selfParams);
+    }
     await UIActionUtil.execAndResolved(
       actionId,
       {
-        context: this.context,
-        params: this.params,
+        context: tempContext,
+        params: tempParams,
         data: [row.data],
         view: this.grid.view,
         ctrl: this.grid,
@@ -79075,7 +79170,7 @@ var JsonSchemaUtil = class {
         "ISNOTNULL" /* IS_NOT_NULL */,
         "USERLIKE" /* USER_LIKE */,
         "LIKE" /* LIKE */,
-        "LIFTLIKE" /* LIFT_LIKE */,
+        "LEFTLIKE" /* LEFT_LIKE */,
         "RIGHT_LIKE" /* RIGHT_LIKE */
       ],
       ["NUMBER" /* NUMBER */]: [
@@ -79235,8 +79330,8 @@ var JsonSchemaUtil = class {
         label: ibiz.i18n.t("runtime.controller.utils.jsonSchemaUtil.like")
       },
       {
-        valueOP: "LIFTLIKE" /* LIFT_LIKE */,
-        label: ibiz.i18n.t("runtime.controller.utils.jsonSchemaUtil.lift_like")
+        valueOP: "LEFTLIKE" /* LEFT_LIKE */,
+        label: ibiz.i18n.t("runtime.controller.utils.jsonSchemaUtil.left_like")
       },
       {
         valueOP: "RIGHT_LIKE" /* RIGHT_LIKE */,
@@ -90289,7 +90384,8 @@ var en = {
           noConfigured: "No application functionality configured"
         },
         calendar: {
-          noFoundModel: "Calendar item model not found"
+          noFoundModel: "Calendar item model not found",
+          illegalTime: "[USER2] Calendar style with time range type [custom] does not have valid control dynamic parameters [begintime] and [endtime] configured"
         },
         chart: {
           noConfiguredX: "Sequence is not configured with X-axis",
@@ -90493,7 +90589,7 @@ var en = {
           in: "Value In range (In)",
           not_in: "Value not in range (NotIn)",
           like: "Text contains (%)",
-          lift_like: "Text left contained (%#)",
+          left_like: "Text left contained (%#)",
           right_like: "Text right included (#%)",
           exists: "exists(EXISTS)",
           not_exists: "Does not exist (NOTEXISTS)"
@@ -90973,7 +91069,8 @@ var zhCn = {
           noConfigured: "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD"
         },
         calendar: {
-          noFoundModel: "\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B"
+          noFoundModel: "\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B",
+          illegalTime: "[USER2]\u65E5\u5386\u6837\u5F0F\u65F6\u95F4\u8303\u56F4\u7C7B\u578B\u4E3A[custom]\u7684\u65E5\u5386\u672A\u914D\u7F6E\u5408\u6CD5\u7684\u63A7\u4EF6\u52A8\u6001\u53C2\u6570 [begintime] \u548C [endtime]"
         },
         chart: {
           noConfiguredX: "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74",
@@ -91177,7 +91274,7 @@ var zhCn = {
           in: "\u503C\u5728\u8303\u56F4\u4E2D(In)",
           not_in: "\u503C\u4E0D\u5728\u8303\u56F4\u4E2D(NotIn)",
           like: "\u6587\u672C\u5305\u542B(%)",
-          lift_like: "\u6587\u672C\u5DE6\u5305\u542B(%#)",
+          left_like: "\u6587\u672C\u5DE6\u5305\u542B(%#)",
           right_like: "\u6587\u672C\u53F3\u5305\u542B(#%)",
           exists: "\u5B58\u5728(EXISTS)",
           not_exists: "\u4E0D\u5B58\u5728(NOTEXISTS)"