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

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 (39) hide show
  1. package/dist/index.esm.js +219 -66
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/common/control/control.controller.d.ts +12 -1
  4. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  5. package/out/controller/common/control/control.controller.js +19 -0
  6. package/out/controller/control/chart/generator/base-series-generator.d.ts +12 -5
  7. package/out/controller/control/chart/generator/base-series-generator.d.ts.map +1 -1
  8. package/out/controller/control/chart/generator/base-series-generator.js +55 -24
  9. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts +18 -6
  10. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts.map +1 -1
  11. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.js +57 -25
  12. package/out/controller/control/form/form-detail/form-item/form-item.controller.js +2 -1
  13. package/out/controller/utils/util/util.d.ts +15 -0
  14. package/out/controller/utils/util/util.d.ts.map +1 -1
  15. package/out/controller/utils/util/util.js +57 -5
  16. package/out/engine/md-view.engine.d.ts +1 -1
  17. package/out/engine/md-view.engine.d.ts.map +1 -1
  18. package/out/engine/md-view.engine.js +13 -1
  19. package/out/interface/api/controller/common/i-api-mask-option.d.ts +20 -0
  20. package/out/interface/api/controller/common/i-api-mask-option.d.ts.map +1 -0
  21. package/out/interface/api/controller/common/i-api-mask-option.js +1 -0
  22. package/out/interface/api/controller/common/index.d.ts +1 -0
  23. package/out/interface/api/controller/common/index.d.ts.map +1 -1
  24. package/out/interface/api/controller/control/i-api-chart.controller.d.ts +1 -0
  25. package/out/interface/api/controller/control/i-api-chart.controller.d.ts.map +1 -1
  26. package/out/interface/api/controller/control/i-api-control.controller.d.ts +12 -0
  27. package/out/interface/api/controller/control/i-api-control.controller.d.ts.map +1 -1
  28. package/out/interface/api/state/control/i-api-control.state.d.ts +14 -0
  29. package/out/interface/api/state/control/i-api-control.state.d.ts.map +1 -1
  30. package/out/interface/api/util/i-api-file-util.d.ts +65 -4
  31. package/out/interface/api/util/i-api-file-util.d.ts.map +1 -1
  32. package/out/interface/controller/event/argument/data-change.event.d.ts +4 -5
  33. package/out/interface/controller/event/argument/data-change.event.d.ts.map +1 -1
  34. package/out/service/vo/code-list-data-item/code-list-data-item.d.ts.map +1 -1
  35. package/out/service/vo/code-list-data-item/code-list-data-item.js +8 -1
  36. package/out/utils/file-util/file-util.d.ts +20 -3
  37. package/out/utils/file-util/file-util.d.ts.map +1 -1
  38. package/out/utils/file-util/file-util.js +43 -12
  39. package/package.json +2 -2
package/out/controller/common/control/control.controller.d.ts CHANGED
@@ -5,7 +5,7 @@ import { BaseController } from '..';
5
5
  import { CTX } from '../../ctx';
6
6
  import { EventBase, IControlController, IControlEvent, IControlState, IViewController, IViewLayoutPanelController } from '../../../interface/controller';
7
7
  import { ControllerEvent } from '../../utils';
8
- import { IDataAbilityParams, IProvider } from '../../../interface';
8
+ import { IApiMaskOption, IDataAbilityParams, IProvider } from '../../../interface';
9
9
  import { ControlLogicScheduler } from '../../../logic-scheduler';
10
10
  export type DEDataChangeType = 'create' | 'update' | 'remove';
11
11
  /**
@@ -266,5 +266,16 @@ export declare class ControlController<T extends IControl = IControl, S extends
266
266
  key: string;
267
267
  delay?: number;
268
268
  }): void;
269
+ /**
270
+ * @description 取消部件禁用
271
+ * @memberof ControlController
272
+ */
273
+ enable(): void;
274
+ /**
275
+ * @description 设置部件禁用
276
+ * @param {IApiMaskOption} [options={ mode: 'BLANK' }]
277
+ * @memberof ControlController
278
+ */
279
+ disabled(options?: IApiMaskOption): void;
269
280
  }
