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

package/out/controller/control/chart/generator/base-series-generator.d.ts

@@ -246,12 +246,19 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
      */
     sortTimeData(data: GroupData): void;
     /**
-     * 根据分组模式补全分组数据并排序
-     * @param {IData} data
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2023-08-16 13:57:53
+     * @description 根据分组模式补全时间数据
+     * - 将最小日期和最大日期之间的数据补全，确保横坐标时间的连续性
+     * @param {GroupData} data
+     * @returns {*}  {void}
+     * @memberof BaseSeriesGenerator
      */
     addTimeData(data: GroupData): void;
+    /**
+     * @description 根据分组模式计算时间数据
+     * - 只计算有值的日期，展示关键信息数据，多用于横轴日期显示跨度大的情况
+     * @param {GroupData} data
+     * @memberof BaseSeriesGenerator
+     */
+    calcTimeData(data: GroupData): void;
 }
 //# sourceMappingURL=base-series-generator.d.ts.map

package/out/controller/control/chart/generator/base-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"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"}

package/out/controller/control/chart/generator/base-series-generator.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import { plus, RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import minMax from 'dayjs/plugin/minMax';
@@ -8,6 +9,7 @@ import isoWeek from 'dayjs/plugin/isoWeek';
 import { clone, isNil, mergeDeepRight } from 'ramda';
 import { parseUserParams, } from './chart-options-generator';
 import { ChartData } from '../../../../service';
+import { generateYearWeekRange } from '../../../utils';
 dayjs.extend(minMax);
 dayjs.extend(isSameOrBefore);
 dayjs.extend(quarterOfYear);
@@ -554,9 +556,16 @@ export class BaseSeriesGenerator {
      * @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 || userParam === void 0 ? void 0 : userParam.completiondate) === 'false' ||
+            (echartsType &&
+                ['pie', 'gauge', 'radar', 'funnel'].includes(echartsType));
+        noCompletionDate
+            ? this.calcTimeData(groupData)
+            : this.addTimeData(groupData);
         return this.calcGroupSeries(groupData);
     }
     /**
@@ -659,17 +668,16 @@ export class BaseSeriesGenerator {
         });
     }
     /**
-     * 根据分组模式补全分组数据并排序
-     * @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 => {
@@ -749,7 +757,7 @@ export class BaseSeriesGenerator {
         }
         else if (groupMode === 'YEARWEEK') {
             // 找出最大和最小年周
-            const yearWeeks = [];
+            let yearWeeks = [];
             Object.keys(data).forEach(key => {
                 data[key].forEach((_val, yearWeek) => {
                     yearWeeks.push(yearWeek);
@@ -757,23 +765,46 @@ export class BaseSeriesGenerator {
             });
             const minYearWeek = yearWeeks.reduce((min, current) => (current < min ? current : min), yearWeeks[0]);
             const maxYearWeek = yearWeeks.reduce((max, current) => (current > max ? current : max), yearWeeks[0]);
-            // 解析最小和最大年周
-            const [minYear] = minYearWeek.split('-');
-            const [maxYear] = maxYearWeek.split('-');
-            // 填充中间年周的数据项
-            for (let year = parseInt(minYear, 10); year <= parseInt(maxYear, 10); year++) {
-                const numWeeks = dayjs(`${year}-12-31`).isoWeek();
-                for (let week = 1; week <= numWeeks; week++) {
-                    const yearWeek = `${year}-${week}`;
-                    Object.keys(data).forEach(key => {
-                        if (!data[key].get(yearWeek)) {
-                            data[key].set(yearWeek, { value: 0 });
-                        }
-                    });
-                }
-            }
+            // 只解析开始周和结束周前后3周，防止数据过大
+            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);
+    }
 }

package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts

@@ -81,12 +81,6 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
      * @memberof FormDRUIPartController
      */
     formStateNotify(state: FormNotifyState): Promise<void>;
-    /**
-     * @description 同步当前表单数据至子界面数据服务
-     * @returns {*}  {Promise<void>}
-     * @memberof FormDRUIPartController
-     */
-    SyncDataToEmbedService(): Promise<void>;
     /**
      * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
      * @returns {*}  {void}
@@ -111,5 +105,23 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
      * @memberof FormDRUIPartController
      */
     silentValidate(): Promise<boolean>;
