npm - @ibiz-template/runtime - Versions diffs - 0.7.26 → 0.7.27 - Mend

@ibiz-template/runtime 0.7.26 → 0.7.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/out/controller/control/chart/chart.controller.d.ts CHANGED Viewed

@@ -4,8 +4,10 @@ import { ChartOptionsGenerator } from './generator/chart-options-generator';
 import { ChartService } from './chart.service';
 import { IChartController, IChartEvent, IChartState, MDCtrlLoadParams } from '../../../interface';
 import { MDControlController } from '../../common';
+import { ControllerEvent } from '../../utils';
 export declare class ChartController extends MDControlController<IDEChart, IChartState, IChartEvent> implements IChartController {
     service: ChartService;
+    protected get _evt(): ControllerEvent<IChartEvent>;
     /**
      * echarts对象
      * @author lxm
@@ -88,7 +90,7 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @author lxm
      * @date 2023-06-07 10:03:48
      */
-    updateChart(): void;
+    updateChart(): Promise<void>;
     /**
      * 刷新图表的大小
      * @author lxm

package/out/controller/control/chart/chart.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;~~AAEnD~~,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IASnD;;;;OAIG;~~IACH~~,WAAW,IAAI,IAAI;~~IAenB~~;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}
1	+ {"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IASnD;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}

package/out/controller/control/chart/chart.controller.js CHANGED Viewed

@@ -3,6 +3,9 @@ import { ChartOptionsGenerator } from './generator/chart-options-generator';
 import { ChartService } from './chart.service';
 import { MDControlController } from '../../common';
 export class ChartController extends MDControlController {
+    get _evt() {
+        return this.evt;
+    }
     initState() {
         super.initState();
         this.state.size = 1000;
@@ -240,13 +243,14 @@ export class ChartController extends MDControlController {
      * @author lxm
      * @date 2023-06-07 10:03:48
      */
-    updateChart() {
+    async updateChart() {
         if (!this.chart) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.chart.noInitialised'));
         }
         if (!this.options) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.chart.noCalculated'));
         }
+        await this._evt.emit('onBeforeUpdate', undefined);
         this.chart.setOption(this.options, { notMerge: true });
         this.resizeChart();
     }

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

@@ -135,6 +135,14 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
      * @return {*}  {(string | undefined)}
      */
     translateVal(codeListKey: string | undefined, val: string | undefined, isExclude?: boolean): string | undefined;