270
281
  //# sourceMappingURL=control.controller.d.ts.map
package/out/controller/common/control/control.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"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"}
1
+ {"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 CHANGED
@@ -127,6 +127,8 @@ export class ControlController extends BaseController {
127
127
  super.initState();
128
128
  this.state.activated = true;
129
129
  this.state.isLoading = false;
130
+ this.state.disabled = false;
131
+ this.state.maskOption = { mode: 'BLANK' };
130
132
  }
131
133
  async onCreated() {
132
134
  var _a;
@@ -513,4 +515,21 @@ export class ControlController extends BaseController {
513
515
  cb();
514
516
  }
515
517
  }
518
+ /**
519
+ * @description 取消部件禁用
520
+ * @memberof ControlController
521
+ */
522
+ enable() {
523
+ this.state.disabled = false;
524
+ this.state.maskOption = { mode: 'BLANK' };
525
+ }
526
+ /**
527
+ * @description 设置部件禁用
528
+ * @param {IApiMaskOption} [options={ mode: 'BLANK' }]
529
+ * @memberof ControlController
530
+ */
531
+ disabled(options = { mode: 'BLANK' }) {
532
+ this.state.disabled = true;
533
+ this.state.maskOption = options;
534
+ }
516
535
  }
package/out/controller/control/chart/generator/base-series-generator.d.ts CHANGED
@@ -246,12 +246,19 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
246
246
  */
247
247
  sortTimeData(data: GroupData): void;
248
248
  /**
249
- * 根据分组模式补全分组数据并排序
250
- * @param {IData} data
251
- * @return {*}
252
- * @author: zhujiamin
253
- * @Date: 2023-08-16 13:57:53
249
+ * @description 根据分组模式补全时间数据
250
+ * - 将最小日期和最大日期之间的数据补全，确保横坐标时间的连续性
251
+ * @param {GroupData} data
252
+ * @returns {*} {void}
253
+ * @memberof BaseSeriesGenerator
254
254
  */
255
255
  addTimeData(data: GroupData): void;
256
+ /**
257
+ * @description 根据分组模式计算时间数据
258
+ * - 只计算有值的日期，展示关键信息数据，多用于横轴日期显示跨度大的情况
259
+ * @param {GroupData} data
260
+ * @memberof BaseSeriesGenerator
261
+ */
262
+ calcTimeData(data: GroupData): void;
256
263
  }
257
264
  //# sourceMappingURL=base-series-generator.d.ts.map