+    /**
+     * @description 同步当前表单数据至子界面数据服务
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    SyncDataToEmbedService(): Promise<void>;
+    /**
+     * @description 同步子界面数据至表单
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    SyncEmbedDataToForm(): Promise<void>;
+    /**
+     * @description 保存嵌入视图数据
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    saveEmbedViewData(): Promise<void>;
 }
 //# sourceMappingURL=form-druipart.controller.d.ts.map

package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,aAAa,EACb,uBAAuB,EAEvB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;GAKG;AACH,qBAAa,sBACX,SAAQ,oBAAoB,CAAC,eAAe,CAC5C,YAAW,uBAAuB;IAE1B,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;OAIG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;OAIG;IACH,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IAEvC;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;OAIG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,GAAG,SAAS,CAAC;IAE5C;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCvC;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5D;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW7C;;;;OAIG;IACH,cAAc,IAAI,IAAI;IAkDtB;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAiCzC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBlC;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;CAezC"}
+{"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,aAAa,EACb,uBAAuB,EAEvB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;GAKG;AACH,qBAAa,sBACX,SAAQ,oBAAoB,CAAC,eAAe,CAC5C,YAAW,uBAAuB;IAE1B,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;OAIG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;OAIG;IACH,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IAEvC;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;OAIG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,GAAG,SAAS,CAAC;IAE5C;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CvC;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5D;;;;OAIG;IACH,cAAc,IAAI,IAAI;IAyDtB;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IA0BzC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBlC;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBxC;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW7C;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;OAIG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAKzC"}

package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.js

@@ -75,6 +75,14 @@ export class FormDRUIPartController extends FormDetailController {
         if (embedView.appDataEntityId) {
             this.embedDataService = await app.deService.getService(tempContext, embedView.appDataEntityId);
         }
+        // 主表单保存之前
+        this.form.evt.on('onBeforeSave', async () => {
+            // 处理子应用同实体表单合并关系界面（手动触发子数据保存、再将子数据同步到主表单）
+            if (this.isNeedSyncEmbed && this.embedView && this.embedDataService) {
+                await this.saveEmbedViewData();
+                await this.SyncEmbedDataToForm();
+            }
+        });
     }
     /**
      * @description 表单数据变更通知(由表单控制器调用)
@@ -113,21 +121,6 @@ export class FormDRUIPartController 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}
@@ -136,8 +129,13 @@ export class FormDRUIPartController 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 (notNilEmpty(navContexts)) {
             newContext = Object.assign(newContext, convertNavData(navContexts, this.data, this.form.params, this.form.context));
@@ -189,14 +187,7 @@ export class FormDRUIPartController extends FormDetailController {
                 this.form.updateFormItem(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();
         });
     }
     /**
@@ -235,4 +226,45 @@ export class FormDRUIPartController 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 _a;
+        if (this.isNeedSyncEmbed && this.embedView) {
+            await ((_a = this.embedView) === null || _a === void 0 ? void 0 : _a.call(SysUIActionTag.SAVE));
+        }
+    }
 }

package/out/controller/utils/util/util.d.ts

@@ -49,4 +49,19 @@ export declare function formatSeparator(type: string, items: IData[] | undefined
  * @returns {*}  {string}
  */
 export declare function formatDate(val: string, format: 'year' | 'quarter' | 'month' | 'week' | 'day'): string;
+/**
+ * @description 获取某年的总周数
+ * @param {number} year 年份
+ * @returns {*}  {number}
+ */
+export declare function getWeeksInYear(year: number): number;
+/**
+ * @description 生成年周数组
+ * @export
+ * @param {string} minYearWeek 最小年周
+ * @param {string} maxYearWeek 最大年周
+ * @param {number} [paddingWeeks=0] 前后范围
+ * @returns {*}  {string[]}
+ */
+export declare function generateYearWeekRange(minYearWeek: string, maxYearWeek: string, paddingWeeks?: number): string[];
 //# sourceMappingURL=util.d.ts.map

