@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.6

package/dist/index.esm.js

@@ -25535,7 +25535,7 @@ var CodeListDataItem = class {
       try {
         this.data = ScriptFactory.execSingleLine(
           dataAppDEFieldId,
-          this.$origin
+          this.$origin instanceof AppDataEntity ? clone5(this.$origin._data) : clone5(this.$origin)
         );
       } catch (error) {
         ibiz.log.error(ibiz.i18n.t("runtime.service.dynamicCodeTable"));
@@ -25579,6 +25579,10 @@ var CodeListDataItem = class {
       enumerable: true,
       configurable: true
     });
+    this.children = void 0;
+    this.cls = void 0;
+    this.tooltip = void 0;
+    this.userData = void 0;
     Object.keys(
       data instanceof AppDataEntity ? clone5(data._data) : clone5(data)
     ).forEach((key) => {
@@ -34588,20 +34592,18 @@ function formatDate(val, format) {
   if (!val || isNaN(date.getTime()))
     return value;
   const year = dayjs(date).year();
-  const month = dayjs(date).month() + 1;
   switch (format) {
     case "year":
       value = "".concat(year);
       break;
     case "quarter":
-      value = "".concat(year, " ").concat(Math.ceil(month / 3)).concat(ibiz.i18n.t("runtime.controller.utils.util.quarter"));
+      value = "".concat(year, " ").concat(dayjs(date).quarter()).concat(ibiz.i18n.t("runtime.controller.utils.util.quarter"));
       break;
     case "month":
-      value = "".concat(year, " ").concat(month).concat(ibiz.i18n.t("runtime.controller.utils.util.month"));
+      value = "".concat(year, " ").concat(dayjs(date).month() + 1).concat(ibiz.i18n.t("runtime.controller.utils.util.month"));
       break;
     case "week":
-      const week = dayjs(date).week();
-      value = "".concat(year, " ").concat(week).concat(ibiz.i18n.t("runtime.controller.utils.util.week"));
+      value = "".concat(year, " ").concat(dayjs(date).week()).concat(ibiz.i18n.t("runtime.controller.utils.util.week"));
       break;
     case "day":
       value = dayjs(date).format("YYYY-MM-DD");
@@ -34611,6 +34613,41 @@ function formatDate(val, format) {
   }
   return value;
 }
+function getWeeksInYear(year) {
+  const lastDayOfYear = dayjs("".concat(year, "-12-31"));
+  const week = lastDayOfYear.isoWeek();
+  return week === 1 ? 52 : week;
+}
+function generateYearWeekRange(minYearWeek, maxYearWeek, paddingWeeks = 0) {
+  const [minYear, minWeek] = minYearWeek.split("-").map(Number);
+  const [maxYear, maxWeek] = maxYearWeek.split("-").map(Number);
+  let startYear = minYear;
+  let startWeek = minWeek - paddingWeeks;
+  while (startWeek < 1) {
+    startYear--;
+    startWeek += getWeeksInYear(startYear);
+  }
+  let endYear = maxYear;
+  let endWeek = maxWeek + paddingWeeks;
+  const maxWeeksInEndYear = getWeeksInYear(endYear);
+  if (endWeek > maxWeeksInEndYear) {
+    endWeek -= maxWeeksInEndYear;
+    endYear++;
+  }
+  const yearWeeks = [];
+  let currentYear = startYear;
+  let currentWeek = startWeek;
+  while (currentYear < endYear || currentYear === endYear && currentWeek <= endWeek) {
+    yearWeeks.push("".concat(currentYear, "-").concat(currentWeek));
+    currentWeek++;
+    const weeksInCurrentYear = getWeeksInYear(currentYear);
+    if (currentWeek > weeksInCurrentYear) {
+      currentYear++;
+      currentWeek = 1;
+    }
+  }
+  return yearWeeks;
+}
 
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError25 } from "@ibiz-template/core";
@@ -43183,9 +43220,11 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(SeriesOption[] | SeriesOption)}
    */
   calcByData(data) {
+    const { userParam, echartsType } = this.model;
     const tempData = this.dataPreprocess(data);
     const groupData = this.calcGroupData(tempData);
-    this.addTimeData(groupData);
+    const noCompletionDate = (userParam == null ? void 0 : userParam.completiondate) === "false" || echartsType && ["pie", "gauge", "radar", "funnel"].includes(echartsType);
+    noCompletionDate ? this.calcTimeData(groupData) : this.addTimeData(groupData);
     return this.calcGroupSeries(groupData);
   }
   /**
@@ -43286,17 +43325,16 @@ var BaseSeriesGenerator = class {
     });
   }
   /**
-   * 根据分组模式补全分组数据并排序
-   * @param {IData} data
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-08-16 13:57:53
+   * @description 根据分组模式补全时间数据
+   * - 将最小日期和最大日期之间的数据补全，确保横坐标时间的连续性
+   * @param {GroupData} data
+   * @returns {*}  {void}
+   * @memberof BaseSeriesGenerator
    */
   addTimeData(data) {
     const { groupMode } = this.model;
-    if (!groupMode || groupMode === "CODELIST") {
+    if (!groupMode || groupMode === "CODELIST")
       return;
-    }
     const dates = [];
     Object.keys(data).forEach((key) => {
       data[key].forEach((_val, date) => {
@@ -43369,7 +43407,7 @@ var BaseSeriesGenerator = class {
         }
       }
     } else if (groupMode === "YEARWEEK") {
-      const yearWeeks = [];
+      let yearWeeks = [];
       Object.keys(data).forEach((key) => {
         data[key].forEach((_val, yearWeek) => {
           yearWeeks.push(yearWeek);
@@ -43383,22 +43421,41 @@ var BaseSeriesGenerator = class {
         (max2, current) => current > max2 ? current : max2,
         yearWeeks[0]
       );
-      const [minYear] = minYearWeek.split("-");
-      const [maxYear] = maxYearWeek.split("-");
-      for (let year = parseInt(minYear, 10); year <= parseInt(maxYear, 10); year++) {
-        const numWeeks = dayjs5("".concat(year, "-12-31")).isoWeek();
-        for (let week = 1; week <= numWeeks; week++) {
-          const yearWeek = "".concat(year, "-").concat(week);
-          Object.keys(data).forEach((key) => {
-            if (!data[key].get(yearWeek)) {
-              data[key].set(yearWeek, { value: 0 });
-            }
-          });
-        }
-      }
+      yearWeeks = generateYearWeekRange(minYearWeek, maxYearWeek, 3);
+      yearWeeks.forEach((yearWeek) => {
+        Object.keys(data).forEach((key) => {
+          if (!data[key].get(yearWeek)) {
+            data[key].set(yearWeek, { value: 0 });
+          }
+        });
+      });
     }
     this.sortTimeData(data);
   }
+  /**
+   * @description 根据分组模式计算时间数据
+   * - 只计算有值的日期，展示关键信息数据，多用于横轴日期显示跨度大的情况
+   * @param {GroupData} data
+   * @memberof BaseSeriesGenerator
+   */
+  calcTimeData(data) {
+    const { groupMode } = this.model;
+    if (!groupMode || groupMode === "CODELIST")
+      return;
+    const dates = [];
+    Object.keys(data).forEach((key) => {
+      data[key].forEach((_val, date) => {
+        dates.push(date);
+      });
+    });
+    dates.forEach((date) => {
+      Object.keys(data).forEach((key) => {
+        if (!data[key].get(date))
+          data[key].set(date, { value: 0 });
+      });
+    });
+    this.sortTimeData(data);
+  }
 };
 
 // src/controller/control/chart/generator/line-series-generator.ts
@@ -51830,6 +51887,12 @@ var FormDRUIPartController = class extends FormDetailController {
         embedView.appDataEntityId
       );
     }
+    this.form.evt.on("onBeforeSave", async () => {
+      if (this.isNeedSyncEmbed && this.embedView && this.embedDataService) {
+        await this.saveEmbedViewData();
+        await this.SyncEmbedDataToForm();
+      }
+    });
   }
   /**
    * @description 表单数据变更通知(由表单控制器调用)
@@ -51861,21 +51924,6 @@ var FormDRUIPartController = class extends FormDetailController {
       this.calcViewParams();
     }
   }
-  /**
-   * @description 同步当前表单数据至子界面数据服务
-   * @returns {*}  {Promise<void>}
-   * @memberof FormDRUIPartController
-   */
-  async SyncDataToEmbedService() {
-    if (this.isNeedSyncEmbed && this.embedDataService) {
-      const tempContext = this.context.clone();
-      tempContext.srfappid = this.model.appId;
-      const originData = this.form.state.data.$origin;
-      const res = await this.embedDataService.getTemp(tempContext);
-      const syncAction = res.data ? "updateTemp" : "createTemp";
-      await this.embedDataService[syncAction](tempContext, originData);
-    }
-  }
   /**
    * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
    * @returns {*}  {void}
@@ -51883,7 +51931,10 @@ var FormDRUIPartController = class extends FormDetailController {
    */
   calcViewParams() {
     let newContext = this.form.context.clone();
-    newContext.srfignorechange = this.isNeedSyncEmbed;
+    if (this.isNeedSyncEmbed) {
+      newContext.srfignorechange = true;
+      newContext.srfsilent = true;
+    }
     const navContexts = this.model.navigateContexts;
     if (notNilEmpty10(navContexts)) {
       newContext = Object.assign(
@@ -51942,14 +51993,7 @@ var FormDRUIPartController = class extends FormDetailController {
           this.model.deformItemUpdateId
         );
       }
-      if (this.isNeedSyncEmbed && this.embedDataService) {
-        const tempContext = this.context.clone();
-        tempContext.srfappid = this.model.appId;
-        const res = await this.embedDataService.getTemp(tempContext);
-        const childData = res.data || {};
-        const exData = this.form.state.data.srfexdata || {};
-        this.form.state.data.srfexdata = Object.assign(exData, childData);
-      }
+      await this.SyncEmbedDataToForm();
     });
   }
   /**
@@ -51990,6 +52034,47 @@ var FormDRUIPartController = class extends FormDetailController {
     }
     return true;
   }
+  /**
+   * @description 同步当前表单数据至子界面数据服务
+   * @returns {*}  {Promise<void>}
+   * @memberof FormDRUIPartController
+   */
+  async SyncDataToEmbedService() {
+    if (this.isNeedSyncEmbed && this.embedDataService) {
+      const tempContext = this.context.clone();
+      tempContext.srfappid = this.model.appId;
+      const originData = this.form.state.data.$origin;
+      const res = await this.embedDataService.getTemp(tempContext);
+      const syncAction = res.data ? "updateTemp" : "createTemp";
+      await this.embedDataService[syncAction](tempContext, originData);
+    }
+  }
+  /**
+   * @description 同步子界面数据至表单
+   * @returns {*}  {Promise<void>}
+   * @memberof FormDRUIPartController
+   */
+  async SyncEmbedDataToForm() {
+    if (this.isNeedSyncEmbed && this.embedDataService) {
+      const tempContext = this.context.clone();
+      tempContext.srfappid = this.model.appId;
+      const res = await this.embedDataService.getTemp(tempContext);
+      const childData = res.data || {};
+      const exData = this.form.state.data.srfexdata || {};
+      this.form.state.data.srfexdata = Object.assign(exData, childData);
+    }
+  }
+  /**
+   * @description 保存嵌入视图数据
+   * @returns {*}  {Promise<void>}
+   * @memberof FormDRUIPartController
+   */
+  async saveEmbedViewData() {
+    var _a3;
+    if (this.isNeedSyncEmbed && this.embedView) {
+      await ((_a3 = this.embedView) == null ? void 0 : _a3.call("Save" /* SAVE */));
+    }
+  }
 };
 
 // src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts
@@ -68241,6 +68326,43 @@ import {
 } from "@ibiz-template/core";
 import qs4 from "qs";
 var FileUtil = class {
+  constructor() {
+    /**
+     * @description 自定义文件上传请求头数据
+     * @protected
+     * @type {Record<string, string>}
+     * @memberof FileUtil
+     */
+    this.customUploadHeaders = {};
+  }
+  /**
+   * @description 设置文件上传请求头数据
+   * @param {Record<string, string>} args
+   * @memberof FileUtil
+   */
+  setUploadHeaders(args) {
+    Object.assign(this.customUploadHeaders, args);
+  }
+  /**
+   * @description 获取文件上传请求头数据
+   * @returns {*}  {Record<string, string>}
+   * @memberof IApiFileUtil
+   */
+  getUploadHeaders() {
+    const uploadHeaders = {};
+    const token = getAppCookie2(CoreConst3.TOKEN);
+    if (token) {
+      Object.assign(uploadHeaders, {
+        ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(token)
+      });
+    }
+    if (this.customUploadHeaders && Object.keys(this.customUploadHeaders).length > 0) {
+      Object.assign(uploadHeaders, {
+        ...this.customUploadHeaders
+      });
+    }
+    return uploadHeaders;
+  }
   /**
    * @description 计算OSSCat参数
    * @protected
@@ -68259,9 +68381,7 @@ var FileUtil = class {
     return uploadUrl;
   }
   /**
-   * @description 计算文件的上传路径和下载路径
-   * 下载路径文件id用%fileId%占位，替换即可
-   * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
+   * @description 计算文件的上传路径和下载路径,下载路径文件id用%fileId%占位，替换即可;配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
    * @param {IContext} context
    * @param {IParams} params
    * @param {IData} [data={}]
@@ -68379,17 +68499,16 @@ var FileUtil = class {
    * @memberof FileUtil
    */
   async chooseFileAndUpload(context, params, data, option = {}) {
-    const { accept, multiple, showUploadManager } = option;
-    const urls = ibiz.util.file.calcFileUpDownUrl(context, params, data);
+    const { accept, multiple, showUploadManager, extraParams } = option;
+    const urls = ibiz.util.file.calcFileUpDownUrl(
+      context,
+      params,
+      data,
+      extraParams
+    );
     const files = await ibiz.util.file.chooseFile(accept, multiple);
     let promises = [];
-    const headers = {};
-    const token = getAppCookie2(CoreConst3.TOKEN);
-    if (token) {
-      Object.assign(headers, {
-        ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(token)
-      });
-    }
+    const headers = this.getUploadHeaders();
     if (showUploadManager) {
       promises = await ibiz.notification.uploadManager({
         uploadUrl: urls.uploadUrl,
@@ -76520,13 +76639,19 @@ var MDViewEngine = class extends ViewEngineBase {
         ibiz.i18n.t("runtime.engine.logicOpendata")
       );
     } else {
+      if (result.ok && result.data && result.data.length > 0) {
+        this.view.evt.emit("onDataChange", {
+          data: result.data,
+          actionType: "EDIT"
+        });
+      }
       return {
         cancel: result ? !result.ok : true
       };
     }
   }
   /**
-   * 打开编辑数据视图
+   * 打开新建数据视图
    *
    * @author lxm
    * @date 2022-09-01 18:09:19
@@ -76563,6 +76688,12 @@ var MDViewEngine = class extends ViewEngineBase {
         ibiz.i18n.t("runtime.engine.logicNewdata")
       );
     } else {
+      if (result.ok && result.data && result.data.length > 0) {
+        this.view.evt.emit("onDataChange", {
+          data: result.data,
+          actionType: "NEW"
+        });
+      }
       return {
         cancel: result ? !result.ok : true
       };
@@ -80143,6 +80274,7 @@ export {
   generateCacheKy,
   generateEditorRules,
   generateRules,
+  generateYearWeekRange,
   getAcItemProvider,
   getAllItems,
   getAllPanelField,
@@ -80194,6 +80326,7 @@ export {
   getViewProvider,
   getWFContext,
   getWFSubmitViewId,
+  getWeeksInYear,
   handleAllSettled,
   hasDeCodeName,
   hasSubRoute,