+    /**
+     * 获取序列颜色
+     *
+     * @param {string} group
+     * @return {*}  {string}
+     * @memberof BaseSeriesGenerator
+     */
+    getSeriesColor(group: string): string;
     /**
      * 准备图表数据
      * @return {*}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAyG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAzGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,aAAa,EAAE,KAAK,EAAE,CAAM;IAE5B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAqDjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAcP;;;;;;;OAOG;IACH,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IA6BxE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAwIjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;~~IAuB~~/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAevD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}
1	+ {"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAyG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAzGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,aAAa,EAAE,KAAK,EAAE,CAAM;IAE5B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAqDjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;;OAMG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAWrC;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAcP;;;;;;;OAOG;IACH,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IA6BxE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAwIjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IA2B/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAevD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}

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

@@ -150,6 +150,23 @@ export class BaseSeriesGenerator {
         }
         return isExclude ? undefined : val;
     }
+    /**
+     * 获取序列颜色
+     *
+     * @param {string} group
+     * @return {*}  {string}
+     * @memberof BaseSeriesGenerator
+     */
+    getSeriesColor(group) {
+        let color = '';
+        const maps = this.chartGenerator.codeListMap.values();
+        const codeListItems = [...maps].flat();
+        const item = codeListItems.find(x => x.text === group);
+        if (item) {
+            color = item.color || '';
+        }
+        return color;
+    }
     /**
      * 准备图表数据
      * @return {*}
@@ -334,6 +351,11 @@ export class BaseSeriesGenerator {
             if (group !== DEFAULT_GROUP) {
                 options.name = group;
             }
+            // 合并颜色
+            const color = this.getSeriesColor(group);
+            if (color) {
+                options.color = color;
+            }
             // 合并自定义参数
             if (this.seriesUserParam) {
                 options = mergeDeepRight(options, this.seriesUserParam);

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-mdctrl-repeater.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;~~AAEhE~~;;;;;;;;;GASG;AACH,qBAAa,4BAA6B,SAAQ,oBAAoB;IACpE;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,KAAK,EAAE,GAAG,KAAK,GAAG,IAAI,CAElC;IAED;;;;;OAKG;IACH,aAAa,EAAE,MAAM,GAAG,WAAW,GAAG,YAAY,CAAe;IAEjE;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;OAKG;IACH,YAAY,EAAG,OAAO,CAAC;IAEvB;;;;OAIG;IACH,WAAW,mCAA0C;cAErC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCvC;;;;OAIG;IACH,mBAAmB,IAAI,IAAI;IA+B3B;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IAIxE;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI;IAI7C;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;~~IAgB5B~~;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;~~IAa5B~~;;;;;;;OAOG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBvD"}
1	+ {"version":3,"file":"form-mdctrl-repeater.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGhE;;;;;;;;;GASG;AACH,qBAAa,4BAA6B,SAAQ,oBAAoB;IACpE;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,KAAK,EAAE,GAAG,KAAK,GAAG,IAAI,CAElC;IAED;;;;;OAKG;IACH,aAAa,EAAE,MAAM,GAAG,WAAW,GAAG,YAAY,CAAe;IAEjE;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;OAKG;IACH,YAAY,EAAG,OAAO,CAAC;IAEvB;;;;OAIG;IACH,WAAW,mCAA0C;cAErC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCvC;;;;OAIG;IACH,mBAAmB,IAAI,IAAI;IA+B3B;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IAIxE;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI;IAI7C;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAoB5B;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAgB5B;;;;;;;OAOG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBvD"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.js CHANGED Viewed

@@ -141,21 +141,25 @@ export class FormMDCtrlRepeaterController extends FormMDCtrlController {
      * @date 2023-11-22 04:50:19
      */
     create(index) {
+        const item = {};
         if (this.isSingleData) {
-            this.setValue({});
+            this.setValue(item);
         }
         else {
             // 多数据，拷贝数组再添加新对象
             let tempValue = this.value;
             tempValue = tempValue ? [...tempValue] : [];
             if (index !== undefined) {
-                tempValue.splice(index, 0, {});
+                tempValue.splice(index, 0, item);
             }
             else {
-                tempValue.push({});
+                tempValue.push(item);
             }
             this.setValue(tempValue);
         }
+        this.form.evt.emit('onMDCtrlNew', {
+            args: item,
+        });
     }
     /**
      * 删除数据
@@ -173,6 +177,9 @@ export class FormMDCtrlRepeaterController extends FormMDCtrlController {
             return index !== i;
         });
         this.setValue(newArr);
+        this.form.evt.emit('onMDCtrlRemove', {
+            args: newArr,
+        });
     }
     /**
      * 表单数据变更通知

package/out/controller/control/gantt/gantt.controller.d.ts CHANGED Viewed

@@ -180,16 +180,6 @@ export declare class GanttController extends TreeGridExController<IDEGantt, IGan
      * @memberof GanttController
      */
     newRow(args?: MDCtrlLoadParams): Promise<void>;