package/out/controller/utils/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/util/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAKtE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE,GAC9C,KAAK,GAAG,SAAS,CAMnB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EAAE,EACd,UAAU,GAAE,MAAmB,GAC9B,KAAK,EAAE,CAaT;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,SAAS,GACzB,MAAM,EAAE,CAyGV;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GACpD,MAAM,CA2BR"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/util/util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAKtE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE,GAC9C,KAAK,GAAG,SAAS,CAMnB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EAAE,EACd,UAAU,GAAE,MAAmB,GAC9B,KAAK,EAAE,CAaT;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,SAAS,GACzB,MAAM,EAAE,CAyGV;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GACpD,MAAM,CAyBR;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAInD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,YAAY,SAAI,GACf,MAAM,EAAE,CA0CV"}

package/out/controller/utils/util/util.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-plusplus */
 /* eslint-disable no-case-declarations */
 /* eslint-disable no-restricted-globals */
 import { isNil } from 'ramda';
@@ -184,20 +185,18 @@ export 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 = `${year}`;
             break;
         case 'quarter':
-            value = `${year} ${Math.ceil(month / 3)}${ibiz.i18n.t('runtime.controller.utils.util.quarter')}`;
+            value = `${year} ${dayjs(date).quarter()}${ibiz.i18n.t('runtime.controller.utils.util.quarter')}`;
             break;
         case 'month':
-            value = `${year} ${month}${ibiz.i18n.t('runtime.controller.utils.util.month')}`;
+            value = `${year} ${dayjs(date).month() + 1}${ibiz.i18n.t('runtime.controller.utils.util.month')}`;
             break;
         case 'week':
-            const week = dayjs(date).week();
-            value = `${year} ${week}${ibiz.i18n.t('runtime.controller.utils.util.week')}`;
+            value = `${year} ${dayjs(date).week()}${ibiz.i18n.t('runtime.controller.utils.util.week')}`;
             break;
         case 'day':
             value = dayjs(date).format('YYYY-MM-DD');
@@ -207,3 +206,56 @@ export function formatDate(val, format) {
     }
     return value;
 }
+/**
+ * @description 获取某年的总周数
+ * @param {number} year 年份
+ * @returns {*}  {number}
+ */
+export function getWeeksInYear(year) {
+    const lastDayOfYear = dayjs(`${year}-12-31`);
+    const week = lastDayOfYear.isoWeek();
+    return week === 1 ? 52 : week;
+}
+/**
+ * @description 生成年周数组
+ * @export
+ * @param {string} minYearWeek 最小年周
+ * @param {string} maxYearWeek 最大年周
+ * @param {number} [paddingWeeks=0] 前后范围
+ * @returns {*}  {string[]}
+ */
+export function generateYearWeekRange(minYearWeek, maxYearWeek, paddingWeeks = 0) {
+    // 1. 解析最小和最大年周
+    const [minYear, minWeek] = minYearWeek.split('-').map(Number);
+    const [maxYear, maxWeek] = maxYearWeek.split('-').map(Number);
+    // 2. 计算起始年周（minYearWeek - paddingWeeks）
+    let startYear = minYear;
+    let startWeek = minWeek - paddingWeeks;
+    while (startWeek < 1) {
+        startYear--;
+        startWeek += getWeeksInYear(startYear);
+    }
+    // 3. 计算结束年周（maxYearWeek + paddingWeeks）
+    let endYear = maxYear;
+    let endWeek = maxWeek + paddingWeeks;
+    const maxWeeksInEndYear = getWeeksInYear(endYear);
+    if (endWeek > maxWeeksInEndYear) {
+        endWeek -= maxWeeksInEndYear;
+        endYear++;
+    }
+    // 4. 生成从 startYear-startWeek 到 endYear-endWeek 的所有年周
+    const yearWeeks = [];
+    let currentYear = startYear;
+    let currentWeek = startWeek;
+    while (currentYear < endYear ||
+        (currentYear === endYear && currentWeek <= endWeek)) {
+        yearWeeks.push(`${currentYear}-${currentWeek}`);
+        currentWeek++;
+        const weeksInCurrentYear = getWeeksInYear(currentYear);
+        if (currentWeek > weeksInCurrentYear) {
+            currentYear++;
+            currentWeek = 1;
+        }
+    }
+    return yearWeeks;
+}

package/out/engine/md-view.engine.d.ts

