@ibiz-template/runtime 0.7.1 → 0.7.3

package/out/config/global-config.d.ts

@@ -1,4 +1,4 @@
-import { IGlobalConfig, IGlobalGridConfig, IGlobalAppMenuConfig, IGlobalCodeListConfig, IGlobalViewConfig } from '../interface';
+import { IGlobalConfig, IGlobalGridConfig, IGlobalAppMenuConfig, IGlobalCodeListConfig, IGlobalViewConfig, IGlobalPickerEditorConfig } from '../interface';
 import { IGlobalFormConfig } from '../interface/common/i-global-config';
 /**
  * 全局配置类,控制应用的功能开关。
@@ -15,5 +15,6 @@ export declare class GlobalConfig implements IGlobalConfig {
     appMenu: IGlobalAppMenuConfig;
     codeList: IGlobalCodeListConfig;
     form: IGlobalFormConfig;
+    pickerEditor: IGlobalPickerEditorConfig;
 }
 //# sourceMappingURL=global-config.d.ts.map

package/out/config/global-config.d.ts.map

@@ -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,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAIrB;IAGF,IAAI,EAAE,iBAAiB,CAIrB;IAGF,OAAO,EAAE,oBAAoB,CAE3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAErB;CACH"}
+{"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,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAIrB;IAGF,IAAI,EAAE,iBAAiB,CAIrB;IAGF,OAAO,EAAE,oBAAoB,CAE3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAErB;IAGF,YAAY,EAAE,yBAAyB,CAErC;CACH"}

package/out/config/global-config.js

@@ -33,5 +33,9 @@ export class GlobalConfig {
         this.form = {
             mdCtrlConfirmBeforeRemove: true,
         };
+        // 全局下拉选择类编辑器配置
+        this.pickerEditor = {
+            overflowMode: 'auto',
+        };
     }
 }

package/out/controller/common/base.controller.d.ts

@@ -12,7 +12,6 @@ import { ActivityCounter, ControllerEvent } from '../utils';
  */
 export declare class BaseController<T extends IModelObject = IModelObject, S extends IControllerState = IControllerState, E extends IComponentEvent = IComponentEvent> implements IController<T, S, E> {
     readonly model: T;
-    readonly context: IContext;
     readonly params: IParams;
     protected readonly ctx: CTX;
     id: string;
@@ -25,6 +24,15 @@ export declare class BaseController<T extends IModelObject = IModelObject, S ext
      */
     protected get _evt(): ControllerEvent<IComponentEvent>;
     state: S;
+    /**
+     * 上下文对象
+     *
+     * @author tony001
+     * @date 2024-04-16 16:04:30
+     * @readonly
+     * @type {IContext}
+     */
+    get context(): IContext;
     /**
      * 控制器名称，作为检索控制器的唯一标识
      * @author lxm

package/out/controller/common/base.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/common/base.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EACL,SAAS,EACT,eAAe,EACf,WAAW,EACX,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D;;;;;;GAMG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,YAAY,GAAG,YAAY,EACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aAgCb,KAAK,EAAE,CAAC;aACR,OAAO,EAAE,QAAQ;aACjB,MAAM,EAAE,OAAO;IAC/B,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;IAjC7B,EAAE,EAAE,MAAM,CAAgB;IAE1B;;;;;;OAMG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,KAAK,EAAE,CAAC,CAAW;IAEnB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;;;;OAKG;gBAEe,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG;IAQ7B;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAU5C;;;;;OAKG;IACH,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAErB;IAEF;;;;;OAKG;IACH,YAAY,EAAE,eAAe,CAAgD;IAE7E;;;;;OAKG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B;;;;OAIG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;OAMG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IAIvE,UAAU,IAAI,eAAe;IAI7B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAIrE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAG3C"}
+{"version":3,"file":"base.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/common/base.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EACL,SAAS,EACT,eAAe,EACf,WAAW,EACX,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D;;;;;;GAMG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,YAAY,GAAG,YAAY,EACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aA4Cb,KAAK,EAAE,CAAC;aAER,MAAM,EAAE,OAAO;IAC/B,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;IA7C7B,EAAE,EAAE,MAAM,CAAgB;IAE1B;;;;;;OAMG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,KAAK,EAAE,CAAC,CAAW;IAEnB;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;;;;OAKG;gBAEe,KAAK,EAAE,CAAC,EACxB,OAAO,EAAE,QAAQ,EACD,MAAM,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG;IAS7B;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAU5C;;;;;OAKG;IACH,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAErB;IAEF;;;;;OAKG;IACH,YAAY,EAAE,eAAe,CAAgD;IAE7E;;;;;OAKG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B;;;;OAIG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;OAMG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IAIvE,UAAU,IAAI,eAAe;IAI7B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;IAIrE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAG3C"}

package/out/controller/common/base.controller.js

@@ -19,6 +19,17 @@ export class BaseController {
     get _evt() {
         return this.evt;
     }
+    /**
+     * 上下文对象
+     *
+     * @author tony001
+     * @date 2024-04-16 16:04:30
+     * @readonly
+     * @type {IContext}
+     */
+    get context() {
+        return this.state.context;
+    }
     /**
      * Creates an instance of BaseController.
      * @author lxm
@@ -27,7 +38,6 @@ export class BaseController {
      */
     constructor(model, context, params, ctx) {
         this.model = model;
-        this.context = context;
         this.params = params;
         this.ctx = ctx;
         this.id = createUUID();
@@ -61,6 +71,7 @@ export class BaseController {
          */
         this.childNames = [];
         this.name = model.name || model.id;
+        this.state.context = context;
         this.preprocessModel(model);
         this.initState();
         this.convertMultipleLanguages();

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

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

@@ -1,9 +1,10 @@
 /* eslint-disable max-classes-per-file */
-import { isElementSame, RuntimeError, } from '@ibiz-template/core';
+import { isElementSame, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 import { calcDeCodeNameById } from '../../../model';
 import { Srfuf } from '../../../service';
 import { handleAllSettled } from '../../../utils';
+import { openDataImport } from '../../utils';
 import { ControlController } from './control.controller';
 /**
  * 多数据部件控制器
@@ -433,29 +434,16 @@ export class MDControlController extends ControlController {
      * @returns {*}  {Promise<void>}
      */
     async importData() {
-        var _a;
         const { appDataEntityId, dedataImportId } = this.model;
-        const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId, this.model.appId);
-        const dataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find((importItem) => importItem.id === dedataImportId);
-        if (!dataImport) {
-            throw new RuntimeError('无导入模型！');
-        }
-        let importName = 'DataImport';
-        if (dataImport.enableCustomized) {
-            importName = 'DataImport2';
+        if (!appDataEntityId || !dedataImportId) {
+            throw new RuntimeModelError(this.model, '没有配置导入模型！');
         }
-        const modal = ibiz.overlay.createModal(importName, {
-            dismiss: () => modal.dismiss(),
-            dataImport,
-            appDataEntity,
+        await openDataImport({
+            appDataEntityId,
+            deDataImportId: dedataImportId,
             context: this.context,
             params: this.params,
-        }, {
-            width: 'auto',
-            placement: 'center',
         });
-        modal.present();
-        await modal.onWillDismiss();
     }
     /**
      * 数据导出

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

@@ -1,3 +1,4 @@
+export { AppDataUploadViewController } from './view/app-data-upload-view.controller';
 export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
 export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,cAAc,WAAW,CAAC"}

package/out/controller/common/index.js

@@ -1,3 +1,4 @@
+export { AppDataUploadViewController } from './view/app-data-upload-view.controller';
 export { MobViewController } from './view/mob-view.controller';
 export { ViewController } from './view/view.controller';
 export { WFStepTraceViewController } from './view/wf-step-trace-view.controller';

package/out/controller/common/view/app-data-upload-view.controller.d.ts

@@ -0,0 +1,36 @@
+import { IAppView } from '@ibiz/model-core';
+import { IAppDataUploadViewState, IViewController, IViewEvent } from '../../../interface';
+import { ViewController } from './view.controller';
+import { ImportDataResult } from '../../utils';
+export declare class AppDataUploadViewController<T extends IAppView = IAppView, S extends IAppDataUploadViewState = IAppDataUploadViewState, E extends IViewEvent = IViewEvent> extends ViewController<T, S, E> implements IViewController<T, S, E> {
+    protected initState(): void;
+    protected onCreated(): Promise<void>;
+    /**
+     * 下载模版文件
+     * @author lxm
+     * @date 2024-04-16 02:15:29
+     */
+    downloadTemplate(): void;
+    /**
+     * 选中导入文件并导入
+     * @author lxm
+     * @date 2024-04-16 03:54:19
+     * @return {*}
+     */
+    selectAndImport(): Promise<ImportDataResult>;
+    /**
+     * 自定义导入数据方法
+     * @author lxm
+     * @date 2024-04-18 05:17:22
+     * @param {{
+     *     fileId: string;
+     *     schemaId: string;
+     *   }} opts
+     * @return {*}  {Promise<void>}
+     */
+    asyncImportData2(opts: {
+        fileId: string;
+        schemaId: string;
+    }): Promise<void>;
+}
+//# sourceMappingURL=app-data-upload-view.controller.d.ts.map

package/out/controller/common/view/app-data-upload-view.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-data-upload-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/app-data-upload-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,gBAAgB,EAKjB,MAAM,aAAa,CAAC;AAErB,qBAAa,2BAA2B,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,EAC3D,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAKxB;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAalD;;;;;;;;;OASG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;CAQlB"}

package/out/controller/common/view/app-data-upload-view.controller.js

@@ -0,0 +1,59 @@
+import { ViewController } from './view.controller';
+import { asyncImportData2, downloadImportTemplate, getDataImportModels, selectAndImport, } from '../../utils';
+export class AppDataUploadViewController extends ViewController {
+    initState() {
+        super.initState();
+    }
+    async onCreated() {
+        await super.onCreated();
+        // 加载模型数据
+        const { srfappdataentityid, srfdedataimportid, srfappid } = this.context;
+        const { appDataEntity, deDataImport } = await getDataImportModels({
+            appDataEntityId: srfappdataentityid,
+            deDataImportId: srfdedataimportid,
+            appId: srfappid,
+        });
+        this.state.appDataEntity = appDataEntity;
+        this.state.deDataImport = deDataImport;
+    }
+    /**
+     * 下载模版文件
+     * @author lxm
+     * @date 2024-04-16 02:15:29
+     */
+    downloadTemplate() {
+        const { appDataEntity, deDataImport } = this.state;
+        downloadImportTemplate(appDataEntity, deDataImport);
+    }
+    /**
+     * 选中导入文件并导入
+     * @author lxm
+     * @date 2024-04-16 03:54:19
+     * @return {*}
+     */
+    async selectAndImport() {
+        const result = await selectAndImport({
+            appDataEntity: this.state.appDataEntity,
+            dataImport: this.state.deDataImport,
+            context: this.context,
+        });
+        // 异步导入的时候直接关闭视图
+        if (result.isAsync === true) {
+            this.closeView();
+        }
+        return result;
+    }
+    /**
+     * 自定义导入数据方法
+     * @author lxm
+     * @date 2024-04-18 05:17:22
+     * @param {{
+     *     fileId: string;
+     *     schemaId: string;
+     *   }} opts
+     * @return {*}  {Promise<void>}
+     */
+    async asyncImportData2(opts) {
+        return asyncImportData2(Object.assign({ appDataEntity: this.state.appDataEntity, dataImport: this.state.deDataImport, context: this.context }, opts));
+    }
+}

package/out/controller/common/view/view.controller.d.ts.map

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

package/out/controller/common/view/view.controller.js

@@ -275,6 +275,10 @@ export class ViewController extends BaseController {
             context = convertNavData(navContexts, this.params, this.context);
         }
         Object.assign(this.context, context);
+        // 预置视图srfreadonly字段
+        if (!Object.prototype.hasOwnProperty.call(this.context, 'srfreadonly')) {
+            Object.assign(this.context, { srfreadonly: false });
+        }
         // 处理自定义视图参数
         const navParams = this.model.appViewNavParams;
         let params = {};
@@ -377,6 +381,11 @@ export class ViewController extends BaseController {
         const modalParams = {
             title: message.title,
             desc: message.message,
+            // todo 待模型修复
+            // options: {
+            //   showClose: message.removeMode !== 0,
+            //   showConfirmButton: message.removeMode !== 0,
+            // },
         };
         // userTag为确认按钮文本
         if (message.extraParams.userTag) {

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

@@ -113,11 +113,11 @@ export class EditFormController extends FormController {
         let res;
         try {
             await this.startLoading();
-            await this.evt.emit('onBeforeLoad', undefined);
+            await this.evt.emit('onBeforeLoad', { args: queryParams });
             res = await this.service.get(context, queryParams);
         }
         catch (error) {
-            await this.evt.emit('onLoadError', undefined);
+            await this.evt.emit('onLoadError', { args: error });
             this.actionNotification('GETERROR', {
                 error: error,
             });
@@ -132,7 +132,7 @@ export class EditFormController extends FormController {
         this.state.modified = false;
         this.state.data = res.data;
         this.formStateNotify(FormNotifyState.LOAD);
-        await this.evt.emit('onLoadSuccess', undefined);
+        await this.evt.emit('onLoadSuccess', { args: res.data });
         this.actionNotification('GETSUCCESS');
         this.state.isLoaded = true;
         return this.data;
@@ -159,11 +159,11 @@ export class EditFormController extends FormController {
         let res;
         try {
             await this.startLoading();
-            await this.evt.emit('onBeforeLoad', undefined);
+            await this.evt.emit('onBeforeLoad', { args: queryParams });
             res = await this.service.get(context, queryParams);
         }
         catch (error) {
-            await this.evt.emit('onLoadError', undefined);
+            await this.evt.emit('onLoadError', { args: error });
             this.actionNotification('GETERROR', {
                 error: error,
             });
@@ -177,7 +177,7 @@ export class EditFormController extends FormController {
         // 缓存旧数据
         this.oldData = this.data.clone();
         this.formStateNotify(FormNotifyState.LOAD);
-        await this.evt.emit('onLoadSuccess', undefined);
+        await this.evt.emit('onLoadSuccess', { args: res.data });
         this.actionNotification('GETSUCCESS');
         this.state.isLoaded = true;
         return this.data;
@@ -202,18 +202,18 @@ export class EditFormController extends FormController {
         if (!silent) {
             await this.startLoading();
         }
-        await this.evt.emit('onBeforeSave', undefined);
         const { context, data } = this.handlerAbilityParams(args);
         const saveData = data[0];
         const isCreate = saveData.srfuf === Srfuf.CREATE;
         let res;
         try {
+            await this.evt.emit('onBeforeSave', { args: saveData });
             res = isCreate
                 ? await this.service.create(context, saveData)
                 : await this.service.update(context, saveData);
         }
         catch (error) {
-            await this.evt.emit('onSaveError', undefined);
+            await this.evt.emit('onSaveError', { args: error });
             this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
                 error: error,
             });
@@ -241,7 +241,7 @@ export class EditFormController extends FormController {
             this.data.tempsrfkey = this.data.srfkey;
         }
         this.state.modified = false;
-        await this.evt.emit('onSaveSuccess', undefined);
+        await this.evt.emit('onSaveSuccess', { args: res.data });
         if (!this.view.state.isClosing) {
             this.formStateNotify(FormNotifyState.SAVE);
         }
@@ -266,7 +266,7 @@ export class EditFormController extends FormController {
         // 新建数据清空数据
         let res;
         let ok = false;
-        await this.evt.emit('onBeforeRemove', undefined);
+        await this.evt.emit('onBeforeRemove', { args: this.data });
         // 新建的数据不用进行后台删除
         if (this.data.srfuf === Srfuf.UPDATE) {
             ok = await ibiz.modal.confirm({
@@ -282,7 +282,7 @@ export class EditFormController extends FormController {
                 res = await this.service.remove(context, params);
             }
             catch (error) {
-                await this.evt.emit('onRemoveError', undefined);
+                await this.evt.emit('onRemoveError', { args: error });
                 this.actionNotification('REMOVEERROR', {
                     error: error,
                 });
@@ -297,7 +297,7 @@ export class EditFormController extends FormController {
         // 删除完成后都要置空当前表单数据
         this.state.data = new ControlVO();
         this.state.modified = false;
-        await this.evt.emit('onRemoveSuccess', undefined);
+        await this.evt.emit('onRemoveSuccess', { args: this.data });
         this.actionNotification('REMOVESUCCESS');
         return ok;
     }

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

@@ -137,7 +137,7 @@ export class FormController extends ControlController {
     async initDetailControllers(details = this.model.deformPages, form = this, parent = undefined) {
         await Promise.all(details.map(async (detail) => {
             // 生成表单成员控制器
-            const detailProvider = await getFormDetailProvider(detail);
+            const detailProvider = await getFormDetailProvider(detail, this.model);
             if (!detailProvider) {
                 return;
             }

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,EAE/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;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;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;IAqCvC;;;;;;;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;IAW1C;;;;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;IAsBrC;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAWjD"}
+{"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,EAE/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;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;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;IASzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;;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;IAW1C;;;;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;IAsBrC;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAWjD"}

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

@@ -77,6 +77,7 @@ export class FormDetailController {
         this.form = form;
         this.parent = parent;
         this.state = this.createState();
+        this.state.context = this.context;
     }
     /**
      * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
@@ -108,10 +109,6 @@ export class FormDetailController {
         if (capLanguageRes && capLanguageRes.lanResTag) {
             this.model.caption = ibiz.i18n.t(capLanguageRes.lanResTag, this.model.caption);
         }
-        if (this.context.srfreadonly === true ||
-            this.context.srfreadonly === 'true') {
-            this.state.readonly = true;
-        }
     }
     /**
      * 创建表单状态对象

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

@@ -37,6 +37,14 @@ export declare class FormDetailState implements IFormDetailState {
      * @type {boolean}
      */
     readonly: boolean;
+    /**
+     * 上下文对象
+     *
+     * @author tony001
+     * @date 2024-04-16 16:04:29
+     * @type {IContext}
+     */
+    context?: IContext;
     constructor(parent?: IFormDetailContainerState | undefined);
 }
 //# sourceMappingURL=form-detail.state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"form-detail.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.state.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAElC;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,gBAAgB;IAgD1C,SAAS,CAAC,MAAM,CAAC;IA/CrB,OAAO,EAAE,OAAO,CAAC;IAEzB,QAAQ,EAAE,OAAO,CAAS;IAElB,SAAS,EAAE,OAAO,CAAC;IAE3B,MAAM,EAAE,YAAY,CAMlB;IAEF,KAAK,EAAE,gBAAgB,CAKrB;IAEF;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;OAKG;IACH,YAAY,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAK;IAErC;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;gBAEJ,MAAM,CAAC,uCAA2B;CA8DzD"}
+{"version":3,"file":"form-detail.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.state.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAElC;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,gBAAgB;IAyD1C,SAAS,CAAC,MAAM,CAAC;IAxDrB,OAAO,EAAE,OAAO,CAAC;IAEzB,QAAQ,EAAE,OAAO,CAAS;IAElB,SAAS,EAAE,OAAO,CAAC;IAE3B,MAAM,EAAE,YAAY,CAMlB;IAEF,KAAK,EAAE,gBAAgB,CAKrB;IAEF;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;OAKG;IACH,YAAY,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAK;IAErC;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;gBAEG,MAAM,CAAC,uCAA2B;CA0EzD"}

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

@@ -93,12 +93,22 @@ export class FormDetailState {
                 return true;
             },
         });
-        let $readonly = false;
+        // 定义只读状态
+        let $readonly;
         Object.defineProperty(this, 'readonly', {
             enumerable: true,
             configurable: true,
             get() {
-                return $readonly;
+                // 自身设置了值则只看自身
+                if ($readonly !== undefined) {
+                    return $readonly;
+                }
+                // 自身没有设置值，看父
+                if (this.context) {
+                    return !!(this.context.srfreadonly === true ||
+                        this.context.srfreadonly === 'true');
+                }
+                return false;
             },
             set(val) {
                 $readonly = val;

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

@@ -1 +1 @@
-{"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAKzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IA8BlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOjC"}
+{"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAKzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IA8BlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOjC"}

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

@@ -120,7 +120,7 @@ export class FormItemController extends FormDetailController {
      * @returns {*}  {Promise<void>}
      */
     async onInit() {
-        var _a;
+        var _a, _b;
         await super.onInit();
         // 空输入默认值
         this.state.required = !this.model.allowEmpty;
@@ -130,8 +130,9 @@ export class FormItemController extends FormDetailController {
             this.state.enableCondDisabled = true;
         }
         if (this.context.srfreadonly !== true &&
-            this.context.srfreadonly !== 'true') {
-            this.state.readonly = ((_a = this.model.editor) === null || _a === void 0 ? void 0 : _a.readOnly) || false;
+            this.context.srfreadonly !== 'true' &&
+            ((_a = this.model.editor) === null || _a === void 0 ? void 0 : _a.readOnly)) {
+            this.state.readonly = ((_b = this.model.editor) === null || _b === void 0 ? void 0 : _b.readOnly) || false;
         }
         // 初始化编辑器控制器,除了隐藏都会需要适配器
         if (this.model.editor && this.model.editor.editorType !== 'HIDDEN') {

package/out/controller/control/grid/grid/grid-row.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-row.state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-row.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,YAAa,YAAW,aAAa;IAChD,IAAI,EAAE,SAAS,CAAC;IAEhB,OAAO,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAM;IAE5C;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAM;IAEP;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEjE;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAS;IAE7B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAS;IAE5B,WAAW,IAAI,SAAS;gBAgBZ,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc;CA+BlD"}
+{"version":3,"file":"grid-row.state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-row.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,YAAa,YAAW,aAAa;IAChD,IAAI,EAAE,SAAS,CAAC;IAEhB,OAAO,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAM;IAE5C;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAM;IAEP;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEjE;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAS;IAE7B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAS;IAE5B,WAAW,IAAI,SAAS;gBAgBZ,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc;CA0DlD"}

package/out/controller/control/grid/grid/grid-row.state.js

@@ -95,7 +95,7 @@ export class GridRowState {
         Object.values(grid.fieldColumns).forEach(column => {
             column.initActionStates(this);
         });
-        // 初始化编辑项状态
+        // 初始化编辑项状态（禁用、只读、可编辑器、必填）
         Object.values(grid.editColumns).forEach(editColumn => {
             this.editColStates[editColumn.fieldName] = {
                 disabled: false,
@@ -103,6 +103,27 @@ export class GridRowState {
                 editable: ibiz.config.grid.editShowMode === 'all',
                 required: false,
             };
+            let $readonly;
+            Object.defineProperty(this.editColStates[editColumn.fieldName], 'readonly', {
+                enumerable: true,
+                configurable: true,
+                get() {
+                    // 自身设置了值则只看自身
+                    if ($readonly !== undefined) {
+                        return $readonly;
+                    }
+                    // 自身没有设置值，看父
+                    if (grid.context) {
+                        return !!(grid.context.srfreadonly === true ||
+                            grid.context.srfreadonly === 'true');
+                    }
+                    return false;
+                },
+                set(val) {
+                    $readonly = val;
+                    return true;
+                },
+            });
         });
     }
 }

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

@@ -586,7 +586,7 @@ export class GridController extends MDControlController {
     async initColumnsController(column) {
         var _a;
         // 初始化适配器
-        const provider = await getGridColumnProvider(column);
+        const provider = await getGridColumnProvider(column, this.model);
         if (!provider) {
             return;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BpD"}
+{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAQ3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BpD"}

package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.js

@@ -223,7 +223,9 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
         var _a;
         const isReadOnly = !!((_a = this.editItem.editor) === null || _a === void 0 ? void 0 : _a.readOnly);
         // 修改state
-        row.editColStates[this.fieldName].readonly = isReadOnly;
+        if (isReadOnly) {
+            row.editColStates[this.fieldName].readonly = isReadOnly;
+        }
     }
     /**
      * 计算启用项的禁用