package/out/controller/control/chart/generator/base-series-generator.d.ts.map CHANGED
@@ -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,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASjE,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;IAiH/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjHjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,aAAa,EAAE,KAAK,EAAE,CAAM;IAE5B;;;;;OAKG;IACH,UAAU,EAAG,MAAM,CAAC;IAEpB;;;;;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,EAAG,MAAM,CAAC;IAEpB;;;;;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;;;;;OAKG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAa;IAE3C;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAQjD;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,CAAC,EAAE,cAAc,EAAE,qBAAqB,GAAG,IAAI;IAiDjE;;;;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,EACb,gBAAgB,EAAE,KAAK,EAAE,GACxB,IAAI;IAqBP;;;;;;;OAOG;IACH,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,KAAK,EAAE;IAoEpE;;;;;;;;;;;;OAYG;IACH,SAAS,CAAC,mBAAmB,CAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,KAAK,EAAE,EACb,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,YAAY,EAAE,GACrC,YAAY,EAAE;IAgCjB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAsNjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IA4C/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;IAW/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":"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"}
package/out/controller/control/chart/generator/base-series-generator.js CHANGED
@@ -1,3 +1,4 @@
1
+ /* eslint-disable no-unused-expressions */
1
2
  import { plus, RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
2
3
  import dayjs from 'dayjs';
3
4
  import minMax from 'dayjs/plugin/minMax';
@@ -8,6 +9,7 @@ import isoWeek from 'dayjs/plugin/isoWeek';
8
9
  import { clone, isNil, mergeDeepRight } from 'ramda';
9
10
  import { parseUserParams, } from './chart-options-generator';
10
11
  import { ChartData } from '../../../../service';
12
+ import { generateYearWeekRange } from '../../../utils';
11
13
  dayjs.extend(minMax);
12
14
  dayjs.extend(isSameOrBefore);
13
15
  dayjs.extend(quarterOfYear);
@@ -554,9 +556,16 @@ export class BaseSeriesGenerator {
554
556
  * @return {*} {(SeriesOption[] | SeriesOption)}
555
557
  */
556
558
  calcByData(data) {
559
+ const { userParam, echartsType } = this.model;
557
560
  const tempData = this.dataPreprocess(data);
558
561
  const groupData = this.calcGroupData(tempData);
559
- this.addTimeData(groupData);
562
+ // 判断是否补全日期（无横轴序列默认不补全（饼图，仪表盘，雷达图，漏斗图），有横轴序列默认补全）
563
+ const noCompletionDate = (userParam === null || userParam === void 0 ? void 0 : userParam.completiondate) === 'false' ||
564
+ (echartsType &&
565
+ ['pie', 'gauge', 'radar', 'funnel'].includes(echartsType));
566
+ noCompletionDate
567
+ ? this.calcTimeData(groupData)
568
+ : this.addTimeData(groupData);
560
569
  return this.calcGroupSeries(groupData);
561
570
  }
562
571
  /**
@@ -659,17 +668,16 @@ export class BaseSeriesGenerator {
659
668
  });
660
669
  }
661
670
  /**
662
- * 根据分组模式补全分组数据并排序
663
- * @param {IData} data
664
- * @return {*}
665
- * @author: zhujiamin
666
- * @Date: 2023-08-16 13:57:53
671
+ * @description 根据分组模式补全时间数据
672
+ * - 将最小日期和最大日期之间的数据补全，确保横坐标时间的连续性
673
+ * @param {GroupData} data
674
+ * @returns {*} {void}
675
+ * @memberof BaseSeriesGenerator
667
676
  */
668
677
  addTimeData(data) {
669
678
  const { groupMode } = this.model;
670
- if (!groupMode || groupMode === 'CODELIST') {
679
+ if (!groupMode || groupMode === 'CODELIST')
671
680
  return;
672
- }
673
681
  const dates = [];
674
682
  // 遍历数据，生成日期数组
675
683
  Object.keys(data).forEach(key => {
@@ -749,7 +757,7 @@ export class BaseSeriesGenerator {
749
757
  }
750
758
  else if (groupMode === 'YEARWEEK') {
751
759
  // 找出最大和最小年周
752
- const yearWeeks = [];
760
+ let yearWeeks = [];
753
761
  Object.keys(data).forEach(key => {
754
762
  data[key].forEach((_val, yearWeek) => {
755
763
  yearWeeks.push(yearWeek);
@@ -757,23 +765,46 @@ export class BaseSeriesGenerator {
757
765
  });
758
766
  const minYearWeek = yearWeeks.reduce((min, current) => (current < min ? current : min), yearWeeks[0]);
759
767
  const maxYearWeek = yearWeeks.reduce((max, current) => (current > max ? current : max), yearWeeks[0]);
760
- // 解析最小和最大年周
761
- const [minYear] = minYearWeek.split('-');
762
- const [maxYear] = maxYearWeek.split('-');
763
- // 填充中间年周的数据项
764
- for (let year = parseInt(minYear, 10); year <= parseInt(maxYear, 10); year++) {
765
- const numWeeks = dayjs(`${year}-12-31`).isoWeek();
766
- for (let week = 1; week <= numWeeks; week++) {
767
- const yearWeek = `${year}-${week}`;
768
- Object.keys(data).forEach(key => {
769
- if (!data[key].get(yearWeek)) {
770
- data[key].set(yearWeek, { value: 0 });
771
- }
772
- });
773
- }
774
- }
768
+ // 只解析开始周和结束周前后3周，防止数据过大
769
+ yearWeeks = generateYearWeekRange(minYearWeek, maxYearWeek, 3);
770
+ // 填充年周数据项
771
+ yearWeeks.forEach(yearWeek => {
772
+ Object.keys(data).forEach(key => {
773
+ if (!data[key].get(yearWeek)) {
774
+ data[key].set(yearWeek, { value: 0 });
775
+ }
776
+ });
777
+ });
775
778
  }
776
779
  // 根据时间大小排序
777
780
  this.sortTimeData(data);
778
781
  }
782
+ /**
783
+ * @description 根据分组模式计算时间数据
784
+ * - 只计算有值的日期，展示关键信息数据，多用于横轴日期显示跨度大的情况
785
+ * @param {GroupData} data
786
+ * @memberof BaseSeriesGenerator
787
+ */
788
+ calcTimeData(data) {
789
+ const { groupMode } = this.model;
790
+ if (!groupMode || groupMode === 'CODELIST')
791
+ return;
792
+ // 所有有值的日期数组
793
+ const dates = [];
794
+ // 遍历数据，生成日期数组
795
+ Object.keys(data).forEach(key => {
796
+ data[key].forEach((_val, date) => {
797
+ dates.push(date);
798
+ });
799
+ });
800
+ // 补全每组缺失的日期值，防止横坐标绘制异常
801
+ dates.forEach(date => {
802
+ Object.keys(data).forEach(key => {
803
+ if (!data[key].get(date))
804
+ data[key].set(date, { value: 0 });
805
+ });
806
+ });
807
+ // 根据时间大小排序
808
+ this.sortTimeData(data);
809
+ }
779
810
  }
package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts CHANGED
@@ -81,12 +81,6 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
81
81
  * @memberof FormDRUIPartController
82
82
  */
83
83
  formStateNotify(state: FormNotifyState): Promise<void>;
84
- /**
85
- * @description 同步当前表单数据至子界面数据服务
86
- * @returns {*} {Promise<void>}
87
- * @memberof FormDRUIPartController
88
- */
89
- SyncDataToEmbedService(): Promise<void>;
90
84
  /**
91
85
  * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
92
86
  * @returns {*} {void}
@@ -111,5 +105,23 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
111
105
  * @memberof FormDRUIPartController
112
106
  */
113
107
  silentValidate(): Promise<boolean>;
108
+ /**
109
+ * @description 同步当前表单数据至子界面数据服务
110
+ * @returns {*} {Promise<void>}
111
+ * @memberof FormDRUIPartController
112
+ */
113
+ SyncDataToEmbedService(): Promise<void>;
114
+ /**
115
+ * @description 同步子界面数据至表单
116
+ * @returns {*} {Promise<void>}
117
+ * @memberof FormDRUIPartController
118
+ */
119
+ SyncEmbedDataToForm(): Promise<void>;
120
+ /**
121
+ * @description 保存嵌入视图数据
122
+ * @returns {*} {Promise<void>}
123
+ * @memberof FormDRUIPartController
124
+ */
125
+ saveEmbedViewData(): Promise<void>;
114
126
  }
115
127
  //# sourceMappingURL=form-druipart.controller.d.ts.map
package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts.map CHANGED
@@ -1 +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"}
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;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 CHANGED
@@ -75,6 +75,14 @@ export class FormDRUIPartController extends FormDetailController {
75
75
  if (embedView.appDataEntityId) {
76
76
  this.embedDataService = await app.deService.getService(tempContext, embedView.appDataEntityId);
77
77
  }
78
+ // 主表单保存之前
79
+ this.form.evt.on('onBeforeSave', async () => {
80
+ // 处理子应用同实体表单合并关系界面（手动触发子数据保存、再将子数据同步到主表单）
81
+ if (this.isNeedSyncEmbed && this.embedView && this.embedDataService) {
82
+ await this.saveEmbedViewData();
83
+ await this.SyncEmbedDataToForm();
84
+ }
85
+ });
78
86
  }
79
87
  /**
80
88
  * @description 表单数据变更通知(由表单控制器调用)
@@ -113,21 +121,6 @@ export class FormDRUIPartController extends FormDetailController {
113
121
  this.calcViewParams();
114
122
  }
115
123
  }
116
- /**
117
- * @description 同步当前表单数据至子界面数据服务
118
- * @returns {*} {Promise<void>}
119
- * @memberof FormDRUIPartController
120
- */
121
- async SyncDataToEmbedService() {
122
- if (this.isNeedSyncEmbed && this.embedDataService) {
123
- const tempContext = this.context.clone();
124
- tempContext.srfappid = this.model.appId;
125
- const originData = this.form.state.data.$origin;
126
- const res = await this.embedDataService.getTemp(tempContext);
127
- const syncAction = res.data ? 'updateTemp' : 'createTemp';
128
- await this.embedDataService[syncAction](tempContext, originData);
129
- }
130
- }
131
124
  /**
132
125
  * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
133
126
  * @returns {*} {void}
@@ -136,8 +129,13 @@ export class FormDRUIPartController extends FormDetailController {
136
129
  calcViewParams() {
137
130
  // 计算导航上下文
138
131
  let newContext = this.form.context.clone();
139
- // 忽略数据变化(子应用表单合并场景)
140
- newContext.srfignorechange = this.isNeedSyncEmbed;
132
+ // 子应用表单合并场景
133
+ if (this.isNeedSyncEmbed) {
134
+ // 忽略数据变化
135
+ newContext.srfignorechange = true;
136
+ // 静默保存
137
+ newContext.srfsilent = true;
138
+ }
141
139
  const navContexts = this.model.navigateContexts;
142
140
  if (notNilEmpty(navContexts)) {
143
141
  newContext = Object.assign(newContext, convertNavData(navContexts, this.data, this.form.params, this.form.context));
@@ -189,14 +187,7 @@ export class FormDRUIPartController extends FormDetailController {
189
187
  this.form.updateFormItem(this.model.deformItemUpdateId);
190
188
  }
191
189
  // 同步子界面数据
192
- if (this.isNeedSyncEmbed && this.embedDataService) {
193
- const tempContext = this.context.clone();
194
- tempContext.srfappid = this.model.appId;
195
- const res = await this.embedDataService.getTemp(tempContext);
196
- const childData = res.data || {};
197
- const exData = this.form.state.data.srfexdata || {};
198
- this.form.state.data.srfexdata = Object.assign(exData, childData);
199
- }
190
+ await this.SyncEmbedDataToForm();
200
191
  });
201
192
  }
202
193
  /**
@@ -235,4 +226,45 @@ export class FormDRUIPartController extends FormDetailController {
235
226
  }
236
227
  return true;
237
228
  }
229
+ /**
230
+ * @description 同步当前表单数据至子界面数据服务
231
+ * @returns {*} {Promise<void>}
232
+ * @memberof FormDRUIPartController
233
+ */
234
+ async SyncDataToEmbedService() {
235
+ if (this.isNeedSyncEmbed && this.embedDataService) {
236
+ const tempContext = this.context.clone();
237
+ tempContext.srfappid = this.model.appId;
238
+ const originData = this.form.state.data.$origin;
239
+ const res = await this.embedDataService.getTemp(tempContext);
240
+ const syncAction = res.data ? 'updateTemp' : 'createTemp';
241
+ await this.embedDataService[syncAction](tempContext, originData);
242
+ }
243
+ }
244
+ /**
245
+ * @description 同步子界面数据至表单
246
+ * @returns {*} {Promise<void>}
247
+ * @memberof FormDRUIPartController
248
+ */
249
+ async SyncEmbedDataToForm() {
250
+ if (this.isNeedSyncEmbed && this.embedDataService) {
251
+ const tempContext = this.context.clone();
252
+ tempContext.srfappid = this.model.appId;
253
+ const res = await this.embedDataService.getTemp(tempContext);
254
+ const childData = res.data || {};
255
+ const exData = this.form.state.data.srfexdata || {};
256
+ this.form.state.data.srfexdata = Object.assign(exData, childData);
257
+ }
258
+ }
259
+ /**
260
+ * @description 保存嵌入视图数据
261
+ * @returns {*} {Promise<void>}
262
+ * @memberof FormDRUIPartController
263
+ */
264
+ async saveEmbedViewData() {
265
+ var _a;
266
+ if (this.isNeedSyncEmbed && this.embedView) {
267
+ await ((_a = this.embedView) === null || _a === void 0 ? void 0 : _a.call(SysUIActionTag.SAVE));
268
+ }
269
+ }
238
270
  }
package/out/controller/control/form/form-detail/form-item/form-item.controller.js CHANGED
@@ -33,7 +33,8 @@ export class FormItemController extends FormDetailController {
33
33
  * @type {unknown}
34
34
  */
35
35
  get value() {
36
- return this.data[this.name];
36
+ var _a;
37
+ return (_a = this.data) === null || _a === void 0 ? void 0 : _a[this.name];
37
38
  }
38
39
  /**
39
40
  * 值项
package/out/controller/utils/util/util.d.ts CHANGED
@@ -49,4 +49,19 @@ export declare function formatSeparator(type: string, items: IData[] | undefined
49
49
  * @returns {*} {string}
50
50
  */
51
51
  export declare function formatDate(val: string, format: 'year' | 'quarter' | 'month' | 'week' | 'day'): string;
52
+ /**
53
+ * @description 获取某年的总周数
54
+ * @param {number} year 年份
55
+ * @returns {*} {number}
56
+ */
57
+ export declare function getWeeksInYear(year: number): number;
58
+ /**
59
+ * @description 生成年周数组
60
+ * @export
61
+ * @param {string} minYearWeek 最小年周
62
+ * @param {string} maxYearWeek 最大年周
63
+ * @param {number} [paddingWeeks=0] 前后范围
64
+ * @returns {*} {string[]}
65
+ */
66
+ export declare function generateYearWeekRange(minYearWeek: string, maxYearWeek: string, paddingWeeks?: number): string[];
52
67
  //# sourceMappingURL=util.d.ts.map
package/out/controller/utils/util/util.d.ts.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -1,3 +1,4 @@
1
+ /* eslint-disable no-plusplus */
1
2
  /* eslint-disable no-case-declarations */
2
3
  /* eslint-disable no-restricted-globals */
3
4
  import { isNil } from 'ramda';
@@ -184,20 +185,18 @@ export function formatDate(val, format) {
184
185
  if (!val || isNaN(date.getTime()))
185
186
  return value;
186
187
  const year = dayjs(date).year();
187
- const month = dayjs(date).month() + 1;
188
188
  switch (format) {
189
189
  case 'year':
190
190
  value = `${year}`;
191
191
  break;
192
192
  case 'quarter':
193
- value = `${year} ${Math.ceil(month / 3)}${ibiz.i18n.t('runtime.controller.utils.util.quarter')}`;
193
+ value = `${year} ${dayjs(date).quarter()}${ibiz.i18n.t('runtime.controller.utils.util.quarter')}`;
194
194
  break;
195
195
  case 'month':
196
- value = `${year} ${month}${ibiz.i18n.t('runtime.controller.utils.util.month')}`;
196
+ value = `${year} ${dayjs(date).month() + 1}${ibiz.i18n.t('runtime.controller.utils.util.month')}`;
197
197
  break;
198
198
  case 'week':
199
- const week = dayjs(date).week();
200
- value = `${year} ${week}${ibiz.i18n.t('runtime.controller.utils.util.week')}`;
199
+ value = `${year} ${dayjs(date).week()}${ibiz.i18n.t('runtime.controller.utils.util.week')}`;
201
200
  break;
202
201
  case 'day':
203
202
  value = dayjs(date).format('YYYY-MM-DD');
@@ -207,3 +206,56 @@ export function formatDate(val, format) {
207
206
  }
208
207
  return value;
209
208
  }
209
+ /**
210
+ * @description 获取某年的总周数
211
+ * @param {number} year 年份
212
+ * @returns {*} {number}
213
+ */
214
+ export function getWeeksInYear(year) {
215
+ const lastDayOfYear = dayjs(`${year}-12-31`);
216
+ const week = lastDayOfYear.isoWeek();
217
+ return week === 1 ? 52 : week;
218
+ }
219
+ /**
220
+ * @description 生成年周数组
221
+ * @export
222
+ * @param {string} minYearWeek 最小年周
223
+ * @param {string} maxYearWeek 最大年周
224
+ * @param {number} [paddingWeeks=0] 前后范围
225
+ * @returns {*} {string[]}
226
+ */
227
+ export function generateYearWeekRange(minYearWeek, maxYearWeek, paddingWeeks = 0) {
228
+ // 1. 解析最小和最大年周
229
+ const [minYear, minWeek] = minYearWeek.split('-').map(Number);
230
+ const [maxYear, maxWeek] = maxYearWeek.split('-').map(Number);
231
+ // 2. 计算起始年周（minYearWeek - paddingWeeks）
232
+ let startYear = minYear;
233
+ let startWeek = minWeek - paddingWeeks;
234
+ while (startWeek < 1) {
235
+ startYear--;
236
+ startWeek += getWeeksInYear(startYear);
237
+ }
238
+ // 3. 计算结束年周（maxYearWeek + paddingWeeks）
239
+ let endYear = maxYear;
240
+ let endWeek = maxWeek + paddingWeeks;
241
+ const maxWeeksInEndYear = getWeeksInYear(endYear);
242
+ if (endWeek > maxWeeksInEndYear) {
243
+ endWeek -= maxWeeksInEndYear;
244
+ endYear++;
245
+ }
246
+ // 4. 生成从 startYear-startWeek 到 endYear-endWeek 的所有年周
247
+ const yearWeeks = [];
248
+ let currentYear = startYear;
249
+ let currentWeek = startWeek;
250
+ while (currentYear < endYear ||
251
+ (currentYear === endYear && currentWeek <= endWeek)) {
252
+ yearWeeks.push(`${currentYear}-${currentWeek}`);
253
+ currentWeek++;
254
+ const weeksInCurrentYear = getWeeksInYear(currentYear);
255
+ if (currentWeek > weeksInCurrentYear) {
256
+ currentYear++;
257
+ currentWeek = 1;
258
+ }
259
+ }
260
+ return yearWeeks;
261
+ }
package/out/engine/md-view.engine.d.ts CHANGED
@@ -80,7 +80,7 @@ export declare class MDViewEngine extends ViewEngineBase {
80
80
  params?: IParams;
81
81
  }): Promise<IUIActionResult>;
82
82
  /**
83
- * 打开编辑数据视图
83
+ * 打开新建数据视图
84
84
  *
85
85
  * @author lxm
86
86
  * @date 2022-09-01 18:09:19
package/out/engine/md-view.engine.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}
1
+ {"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 CHANGED
@@ -249,13 +249,19 @@ export class MDViewEngine extends ViewEngineBase {
249
249
  throw new RuntimeModelError(this.view.model, ibiz.i18n.t('runtime.engine.logicOpendata'));
250
250
  }
251
251
  else {
252
+ if (result.ok && result.data && result.data.length > 0) {
253
+ this.view.evt.emit('onDataChange', {
254
+ data: result.data,
255
+ actionType: 'EDIT',
256
+ });
257
+ }
252
258
  return {
253
259
  cancel: result ? !result.ok : true,
254
260
  };
255
261
  }
256
262
  }
257
263
  /**
258
- * 打开编辑数据视图
264
+ * 打开新建数据视图
259
265
  *
260
266
  * @author lxm
261
267
  * @date 2022-09-01 18:09:19
@@ -285,6 +291,12 @@ export class MDViewEngine extends ViewEngineBase {
285
291
  throw new RuntimeModelError(this.view.model, ibiz.i18n.t('runtime.engine.logicNewdata'));
286
292
  }
287
293
  else {
294
+ if (result.ok && result.data && result.data.length > 0) {
295
+ this.view.evt.emit('onDataChange', {
296
+ data: result.data,
297
+ actionType: 'NEW',
298
+ });
299
+ }
288
300
  return {
289
301
  cancel: result ? !result.ok : true,
290
302
  };
package/out/interface/api/controller/common/i-api-mask-option.d.ts ADDED
@@ -0,0 +1,20 @@
1
+ /**
2
+ * @description 界面遮罩参数接口
3
+ * @export
4
+ * @interface IApiMaskOption
5
+ */
6
+ export interface IApiMaskOption {
7
+ /**
8
+ * @description 遮罩模式
9
+ * @type {('BLANK' | 'MASK')} 空白模式：界面能查看，无蒙层，无遮罩文字；遮罩模式：界面无法查看，有蒙层，有遮罩文字
10
+ * @memberof IApiMaskOption
11
+ */
12
+ mode: 'BLANK' | 'MASK';
13
+ /**
14
+ * @description 遮罩显示文本
15
+ * @type {string}
16
+ * @memberof IApiMaskOption
17
+ */
18
+ maskInfo?: string;
19
+ }
20
+ //# sourceMappingURL=i-api-mask-option.d.ts.map
package/out/interface/api/controller/common/i-api-mask-option.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"i-api-mask-option.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/common/i-api-mask-option.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
package/out/interface/api/controller/common/index.d.ts CHANGED
@@ -2,4 +2,5 @@ export type { IApiEnforceableController } from './i-api-enforceable.controller';
2
2
  export type { IApiController } from './i-api.controller';
3
3
  export type { IApiControlMapping } from './i-api-control.mapping';
4
4
  export type { IApiViewMapping } from './i-api-view.mapping';
5
+ export type { IApiMaskOption } from './i-api-mask-option';
5
6
  //# sourceMappingURL=index.d.ts.map
package/out/interface/api/controller/common/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/common/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/common/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC"}
package/out/interface/api/controller/control/i-api-chart.controller.d.ts CHANGED
@@ -12,6 +12,7 @@ import { IApiMDControlController } from './i-api-md-control.controller';
12
12
  * @ctrlparams {name:enabledrilldetail,title:是否开启数据反查,defaultvalue:[],parameterType:IData[],description:此部件参数仅应用于bi报表。主要用于判断当前点击序列是否开启数据反查，如果当前序列有反查视图模型，则左键单击时弹出检查明细按钮}
13
13
  * @ctrlparams {"name":"mdctrlrefreshmode","title":"刷新模式","defaultvalue":"'cache'","parameterType":"'default' | 'cache'","description":"选中数据在部件加载后触发重新计算模式，若值为 'cache' 且不为初始化加载时，则将选中数据更新为最新值；若值为 'default'，将清空选中数据","effectPlatform":"web"}
14
14
  * @ctrlparams {"name":"mode","title":"柱状图图表绘制模式","defaultvalue":"'DEFAULT'","parameterType":"'DEFAULT' | 'ROW'","description":"控制柱状图绘制方向，默认垂直绘制，为ROW时水平绘制"}
15
+ * @ctrlparams {"name":"completiondate","title":"是否填充日期","parameterType":"boolean","description":"该参数为序列自定义参数，用于控制时间分组模式下是否补全时间数据（无横轴序列默认不补全（饼图，仪表盘，雷达图，漏斗图），有横轴序列默认补全）"}
15
16
  * @template T
16
17
  * @template S
17
18
  */
package/out/interface/api/controller/control/i-api-chart.controller.d.ts.map CHANGED
@@ -1 +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"}
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;;;;;;;;;;;;;;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"}