@@ -80,7 +80,7 @@ export declare class MDViewEngine extends ViewEngineBase {
         params?: IParams;
     }): Promise<IUIActionResult>;
     /**
-     * 打开编辑数据视图
+     * 打开新建数据视图
      *
      * @author lxm
      * @date 2022-09-01 18:09:19

package/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}

package/out/engine/md-view.engine.js

@@ -249,13 +249,19 @@ export class MDViewEngine extends ViewEngineBase {
             throw new RuntimeModelError(this.view.model, 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
@@ -285,6 +291,12 @@ export class MDViewEngine extends ViewEngineBase {
             throw new RuntimeModelError(this.view.model, 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,
             };

package/out/interface/api/controller/control/i-api-chart.controller.d.ts

@@ -12,6 +12,7 @@ import { IApiMDControlController } from './i-api-md-control.controller';
  * @ctrlparams {name:enabledrilldetail,title:是否开启数据反查,defaultvalue:[],parameterType:IData[],description:此部件参数仅应用于bi报表。主要用于判断当前点击序列是否开启数据反查，如果当前序列有反查视图模型，则左键单击时弹出检查明细按钮}
  * @ctrlparams {"name":"mdctrlrefreshmode","title":"刷新模式","defaultvalue":"'cache'","parameterType":"'default' | 'cache'","description":"选中数据在部件加载后触发重新计算模式，若值为 'cache' 且不为初始化加载时，则将选中数据更新为最新值；若值为 'default'，将清空选中数据","effectPlatform":"web"}
  * @ctrlparams {"name":"mode","title":"柱状图图表绘制模式","defaultvalue":"'DEFAULT'","parameterType":"'DEFAULT' | 'ROW'","description":"控制柱状图绘制方向，默认垂直绘制，为ROW时水平绘制"}
+ * @ctrlparams {"name":"completiondate","title":"是否填充日期","parameterType":"boolean","description":"该参数为序列自定义参数，用于控制时间分组模式下是否补全时间数据（无横轴序列默认不补全（饼图，仪表盘，雷达图，漏斗图），有横轴序列默认补全）"}
  * @template T
  * @template S
  */

package/out/interface/api/controller/control/i-api-chart.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-api-chart.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-chart.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC;;;OAGG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;CACxC"}
+{"version":3,"file":"i-api-chart.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-chart.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC;;;OAGG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;CACxC"}

package/out/interface/api/util/i-api-file-util.d.ts