-    /**
-     * 处理节点拖入事件
-     *
-     * @param {IGanttNodeData} draggingNode 拖动节点
-     * @param {IGanttNodeData} dropNode 目标节点
-     * @param {('inner' | 'prev' | 'next')} dropType 拖放类型
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    onNodeDrop(draggingNode: IGanttNodeData, dropNode: IGanttNodeData, dropType: 'inner' | 'prev' | 'next'): Promise<void>;
     protected onDEDataChange(msg: IPortalMessage): void;
 }
 //# sourceMappingURL=gantt.controller.d.ts.map

package/out/controller/control/gantt/gantt.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"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~~;;;;;;;;OAQG;IACG~~,~~UAAU,CACd,YAAY,EAAE,cAAc,EAC5B,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAClC,OAAO,CAAC,IAAI,CAAC;IA0GhB,~~SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CACpD"}
1	+ {"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/gantt/gantt.controller.js CHANGED Viewed

@@ -522,101 +522,5 @@ export class GanttController extends TreeGridExController {
             }
         }
     }
-    /**
-     * 处理节点拖入事件
-     *
-     * @param {IGanttNodeData} draggingNode 拖动节点
-     * @param {IGanttNodeData} dropNode 目标节点
-     * @param {('inner' | 'prev' | 'next')} dropType 拖放类型
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    async onNodeDrop(draggingNode, dropNode, dropType) {
-        var _a, _b;
-        if (dropType === 'inner' &&
-            !dropNode._leaf &&
-            dropNode._children === undefined) {
-            await this.expandNodeByKey([dropNode._id]);
-        }
-        /** 修改的树节点数据 */
-        const modifiedNodeDatas = [];
-        const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
-        const dropInNode = dropType === 'inner' ? dropNode : dropNode._parent;
-        let orderNodeModel = this.getNodeModel(dropNode._nodeId);
-        // * 处理切换父节点
-        if (dropType === 'inner' ||
-            ((_a = dropNode._parent) === null || _a === void 0 ? void 0 : _a._id) !== ((_b = draggingNode._parent) === null || _b === void 0 ? void 0 : _b._id)) {
-            const dropNodeRs = this.findDropNodeRS(dropInNode._nodeId, draggingNodeModel.appDataEntityId);
-            if (dropNodeRs) {
-                // 修改关系属性的值为父节点的主键和树节点id
-                draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
-                modifiedNodeDatas.push(draggingNode);
-                orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
-            }
-            // 更改父节点
-            draggingNode._parent = dropInNode;
-            // 修改指向的节点模型
-            draggingNode._nodeId = orderNodeModel.id;
-        }
-        // *处理排序
-        const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
-        if (allowOrder === true) {
-            // 有排序属性才处理排序
-            if (!sortAppDEFieldId) {
-                throw new RuntimeModelError(orderNodeModel, ibiz.i18n.t('runtime.controller.control.tree.sortAttribute'));
-            }
-            const sortField = sortAppDEFieldId.toLowerCase();
-            const isAsc = sortDir === 'ASC';
-            const changedArr = dropInNode._children;
-            // 降序把数组反转,保证两个数组都是从小到大排
-            if (!isAsc) {
-                changedArr.reverse();
-            }
-            /**
-             * 获取下一个100的倍数
-             * @author lxm
-             * @date 2023-09-11 10:03:46
-             * @param {number} num
-             * @return {*}  {number}
-             */
-            const getNextSort = (num) => {
-                return num + (100 - (num % 100));
-            };
-            const getSort = (deData) => {
-                return deData[sortField] || 0;
-            };
-            let lastSort;
-            changedArr.forEach((item, index) => {
-                const deData = item._deData;
-                if (lastSort === undefined) {
-                    // 第一次出现要调整顺序的时候一定是从拖拽节点开始
-                    if (item === draggingNode) {
-                        // 如果时第一个，则排序值为100
-                        if (index === 0) {
-                            lastSort = 100;
-                        }
-                        else {
-                            // 最后一个时，把前一个的排序值加100
-                            lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
-                        }
-                        deData[sortField] = lastSort;
-                        // 修改父的时候可能已经加入进去了
-                        if (modifiedNodeDatas.indexOf(item) === -1) {
-                            modifiedNodeDatas.push(item);
-                        }
-                    }
-                }
-                else {
-                    if (lastSort >= getSort(deData)) {
-                        deData[sortField] = getNextSort(lastSort);
-                        modifiedNodeDatas.push(item);
-                    }
-                    // 更新上一个排序值
-                    lastSort = getSort(deData);
-                }
-            });
-        }
-        await this.updateDeNodeData(modifiedNodeDatas);
-    }
     onDEDataChange(msg) { }
 }

package/out/controller/control/grid/grid/grid.controller.d.ts CHANGED Viewed

@@ -543,12 +543,12 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
         rowState?: IGridRowState;
     }): void;
     /**
-     * 拖拽变更事件处理回调
-     * @author: zzq
-     * @date 2024-04-22 18:12:58
-     * @return {*}  {Promise<void>}
+     * 拖拽改变
+     * @param dragging 拖拽目标
+     * @param drop 放置目标
+     * @param dropType 放置类型
      */
-    onDragChange(): Promise<void>;
+    onDragChange(dragging: IGridRowState, drop: IGridRowState, dropType: 'prev' | 'next'): Promise<void>;
     /**
      * 更新改变项数据
      * @author: zzq

package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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~~IA+BnC~~;;;;;OAKG;IACG,kBAAkB,CAAC,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlE;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAgBtB"}
1	+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/grid/grid/grid.controller.js CHANGED Viewed

@@ -1356,39 +1356,25 @@ export class GridController extends MDControlController {
         super.actionNotification(tag, Object.assign({}, (opts || {})));
     }
     /**
-     * 拖拽变更事件处理回调
-     * @author: zzq
-     * @date 2024-04-22 18:12:58
-     * @return {*}  {Promise<void>}
+     * 拖拽改变
+     * @param dragging 拖拽目标
+     * @param drop 放置目标
+     * @param dropType 放置类型
      */
