@ibiz-template/runtime 0.2.7 → 0.2.9

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

@@ -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;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"}
+{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEhF,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;cAsB1B,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"}

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

@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
+import { debounce } from 'lodash-es';
 import { calcDeCodeNameById } from '../../../model';
 import { Srfuf } from '../../../service';
 import { handleAllSettled } from '../../../utils';
@@ -51,7 +52,10 @@ export class MDControlController extends ControlController {
         (_a = this.dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
             this.fieldIdNameMap.set(field.id, field.name);
         });
-        this.onDataChange = this.onDataChange.bind(this);
+        const fn = this.onDataChange.bind(this);
+        this.onDataChange = debounce(msg => {
+            fn(msg);
+        }, 300);
         ibiz.mc.command.change.on(this.onDataChange);
         // 设置默认排序
         this.setSort();
@@ -347,27 +351,22 @@ export class MDControlController extends ControlController {
      * @returns {*}  {Promise<void>}
      */
     async importData() {
-        // const { appEntity, dataImport } = this.model;
-        // let templateUrl = `${appEntity.deNamePlural}/importtemplate`;
-        // let importUrl = `${appEntity.deNamePlural}/importdata2`;
-        // if (dataImport) {
-        //   templateUrl += `?srfimporttag=${dataImport.codeName}`;
-        //   importUrl += `?srfimporttag=${dataImport.codeName}`;
-        // }
-        // const modal = ibiz.overlay.createModal(
-        //   'DataImport',
-        //   {
-        //     dismiss: () => modal.dismiss(),
-        //     templateUrl,
-        //     importUrl,
-        //   },
-        //   {
-        //     width: 'auto',
-        //     placement: 'center',
-        //   },
-        // );
-        // modal.present();
-        // await modal.onWillDismiss();
+        var _a;
+        const { appDataEntityId, dedataImportId } = this.model;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId);
+        const dataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find((importItem) => importItem.id === dedataImportId);
+        if (!dataImport) {
+            throw new RuntimeError('无导入模型！');
+        }
+        const modal = ibiz.overlay.createModal('DataImport', {
+            dismiss: () => modal.dismiss(),
+            appDataEntity,
+        }, {
+            width: 'auto',
+            placement: 'center',
+        });
+        modal.present();
+        await modal.onWillDismiss();
     }
     /**
      * 数据导出

package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAiC1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA8CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA4CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAqDrD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
+{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAiC1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA8CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA4CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAqDrD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}

package/out/controller/control/form/edit-form/edit-form.controller.js

@@ -346,6 +346,9 @@ export class EditFormController extends FormController {
         const { context, params } = this.handlerAbilityParams(args);
         try {
             await this.service.wfStart(context, params, this.data);
+            if (this.view.modal.mode === 'ROUTE') {
+                ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+            }
         }
         catch (error) {
             this.actionNotification('WFSTARTERROR', {
@@ -375,6 +378,9 @@ export class EditFormController extends FormController {
         const { context, params } = this.handlerAbilityParams(args);
         try {
             await this.service.wfSubmit(context, params, this.data);
+            if (this.view.modal.mode === 'ROUTE') {
+                ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+            }
         }
         catch (error) {
             this.actionNotification('WFSUBMITERROR', {

package/out/controller/control/form/form-detail/form-detail/form-detail.controller.d.ts

@@ -60,6 +60,17 @@ export declare class FormDetailController<T extends IDEFormDetail = IDEFormDetai
      * @type {string[]}
      */
     get labelClass(): string[];
+    /**
+     * 动态逻辑结果
+     * @author lxm
+     * @date 2023-09-21 03:36:37
+     * @protected
+     */
+    protected dynaLogicResult: {
+        visible?: boolean;
+        disabled?: boolean;
+        required?: boolean;
+    };
     /**
      * Creates an instance of FormDetailController.
      * @author lxm
@@ -144,16 +155,5 @@ export declare class FormDetailController<T extends IDEFormDetail = IDEFormDetai
      * @param {IData} data
      */
     calcDetailRequired(data: IData): void;
-    /**
-     * 动态逻辑结果
-     * @author lxm
-     * @date 2023-09-21 03:36:37
-     * @protected
-     */
-    protected dynaLogicResult: {
-        visible: boolean;
-        disabled: boolean;
-        required: boolean;
-    };
 }
 //# sourceMappingURL=form-detail.controller.d.ts.map

