@ibiz-template/runtime 0.7.41-alpha.112 → 0.7.41-alpha.114
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 +264 -44
- package/dist/index.system.min.js +1 -1
- package/out/config/global-config.d.ts.map +1 -1
- package/out/config/global-config.js +1 -0
- package/out/constant/predefined-attributes.d.ts +5 -1
- package/out/constant/predefined-attributes.d.ts.map +1 -1
- package/out/constant/predefined-attributes.js +4 -0
- package/out/controller/common/control/md-control.controller.js +1 -1
- package/out/controller/control/form/form/form.controller.d.ts +9 -1
- package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
- package/out/controller/control/form/form/form.controller.js +54 -5
- package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.js +5 -0
- package/out/controller/control/grid/grid/grid.controller.d.ts +4 -0
- package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
- package/out/controller/control/grid/grid/grid.controller.js +45 -8
- package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts +2 -1
- package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts.map +1 -1
- package/out/controller/control/md-ctrl/md-ctrl.controller.js +37 -6
- package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts +16 -1
- package/out/controller/control/medit-view-panel/medit-view-panel.controller.d.ts.map +1 -1
- package/out/controller/control/medit-view-panel/medit-view-panel.controller.js +31 -0
- package/out/controller/utils/data-file-util/data-file-util.d.ts +2 -1
- package/out/controller/utils/data-file-util/data-file-util.d.ts.map +1 -1
- package/out/controller/utils/data-file-util/data-file-util.js +11 -6
- package/out/interface/api/call/i-api-medit-view9.call.d.ts +20 -0
- package/out/interface/api/call/i-api-medit-view9.call.d.ts.map +1 -1
- package/out/interface/api/common/global-config/i-api-global-common-config.d.ts +9 -0
- package/out/interface/api/common/global-config/i-api-global-common-config.d.ts.map +1 -1
- package/out/interface/api/controller/control/i-api-medit-view-panel.controller.d.ts +9 -0
- package/out/interface/api/controller/control/i-api-medit-view-panel.controller.d.ts.map +1 -1
- package/out/interface/api/util/i-api-excel-util.d.ts +53 -1
- package/out/interface/api/util/i-api-excel-util.d.ts.map +1 -1
- package/out/interface/controller/state/control/i-tree.state.d.ts +12 -0
- package/out/interface/controller/state/control/i-tree.state.d.ts.map +1 -1
- package/out/interface/provider/i-platform-provider.d.ts +54 -2
- package/out/interface/provider/i-platform-provider.d.ts.map +1 -1
- package/out/locale/en/index.d.ts +3 -0
- package/out/locale/en/index.d.ts.map +1 -1
- package/out/locale/en/index.js +3 -0
- package/out/locale/zh-CN/index.d.ts +3 -0
- package/out/locale/zh-CN/index.d.ts.map +1 -1
- package/out/locale/zh-CN/index.js +3 -0
- package/out/platform/provider/platform-provider-base.d.ts.map +1 -1
- package/out/platform/provider/platform-provider-base.js +1 -2
- package/out/service/vo/tree-node-data/tree-code-list-node-data.d.ts.map +1 -1
- package/out/service/vo/tree-node-data/tree-code-list-node-data.js +2 -0
- package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts +14 -0
- package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map +1 -1
- package/out/service/vo/tree-node-data/tree-data-set-node-data.js +33 -0
- package/out/service/vo/tree-node-data/tree-node-data.d.ts +16 -0
- package/out/service/vo/tree-node-data/tree-node-data.d.ts.map +1 -1
- package/out/service/vo/tree-node-data/tree-node-data.js +25 -0
- package/out/service/vo/tree-node-data/tree-static-node-data.d.ts.map +1 -1
- package/out/service/vo/tree-node-data/tree-static-node-data.js +2 -0
- package/out/ui-action/provider/front-ui-action-provider.d.ts.map +1 -1
- package/out/ui-action/provider/front-ui-action-provider.js +3 -1
- package/package.json +3 -3
- package/src/config/global-config.ts +1 -0
- package/src/constant/predefined-attributes.ts +5 -0
- package/src/controller/common/control/md-control.controller.ts +1 -1
- package/src/controller/control/form/form/form.controller.ts +58 -11
- package/src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts +3 -0
- package/src/controller/control/grid/grid/grid.controller.ts +63 -11
- package/src/controller/control/md-ctrl/md-ctrl.controller.ts +52 -7
- package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts +39 -1
- package/src/controller/utils/data-file-util/data-file-util.ts +21 -9
- package/src/interface/api/call/i-api-medit-view9.call.ts +21 -0
- package/src/interface/api/common/global-config/i-api-global-common-config.ts +10 -0
- package/src/interface/api/controller/control/i-api-medit-view-panel.controller.ts +10 -0
- package/src/interface/api/util/i-api-excel-util.ts +38 -1
- package/src/interface/controller/state/control/i-tree.state.ts +14 -0
- package/src/interface/provider/i-platform-provider.ts +43 -2
- package/src/locale/en/index.ts +4 -0
- package/src/locale/zh-CN/index.ts +3 -0
- package/src/platform/provider/platform-provider-base.ts +1 -2
- package/src/service/vo/tree-node-data/tree-code-list-node-data.ts +2 -0
- package/src/service/vo/tree-node-data/tree-data-set-node-data.ts +35 -0
- package/src/service/vo/tree-node-data/tree-node-data.ts +33 -0
- package/src/service/vo/tree-node-data/tree-static-node-data.ts +2 -0
- package/src/ui-action/provider/front-ui-action-provider.ts +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,yBAAyB,EACzB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAUrB;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,OAAO,EAAE,oBAAoB,CAI3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAWrB;IAGF,MAAM,EAAE,sBAAsB,CAG5B;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAGjC;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,MAAM,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,yBAAyB,EACzB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAUrB;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,OAAO,EAAE,oBAAoB,CAI3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAWrB;IAGF,MAAM,EAAE,sBAAsB,CAG5B;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAGjC;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,MAAM,EAAE,mBAAmB,CA0BzB;IAGF,KAAK,EAAE,sBAAsB,CAI3B;IAGF,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,SAAS,GAAG,OAAO,CAAW;IAGjD,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAQ;IAGjD,SAAS,EAAE,yBAAyB,CAmBlC;IAEF;;;;OAIG;IACH,GAAG,EAAE,gBAAgB,CAWnB;IAEF;;;;OAIG;IACH,iBAAiB,EAAE,wBAAwB,CAIzC;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predefined-attributes.d.ts","sourceRoot":"","sources":["../../src/constant/predefined-attributes.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,oBAAoB;IAC9B;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"predefined-attributes.d.ts","sourceRoot":"","sources":["../../src/constant/predefined-attributes.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,oBAAoB;IAC9B;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,MAAM,WAAW;IAEjB;;OAEG;IACH,mBAAmB,wBAAwB;CAC5C"}
|
|
@@ -734,7 +734,7 @@ export class MDControlController extends ControlController {
|
|
|
734
734
|
// 'DataExport',
|
|
735
735
|
// {
|
|
736
736
|
// dismiss: (result: unknown) => popover.dismiss(result),
|
|
737
|
-
// maxRowCount: dataExport.maxRowCount ||
|
|
737
|
+
// maxRowCount: dataExport.maxRowCount || ibiz.config.common.maxExportRowsDefault,
|
|
738
738
|
// pageSize: this.state.size,
|
|
739
739
|
// },
|
|
740
740
|
// { autoClose: true, placement: 'bottom-end' },
|
|
@@ -4,7 +4,7 @@ import { AppCounter } from '../../../../service';
|
|
|
4
4
|
import { ControlController } from '../../../common';
|
|
5
5
|
import { FormNotifyState } from '../../../constant';
|
|
6
6
|
import { ControllerEvent } from '../../../utils';
|
|
7
|
-
import type { FormDRUIPartController, FormGroupPanelController, FormItemController, FormMDCtrlController } from '../form-detail';
|
|
7
|
+
import type { FormDRUIPartController, FormDetailController, FormGroupPanelController, FormItemController, FormMDCtrlController } from '../form-detail';
|
|
8
8
|
import { FormService } from './form.service';
|
|
9
9
|
/**
|
|
10
10
|
* 表单控制器
|
|
@@ -254,6 +254,14 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
|
|
|
254
254
|
* @memberof FormController
|
|
255
255
|
*/
|
|
256
256
|
silentValidate(): Promise<boolean>;
|
|
257
|
+
/**
|
|
258
|
+
* 输出校验失败的错误日志
|
|
259
|
+
* @description 收集校验失败的表单成员名称，通过 ibiz.log.error 输出。名称使用表单成员标识
|
|
260
|
+
* @protected
|
|
261
|
+
* @param {FormDetailController[]} failedDetails 校验失败的表单成员集合
|
|
262
|
+
* @memberof FormController
|
|
263
|
+
*/
|
|
264
|
+
protected logValidateFail(failedDetails: FormDetailController[]): void;
|
|
257
265
|
/**
|
|
258
266
|
* 执行对应部件行为消息提示
|
|
259
267
|
* @author zzq
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,aAAa,EACb,OAAO,EACP,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,UAAU,EAIX,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,sBAAsB,
|
|
1
|
+
{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -426,8 +426,19 @@ export class FormController extends ControlController {
|
|
|
426
426
|
* @returns {*} {Promise<boolean>}
|
|
427
427
|
*/
|
|
428
428
|
async validate() {
|
|
429
|
-
const
|
|
430
|
-
|
|
429
|
+
const details = [
|
|
430
|
+
...this.formItems,
|
|
431
|
+
...this.formMDCtrls,
|
|
432
|
+
...this.formDruipart,
|
|
433
|
+
];
|
|
434
|
+
const values = await Promise.all(details.map(detail => detail.validate()));
|
|
435
|
+
const result = values.findIndex(value => !value) === -1;
|
|
436
|
+
if (!result) {
|
|
437
|
+
// 收集校验失败的成员并输出错误日志
|
|
438
|
+
const failedDetails = details.filter((_, index) => !values[index]);
|
|
439
|
+
this.logValidateFail(failedDetails);
|
|
440
|
+
}
|
|
441
|
+
return result;
|
|
431
442
|
}
|
|
432
443
|
/**
|
|
433
444
|
* @description 处理校验失败
|
|
@@ -457,9 +468,39 @@ export class FormController extends ControlController {
|
|
|
457
468
|
* @memberof FormController
|
|
458
469
|
*/
|
|
459
470
|
async silentValidate() {
|
|
460
|
-
const
|
|
471
|
+
const details = [
|
|
472
|
+
...this.formItems,
|
|
473
|
+
...this.formMDCtrls,
|
|
474
|
+
...this.formDruipart,
|
|
475
|
+
];
|
|
476
|
+
const values = await Promise.all(details.map(detail => detail.silentValidate()));
|
|
461
477
|
// 找不到value为false即全部是true
|
|
462
|
-
|
|
478
|
+
const result = values.findIndex(value => !value) === -1;
|
|
479
|
+
if (!result) {
|
|
480
|
+
// 收集校验失败的成员并输出错误日志
|
|
481
|
+
const failedDetails = details.filter((_, index) => !values[index]);
|
|
482
|
+
this.logValidateFail(failedDetails);
|
|
483
|
+
}
|
|
484
|
+
return result;
|
|
485
|
+
}
|
|
486
|
+
/**
|
|
487
|
+
* 输出校验失败的错误日志
|
|
488
|
+
* @description 收集校验失败的表单成员名称，通过 ibiz.log.error 输出。名称使用表单成员标识
|
|
489
|
+
* @protected
|
|
490
|
+
* @param {FormDetailController[]} failedDetails 校验失败的表单成员集合
|
|
491
|
+
* @memberof FormController
|
|
492
|
+
*/
|
|
493
|
+
logValidateFail(failedDetails) {
|
|
494
|
+
const separator = ibiz.i18n.t('runtime.controller.control.form.validateFailSeparator');
|
|
495
|
+
const names = failedDetails
|
|
496
|
+
.map(detail => detail.model.id || '')
|
|
497
|
+
.filter(name => !!name);
|
|
498
|
+
if (names.length === 0) {
|
|
499
|
+
return;
|
|
500
|
+
}
|
|
501
|
+
ibiz.log.error(ibiz.i18n.t('runtime.controller.control.form.validateFail', {
|
|
502
|
+
names: names.join(separator),
|
|
503
|
+
}));
|
|
463
504
|
}
|
|
464
505
|
/**
|
|
465
506
|
* 执行对应部件行为消息提示
|
|
@@ -539,7 +580,15 @@ export class FormController extends ControlController {
|
|
|
539
580
|
* @memberof FormController
|
|
540
581
|
*/
|
|
541
582
|
setDetailError(name, message) {
|
|
542
|
-
|
|
583
|
+
let detail = this.details[name];
|
|
584
|
+
// 界面表单项标识和属性标识可能不一致，尝试通过属性标识找下表单项，后台返回错误信息是以属性标识返回
|
|
585
|
+
if (!detail) {
|
|
586
|
+
detail = Object.values(this.details).find((item) => {
|
|
587
|
+
var _a;
|
|
588
|
+
const fieldId = (_a = item === null || item === void 0 ? void 0 : item.model) === null || _a === void 0 ? void 0 : _a.appDEFieldId;
|
|
589
|
+
return !!fieldId && fieldId === name;
|
|
590
|
+
});
|
|
591
|
+
}
|
|
543
592
|
const state = detail === null || detail === void 0 ? void 0 : detail.state;
|
|
544
593
|
if (state) {
|
|
545
594
|
state.error = message;
|
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,eAAe,EAEf,uBAAuB,EACxB,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;
|
|
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,eAAe,EAEf,uBAAuB,EACxB,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;IA6CvC;;;;;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"}
|
|
@@ -77,11 +77,16 @@ export class FormDRUIPartController extends FormDetailController {
|
|
|
77
77
|
}
|
|
78
78
|
// 主表单保存之前
|
|
79
79
|
this.form.evt.on('onBeforeSave', async () => {
|
|
80
|
+
var _a;
|
|
80
81
|
// 处理子应用同实体表单合并关系界面（手动触发子数据保存、再将子数据同步到主表单）
|
|
81
82
|
if (this.isNeedSyncEmbed && this.embedView && this.embedDataService) {
|
|
82
83
|
await this.saveEmbedViewData();
|
|
83
84
|
await this.SyncEmbedDataToForm();
|
|
84
85
|
}
|
|
86
|
+
else if (this.model.needSave && this.embedView) {
|
|
87
|
+
// 常规子视图保存
|
|
88
|
+
await ((_a = this.embedView) === null || _a === void 0 ? void 0 : _a.call(SysUIActionTag.SAVE));
|
|
89
|
+
}
|
|
85
90
|
});
|
|
86
91
|
}
|
|
87
92
|
}
|
|
@@ -534,6 +534,10 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
|
|
|
534
534
|
getDataExcelModel(): {
|
|
535
535
|
header: string[];
|
|
536
536
|
fields: string[];
|
|
537
|
+
exportColumns: IData[];
|
|
538
|
+
colWidths: {
|
|
539
|
+
wpx: number;
|
|
540
|
+
}[];
|
|
537
541
|
};
|
|
538
542
|
/**
|
|
539
543
|
* 格式化导出数据
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,aAAa,EAEb,gBAAgB,EAIjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,qBAAqB,EACrB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,aAAa,EAEb,gBAAgB,EAIjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,qBAAqB,EACrB,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAKL,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAcxB;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,eAAe,IAAI,OAAO,CAQ7B;IAED;;;;;OAKG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,KAAK,GAAG,KAAK,CAUzC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,WAAW,GAAG,MAAM,GAAG,QAAQ,CAKlD;IAED;;;;;;;OAOG;IACH,IAAI,mBAAmB,IAAI,SAAS,GAAG,OAAO,CAK7C;IAED;;;;;OAKG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,OAAO,GAAG,QAAQ,CAG7C;IAED;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAM;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,EAAE,CAAM;IAE3B;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAwD;IAExE;;;;;OAKG;IACH,UAAU,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAM;IAEvC;;;;;OAKG;IACH,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAC,CAAa;IAEvE;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAM;IAEvC;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,kBAAkB,IAAI,OAAO,CAEhC;IAED;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAElC,SAAS,CAAC,SAAS,IAAI,IAAI;IAkB3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C;;;;OAIG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB9C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IASnC;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAOtC;;;;;OAKG;IAEH,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,IAAI;IA4BpC;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCzC;;;;;;OAMG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC/C;;;;;;OAMG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BtD;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAoCvB;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAMzD;;;OAGG;IACG,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtD;;;;;;OAMG;IACG,SAAS,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B3E;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAuC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BxC,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAQjE;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAMnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDxD;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC3E;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAmDlC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,CAC7B,IAAI,EAAE,YAAY,EAAE,EACpB,KAAK,EAAE,YAAY,EAAE,GACpB,YAAY,EAAE;IAiBjB;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;;OASG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IASnD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAS/B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IASpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAwDhB;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAWvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgD5E;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;OAKG;IACG,oBAAoB,CACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,EAAE,CAAC;IA2B3B;;;;;OAKG;IACH,WAAW,WACD,OAAO,gBACD,MAAM,UACb,OAAO,KACb,MAAM,CAWP;IAEF;;;OAGG;IACH,iBAAiB,IAAI;QACnB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,aAAa,EAAE,KAAK,EAAE,CAAC;QACvB,SAAS,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC9B;IA6CD;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE;IAmDzD;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAkC/D;;;OAGG;IACG,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4ClE;;;;;OAKG;IACG,UAAU,CAAC,IAAI,EAAE;QACrB,MAAM,EAAE,gBAAgB,CAAC;QACzB,KAAK,EAAE,UAAU,CAAC;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwDjB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAwBtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAuB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IASjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA8C5C;;;;;OAKG;IACH,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI;IAcP;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAoBxB;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QACvB,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,aAAa,CAAC;KAC1B,GACA,IAAI;IAqBP;;;;;OAKG;IACG,YAAY,CAChB,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,MAAM,GAAG,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAwBhB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAoBrB;;;;;OAKG;IACH,cAAc,CAAC,MAAM,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,IAAI;IAoBrE;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAWlD;;;;;;;OAOG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,qBAAqB,EACjD,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,MAAM,GACT,qBAAqB,CAAC,CAAC,CAAC;IAI3B;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7C"}
|
|
@@ -15,6 +15,7 @@ import { ValueExUtil, isValueChange, getDefaultValue, getEntitySchema, } from '.
|
|
|
15
15
|
import { ScriptFactory, convertNavData, handleAllSettled, } from '../../../../utils';
|
|
16
16
|
import { calcColumnModelBySchema } from './entity-schema';
|
|
17
17
|
import { newRowDynamic, switchRowEditDynamic, initModelByEntitySchema, } from './auto-grid.util';
|
|
18
|
+
import { PredefinedAttributes } from '../../../../constant';
|
|
18
19
|
/**
|
|
19
20
|
* 表格控制器
|
|
20
21
|
*
|
|
@@ -1289,11 +1290,14 @@ export class GridController extends MDControlController {
|
|
|
1289
1290
|
const excelModel = {
|
|
1290
1291
|
header: [],
|
|
1291
1292
|
fields: [],
|
|
1293
|
+
exportColumns: [],
|
|
1294
|
+
colWidths: [],
|
|
1292
1295
|
};
|
|
1293
1296
|
if (dedataExportId) {
|
|
1294
1297
|
if (this.allExportColumns.length) {
|
|
1295
1298
|
excelModel.fields = this.allExportColumns.map(x => x.appDEFieldId);
|
|
1296
1299
|
excelModel.header = this.allExportColumns.map(x => x.caption);
|
|
1300
|
+
excelModel.exportColumns = this.allExportColumns;
|
|
1297
1301
|
}
|
|
1298
1302
|
}
|
|
1299
1303
|
else {
|
|
@@ -1311,6 +1315,12 @@ export class GridController extends MDControlController {
|
|
|
1311
1315
|
});
|
|
1312
1316
|
excelModel.fields = exportColumns.map(item => item.id);
|
|
1313
1317
|
excelModel.header = exportColumns.map(item => item.caption);
|
|
1318
|
+
excelModel.colWidths = exportColumns.map(item => {
|
|
1319
|
+
return {
|
|
1320
|
+
wpx: item.width || 150,
|
|
1321
|
+
};
|
|
1322
|
+
});
|
|
1323
|
+
excelModel.exportColumns = exportColumns;
|
|
1314
1324
|
}
|
|
1315
1325
|
return excelModel;
|
|
1316
1326
|
}
|
|
@@ -1386,7 +1396,11 @@ export class GridController extends MDControlController {
|
|
|
1386
1396
|
offset: (startPage - 1) * size,
|
|
1387
1397
|
size: (endPage - startPage + 1) * size,
|
|
1388
1398
|
}
|
|
1389
|
-
: {
|
|
1399
|
+
: {
|
|
1400
|
+
size: ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.maxRowCount) ||
|
|
1401
|
+
ibiz.config.common.maxExportRowsDefault,
|
|
1402
|
+
page: 0,
|
|
1403
|
+
};
|
|
1390
1404
|
data = await this.loadData({ viewParam });
|
|
1391
1405
|
}
|
|
1392
1406
|
else if (type === 'selectedRows') {
|
|
@@ -1434,7 +1448,11 @@ export class GridController extends MDControlController {
|
|
|
1434
1448
|
offset: (startPage - 1) * size,
|
|
1435
1449
|
size: (endPage - startPage + 1) * size,
|
|
1436
1450
|
}
|
|
1437
|
-
: {
|
|
1451
|
+
: {
|
|
1452
|
+
size: ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.maxRowCount) ||
|
|
1453
|
+
ibiz.config.common.maxExportRowsDefault,
|
|
1454
|
+
page: 0,
|
|
1455
|
+
};
|
|
1438
1456
|
}
|
|
1439
1457
|
Object.assign(fetchParams, tempParams);
|
|
1440
1458
|
// 执行导出
|
|
@@ -1447,18 +1465,18 @@ export class GridController extends MDControlController {
|
|
|
1447
1465
|
* @memberof GridController
|
|
1448
1466
|
*/
|
|
1449
1467
|
async exportData(args) {
|
|
1450
|
-
var _a, _b;
|
|
1468
|
+
var _a, _b, _c;
|
|
1451
1469
|
if ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.enableBackend) {
|
|
1452
1470
|
await this.excuteBackendExport(args.params);
|
|
1453
1471
|
return;
|
|
1454
1472
|
}
|
|
1455
|
-
const { header, fields } = this.getDataExcelModel();
|
|
1456
|
-
if (!header) {
|
|
1457
|
-
throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.tabularColumns'));
|
|
1458
|
-
}
|
|
1459
1473
|
// 导出前先填充导出代码表数据
|
|
1460
1474
|
await this.fillExportCodelistMap();
|
|
1461
1475
|
const data = await this.getExportData(args.params);
|
|
1476
|
+
const { header, fields, exportColumns, colWidths } = this.getDataExcelModel();
|
|
1477
|
+
if (!header) {
|
|
1478
|
+
throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.tabularColumns'));
|
|
1479
|
+
}
|
|
1462
1480
|
const formatData = this.formatExcelData(data, fields);
|
|
1463
1481
|
const table = formatData.map(v => Object.values(v));
|
|
1464
1482
|
// 获取导出文件名,如果有自定义文件名格式则使用自定义文件名格式
|
|
@@ -1471,11 +1489,30 @@ export class GridController extends MDControlController {
|
|
|
1471
1489
|
now: new Date(),
|
|
1472
1490
|
});
|
|
1473
1491
|
}
|
|
1474
|
-
|
|
1492
|
+
// 准备前台导出参数
|
|
1493
|
+
const frontExportParams = {
|
|
1475
1494
|
header,
|
|
1476
1495
|
data: table,
|
|
1477
1496
|
fileName,
|
|
1497
|
+
colWidths: () => {
|
|
1498
|
+
return colWidths;
|
|
1499
|
+
},
|
|
1500
|
+
};
|
|
1501
|
+
// 前台导出注入属性识别
|
|
1502
|
+
const frontExportAttri = (_c = this.model.controlAttributes) === null || _c === void 0 ? void 0 : _c.find(item => {
|
|
1503
|
+
return item.attrName === PredefinedAttributes.BEFORE_FRONT_EXPORT;
|
|
1478
1504
|
});
|
|
1505
|
+
if (frontExportAttri) {
|
|
1506
|
+
const { attrValue } = frontExportAttri;
|
|
1507
|
+
if (attrValue) {
|
|
1508
|
+
const frontExportResult = await ScriptFactory.asyncExecScriptFn({ exportColumns, data }, attrValue);
|
|
1509
|
+
if (frontExportResult) {
|
|
1510
|
+
Object.assign(frontExportParams, frontExportResult);
|
|
1511
|
+
}
|
|
1512
|
+
}
|
|
1513
|
+
}
|
|
1514
|
+
// 导出数据
|
|
1515
|
+
await ibiz.platform.frontExport(frontExportParams);
|
|
1479
1516
|
}
|
|
1480
1517
|
/**
|
|
1481
1518
|
* 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
|
|
@@ -218,12 +218,13 @@ export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl,
|
|
|
218
218
|
findAllExportColumns(dataExport: IAppDEDataExport): Promise<IExportColumn[]>;
|
|
219
219
|
/**
|
|
220
220
|
* @description 获取数据导出模型
|
|
221
|
-
* @returns {*} {{ header: string[]
|
|
221
|
+
* @returns {*} {{ header: string[], fields: string[], exportColumns: IData[] }}
|
|
222
222
|
* @memberof MDCtrlController
|
|
223
223
|
*/
|
|
224
224
|
getDataExcelModel(): {
|
|
225
225
|
header: string[];
|
|
226
226
|
fields: string[];
|
|
227
|
+
exportColumns: IData[];
|
|
227
228
|
};
|
|
228
229
|
/**
|
|
229
230
|
* @description 加载数据(只加载数据 不做其他操作)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAEhB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,gBAAgB,
|
|
1
|
+
{"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ import { MDControlController } from '../../common';
|
|
|
7
7
|
import { UIActionUtil } from '../../../ui-action';
|
|
8
8
|
import { ButtonContainerState, UIActionButtonState } from '../../utils';
|
|
9
9
|
import { calcUIActionGroup, getAllUIActionItems } from '../../../model';
|
|
10
|
+
import { ScriptFactory } from '../../../utils';
|
|
11
|
+
import { PredefinedAttributes } from '../../../constant';
|
|
10
12
|
export class MDCtrlController extends MDControlController {
|
|
11
13
|
constructor() {
|
|
12
14
|
super(...arguments);
|
|
@@ -469,7 +471,7 @@ export class MDCtrlController extends MDControlController {
|
|
|
469
471
|
}
|
|
470
472
|
/**
|
|
471
473
|
* @description 获取数据导出模型
|
|
472
|
-
* @returns {*} {{ header: string[]
|
|
474
|
+
* @returns {*} {{ header: string[], fields: string[], exportColumns: IData[] }}
|
|
473
475
|
* @memberof MDCtrlController
|
|
474
476
|
*/
|
|
475
477
|
getDataExcelModel() {
|
|
@@ -477,11 +479,13 @@ export class MDCtrlController extends MDControlController {
|
|
|
477
479
|
const excelModel = {
|
|
478
480
|
header: [],
|
|
479
481
|
fields: [],
|
|
482
|
+
exportColumns: [],
|
|
480
483
|
};
|
|
481
484
|
if (dedataExportId) {
|
|
482
485
|
if (this.allExportColumns.length) {
|
|
483
486
|
excelModel.fields = this.allExportColumns.map(x => x.appDEFieldId);
|
|
484
487
|
excelModel.header = this.allExportColumns.map(x => x.caption);
|
|
488
|
+
excelModel.exportColumns = this.allExportColumns;
|
|
485
489
|
}
|
|
486
490
|
}
|
|
487
491
|
return excelModel;
|
|
@@ -530,7 +534,11 @@ export class MDCtrlController extends MDControlController {
|
|
|
530
534
|
offset: (startPage - 1) * size,
|
|
531
535
|
size: (endPage - startPage + 1) * size,
|
|
532
536
|
}
|
|
533
|
-
: {
|
|
537
|
+
: {
|
|
538
|
+
size: ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.maxRowCount) ||
|
|
539
|
+
ibiz.config.common.maxExportRowsDefault,
|
|
540
|
+
page: 0,
|
|
541
|
+
};
|
|
534
542
|
data = await this.loadData({ viewParam });
|
|
535
543
|
}
|
|
536
544
|
else if (type === 'selectedRows') {
|
|
@@ -625,7 +633,11 @@ export class MDCtrlController extends MDControlController {
|
|
|
625
633
|
offset: (startPage - 1) * size,
|
|
626
634
|
size: (endPage - startPage + 1) * size,
|
|
627
635
|
}
|
|
628
|
-
: {
|
|
636
|
+
: {
|
|
637
|
+
size: ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.maxRowCount) ||
|
|
638
|
+
ibiz.config.common.maxExportRowsDefault,
|
|
639
|
+
page: 0,
|
|
640
|
+
};
|
|
629
641
|
}
|
|
630
642
|
Object.assign(fetchParams, tempParams);
|
|
631
643
|
// 执行导出
|
|
@@ -641,22 +653,41 @@ export class MDCtrlController extends MDControlController {
|
|
|
641
653
|
* @memberof MDCtrlController
|
|
642
654
|
*/
|
|
643
655
|
async exportData(args = {}) {
|
|
644
|
-
var _a;
|
|
656
|
+
var _a, _b;
|
|
645
657
|
if ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.enableBackend) {
|
|
646
658
|
await this.excuteBackendExport(args.params || {});
|
|
647
659
|
return;
|
|
648
660
|
}
|
|
649
|
-
const { header, fields } = this.getDataExcelModel();
|
|
661
|
+
const { header, fields, exportColumns } = this.getDataExcelModel();
|
|
650
662
|
if (!header) {
|
|
651
663
|
throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.tabularColumns'));
|
|
652
664
|
}
|
|
653
665
|
const data = await this.getExportData(args.params || {});
|
|
654
666
|
const formatData = this.formatExcelData(data, fields);
|
|
655
667
|
const table = formatData.map(v => Object.values(v));
|
|
656
|
-
|
|
668
|
+
// 准备前台导出参数
|
|
669
|
+
const frontExportParams = {
|
|
657
670
|
header,
|
|
658
671
|
data: table,
|
|
659
672
|
fileName: this.model.logicName,
|
|
673
|
+
colWidths: () => {
|
|
674
|
+
return [];
|
|
675
|
+
},
|
|
676
|
+
};
|
|
677
|
+
// 前台导出注入属性识别
|
|
678
|
+
const frontExportAttri = (_b = this.model.controlAttributes) === null || _b === void 0 ? void 0 : _b.find(item => {
|
|
679
|
+
return item.attrName === PredefinedAttributes.BEFORE_FRONT_EXPORT;
|
|
660
680
|
});
|
|
681
|
+
if (frontExportAttri) {
|
|
682
|
+
const { attrValue } = frontExportAttri;
|
|
683
|
+
if (attrValue) {
|
|
684
|
+
const frontExportResult = await ScriptFactory.asyncExecScriptFn({ exportColumns, data }, attrValue);
|
|
685
|
+
if (frontExportResult) {
|
|
686
|
+
Object.assign(frontExportParams, frontExportResult);
|
|
687
|
+
}
|
|
688
|
+
}
|
|
689
|
+
}
|
|
690
|
+
// 导出数据
|
|
691
|
+
await ibiz.platform.frontExport(frontExportParams);
|
|
661
692
|
}
|
|
662
693
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { IApiData, IPortalMessage } from '@ibiz-template/core';
|
|
1
2
|
import { IDEMultiEditViewPanel } from '@ibiz/model-core';
|
|
2
|
-
import { IMEditViewPanelState, IMEditViewPanelEvent, IMEditViewPanelController, MDCtrlLoadParams, IPanelUiItem, DataChangeEvent, EventBase, IViewController } from '../../../interface';
|
|
3
|
+
import { IMEditViewPanelState, IMEditViewPanelEvent, IMEditViewPanelController, MDCtrlLoadParams, IPanelUiItem, DataChangeEvent, EventBase, IViewController, IApiFormSaveParams } from '../../../interface';
|
|
3
4
|
import { ControlVO } from '../../../service';
|
|
4
5
|
import { MDControlController } from '../../common';
|
|
5
6
|
import { MEditViewPanelService } from './medit-view-panel.service';
|
|
@@ -114,5 +115,19 @@ export declare class MEditViewPanelController extends MDControlController<IDEMul
|
|
|
114
115
|
* @memberof MEditViewPanelController
|
|
115
116
|
*/
|
|
116
117
|
getActiveView(): IViewController | undefined;
|
|
118
|
+
/**
|
|
119
|
+
* @description 检测实体数据变更，子视图数据变更不应该触发列表加载
|
|
120
|
+
* @protected
|
|
121
|
+
* @param {IPortalMessage} _msg
|
|
122
|
+
* @memberof MEditViewPanelController
|
|
123
|
+
*/
|
|
124
|
+
protected onDEDataChange(_msg: IPortalMessage): void;
|
|
125
|
+
/**
|
|
126
|
+
* @description 保存数据
|
|
127
|
+
* @param {IApiFormSaveParams} [args]
|
|
128
|
+
* @returns {*} {Promise<IApiData[]>}
|
|
129
|
+
* @memberof MEditViewPanelController
|
|
130
|
+
*/
|
|
131
|
+
save(args?: IApiFormSaveParams): Promise<IApiData[]>;
|
|
117
132
|
}
|
|
118
133
|
//# sourceMappingURL=medit-view-panel.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/medit-view-panel/medit-view-panel.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/medit-view-panel/medit-view-panel.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAgB,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,SAAS,EACT,eAAe,EACf,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE;;;;;;GAMG;AACH,qBAAa,wBACX,SAAQ,mBAAmB,CACzB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAE5B,OAAO,EAAE,qBAAqB,CAAC;IAEvC;;;OAGG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;OAIG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAa;cAErC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBrC;;;;;;;;OAQG;IACG,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAmBvB;;;;;;OAMG;IACH,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,YAAY;IAqCnD;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,gBAAgB,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI;IAUpE;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BrD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAW9B;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAOzD;;;;;OAKG;IACG,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBlE;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK/B;;;;OAIG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAQjD;;;;OAIG;IACH,aAAa,IAAI,eAAe,GAAG,SAAS;IAI5C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAMpD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,kBAAqC,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAiB7E"}
|
|
@@ -3,6 +3,7 @@ import { RuntimeError } from '@ibiz-template/core';
|
|
|
3
3
|
import { createUUID } from 'qx-util';
|
|
4
4
|
import { MDControlController } from '../../common';
|
|
5
5
|
import { MEditViewPanelService } from './medit-view-panel.service';
|
|
6
|
+
import { SysUIActionTag } from '../../../constant';
|
|
6
7
|
/**
|
|
7
8
|
* 多编辑视图面板部件控制器
|
|
8
9
|
* @export
|
|
@@ -276,4 +277,34 @@ export class MEditViewPanelController extends MDControlController {
|
|
|
276
277
|
getActiveView() {
|
|
277
278
|
return this.embedViews.get(this.state.activeTab);
|
|
278
279
|
}
|
|
280
|
+
/**
|
|
281
|
+
* @description 检测实体数据变更，子视图数据变更不应该触发列表加载
|
|
282
|
+
* @protected
|
|
283
|
+
* @param {IPortalMessage} _msg
|
|
284
|
+
* @memberof MEditViewPanelController
|
|
285
|
+
*/
|
|
286
|
+
onDEDataChange(_msg) {
|
|
287
|
+
ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.meditViewPanel.ignoreDataChange'));
|
|
288
|
+
}
|
|
289
|
+
/**
|
|
290
|
+
* @description 保存数据
|
|
291
|
+
* @param {IApiFormSaveParams} [args]
|
|
292
|
+
* @returns {*} {Promise<IApiData[]>}
|
|
293
|
+
* @memberof MEditViewPanelController
|
|
294
|
+
*/
|
|
295
|
+
async save(args = { silent: true }) {
|
|
296
|
+
if (this.state.panelUiItems.length === 0) {
|
|
297
|
+
return [];
|
|
298
|
+
}
|
|
299
|
+
const allViews = this.state.panelUiItems.map(item => {
|
|
300
|
+
return this.embedViews.get(item.id);
|
|
301
|
+
});
|
|
302
|
+
if (allViews.length === 0) {
|
|
303
|
+
return [];
|
|
304
|
+
}
|
|
305
|
+
const result = await Promise.all(allViews.map(async (view) => {
|
|
306
|
+
return view === null || view === void 0 ? void 0 : view.call(SysUIActionTag.SAVE, args);
|
|
307
|
+
}));
|
|
308
|
+
return result.flatMap(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.data) !== null && _a !== void 0 ? _a : []; });
|
|
309
|
+
}
|
|
279
310
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { IHttpResponse, SelectFileOpts } from '@ibiz-template/core';
|
|
2
2
|
import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
|
|
3
|
+
import { IFrontExportParams } from '../../../interface';
|
|
3
4
|
export type ImportDataResult = {
|
|
4
5
|
/**
|
|
5
6
|
* 是否是异步导入
|
|
@@ -72,7 +73,7 @@ export declare function importData2(opts: {
|
|
|
72
73
|
* @param {string} fileName
|
|
73
74
|
* @return {*} {Promise<IExportDataResult>}
|
|
74
75
|
*/
|
|
75
|
-
export declare function exportData(
|
|
76
|
+
export declare function exportData(args: IFrontExportParams): Promise<IExportDataResult>;
|
|
76
77
|
/**
|
|
77
78
|
* 获取导入相关模型
|
|
78
79
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAIb,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"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"}
|