@@ -5,6 +5,49 @@ import { IApiContext, IApiData, IApiParams } from '@ibiz-template/core';
  * @interface IApiFileUtil
  */
 export interface IApiFileUtil {
+    /**
+     * @description 设置文件上传请求头数据
+     * @param {Record<string, string>} args
+     * @memberof IApiFileUtil
+     */
+    setUploadHeaders(args: Record<string, string>): void;
+    /**
+     * @description 获取文件上传请求头数据
+     * @returns {*}  {Record<string, string>}
+     * @memberof IApiFileUtil
+     */
+    getUploadHeaders(): Record<string, string>;
+    /**
+     * @description 计算文件的上传路径和下载路径,下载路径文件id用%fileId%占位，替换即可;配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
+     * @param {IContext} context 应用上下文对象
+     * @param {IParams} params 视图参数对象
+     * @param {IApiData} [data] 业务数据对象，默认给{}
+     * @param {{
+     *       uploadParams?: IApiData;
+     *       exportParams?: IApiData;
+     *       osscat?: string;
+     *     }} [extraParams] 上传附件参数;下载附加参数；自定义oss分类名称
+     * @returns {*}  {{
+     *     uploadUrl: string;
+     *     downloadUrl: string;
+     *   }}
+     * @memberof IApiFileUtil
+     */
+    calcFileUpDownUrl(context: IContext, params: IParams, data?: IApiData, extraParams?: {
+        uploadParams?: IApiData;
+        exportParams?: IApiData;
+        osscat?: string;
+    }): {
+        uploadUrl: string;
+        downloadUrl: string;
+    };
+    /**
+     * @description 获取响应文件名
+     * @param {IApiData} response 响应对象
+     * @returns {*}  {string}
+     * @memberof IApiFileUtil
+     */
+    getFileName(response: IApiData): string;
     /**
      * @description 文件下载
      * @param {string} url
@@ -27,15 +70,33 @@ export interface IApiFileUtil {
      * @param {IApiContext} context
      * @param {IApiParams} params
      * @param {IApiData} data
-     * @param {IApiData} [option={}]
+     * @param {{
+     *       accept: string;
+     *       multiple?: boolean;
+     *       showUploadManager?: boolean;
+     *       extraParams?: {
+     *         uploadParams?: IApiData;
+     *         exportParams?: IApiData;
+     *         osscat?: string;
+     *       };
+     *     }} [option] {上传文件类型,是否多选，是否展示文件管理器，扩展参数（包含上传附件参数、下载附加参数、自定义oss分类名称）}
      * @returns {*}  {Promise<IApiData[]>}
      * @memberof IApiFileUtil
      */
-    chooseFileAndUpload(context: IApiContext, params: IApiParams, data: IApiData, option?: IApiData): Promise<IApiData[]>;
+    chooseFileAndUpload(context: IApiContext, params: IApiParams, data: IApiData, option?: {
+        accept: string;
+        multiple?: boolean;
+        showUploadManager?: boolean;
+        extraParams?: {
+            uploadParams?: IApiData;
+            exportParams?: IApiData;
+            osscat?: string;
+        };
+    }): Promise<IApiData[]>;
     /**
      * @description 选择文件
-     * @param {string} [accept]
-     * @param {boolean} [multiple] 默认为false
+     * @param {string} [accept] 选择文件类型
+     * @param {boolean} [multiple] 是否多选，默认为false
      * @returns {*}  {Promise<FileList>}
      * @memberof IApiFileUtil
      */

package/out/interface/api/util/i-api-file-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-api-file-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/api/util/i-api-file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAExE;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;;;OAOG;IACH,UAAU,CACR,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,mBAAmB,CACjB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,QAAQ,EACd,MAAM,CAAC,EAAE,QAAQ,GAChB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEvB;;;;;;OAMG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACnE"}
+{"version":3,"file":"i-api-file-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/api/util/i-api-file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAExE;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAErD;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE3C;;;;;;;;;;;;;;;OAeG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,QAAQ,EACf,WAAW,CAAC,EAAE;QACZ,YAAY,CAAC,EAAE,QAAQ,CAAC;QACxB,YAAY,CAAC,EAAE,QAAQ,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GACA;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;IAExC;;;;;;OAMG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;;;OAOG;IACH,UAAU,CACR,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;;;;;;;;;;OAiBG;IACH,mBAAmB,CACjB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,QAAQ,EACd,MAAM,CAAC,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,WAAW,CAAC,EAAE;YACZ,YAAY,CAAC,EAAE,QAAQ,CAAC;YACxB,YAAY,CAAC,EAAE,QAAQ,CAAC;YACxB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,GACA,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEvB;;;;;;OAMG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACnE"}

package/out/interface/controller/event/argument/data-change.event.d.ts

@@ -1,11 +1,10 @@
 import { EventBase } from './base.event';
 export interface DataChangeEvent extends EventBase {
     /**
-     * 变更行为类型
-     * @author lxm
-     * @date 2023-03-26 01:24:06
-     * @type {('LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE' | string)}
+     * @description 变更行为类型
+     * @type {('LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE' | 'NEW' | 'EDIT')}
+     * @memberof DataChangeEvent
      */
-    actionType: 'LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE';
+    actionType: 'LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE' | 'NEW' | 'EDIT';
 }
 //# sourceMappingURL=data-change.event.d.ts.map

package/out/interface/controller/event/argument/data-change.event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-change.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/data-change.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;;OAKG;IACH,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;CACtD"}
+{"version":3,"file":"data-change.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/data-change.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;OAIG;IACH,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;CACvE"}

package/out/service/vo/code-list-data-item/code-list-data-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list-data-item.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/code-list-data-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAG,MAAM,GAAG,MAAM,CAAC;IAExB,IAAI,EAAG,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;;;OASG;gBAED,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CAkNJ"}
+{"version":3,"file":"code-list-data-item.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/code-list-data-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAG,MAAM,GAAG,MAAM,CAAC;IAExB,IAAI,EAAG,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;;;OASG;gBAED,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA0NJ"}