-    async onDragChange() {
-        const sortField = this.model.orderValueAppDEFieldId;
-        // 获取下一个100的倍数
-        const getNextSort = (num) => {
-            return num + (100 - (num % 100));
+    async onDragChange(dragging, drop, dropType) {
+        var _a;
+        const moveAction = (_a = this.model.moveControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId;
+        if (!moveAction) {
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.noMoveDataCconfig'));
+        }
+        const moveParams = {
+            srftargetkey: drop.data.srfkey,
+            srfmovetype: dropType === 'prev' ? 'MOVEBEFORE' : 'MOVEAFTER',
         };
-        // 拖拽时已计算出排序数据
-        const changedArr = this.state.rows.map(row => row.data);
-        let lastSort;
-        const modifiedItems = [];
-        changedArr.forEach(item => {
-            if (lastSort === undefined) {
-                lastSort = item[sortField] || 100;
-                if (!item[sortField]) {
-                    item[sortField] = lastSort;
-                    modifiedItems.push(item);
-                }
-            }
-            else {
-                // 排序值不存在或如果当前排序值比上一个小，提升它的排序值
-                if (!item[sortField] || lastSort >= item[sortField]) {
-                    item[sortField] = getNextSort(lastSort);
-                    modifiedItems.push(item);
-                }
-                lastSort = item[sortField];
-            }
-        });
-        this.updateChangedItems(modifiedItems);
+        const res = await this.service.moveOrderItem(this.context, dragging.data, moveParams);
+        if (res.ok) {
+            this.refresh();
+        }
     }
     /**
      * 更新改变项数据

package/out/controller/control/grid/grid/grid.service.d.ts CHANGED Viewed

@@ -28,5 +28,15 @@ export declare class GridService extends MDControlService<IDEGrid> {
      * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
      */
     updateGridEditItem(methodName: string, context: IContext, data?: IData, params?: IParams): Promise<IHttpResponse<ControlVO>>;
+    /**
+     * 移动并排序数据
+     *
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @param {IData} args
+     * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     * @memberof GridService
+     */
+    moveOrderItem(context: IContext, data: ControlVO, params: IParams): Promise<IHttpResponse<ControlVO[]>>;
 }
 //# sourceMappingURL=grid.service.d.ts.map

package/out/controller/control/grid/grid/grid.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAsB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;~~AAE9E~~;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAsCrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;~~CAUrC~~"}
1	+ {"version":3,"file":"grid.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAsB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAc,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAG9E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAsCrB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,aAAa,CACjB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;CASvC"}

package/out/controller/control/grid/grid/grid.service.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { RuntimeModelError } from '@ibiz-template/core';
 import { MDControlService, UIMapField } from '../../../../service';
+import { calcDeCodeNameById } from '../../../../model';
 /**
  * 表格部件服务
  * @author lxm
@@ -67,4 +68,22 @@ export class GridService extends MDControlService {
         res = this.handleResponse(res);
         return res;
     }
+    /**
+     * 移动并排序数据
+     *
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @param {IData} args
+     * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     * @memberof GridService
+     */
+    async moveOrderItem(context, data, params) {
+        const moveAction = this.model.moveControlAction.appDEMethodId;
+        const deName = calcDeCodeNameById(this.model.appDataEntityId);
+        const tempContext = context.clone();
+        tempContext[deName] = data.srfkey;
+        let res = await this.exec(moveAction, tempContext, params);
+        res = this.handleResponse(res);
+        return res;
+    }
 }

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAoBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;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;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAiFhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;~~IAsBxC~~;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAcjB"}
1	+ {"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAoBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;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;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAiFhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;IA4BxC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAcjB"}

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DataTypes, ModelError, plus } from '@ibiz-template/core';
+import { DataTypes, ModelError, plus, base64ToStr, isBase64, } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash-es';
 import { clone, isNil } from 'ramda';