package/out/controller/control/form/form-detail/form-detail/form-detail.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAiBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBrC;;;;;OAKG;IACH,SAAS,CAAC,eAAe;;;;MAIvB;CACH"}
+{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAqBtC"}

package/out/controller/control/form/form-detail/form-detail/form-detail.controller.js

@@ -47,9 +47,9 @@ export class FormDetailController {
          * @protected
          */
         this.dynaLogicResult = {
-            visible: true,
-            disabled: false,
-            required: false,
+            visible: undefined,
+            disabled: undefined,
+            required: undefined,
         };
         this.model = model;
         this.form = form;
@@ -210,18 +210,20 @@ export class FormDetailController {
      * @param {IData} data
      */
     calcDetailDisabled(data) {
-        let enable = !this.dynaLogicResult.disabled;
+        let { disabled } = this.dynaLogicResult;
         // 上层计算为启用时计算预定义项启用逻辑
-        if (enable && this.form.scheduler) {
+        if (disabled !== true && this.form.scheduler) {
             const itemEnable = this.form.scheduler.triggerItemEnable(this.model.id, {
                 data: [data],
             });
             if (itemEnable !== undefined) {
-                enable = itemEnable;
+                disabled = !itemEnable;
             }
         }
-        // 修改state
-        this.state.disabled = !enable;
+        // 有值的时候才会去修改state
+        if (disabled !== undefined) {
+            this.state.disabled = disabled;
+        }
     }
     /**
      * 计算项的显示状态
@@ -231,7 +233,7 @@ export class FormDetailController {
     calcDetailVisible(data) {
         let { visible } = this.dynaLogicResult;
         // 上层计算为显示时计算预定义项显示逻辑
-        if (visible && this.form.scheduler) {
+        if (visible !== false && this.form.scheduler) {
             const itemVIsible = this.form.scheduler.triggerItemVisible(this.model.id, {
                 data: [data],
             });
@@ -239,8 +241,10 @@ export class FormDetailController {
                 visible = itemVIsible;
             }
         }
-        // 修改state
-        this.state.visible = visible;
+        // 有值的时候才会去修改state
+        if (visible !== undefined) {
+            this.state.visible = visible;
+        }
     }
     /**
      * 计算项的必填状态
@@ -248,17 +252,19 @@ export class FormDetailController {
      * @param {IData} data
      */
     calcDetailRequired(data) {
-        let allowEmpty = !this.dynaLogicResult.required;
+        let { required } = this.dynaLogicResult;
         // 上层计算为启用时计算预定义项空输入逻辑
-        if (allowEmpty && this.form.scheduler) {
+        if (required !== true && this.form.scheduler) {
             const itemAllowEmpty = this.form.scheduler.triggerItemBlank(this.model.id, {
                 data: [data],
             });
             if (itemAllowEmpty !== undefined) {
-                allowEmpty = itemAllowEmpty;
+                required = !itemAllowEmpty;
             }
         }
-        // 修改state
-        this.state.required = !allowEmpty;
+        // 有值的时候才会去修改state
+        if (required !== undefined) {
+            this.state.required = required;
+        }
     }
 }

package/out/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.d.ts

@@ -33,7 +33,7 @@ export declare class FormGroupPanelController<T extends IDEFormGroupPanel = IDEF
     get defaultExpansion(): boolean;
     protected createState(): FormGroupPanelState;
     protected onInit(): Promise<void>;
-    formStateNotify(_state: FormNotifyState): Promise<void>;
+    formStateNotify(state: FormNotifyState): Promise<void>;
     /**
      * 初始化标题右侧界面行为按钮的状态
      *

package/out/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-group-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACjC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAEjD,SAAQ,oBAAoB,CAAC,CAAC,CAC9B,YAAW,8BAA8B;IAEjC,KAAK,EAAE,mBAAmB,CAAC;IAEnC;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAG1B;IAED;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,OAAO,CAG9B;IAED,SAAS,CAAC,WAAW,IAAI,mBAAmB;cAI5B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7D;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAWjB"}
+{"version":3,"file":"form-group-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;;;;GAQG;AACH,qBAAa,wBAAwB,CACjC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAEjD,SAAQ,oBAAoB,CAAC,CAAC,CAC9B,YAAW,8BAA8B;IAEjC,KAAK,EAAE,mBAAmB,CAAC;IAEnC;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAG1B;IAED;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,OAAO,CAG9B;IAED,SAAS,CAAC,WAAW,IAAI,mBAAmB;cAI5B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5D;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAWjB"}

package/out/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.js

@@ -43,8 +43,8 @@ export class FormGroupPanelController extends FormDetailController {
         super.onInit();
         await this.initActionStates();
     }
-    async formStateNotify(_state) {
-        super.calcDynamicLogic([], true);
+    async formStateNotify(state) {
+        super.formStateNotify(state);
         // 只在加载后台数据之后，更新界面行为组状态
         if (this.state.actionGroupState) {
             this.state.actionGroupState.update(this.form.data.getOrigin());

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.js

@@ -66,10 +66,11 @@ export class FormMDCtrlContentTypeController {
      * @memberof FormMDCtrlController
      */
     onDataRemove(index) {
+        var _a;
         if (index < 0) {
             return;
         }
-        this.parent.state.contentCtrlData.splice(index, 1);
+        (_a = this.parent.state.contentCtrlData) === null || _a === void 0 ? void 0 : _a.splice(index, 1);
         this.parent.setFormDataValue();
     }
     /**
@@ -81,7 +82,8 @@ export class FormMDCtrlContentTypeController {
      * @memberof FormMDCtrlContentTypeController
      */
     onDataInsert(data) {
-        this.parent.state.contentCtrlData.push(data || {});
+        var _a;
+        (_a = this.parent.state.contentCtrlData) === null || _a === void 0 ? void 0 : _a.push(data || {});
         this.parent.setFormDataValue();
     }
     /**

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.d.ts

@@ -23,6 +23,18 @@ export declare class FormMDCtrlController extends FormDetailController<IDEFormMD
      */
     state: FormMDCtrlState;
     form: EditFormController;
+    /**
+     * 是否显示添加按钮
+     *
+     * @memberof FormMDCtrlController
+     */
+    get isCreate(): boolean;
+    /**
+     * 是否显示删除按钮
+     *
+     * @memberof FormMDCtrlController
+     */
+    get isDelete(): boolean;
     /**
      * Creates an instance of FormMDCtrlController.
      *
@@ -77,5 +89,13 @@ export declare class FormMDCtrlController extends FormDetailController<IDEFormMD
      * @memberof FormMDCtrlController
      */
     setDefaultValue(): void;
+    /**
+     * 表单数据变更通知
+     *
+     * @author lxm
+     * @date 2022-09-20 18:09:56
+     * @param {string[]} names
+     */
+    dataChangeNotify(names: string[]): Promise<void>;
 }
 //# sourceMappingURL=form-mdctrl.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAQxF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;;OAOG;IACK,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,kBAAkB,CAAC;IAEjC;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;;;OAQG;IACI,uBAAuB,EAAG,+BAA+B,CAAC;IAEjE;;;;;;;;OAQG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDvC;;;;;;OAMG;IACH,gBAAgB,IAAI,IAAI;IAQxB;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;CAGxB"}
+{"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAQxF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;;OAOG;IACK,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,kBAAkB,CAAC;IAEjC;;;;OAIG;IACH,IAAI,QAAQ,IAAI,OAAO,CAKtB;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,OAAO,CAKtB;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;;;OAQG;IACI,uBAAuB,EAAG,+BAA+B,CAAC;IAEjE;;;;;;;;OAQG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDvC;;;;;;OAMG;IACH,gBAAgB,IAAI,IAAI;IAQxB;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAIvB;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAgCvD"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.js

@@ -1,3 +1,4 @@
+import { clone } from 'ramda';
 import { FormDetailController } from '../form-detail';
 import { FormMDCtrlDataViewController } from './form-mdctrl-data-view/form-mdctrl-data-view.controller';
 import { FormMDCtrlFormController } from './form-mdctrl-form/form-mdctrl-form.controller';
@@ -17,6 +18,28 @@ import { FormMDCtrlState } from './form-mdctrl.state';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlController extends FormDetailController {
+    /**
+     * 是否显示添加按钮
+     *
+     * @memberof FormMDCtrlController
+     */
+    get isCreate() {
+        if (this.model.buildInActions) {
+            return [1, 3, 5, 7].includes(this.model.buildInActions);
+        }
+        return false;
+    }
+    /**
+     * 是否显示删除按钮
+     *
+     * @memberof FormMDCtrlController
+     */
+    get isDelete() {
+        if (this.model.buildInActions) {
+            return [4, 5, 6, 7].includes(this.model.buildInActions);
+        }
+        return false;
+    }
     /**
      * Creates an instance of FormMDCtrlController.
      *
@@ -92,7 +115,7 @@ export class FormMDCtrlController extends FormDetailController {
     setFormDataValue() {
         const name = this.model.appDEFieldId || this.model.fieldName || this.model.id;
         if (name) {
-            this.form.setDataValue(name, this.state.contentCtrlData);
+            this.form.setDataValue(name, clone(this.state.contentCtrlData));
         }
     }
     /**
@@ -115,4 +138,37 @@ export class FormMDCtrlController extends FormDetailController {
     setDefaultValue() {
         // todo 设置默认值
     }
+    /**
+     * 表单数据变更通知
+     *
+     * @author lxm
+     * @date 2022-09-20 18:09:56
+     * @param {string[]} names
+     */
+    async dataChangeNotify(names) {
+        await super.dataChangeNotify(names);
+        const { resetItemNames } = this.model;
+        const mdctrlName = this.model.appDEFieldId || this.model.fieldName || this.model.id;
+        // 重置项，变更时自己的值置空
+        let isReset = false;
+        if (resetItemNames && resetItemNames.length > 0) {
+            resetItemNames.forEach((resetItemName) => {
+                if (names.includes(resetItemName)) {
+                    isReset = true;
+                }
+            });
+        }
+        if (isReset) {
+            this.state.contentCtrlData = null;
+            this.setFormDataValue();
+        }
+        // 刚加载初始化时的值不校验,只校验自身值变更
+        if (names.includes(mdctrlName)) {
+            this.validate();
+        }
+        // 有表单项更新，且是自身变更时，触发表单项更新
+        if (names.includes(mdctrlName) && this.model.deformItemUpdateId) {
+            await this.form.updateFormItem(this.model.deformItemUpdateId);
+        }
+    }
 }

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts

@@ -11,6 +11,6 @@ export declare class FormMDCtrlState extends FormDetailState {
      *
      * @type {Array<IData>}
      */
-    contentCtrlData: Array<IData> | IData;
+    contentCtrlData: Array<IData> | IData | null;
 }
 //# sourceMappingURL=form-mdctrl.state.d.ts.map

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,eAAgB,SAAQ,eAAe;IAClD;;;;OAIG;IACH,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAM;CAC5C"}
+{"version":3,"file":"form-mdctrl.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,eAAgB,SAAQ,eAAe;IAClD;;;;OAIG;IACH,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,IAAI,CAAM;CACnD"}

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

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

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

@@ -8,7 +8,7 @@ import { getGridColumnProvider } from '../../../../register';
 import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { getDefaultValue, isValueChange } from '../../../utils';
+import { exportData, getDefaultValue, isValueChange } from '../../../utils';
 import { handleAllSettled, ScriptFactory } from '../../../../utils';
 /**
  * 表格控制器
@@ -409,10 +409,6 @@ export class GridController extends MDControlController {
         this.state.items.splice(index, 1, res.data);
         rowState.data = res.data;
         rowState.modified = false;
-        this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
-            default: `${res.data.srfmajortext || ''}保存成功`,
-            data: res.data,
-        });
         this.gridStateNotify(rowState, GridNotifyState.SAVE);
         await this.evt.emit('onSaveSuccess', undefined);
     }
@@ -748,27 +744,26 @@ export class GridController extends MDControlController {
         const items = this.fieldColumns;
         // 数据格式化
         const formatExcelData = (data) => {
-            const codeListMap = new Map();
-            Object.keys(items).forEach((key) => {
-                if (items[key].codeList) {
-                    codeListMap.set(key, items[key].codeListItems);
-                }
-            });
+            // const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
+            // Object.keys(items).forEach((key: string) => {
+            //   if (items[key].codeList) {
+            //     codeListMap.set(key, items[key].codeListItems!);
+            //   }
+            // });
             const cloneData = clone(data.map(item => {
                 return item.getOrigin();
             }));
-            cloneData.forEach(item => {
-                const fields = Object.keys(item);
-                fields.forEach((key) => {
-                    var _a;
-                    if (codeListMap.get(key)) {
-                        item[key] =
-                            ((_a = codeListMap.get(key).find(_item => {
-                                return _item.value === item[key];
-                            })) === null || _a === void 0 ? void 0 : _a.text) || item[key];
-                    }
-                });
-            });
+            // cloneData.forEach(item => {
+            //   const fields = Object.keys(item);
+            //   fields.forEach((key: string) => {
+            //     if (codeListMap.get(key)) {
+            //       item[key] =
+            //         codeListMap.get(key)!.find(_item => {
+            //           return _item.value === item[key];
+            //         })?.text || item[key];
+            //     }
+            //   });
+            // });
             return cloneData;
         };
         const getExportData = async () => {
@@ -812,19 +807,7 @@ export class GridController extends MDControlController {
         const header = Object.keys(items).map((key) => items[key].model.caption);
         // 二维数组
         const data = formatArrayData(filterVal, await getExportData());
-        if (!ibiz.util.getExportExcel) {
-            throw new RuntimeError('ibiz.util.getExportExcel不存在');
-        }
-        const exportExcel = await ibiz.util.getExportExcel();
-        if (!exportExcel) {
-            throw new RuntimeError('导出模块加载错误');
-        }
-        exportExcel.exportJsonToExcel({
-            header,
-            data,
-            filename: this.model.logicName,
-            autoWidth: true, // 单元格是否自适应
-        });
+        await exportData(header, data, this.model.logicName);
     }
     /**
      * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值

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

@@ -22,4 +22,5 @@ export * from './kanban/index';
 export * from './tree-grid-ex/index';
 export * from './tree-grid/index';
 export * from './medit-view-panel/index';
+export * from './map/index';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC"}

package/out/controller/control/index.js

@@ -22,3 +22,4 @@ export * from './kanban/index';
 export * from './tree-grid-ex/index';
 export * from './tree-grid/index';
 export * from './medit-view-panel/index';
+export * from './map/index';

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/map/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from './map.controller';
+export * from './map.service';

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

@@ -0,0 +1,45 @@
+import { ISysMap } from '@ibiz/model-core';
+import { MapService } from './map.service';
+import { IMapController, IMapData, IMapEvent, IMapState, MDCtrlLoadParams } from '../../../interface';
+import { MDControlController } from '../../common';
+export declare class MapController extends MDControlController<ISysMap, IMapState, IMapEvent> implements IMapController {
+    service: MapService;
+    protected initState(): void;
+    protected onCreated(): Promise<void>;
+    /**
+     * 部件加载数据行为
+     *
+     * @author lxm
+     * @date 2022-08-19 14:08:50
+     */
+    load(args?: MDCtrlLoadParams): Promise<IData[]>;
+    afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]>;
+    /**
+     * 计算默认选项
+     * @author lxm
+     * @date 2023-11-01 03:23:33
+     */
+    calcDefaultOptions(): void;
+    /**
+     * 地图变更事件处理
+     * @author lxm
+     * @date 2023-10-31 05:28:36
+     * @param {(string | number)} areaCode
+     */
+    onMapChange(areaCode: string | number): void;
+    /**
+     * 地图区域点击事件处理
+     * @author lxm
+     * @date 2023-10-31 05:30:54
+     * @param {IMapData} mapData
+     */
+    onAreaClick(mapData: IMapData): void;
+    /**
+     * 地图散点点击事件处理
+     * @author lxm
+     * @date 2023-10-31 05:30:58
+     * @param {IMapData} mapData
+     */
+    onPointClick(mapData: IMapData): void;
+}
+//# sourceMappingURL=map.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"map.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/map/map.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,cAAc,EACd,QAAQ,EACR,SAAS,EACT,SAAS,EACT,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,aACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CACzD,YAAW,cAAc;IAEjB,OAAO,EAAE,UAAU,CAAC;IAE5B,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAsCnD,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAkBzE;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;IAgC1B;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAO5C;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAIpC;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAGtC"}