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

package/out/config/global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAMrB;IAGF,IAAI,EAAE,iBAAiB,CAMrB;IAGF,OAAO,EAAE,oBAAoB,CAI3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAEjC;IAGF,IAAI,EAAE,iBAAiB,CAErB;IAGF,MAAM,EAAE,mBAAmB,CAEzB;IAGF,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,SAAS,GAAG,OAAO,CAAW;IAGjD,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAQ;CAClD"}
+{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAMrB;IAGF,IAAI,EAAE,iBAAiB,CAMrB;IAGF,OAAO,EAAE,oBAAoB,CAI3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAEjC;IAGF,IAAI,EAAE,iBAAiB,CAErB;IAGF,MAAM,EAAE,mBAAmB,CAGzB;IAGF,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,SAAS,GAAG,OAAO,CAAW;IAGjD,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAQ;CAClD"}

package/out/config/global-config.js

@@ -59,6 +59,7 @@ export class GlobalConfig {
         // 全局通用配置
         this.common = {
             emptyText: '-',
+            emptyShowMode: 'DEFAULT',
         };
         // 多数据部件默认排序配置
         this.mdctrldefaultsort = '';

package/out/constant/index.d.ts

@@ -8,4 +8,5 @@ export { ViewCallTag } from './view-call-tag';
 export { ViewMode } from './view-mode';
 export { ViewType } from './view-type';
 export { PresetIdentifier } from './preset-identifier';
+export { PredefinedControlRender } from './predefined-control-render';
 //# sourceMappingURL=index.d.ts.map

package/out/constant/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC"}

package/out/constant/index.js

@@ -8,3 +8,4 @@ export { ViewCallTag } from './view-call-tag';
 export { ViewMode } from './view-mode';
 export { ViewType } from './view-type';
 export { PresetIdentifier } from './preset-identifier';
+export { PredefinedControlRender } from './predefined-control-render';

package/out/constant/predefined-control-render.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @description 预定义部件绘制器(后续部件级预置绘制器需在此处声明)
+ * @export
+ * @enum {number}
+ */
+export declare enum PredefinedControlRender {
+    /**
+     * 无数据绘制器标识
+     */
+    EMPTYPANEL = "emptypanel",
+    /**
+     * 部件禁用遮罩层绘制器标识
+     */
+    DISABLEPANEL = "disablepanel"
+}
+//# sourceMappingURL=predefined-control-render.d.ts.map

package/out/constant/predefined-control-render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"predefined-control-render.d.ts","sourceRoot":"","sources":["../../src/constant/predefined-control-render.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,oBAAY,uBAAuB;IACjC;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,YAAY,iBAAiB;CAC9B"}

package/out/constant/predefined-control-render.js

@@ -0,0 +1,17 @@
+/* eslint-disable no-shadow */
+/**
+ * @description 预定义部件绘制器(后续部件级预置绘制器需在此处声明)
+ * @export
+ * @enum {number}
+ */
+export var PredefinedControlRender;
+(function (PredefinedControlRender) {
+    /**
+     * 无数据绘制器标识
+     */
+    PredefinedControlRender["EMPTYPANEL"] = "emptypanel";
+    /**
+     * 部件禁用遮罩层绘制器标识
+     */
+    PredefinedControlRender["DISABLEPANEL"] = "disablepanel";
+})(PredefinedControlRender || (PredefinedControlRender = {}));

package/out/controller/common/control/control.controller.d.ts.map

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

package/out/controller/common/control/control.controller.js

@@ -1,4 +1,4 @@
-import { HttpError, IBizContext, IBizParams, NoticeError, RuntimeError, } from '@ibiz-template/core';
+import { HttpError, IBizContext, IBizParams, NoticeError, RuntimeError, StringUtil, } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
@@ -530,6 +530,9 @@ export class ControlController extends BaseController {
      */
     disabled(options = { mode: 'BLANK' }) {
         this.state.disabled = true;
+        if (options.maskInfo) {
+            options.maskInfo = StringUtil.fill(options.maskInfo, this.context, this.params);
+        }
         this.state.maskOption = options;
     }
 }

package/out/controller/common/editor/editor.controller.d.ts

@@ -101,6 +101,14 @@ export declare class EditorController<T extends IEditor = IEditor> implements IE
      * @memberof EditorController
      */
     get triggerMode(): string;
+    /**
+     * 无数据时是否显示占位文本
+     *
+     * @readonly
+     * @type {boolean}
+     * @memberof EditorController
+     */
+    get emptyShowPlaceholder(): boolean;
     /**
      * @description 当前视图
      * @readonly

package/out/controller/common/editor/editor.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAIvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAexB;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8CvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}
+{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAIvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;OAKG;IACI,WAAW,EAAE,KAAK,CAAM;IAE/B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAexB;IAED;;;;;;OAMG;IACH,IAAI,oBAAoB,IAAI,OAAO,CAGlC;IAED;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,CAO1B;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,kBAAkB,CAO7B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8CvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}

package/out/controller/common/editor/editor.controller.js

@@ -64,6 +64,18 @@ export class EditorController {
         }
         return 'blur';
     }
+    /**
+     * 无数据时是否显示占位文本
+     *
+     * @readonly
+     * @type {boolean}
+     * @memberof EditorController
+     */
+    get emptyShowPlaceholder() {
+        if (!this.placeHolder)
+            return false;
+        return ibiz.config.common.emptyShowMode === 'PLACEHOLDER';
+    }
     /**
      * @description 当前视图
      * @readonly

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/chart/generator/index.d.ts

@@ -0,0 +1,12 @@
+export { AreaSeriesGenerator } from './area-series-generator';
+export { BarSeriesGenerator } from './bar-series-generator';
+export { BaseSeriesGenerator } from './base-series-generator';
+export { CandlestickSeriesGenerator } from './candlestick-series-generator';
+export { ChartOptionsGenerator } from './chart-options-generator';
+export { FunnelSeriesGenerator } from './funnel-series-generator';
+export { GaugeSeriesGenerator } from './gauge-series-generator';
+export { LineSeriesGenerator } from './line-series-generator';
+export { PieSeriesGenerator } from './pie-series-generator';
+export { RadarSeriesGenerator } from './radar-series-generator';
+export { ScatterSeriesGenerator } from './scatter-series-generator';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/chart/generator/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC"}

package/out/controller/control/chart/generator/index.js

@@ -0,0 +1,11 @@
+export { AreaSeriesGenerator } from './area-series-generator';
+export { BarSeriesGenerator } from './bar-series-generator';
+export { BaseSeriesGenerator } from './base-series-generator';
+export { CandlestickSeriesGenerator } from './candlestick-series-generator';
+export { ChartOptionsGenerator } from './chart-options-generator';
+export { FunnelSeriesGenerator } from './funnel-series-generator';
+export { GaugeSeriesGenerator } from './gauge-series-generator';
+export { LineSeriesGenerator } from './line-series-generator';
+export { PieSeriesGenerator } from './pie-series-generator';
+export { RadarSeriesGenerator } from './radar-series-generator';
+export { ScatterSeriesGenerator } from './scatter-series-generator';

package/out/controller/control/chart/index.d.ts

@@ -1,3 +1,4 @@
 export * from './chart.controller';
 export * from './chart.service';
+export * from './generator';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/chart/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC"}

package/out/controller/control/chart/index.js

@@ -1,2 +1,3 @@
 export * from './chart.controller';
 export * from './chart.service';
+export * from './generator';

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/control/kanban/kanban.controller.d.ts

@@ -1,5 +1,5 @@
 import { IDEKanban, IUIActionGroupDetail } from '@ibiz/model-core';
-import { IDragChangeInfo, IKanbanController, IKanbanEvent, IKanbanGroupState, IKanbanState, IToolbarController, MDCtrlLoadParams } from '../../../interface';
+import { IKanbanEvent, IKanbanState, IDragChangeInfo, MDCtrlLoadParams, IApiMDGroupParams, IKanbanController, IKanbanGroupState, IToolbarController } from '../../../interface';
 import { ControlVO } from '../../../service';
 import { DataViewControlController } from '../data-view';
 import { KanbanService } from './kanban.service';
@@ -37,6 +37,14 @@ export declare class KanbanController extends DataViewControlController<IDEKanba
      * @memberof KanbanController
      */
     protected onCreated(): Promise<void>;
+    /**
+     * @description 执行分组
+     * @param {IApiMDGroupParams[]} _arg
+     * @param {IParams} [_params]
+     * @returns {*}  {Promise<void>}
+     * @memberof KanbanController
+     */
+    execGroup(_arg: IApiMDGroupParams[], _params?: IParams): Promise<void>;
     /**
      * 本地排序items
      * @author lxm

package/out/controller/control/kanban/kanban.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kanban.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kanban.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAEL,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,gBACX,SAAQ,yBAAyB,CAAC,SAAS,EAAE,YAAY,EAAE,YAAY,CACvE,YAAW,iBAAiB;IAE5B;;;;;OAKG;IACK,OAAO,EAAE,aAAa,CAAC;IAE/B;;;;;;OAMG;IACH,IAAI,eAAe,IAAI,OAAO,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,eAAe,IAAI,OAAO,CAE7B;cAEe,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD,SAAS,CAAC,SAAS,IAAI,IAAI;IAc3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1C;;;;;;OAMG;IACG,SAAS,CACb,IAAI,EAAE,iBAAiB,EAAE,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAsDzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4CzE;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7C;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK3D;;;;;;;;OAQG;IACG,mBAAmB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,IAAI,CAAC;IAkBhB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC1C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAwKxD;;;;;;;;OAQG;IACG,aAAa,CACjB,WAAW,EAAE,KAAK,EAClB,QAAQ,EAAE,KAAK,GACd,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC;IAkBjD;;;;;;OAMG;IACG,kBAAkB,CAAC,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BlE;;;;;OAKG;IACH,aAAa,IAAI,OAAO;IAQxB;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,OAAO;IAwBvC;;;;;OAKG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAM1C;;;;;;;OAOG;IACH,kBAAkB,CAChB,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,IAAI,EAAE,wBAAwB,GAAG,wBAAwB,EACzD,CAAC,EAAE,kBAAkB,GACpB,IAAI;IAOP;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAcvB;;;;;;OAMG;IACH,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAcnE;;;;;;OAMG;IACH,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAcnE;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAU1C;;;;OAIG;IACH,UAAU,IAAI,IAAI;CASnB"}

package/out/controller/control/kanban/kanban.controller.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-nested-ternary */
 /* eslint-disable prefer-destructuring */
-import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { DataTypes, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { calcDeCodeNameById } from '../../../model';
 import { DataViewControlController } from '../data-view';
@@ -54,6 +54,14 @@ export class KanbanController extends DataViewControlController {
         await super.onCreated();
         this.setToolbarHooks();
     }
+    /**
+     * @description 执行分组
+     * @param {IApiMDGroupParams[]} _arg
+     * @param {IParams} [_params]
+     * @returns {*}  {Promise<void>}
+     * @memberof KanbanController
+     */
+    async execGroup(_arg, _params) { }
     /**
      * 本地排序items
      * @author lxm
@@ -61,13 +69,24 @@ export class KanbanController extends DataViewControlController {
      * @param {IData[]} items
      */
     sortItems(items) {
+        var _a;
         const sortField = this.model.minorSortAppDEFieldId;
         const { minorSortDir } = this.model;
         if (!sortField) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.kanban.sortingProperties'));
+            this.state.draggable = false;
+            ibiz.log.warn(ibiz.i18n.t('runtime.controller.control.kanban.sortingProperties'));
+            return;
         }
         if (!minorSortDir) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.kanban.sortDirection'));
+            this.state.draggable = false;
+            ibiz.log.warn(ibiz.i18n.t('runtime.controller.control.kanban.sortDirection'));
+            return;
+        }
+        const sortFieldItem = (_a = this.dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.find(_item => _item.codeName === sortField);
+        if (!sortFieldItem || !DataTypes.isNumber(sortFieldItem.stdDataType)) {
+            this.state.draggable = false;
+            ibiz.log.warn(ibiz.i18n.t('runtime.controller.control.kanban.invalidSortType'));
+            return;
         }
         const isAsc = minorSortDir === 'ASC';
         // 格式化排序属性的值