@@ -287,8 +287,12 @@ export class GridFieldColumnController extends GridColumnController {
         if (this.model.valueType !== 'SIMPLE') {
             return ValueExUtil.toText(this.model, value);
         }
-        // 根据格式化配置格式化显示
         const strVal = `${isNilOrEmpty(value) ? '' : value}`;
+        // 根据base64判断是否为表情,排除字符串全是数字的情况
+        if (Number.isNaN(Number(strVal)) && isBase64(strVal)) {
+            return base64ToStr(strVal);
+        }
+        // 根据格式化配置格式化显示
         if (!this.valueFormat) {
             return strVal;
         }

package/out/controller/control/report-panel/generator/bi-generator.d.ts CHANGED Viewed

@@ -26,15 +26,5 @@ export declare class BIReportPanelGenerator extends ReportPanelBaseGenerator {
      * @return {*}  {Promise<IData>}
      */
     load(data?: IData): Promise<IData>;
-    /**
-     * 转化报表数据到配置数据
-     *
-     * @author tony001
-     * @date 2024-06-28 14:06:43
-     * @private
-     * @param {IModel} model
-     * @return {*}  {IData}
-     */
-    private translateReportToConfig;
 }
 //# sourceMappingURL=bi-generator.d.ts.map

package/out/controller/control/report-panel/generator/bi-generator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bi-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/bi-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB;IAClE;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAIxC~~;;;;;;;OAOG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;~~IAO7C;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;CAwDhC~~"}
1	+ {"version":3,"file":"bi-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/bi-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB;IAClE;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAQxC;;;;;;;OAOG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAM9C"}

package/out/controller/control/report-panel/generator/bi-generator.js CHANGED Viewed

@@ -17,7 +17,11 @@ export class BIReportPanelGenerator extends ReportPanelBaseGenerator {
      * @return {*}  {Promise<void>}
      */
     async initConfig() {
-        this.config = this.translateReportToConfig(this.model);
+        const { appDEReport } = this.model;
+        const { appBIReport } = appDEReport;
+        const appBISchemeId = appDEReport.appBISchemeId.split('.').pop();
+        appBIReport.appBISchemeId = appBISchemeId;
+        this.config = appBIReport;
     }
     /**
      * 加载数据
@@ -33,65 +37,4 @@ export class BIReportPanelGenerator extends ReportPanelBaseGenerator {
         }
         return Promise.resolve(data);
     }
-    /**
-     * 转化报表数据到配置数据
-     *
-     * @author tony001
-     * @date 2024-06-28 14:06:43
-     * @private
-     * @param {IModel} model
-     * @return {*}  {IData}
-     */
-    translateReportToConfig(model) {
-        const config = {};
-        const biReportDatas = {};
-        const propertyData = {
-            caption: model.logicName,
-            data: biReportDatas,
-        };
-        const { appDEReport } = model;
-        console.log(appDEReport);
-        config.reportTag = appDEReport.id;
-        const tempAppBISchemeId = appDEReport.appBISchemeId.split('.').pop();
-        config.selectedSchemeId = tempAppBISchemeId;
-        const { appBICubeId, appBIReportDimensions, appBIReportMeasures, reportUIModel, } = appDEReport.appBIReport;
-        config.selectCubeId = `${tempAppBISchemeId}.${appBICubeId}`;
-        if (reportUIModel) {
-            const reportUIModelObj = JSON.parse(reportUIModel);
-            config.selectChartType = reportUIModelObj.selectChartType;
-            propertyData.style = reportUIModelObj.style;
-        }
-        else {
-            config.selectChartType = 'NUMBER';
-        }
-        if (appBIReportMeasures && appBIReportMeasures.length > 0) {
-            appBIReportMeasures.forEach((measure) => {
-                if (!biReportDatas.measure) {
-                    biReportDatas.measure = [];
-                }
-                biReportDatas.measure.push({
-                    pssysbischemeid: tempAppBISchemeId,
-                    pssysbicubemeasureid: `${tempAppBISchemeId}.${appBICubeId}.${measure.measureTag}`,
-                    pssysbicubeid: `${tempAppBISchemeId}.${appBICubeId}`,
-                    codename: measure.measureTag,
-                });
-            });
-        }
-        if (appBIReportDimensions && appBIReportDimensions.length > 0) {
-            appBIReportDimensions.forEach((dimension) => {
-                if (!biReportDatas.dimension) {
-                    biReportDatas.dimension = [];
-                }
-                biReportDatas.dimension.push({
-                    pssysbischemeid: tempAppBISchemeId,
-                    pssysbicubedimensionid: `${tempAppBISchemeId}.${appBICubeId}.${dimension.dimensionTag}`,
-                    pssysbicubeid: `${tempAppBISchemeId}.${appBICubeId}`,
-                    codename: dimension.dimensionTag,
-                    pscodelistid: dimension.appCodeListId,
-                });
-            });
-        }
-        config.propertyData = propertyData;
-        return config;
-    }
 }

package/out/controller/control/report-panel/report-panel.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,OAAO,CAaxB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IA+B9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAOlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;~~CAsBlD~~"}
1	+ {"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,OAAO,CAaxB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IA+B9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAOlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAwBlD"}

package/out/controller/control/report-panel/report-panel.controller.js CHANGED Viewed

@@ -190,7 +190,7 @@ export class ReportPanelController extends ControlController {
                 dismiss: (_data) => modal.dismiss(_data),
                 context: this.context,
                 viewParams: this.params,
-                config: this.generator.config,
+                config: await ibiz.util.biReport.translateReportPanelToConfig(this.model),
             }, {
                 width: '90%',
                 height: '90%',