@ibiz-template/runtime 0.2.6 → 0.2.7
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.
- package/dist/index.esm.js +32 -15
- package/dist/index.system.min.js +1 -1
- package/dist/index.system.min.js.map +1 -1
- package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
- package/out/controller/common/control/md-control.controller.js +3 -0
- package/out/controller/control/chart/generator/chart-options-generator.d.ts.map +1 -1
- package/out/controller/control/chart/generator/chart-options-generator.js +9 -5
- package/out/controller/control/chart/generator/funnel-series-generator.d.ts +6 -4
- package/out/controller/control/chart/generator/funnel-series-generator.d.ts.map +1 -1
- package/out/controller/control/chart/generator/funnel-series-generator.js +7 -3
- package/out/controller/control/chart/generator/pie-series-generator.d.ts +6 -4
- package/out/controller/control/chart/generator/pie-series-generator.d.ts.map +1 -1
- package/out/controller/control/chart/generator/pie-series-generator.js +7 -3
- package/out/controller/control/chart/generator/radar-series-generator.d.ts +1 -1
- package/out/controller/control/chart/generator/radar-series-generator.js +3 -3
- package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts.map +1 -1
- package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js +5 -1
- package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.d.ts +4 -0
- package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.d.ts.map +1 -1
- package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.js +3 -0
- package/out/interface/common/i-global-config/i-global-config.d.ts +8 -0
- package/out/interface/common/i-global-config/i-global-config.d.ts.map +1 -1
- package/out/service/vo/control.vo.js +2 -2
- package/package.json +2 -2
- package/src/controller/common/control/md-control.controller.ts +4 -0
- package/src/controller/control/chart/generator/chart-options-generator.ts +13 -4
- package/src/controller/control/chart/generator/funnel-series-generator.ts +13 -7
- package/src/controller/control/chart/generator/pie-series-generator.ts +13 -7
- package/src/controller/control/chart/generator/radar-series-generator.ts +3 -3
- package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts +5 -1
- package/src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts +7 -0
- package/src/interface/common/i-global-config/i-global-config.ts +9 -0
- package/src/service/vo/control.vo.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;cAEtB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAiB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI;IAMxC;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;cAEtB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAiB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI;IAMxC;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAuDzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
|
|
@@ -174,6 +174,9 @@ export class MDControlController extends ControlController {
|
|
|
174
174
|
finally {
|
|
175
175
|
await this.endLoading();
|
|
176
176
|
}
|
|
177
|
+
this.state.items.forEach((item, index) => {
|
|
178
|
+
item.srfserialnum = index + 1;
|
|
179
|
+
});
|
|
177
180
|
this.actionNotification('FETCHSUCCESS');
|
|
178
181
|
return this.state.items;
|
|
179
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,
|
|
1
|
+
{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IA4DpB,OAAO,CAAC,KAAK;IA3DzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;gBAE3C,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAgCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IAwClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IA8D/C,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CA8DlD"}
|
|
@@ -148,14 +148,9 @@ export class ChartOptionsGenerator {
|
|
|
148
148
|
return titleOption;
|
|
149
149
|
}
|
|
150
150
|
calcLegendOption(chartLegend) {
|
|
151
|
-
var _a;
|
|
152
151
|
const { showLegend, legendPos } = chartLegend;
|
|
153
152
|
const legendOption = {};
|
|
154
153
|
legendOption.show = showLegend;
|
|
155
|
-
// 图表单序列不应出图例
|
|
156
|
-
if (((_a = this.model.dechartSerieses) === null || _a === void 0 ? void 0 : _a.length) === 1) {
|
|
157
|
-
legendOption.show = false;
|
|
158
|
-
}
|
|
159
154
|
const position = legendPos === null || legendPos === void 0 ? void 0 : legendPos.toLowerCase();
|
|
160
155
|
if (position === 'left' || position === 'right') {
|
|
161
156
|
legendOption.left = position;
|
|
@@ -295,6 +290,15 @@ export class ChartOptionsGenerator {
|
|
|
295
290
|
}
|
|
296
291
|
});
|
|
297
292
|
this.options.series = seriesOption;
|
|
293
|
+
// 柱状图、折线图、散点图单个序列并且该序列分组数据只有一条时,不用显示图例
|
|
294
|
+
if (this.seriesGenerators.length === 1 &&
|
|
295
|
+
this.seriesGenerators[0].groupData &&
|
|
296
|
+
Object.keys(this.seriesGenerators[0].groupData).length === 1 &&
|
|
297
|
+
seriesOption[0].type &&
|
|
298
|
+
['bar', 'line', 'scatter'].includes(seriesOption[0].type) &&
|
|
299
|
+
this.staticOptions.legend) {
|
|
300
|
+
this.staticOptions.legend.show = false;
|
|
301
|
+
}
|
|
298
302
|
// 合并静态和动态的options
|
|
299
303
|
this.options = mergeDeepRight(this.staticOptions, this.options);
|
|
300
304
|
// 有自定义参数的合并自定义参数
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { IChartSeriesFunnel } from '@ibiz/model-core';
|
|
2
2
|
import type { ECElementEvent, SeriesOption } from 'echarts';
|
|
3
3
|
import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
|
|
4
|
+
interface funnelSeriesData {
|
|
5
|
+
name: string;
|
|
6
|
+
value: IData[];
|
|
7
|
+
}
|
|
4
8
|
/**
|
|
5
9
|
* 漏斗图序列生成器
|
|
6
10
|
* @author lxm
|
|
@@ -11,10 +15,8 @@ import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
|
|
|
11
15
|
*/
|
|
12
16
|
export declare class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunnel> {
|
|
13
17
|
protected calcStaticOptions(): SeriesOption;
|
|
14
|
-
protected calcSeriesData(catalogData: CatalogData):
|
|
15
|
-
name: string;
|
|
16
|
-
value: IData[];
|
|
17
|
-
}[];
|
|
18
|
+
protected calcSeriesData(catalogData: CatalogData): funnelSeriesData[];
|
|
18
19
|
getSrfkeyByParams(params: ECElementEvent): string;
|
|
19
20
|
}
|
|
21
|
+
export {};
|
|
20
22
|
//# sourceMappingURL=funnel-series-generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"funnel-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/funnel-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAsB,YAAY,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAChF,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG
|
|
1
|
+
{"version":3,"file":"funnel-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/funnel-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAsB,YAAY,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAChF,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,EAAE;IAWtE,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
|
|
@@ -15,11 +15,15 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator {
|
|
|
15
15
|
return options;
|
|
16
16
|
}
|
|
17
17
|
calcSeriesData(catalogData) {
|
|
18
|
-
|
|
18
|
+
const temData = [];
|
|
19
|
+
catalogData.forEach((catalog, key) => {
|
|
19
20
|
var _a;
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
temData.push({
|
|
22
|
+
name: key,
|
|
23
|
+
value: [catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey],
|
|
24
|
+
});
|
|
22
25
|
});
|
|
26
|
+
return temData;
|
|
23
27
|
}
|
|
24
28
|
getSrfkeyByParams(params) {
|
|
25
29
|
return params.value[1];
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { IChartSeriesPie } from '@ibiz/model-core';
|
|
2
2
|
import type { ECElementEvent, SeriesOption } from 'echarts';
|
|
3
3
|
import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
|
|
4
|
+
interface pieSeriesData {
|
|
5
|
+
name: string;
|
|
6
|
+
value: IData[];
|
|
7
|
+
}
|
|
4
8
|
/**
|
|
5
9
|
* 饼图序列生成器
|
|
6
10
|
* @author lxm
|
|
@@ -11,10 +15,8 @@ import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
|
|
|
11
15
|
*/
|
|
12
16
|
export declare class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
|
|
13
17
|
protected calcStaticOptions(): SeriesOption;
|
|
14
|
-
protected calcSeriesData(catalogData: CatalogData):
|
|
15
|
-
name: string;
|
|
16
|
-
value: IData[];
|
|
17
|
-
}[];
|
|
18
|
+
protected calcSeriesData(catalogData: CatalogData): pieSeriesData[];
|
|
18
19
|
getSrfkeyByParams(params: ECElementEvent): string;
|
|
19
20
|
}
|
|
21
|
+
export {};
|
|
20
22
|
//# sourceMappingURL=pie-series-generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pie-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/pie-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAmB,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IAC1E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG
|
|
1
|
+
{"version":3,"file":"pie-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/pie-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAmB,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IAC1E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,EAAE;IAWnE,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
|
|
@@ -15,11 +15,15 @@ export class PieSeriesGenerator extends BaseSeriesGenerator {
|
|
|
15
15
|
return options;
|
|
16
16
|
}
|
|
17
17
|
calcSeriesData(catalogData) {
|
|
18
|
-
|
|
18
|
+
const temData = [];
|
|
19
|
+
catalogData.forEach((catalog, key) => {
|
|
19
20
|
var _a;
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
temData.push({
|
|
22
|
+
name: key,
|
|
23
|
+
value: [catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey],
|
|
24
|
+
});
|
|
22
25
|
});
|
|
26
|
+
return temData;
|
|
23
27
|
}
|
|
24
28
|
getSrfkeyByParams(params) {
|
|
25
29
|
return params.value[1];
|
|
@@ -2,7 +2,7 @@ import { IChartSeriesRadar } from '@ibiz/model-core';
|
|
|
2
2
|
import type { ECElementEvent, SeriesOption } from 'echarts';
|
|
3
3
|
import { BaseSeriesGenerator } from './base-series-generator';
|
|
4
4
|
/**
|
|
5
|
-
*
|
|
5
|
+
* 雷达序列生成器
|
|
6
6
|
* @author lxm
|
|
7
7
|
* @date 2023-06-11 06:19:03
|
|
8
8
|
* @export
|
|
@@ -2,7 +2,7 @@ import { mergeDeepRight } from 'ramda';
|
|
|
2
2
|
import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
|
|
3
3
|
import { RadarCoordSystem } from './radar-coord-system';
|
|
4
4
|
/**
|
|
5
|
-
*
|
|
5
|
+
* 雷达序列生成器
|
|
6
6
|
* @author lxm
|
|
7
7
|
* @date 2023-06-11 06:19:03
|
|
8
8
|
* @export
|
|
@@ -29,8 +29,8 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator {
|
|
|
29
29
|
const radar = this.chartGenerator.radarMap.get(this.catalogField);
|
|
30
30
|
// 更新雷达坐标系指示器和最大值
|
|
31
31
|
Object.values(groupData).forEach(catalogData => {
|
|
32
|
-
|
|
33
|
-
radar.updateIndicator(
|
|
32
|
+
catalogData.forEach((catalog, key) => {
|
|
33
|
+
radar.updateIndicator(key, catalog.value);
|
|
34
34
|
});
|
|
35
35
|
});
|
|
36
36
|
}
|
|
@@ -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,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAKpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAKpE,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;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;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;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;;;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;IAqEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;
|
|
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,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAKpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAKpE,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;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;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;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;;;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;IAqEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}
|
package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js
CHANGED
|
@@ -256,7 +256,11 @@ export class GridFieldColumnController extends GridColumnController {
|
|
|
256
256
|
}
|
|
257
257
|
const isDate = DataTypes.isDate(this.dataType);
|
|
258
258
|
if (isDate) {
|
|
259
|
-
|
|
259
|
+
const formatVal = dayjs(strVal).format(this.valueFormat);
|
|
260
|
+
if (formatVal !== 'Invalid Date') {
|
|
261
|
+
return formatVal;
|
|
262
|
+
}
|
|
263
|
+
return strVal;
|
|
260
264
|
}
|
|
261
265
|
return ibiz.util.text.format(strVal, this.valueFormat);
|
|
262
266
|
}
|
|
@@ -25,6 +25,10 @@ export declare class PickupViewPanelController extends ControlController<IDEPick
|
|
|
25
25
|
* @memberof PickupViewPanelController
|
|
26
26
|
*/
|
|
27
27
|
protected onCreated(): Promise<void>;
|
|
28
|
+
updateContextParams(opts: {
|
|
29
|
+
context?: IContext | undefined;
|
|
30
|
+
params?: IParams | undefined;
|
|
31
|
+
}): void;
|
|
28
32
|
/**
|
|
29
33
|
* 初始化导航参数
|
|
30
34
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,yBACX,SAAQ,iBAAiB,CACvB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACH,SAAS,EAAG,eAAe,CACzB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;IAEF;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,yBACX,SAAQ,iBAAiB,CACvB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACH,SAAS,EAAG,eAAe,CACzB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;IAEF;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C,mBAAmB,CAAC,IAAI,EAAE;QACxB,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;QAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KAC9B,GAAG,IAAI;IAKR;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAoBpB;;;;;OAKG;IACH,YAAY,CACV,IAAI,EAAE,eAAe,CACnB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,GACA,IAAI;IAqBP;;;;;;;OAOG;IACG,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzC;;;;;;;OAOG;IACG,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAIrC"}
|
|
@@ -21,6 +21,9 @@ export class PickupViewPanelController extends ControlController {
|
|
|
21
21
|
await super.onCreated();
|
|
22
22
|
// 等待嵌入视图mounted完成,选择视图面板才mounted
|
|
23
23
|
this.mountCounter.enroll(this.model.embeddedAppDEViewId);
|
|
24
|
+
}
|
|
25
|
+
updateContextParams(opts) {
|
|
26
|
+
super.updateContextParams(opts);
|
|
24
27
|
this.initNavParam();
|
|
25
28
|
}
|
|
26
29
|
/**
|
|
@@ -11,6 +11,14 @@ import { IGlobalViewConfig } from './i-global-view-config';
|
|
|
11
11
|
* @interface IGlobalConfig
|
|
12
12
|
*/
|
|
13
13
|
export interface IGlobalConfig {
|
|
14
|
+
/**
|
|
15
|
+
* 设置应用主题
|
|
16
|
+
*
|
|
17
|
+
* @author chitanda
|
|
18
|
+
* @date 2023-10-30 21:10:01
|
|
19
|
+
* @type {string}
|
|
20
|
+
*/
|
|
21
|
+
theme?: string;
|
|
14
22
|
/**
|
|
15
23
|
* 全局视图配置
|
|
16
24
|
* @return {*}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-global-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,OAAO,EAAE,oBAAoB,CAAC;IAE9B;;;;OAIG;IACH,QAAQ,EAAE,qBAAqB,CAAC;CACjC"}
|
|
1
|
+
{"version":3,"file":"i-global-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,OAAO,EAAE,oBAAoB,CAAC;IAE9B;;;;OAIG;IACH,QAAQ,EAAE,qBAAqB,CAAC;CACjC"}
|
|
@@ -44,10 +44,10 @@ export class ControlVO {
|
|
|
44
44
|
if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
|
|
45
45
|
Object.defineProperty(this, key, {
|
|
46
46
|
get() {
|
|
47
|
-
return this.$origin
|
|
47
|
+
return this.$origin[key];
|
|
48
48
|
},
|
|
49
49
|
set(val) {
|
|
50
|
-
this.$origin
|
|
50
|
+
this.$origin[key] = val;
|
|
51
51
|
},
|
|
52
52
|
enumerable: false,
|
|
53
53
|
configurable: true,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.7",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"qx-util": "^0.4.8",
|
|
60
60
|
"ramda": "^0.29.0"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "2533d04e6de6b0d5b20759a0bb3951491c520ca3"
|
|
63
63
|
}
|
|
@@ -228,6 +228,10 @@ export class MDControlController<
|
|
|
228
228
|
await this.endLoading();
|
|
229
229
|
}
|
|
230
230
|
|
|
231
|
+
this.state.items.forEach((item, index) => {
|
|
232
|
+
item.srfserialnum = index + 1;
|
|
233
|
+
});
|
|
234
|
+
|
|
231
235
|
this.actionNotification('FETCHSUCCESS');
|
|
232
236
|
return this.state.items;
|
|
233
237
|
}
|
|
@@ -4,6 +4,7 @@ import type {
|
|
|
4
4
|
XAXisComponentOption,
|
|
5
5
|
YAXisComponentOption,
|
|
6
6
|
ECElementEvent,
|
|
7
|
+
LegendComponentOption,
|
|
7
8
|
} from 'echarts';
|
|
8
9
|
import {
|
|
9
10
|
IAppDataEntity,
|
|
@@ -207,10 +208,6 @@ export class ChartOptionsGenerator {
|
|
|
207
208
|
const { showLegend, legendPos } = chartLegend;
|
|
208
209
|
const legendOption: EChartsOption['legend'] = {};
|
|
209
210
|
legendOption.show = showLegend;
|
|
210
|
-
// 图表单序列不应出图例
|
|
211
|
-
if (this.model.dechartSerieses?.length === 1) {
|
|
212
|
-
legendOption.show = false;
|
|
213
|
-
}
|
|
214
211
|
const position = legendPos?.toLowerCase();
|
|
215
212
|
if (position === 'left' || position === 'right') {
|
|
216
213
|
legendOption.left = position;
|
|
@@ -365,6 +362,18 @@ export class ChartOptionsGenerator {
|
|
|
365
362
|
});
|
|
366
363
|
this.options.series = seriesOption;
|
|
367
364
|
|
|
365
|
+
// 柱状图、折线图、散点图单个序列并且该序列分组数据只有一条时,不用显示图例
|
|
366
|
+
if (
|
|
367
|
+
this.seriesGenerators.length === 1 &&
|
|
368
|
+
this.seriesGenerators[0].groupData &&
|
|
369
|
+
Object.keys(this.seriesGenerators[0].groupData).length === 1 &&
|
|
370
|
+
seriesOption[0].type &&
|
|
371
|
+
['bar', 'line', 'scatter'].includes(seriesOption[0].type) &&
|
|
372
|
+
this.staticOptions.legend
|
|
373
|
+
) {
|
|
374
|
+
(this.staticOptions.legend as LegendComponentOption).show = false;
|
|
375
|
+
}
|
|
376
|
+
|
|
368
377
|
// 合并静态和动态的options
|
|
369
378
|
this.options = mergeDeepRight(
|
|
370
379
|
this.staticOptions,
|
|
@@ -2,6 +2,11 @@ import { IChartSeriesFunnel } from '@ibiz/model-core';
|
|
|
2
2
|
import type { ECElementEvent, FunnelSeriesOption, SeriesOption } from 'echarts';
|
|
3
3
|
import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
|
|
4
4
|
|
|
5
|
+
interface funnelSeriesData {
|
|
6
|
+
name: string;
|
|
7
|
+
value: IData[];
|
|
8
|
+
}
|
|
9
|
+
|
|
5
10
|
/**
|
|
6
11
|
* 漏斗图序列生成器
|
|
7
12
|
* @author lxm
|
|
@@ -20,14 +25,15 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunne
|
|
|
20
25
|
return options;
|
|
21
26
|
}
|
|
22
27
|
|
|
23
|
-
protected calcSeriesData(catalogData: CatalogData): {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
protected calcSeriesData(catalogData: CatalogData): funnelSeriesData[] {
|
|
29
|
+
const temData: funnelSeriesData[] = [];
|
|
30
|
+
catalogData.forEach((catalog, key) => {
|
|
31
|
+
temData.push({
|
|
32
|
+
name: key,
|
|
33
|
+
value: [catalog.value, catalog.deData?.srfkey],
|
|
34
|
+
});
|
|
30
35
|
});
|
|
36
|
+
return temData;
|
|
31
37
|
}
|
|
32
38
|
|
|
33
39
|
getSrfkeyByParams(params: ECElementEvent): string {
|
|
@@ -2,6 +2,11 @@ import { IChartSeriesPie } from '@ibiz/model-core';
|
|
|
2
2
|
import type { ECElementEvent, PieSeriesOption, SeriesOption } from 'echarts';
|
|
3
3
|
import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
|
|
4
4
|
|
|
5
|
+
interface pieSeriesData {
|
|
6
|
+
name: string;
|
|
7
|
+
value: IData[];
|
|
8
|
+
}
|
|
9
|
+
|
|
5
10
|
/**
|
|
6
11
|
* 饼图序列生成器
|
|
7
12
|
* @author lxm
|
|
@@ -20,14 +25,15 @@ export class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
|
|
|
20
25
|
return options;
|
|
21
26
|
}
|
|
22
27
|
|
|
23
|
-
protected calcSeriesData(catalogData: CatalogData): {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
protected calcSeriesData(catalogData: CatalogData): pieSeriesData[] {
|
|
29
|
+
const temData: pieSeriesData[] = [];
|
|
30
|
+
catalogData.forEach((catalog, key) => {
|
|
31
|
+
temData.push({
|
|
32
|
+
name: key,
|
|
33
|
+
value: [catalog.value, catalog.deData?.srfkey],
|
|
34
|
+
});
|
|
30
35
|
});
|
|
36
|
+
return temData;
|
|
31
37
|
}
|
|
32
38
|
|
|
33
39
|
getSrfkeyByParams(params: ECElementEvent): string {
|
|
@@ -5,7 +5,7 @@ import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
|
|
|
5
5
|
import { RadarCoordSystem } from './radar-coord-system';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
|
-
*
|
|
8
|
+
* 雷达序列生成器
|
|
9
9
|
* @author lxm
|
|
10
10
|
* @date 2023-06-11 06:19:03
|
|
11
11
|
* @export
|
|
@@ -39,8 +39,8 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeriesRadar>
|
|
|
39
39
|
|
|
40
40
|
// 更新雷达坐标系指示器和最大值
|
|
41
41
|
Object.values(groupData).forEach(catalogData => {
|
|
42
|
-
|
|
43
|
-
radar.updateIndicator(
|
|
42
|
+
catalogData.forEach((catalog, key) => {
|
|
43
|
+
radar.updateIndicator(key, catalog.value);
|
|
44
44
|
});
|
|
45
45
|
});
|
|
46
46
|
}
|
package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
CHANGED
|
@@ -308,7 +308,11 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
|
|
|
308
308
|
}
|
|
309
309
|
const isDate = DataTypes.isDate(this.dataType!);
|
|
310
310
|
if (isDate) {
|
|
311
|
-
|
|
311
|
+
const formatVal = dayjs(strVal).format(this.valueFormat);
|
|
312
|
+
if (formatVal !== 'Invalid Date') {
|
|
313
|
+
return formatVal;
|
|
314
|
+
}
|
|
315
|
+
return strVal;
|
|
312
316
|
}
|
|
313
317
|
return ibiz.util.text.format(strVal, this.valueFormat);
|
|
314
318
|
}
|
|
@@ -50,6 +50,13 @@ export class PickupViewPanelController
|
|
|
50
50
|
await super.onCreated();
|
|
51
51
|
// 等待嵌入视图mounted完成,选择视图面板才mounted
|
|
52
52
|
this.mountCounter.enroll(this.model.embeddedAppDEViewId!);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
updateContextParams(opts: {
|
|
56
|
+
context?: IContext | undefined;
|
|
57
|
+
params?: IParams | undefined;
|
|
58
|
+
}): void {
|
|
59
|
+
super.updateContextParams(opts);
|
|
53
60
|
this.initNavParam();
|
|
54
61
|
}
|
|
55
62
|
|
|
@@ -12,6 +12,15 @@ import { IGlobalViewConfig } from './i-global-view-config';
|
|
|
12
12
|
* @interface IGlobalConfig
|
|
13
13
|
*/
|
|
14
14
|
export interface IGlobalConfig {
|
|
15
|
+
/**
|
|
16
|
+
* 设置应用主题
|
|
17
|
+
*
|
|
18
|
+
* @author chitanda
|
|
19
|
+
* @date 2023-10-30 21:10:01
|
|
20
|
+
* @type {string}
|
|
21
|
+
*/
|
|
22
|
+
theme?: string;
|
|
23
|
+
|
|
15
24
|
/**
|
|
16
25
|
* 全局视图配置
|
|
17
26
|
* @return {*}
|
|
@@ -147,10 +147,10 @@ export class ControlVO {
|
|
|
147
147
|
if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
|
|
148
148
|
Object.defineProperty(this, key, {
|
|
149
149
|
get() {
|
|
150
|
-
return this.$origin
|
|
150
|
+
return this.$origin[key];
|
|
151
151
|
},
|
|
152
152
|
set(val: unknown) {
|
|
153
|
-
this.$origin
|
|
153
|
+
this.$origin[key] = val;
|
|
154
154
|
},
|
|
155
155
|
enumerable: false,
|
|
156
156
|
configurable: true,
|