@ibiz-template/runtime 0.7.41-alpha.9 → 0.7.41-alpha.90

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

@@ -5,9 +5,9 @@ import { clone } from 'ramda';
 import { calcDeCodeNameById, findChildFormDetails, isFormDataContainer, } from '../../../../model';
 import { getFormDetailProvider } from '../../../../register';
 import { ControlVO, CounterService, Srfuf, } from '../../../../service';
-import { handleAllSettled } from '../../../../utils';
+import { convertNavData, handleAllSettled } from '../../../../utils';
 import { ControlController } from '../../../common';
-import { isValueChange } from '../../../utils';
+import { getEntitySchema, isValueChange, } from '../../../utils';
 /**
  * 表单控制器
  *
@@ -81,6 +81,65 @@ export class FormController extends ControlController {
     get data() {
         return this.state.data;
     }
+    /**
+     * @description 校验模式
+     * @readonly
+     * @type {('default' | 'notification')}
+     * @memberof FormController
+     */
+    get validateMode() {
+        if (this.controlParams.validatemode) {
+            return this.controlParams.validatemode;
+        }
+        return ibiz.config.form.validateMode;
+    }
+    /**
+     * @description 是否启用缓存
+     * @readonly
+     * @type {boolean}
+     * @memberof FormController
+     */
+    get srfCachePos() {
+        if (this.controlParams.srfcachepos)
+            return this.controlParams.srfcachepos === 'true';
+        return ibiz.config.form.srfCachePos;
+    }
+    /**
+     * @description 是否显示提示图标
+     * @readonly
+     * @type {boolean}
+     * @memberof FormController
+     */
+    get showTipsIcon() {
+        if (this.controlParams.showtipsicon)
+            return this.controlParams.showtipsicon === 'true';
+        return ibiz.config.form.showTipsIcon;
+    }
+    /**
+     * @description 缓存标识
+     * @readonly
+     * @type {string}
+     * @memberof FormController
+     */
+    get srfcachekeytempl() {
+        if (this.controlParams.srfcachekeytempl)
+            return this.controlParams.srfcachekeytempl;
+        if (ibiz.config.form.srfCacheKeyTempl)
+            return ibiz.config.form.srfCacheKeyTempl;
+        return `${this.context.srfuserid}_${this.view.model.codeName}_${this.model.codeName}`;
+    }
+    /**
+     * @description 是否启用jsonschema
+     * @readonly
+     * @type {boolean}
+     * @memberof FormController
+     */
+    get enableJsonSchema() {
+        if (this.controlParams.enablejsonschema) {
+            return this.controlParams.enablejsonschema === 'true';
+        }
+        return ibiz.config.form.enableDynaFormJsonSchema;
+    }
     initState() {
         var _a, _b;
         super.initState();
@@ -90,6 +149,8 @@ export class FormController extends ControlController {
         this.state.processing = false;
         this.state.modified = false;
         this.state.formIsDestroyed = false;
+        this.state.simpleDataIndex = 0;
+        this.state.mdCtrlFormIndex = 0;
     }
     /**
      * 设置激活分页
@@ -100,6 +161,38 @@ export class FormController extends ControlController {
     setActiveTab(name) {
         this.state.activeTab = name;
     }
+    /**
+     * @description 设置简单模式数据索引
+     * @param {number} [index]
+     * @memberof EditFormController
+     */
+    setSimpleDataIndex(index) {
+        this.state.simpleDataIndex = index || 0;
+    }
+    /**
+     * @description 获取简单模式数据索引
+     * @returns {*}  {number}
+     * @memberof EditFormController
+     */
+    getSimpleDataIndex() {
+        return this.state.simpleDataIndex;
+    }
+    /**
+     * @description 获取多数据部件表单模式下当前表单索引
+     * @returns {*}  {number}
+     * @memberof FormController
+     */
+    getMdCtrlFormIndex() {
+        return this.state.mdCtrlFormIndex;
+    }
+    /**
+     * @description 设置多数据部件表单模式下当前表单的索引
+     * @param {number} index
+     * @memberof FormController
+     */
+    setMdCtrlFormIndex(index) {
+        this.state.mdCtrlFormIndex = index;
+    }
     /**
      * 更新表单分页面板
      *
@@ -149,10 +242,11 @@ export class FormController extends ControlController {
      * @returns {*}  {Promise<void>}
      */
     async onCreated() {
+        await this.initByEntitySchema();
         await super.onCreated();
-        await this.initDetailControllers();
         // 初始化计数器
         await this.initCounter();
+        await this.initDetailControllers();
         // 数据变更通知防抖，且合并参数
         this.dataChangeNotify = debounceAndAsyncMerge(this.dataChangeNotify.bind(this), (arr1, arr2) => {
             return [Array.from(new Set([...arr1[0], ...arr2[0]]))];
@@ -228,6 +322,19 @@ export class FormController extends ControlController {
     getData() {
         return [this.state.data];
     }
+    /**
+     * @description 获取原始实体数据
+     * @returns {*}  {IData[]}
+     * @memberof FormController
+     */
+    getReal() {
+        let formData = this.getData()[0] || {};
+        formData = this.checkIgnoreInput(formData);
+        const originData = formData instanceof ControlVO ? formData.getOrigin() : formData;
+        const filterData = this.service.getFilteredData(formData);
+        Object.assign(originData, filterData);
+        return [originData];
+    }
     /**
      * 设置表单数据的值
      *
@@ -251,7 +358,13 @@ export class FormController extends ControlController {
         if (!ignore) {
             this.state.modified = true;
         }
-        await this._evt.emit('onFormDataChange', { name, value, oldValue });
+        const realData = this.getReal();
+        await this._evt.emit('onFormDataChange', {
+            name,
+            value,
+            oldValue,
+            realData,
+        });
         if (this.state.formIsDestroyed)
             return;
         try {
@@ -270,9 +383,9 @@ export class FormController extends ControlController {
      * @author tony001
      * @date 2025-01-09 16:01:29
      * @param {IData} data
-     * @return {*}  {Promise<void>}
+     * @return {*}  {IData}
      */
-    async checkIgnoreInput(data) {
+    checkIgnoreInput(data) {
         const formData = clone(data);
         const formDataUIMap = formData.$dataUIMap;
         const isCreate = formData.srfuf === Srfuf.CREATE;
@@ -303,6 +416,7 @@ export class FormController extends ControlController {
                     break;
             }
         });
+        return formData;
     }
     /**
      * 校验表单的全部表单项
@@ -313,9 +427,28 @@ export class FormController extends ControlController {
      */
     async validate() {
         const values = await Promise.all([...this.formItems, ...this.formMDCtrls, ...this.formDruipart].map(formItem => formItem.validate()));
-        // 找不到value为false即全部是true
         return values.findIndex(value => !value) === -1;
     }
+    /**
+     * @description 处理校验失败
+     * @memberof FormController
+     */
+    handleValidateFail() {
+        // 校验模式为通知模式时校验时提示错误信息
+        if (this.validateMode === 'notification') {
+            // 此处只处理表单项错误信息，多数据部件与关系界面暂不考虑
+            const errorItems = [...this.formItems].filter(formItem => formItem.state.error);
+            const errors = errorItems.map(formItem => formItem.state.error);
+            ibiz.notification.error({
+                title: ibiz.i18n.t('runtime.controller.control.form.formCompletion'),
+                desc: errors.join('<br/>'),
+                isHtmlDesc: true,
+            });
+            // 抛出Error错误，只打印错误信息，不抛出错误提示
+            throw new Error(ibiz.i18n.t('runtime.controller.control.form.formCompletion'));
+        }
+        throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.form.formCompletion'));
+    }
     /**
      * 静默校验
      * - 只校验无提示信息
@@ -369,6 +502,9 @@ export class FormController extends ControlController {
         await super.onDestroyed();
         // 销毁视图计数器
         Object.values(this.counters).forEach(counter => counter.destroy());
+        Object.values(this.formItems).forEach(item => {
+            item.destroy();
+        });
     }
     /**
      * 初始化计数器
@@ -378,6 +514,8 @@ export class FormController extends ControlController {
      * @return {*}  {Promise<void>}
      */
     async initCounter() {
+        if (this.state.isCounterDisabled)
+            return;
         this.counters = {};
         const { appCounterRefs } = this.model;
         if (appCounterRefs && appCounterRefs.length > 0) {
@@ -422,7 +560,8 @@ export class FormController extends ControlController {
         });
     }
     /**
-     * @description 切换分组折叠
+     * @description 切换折叠，tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof FormController
      */
     changeCollapse(params = {}) {
@@ -452,9 +591,39 @@ export class FormController extends ControlController {
                 if (group.model.detailType === 'GROUPPANEL') {
                     group.state.collapse = isBoolean(expand)
                         ? !expand
-                        : group.state.collapse;
+                        : !group.state.collapse;
                 }
             });
         }
     }
+    /**
+     * @description 获取表单成员
+     * @template K
+     * @param {K} type
+     * @param {string} id
+     * @returns {*}  {IApiFormDetailMapping[K]}
+     * @memberof FormController
+     */
+    getFormDetail(type, id) {
+        return this.details[id];
+    }
+    /**
+     * @description 初始化jsonschema
+     * @returns {*}  {Promise<void>}
+     * @memberof FormController
+     */
+    async initByEntitySchema() {
+        if (!this.enableJsonSchema) {
+            return;
+        }
+        const jsonSchemaParams = JSON.parse(this.controlParams.jsonschemaparams || '{}');
+        const jsonSchemaQuery = convertNavData(jsonSchemaParams, this.params, this.context);
+        const tempParams = clone(jsonSchemaQuery);
+        Object.assign(tempParams, this.params);
+        const json = await getEntitySchema(this.model.appDataEntityId, this.context, tempParams);
+        if (!json) {
+            return;
+        }
+        this.jsonSchemaProperties = json.properties;
+    }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,OAAO,EAAiB,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AAG5E;;;;;;;;GAQG;AACH,qBAAa,WAAW,CACtB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,YAAY,wBAA+B;IAE3C;;;;;;;;OAQG;IACH,UAAU,CACR,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,QAAQ,GAAG,QAAQ,GACxB,IAAI;IAoCP;;;;;;;OAOG;IACH,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;IAUvC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA0B/B;;;;;;;;OAQG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;CAsBpC"}
+{"version":3,"file":"form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIR,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AAG5E;;;;;;;;GAQG;AACH,qBAAa,WAAW,CACtB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,YAAY,wBAA+B;IAE3C;;;;;;;;OAQG;IACH,UAAU,CACR,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,QAAQ,GAAG,QAAQ,GACxB,IAAI;IAuCP;;;;;;;OAOG;IACH,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;IAUvC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA6B/B;;;;;;;;OAQG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;CAsBpC"}

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

@@ -34,7 +34,10 @@ export class FormService extends ControlService {
     setDefault(data, context, params, type) {
         const { defaultData } = this.getLoadParams(params);
         // 递归所有的表单项，设置默认值
-        recursiveIterate(this.model, (item) => {
+        recursiveIterate(this.model, (item, parent) => {
+            // 重复器中的子表单属性项不应挂在主表单中
+            if (parent.detailType === 'MDCTRL')
+                return true;
             if (item.detailType === 'FORMITEM') {
                 const { createDVT, createDV, updateDVT, updateDV, valueFormat } = item;
                 const valueType = type === 'create' ? createDVT : updateDVT;
@@ -55,6 +58,7 @@ export class FormService extends ControlService {
             }
         }, {
             childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+            isBreak: true,
         });
     }
     /**
@@ -84,7 +88,10 @@ export class FormService extends ControlService {
     initUIDataMap() {
         super.initUIDataMap();
         // 初始化表单属性key和界面key映射
-        recursiveIterate(this.model, (item) => {
+        recursiveIterate(this.model, (item, parent) => {
+            // 重复器中的子表单属性项不应挂在主表单中
+            if (parent.detailType === 'MDCTRL')
+                return true;
             if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
                 const formItem = item;
                 const uiKey = formItem.id.toLowerCase();
@@ -100,6 +107,7 @@ export class FormService extends ControlService {
             }
         }, {
             childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+            isBreak: true,
         });
     }
     /**

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

@@ -2,7 +2,7 @@ import { IDEFormButton } from '@ibiz/model-core';
 import { FormDetailController } from '../form-detail';
 import { FormButtonState } from './form-button.state';
 import { FormNotifyState } from '../../../../constant';
-import { IButtonState } from '../../../../../interface';
+import { IApiFormButtonController, IButtonState } from '../../../../../interface';
 /**
  * 表单按钮控制器
  *
@@ -12,7 +12,7 @@ import { IButtonState } from '../../../../../interface';
  * @class FormButtonController
  * @extends {FormDetailController}
  */
-export declare class FormButtonController extends FormDetailController<IDEFormButton> {
+export declare class FormButtonController extends FormDetailController<IDEFormButton> implements IApiFormButtonController {
     state: FormButtonState;
     /**
      *界面行为状态

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

@@ -1 +1 @@
-{"version":3,"file":"form-button.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAIpE;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IACnE,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAUrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAQpC;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBlD;;;;;;;;OAQG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BzD"}
+{"version":3,"file":"form-button.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EACL,wBAAwB,EACxB,YAAY,EAEb,MAAM,0BAA0B,CAAC;AAIlC;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,oBAAoB,CAAC,aAAa,CAC1C,YAAW,wBAAwB;IAE3B,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAuBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IA0BpC;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBlD;;;;;;;;OAQG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BzD"}

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

@@ -65,10 +65,22 @@ export class FormButtonController extends FormDetailController {
      * @param {IData} data
      */
     calcDetailDisabled(data) {
-        super.calcDetailDisabled(data);
+        let { disabled } = this.dynaLogicResult;
+        // 上层计算为启用时计算预定义项启用逻辑
+        if (disabled !== true && this.form.scheduler) {
+            const itemEnable = this.form.scheduler.triggerItemEnable(this.model.id, {
+                data: [data],
+            });
+            if (itemEnable !== undefined) {
+                disabled = !itemEnable;
+            }
+        }
+        if (disabled !== true && this.actionState) {
+            disabled = this.actionState.disabled;
+        }
         // 表单项与界面行为都有权限时才有权限
-        if (this.actionState) {
-            this.state.disabled = !!(this.state.disabled || this.actionState.disabled);
+        if (disabled !== undefined) {
+            this.state.disabled = disabled;
         }
     }
     /**
@@ -77,10 +89,22 @@ export class FormButtonController extends FormDetailController {
      * @param {IData} data
      */
     calcDetailVisible(data) {
-        super.calcDetailVisible(data);
-        // 表单项与界面行为都有权限时才有权限
-        if (this.actionState) {
-            this.state.visible = !!(this.state.visible && this.actionState.visible);
+        let { visible } = this.dynaLogicResult;
+        // 上层计算为显示时计算预定义项显示逻辑
+        if (visible !== false && this.form.scheduler) {
+            const itemVIsible = this.form.scheduler.triggerItemVisible(this.model.id, {
+                data: [data],
+            });
+            if (itemVIsible !== undefined) {
+                visible = itemVIsible;
+            }
+        }
+        if (visible !== false && this.actionState) {
+            visible = this.actionState.visible;
+        }
+        // 有值的时候才会去修改state
+        if (visible !== undefined) {
+            this.state.visible = visible;
         }
     }
     /**

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

@@ -1,3 +1,4 @@
+import { IApiFormButtonState } from '../../../../../interface';
 import { FormDetailState } from '../form-detail';
 /**
  * 表单按钮状态
@@ -5,7 +6,7 @@ import { FormDetailState } from '../form-detail';
  * @author: zhujiamin
  * @Date: 2023-01-04 10:26:34
  */
-export declare class FormButtonState extends FormDetailState {
+export declare class FormButtonState extends FormDetailState implements IApiFormButtonState {
     /**
      * 加载中
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"form-button.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,eAAgB,SAAQ,eAAe;IAClD;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAS;CAC1B"}
+{"version":3,"file":"form-button.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,eACX,SAAQ,eACR,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAS;CAC1B"}

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

@@ -3,7 +3,7 @@ import { FormDetailController } from '../form-detail';
 import { FormNotifyState } from '../../../../constant';
 import { FormButtonListState } from './form-button-list.state';
 import { FormController } from '../../form';
-import { IFormDetailContainerController } from '../../../../../interface';
+import { IApiFormButtonListController, IFormDetailContainerController } from '../../../../../interface';
 /**
  * 表单按钮组控制器
  *
@@ -11,7 +11,7 @@ import { IFormDetailContainerController } from '../../../../../interface';
  * @class FormButtonListController
  * @extends {FormDetailController<IDEFormButtonList>}
  */
-export declare class FormButtonListController extends FormDetailController<IDEFormButtonList> {
+export declare class FormButtonListController extends FormDetailController<IDEFormButtonList> implements IApiFormButtonListController {
     state: FormButtonListState;
     protected createState(): FormButtonListState;
     /**
@@ -23,6 +23,13 @@ export declare class FormButtonListController extends FormDetailController<IDEFo
      */
     constructor(model: IDEFormButtonList, form: FormController, parent?: IFormDetailContainerController);
     protected onInit(): Promise<void>;
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof FormButtonListController
+     */
+    protected initUIActions(): Promise<void>;
     /**
      * 初始化按钮组状态
      *

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

@@ -1 +1 @@
-{"version":3,"file":"form-button-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button-list/form-button-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACL,8BAA8B,EAE/B,MAAM,0BAA0B,CAAC;AAKlC;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB,CAAC,iBAAiB,CAAC;IAC3E,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;;;OAMG;gBAED,KAAK,EAAE,iBAAiB,EACxB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;cAMzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;OAMG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASrC;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASpC;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY;IAWpB;;;;;;;OAOG;IACG,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;;;;OAQG;IACI,kBAAkB,CACvB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;;OAOG;IACG,gBAAgB,CACpB,KAAK,EAAE,aAAa,EACpB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;;;;;OAOG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CASjE"}
+{"version":3,"file":"form-button-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button-list/form-button-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAEL,4BAA4B,EAC5B,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAMlC;;;;;;GAMG;AACH,qBAAa,wBACX,SAAQ,oBAAoB,CAAC,iBAAiB,CAC9C,YAAW,4BAA4B;IAE/B,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;;;OAMG;gBAED,KAAK,EAAE,iBAAiB,EACxB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;cAMzB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAW9C;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCvC;;;;;;OAMG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASrC;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IASpC;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY;IAWpB;;;;;;;OAOG;IACG,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;;;;OAQG;IACI,kBAAkB,CACvB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;;OAOG;IACG,gBAAgB,CACpB,KAAK,EAAE,aAAa,EACpB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;;;;;OAOG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CASjE"}

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

@@ -4,6 +4,7 @@ import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
 import { FormButtonListState } from './form-button-list.state';
 import { OpenAppViewCommand } from '../../../../../command';
 import { convertNavData } from '../../../../../utils';
+import { calcUIActionGroup, getAllUIActionItems } from '../../../../../model';
 /**
  * 表单按钮组控制器
  *
@@ -28,9 +29,21 @@ export class FormButtonListController extends FormDetailController {
         this.state.buttonsState = new ButtonContainerState();
     }
     async onInit() {
-        super.onInit();
+        await super.onInit();
         await this.initButtonsState();
     }
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof FormButtonListController
+     */
+    async initUIActions() {
+        const { buttonListType, uiactionGroup } = this.model;
+        if (buttonListType === 'UIACTIONGROUP' && uiactionGroup) {
+            await calcUIActionGroup(uiactionGroup, this.form.context, this.form.params);
+        }
+    }
     /**
      * 初始化按钮组状态
      *
@@ -38,15 +51,17 @@ export class FormButtonListController extends FormDetailController {
      * @memberof FormButtonListController
      */
     async initButtonsState() {
-        var _a;
         const { buttonListType, uiactionGroup, deformButtons } = this.model;
         if (buttonListType === 'UIACTIONGROUP') {
-            (_a = uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.forEach(detail => {
-                if (detail.uiactionId) {
-                    const buttonState = new UIActionButtonState(detail.id, detail.appId, detail.uiactionId, detail);
-                    this.state.buttonsState.addState(detail.id, buttonState);
-                }
-            });
+            if (uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails) {
+                const actions = getAllUIActionItems(uiactionGroup.uiactionGroupDetails);
+                actions.forEach(detail => {
+                    if (detail.uiactionId) {
+                        const buttonState = new UIActionButtonState(detail.id, detail.appId, detail.uiactionId, detail);
+                        this.state.buttonsState.addState(detail.id, buttonState);
+                    }
+                });
+            }
         }
         else {
             deformButtons === null || deformButtons === void 0 ? void 0 : deformButtons.forEach(button => {
@@ -108,10 +123,11 @@ export class FormButtonListController extends FormDetailController {
      * @memberof FormButtonListController
      */
     getModelById(id) {
-        var _a;
         const { buttonListType, uiactionGroup, deformButtons } = this.model;
-        if (buttonListType === 'UIACTIONGROUP')
-            return (_a = uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.find(detail => detail.id === id);
+        if (buttonListType === 'UIACTIONGROUP') {
+            const actions = getAllUIActionItems(uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails);
+            return actions.find(detail => detail.id === id);
+        }
         return deformButtons === null || deformButtons === void 0 ? void 0 : deformButtons.find(button => button.id === id);
     }
     /**

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

@@ -1,4 +1,4 @@
-import { IButtonContainerState } from '../../../../../interface';
+import { IApiFormButtonListState, IButtonContainerState } from '../../../../../interface';
 import { FormDetailState } from '../form-detail';
 /**
  * 表单按钮组状态
@@ -7,7 +7,7 @@ import { FormDetailState } from '../form-detail';
  * @class FormButtonListState
  * @extends {FormDetailState}
  */
-export declare class FormButtonListState extends FormDetailState {
+export declare class FormButtonListState extends FormDetailState implements IApiFormButtonListState {
     /**
      * 按钮组状态
      *

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

@@ -1 +1 @@
-{"version":3,"file":"form-button-list.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button-list/form-button-list.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,mBAAoB,SAAQ,eAAe;IACtD;;;;;OAKG;IACH,YAAY,EAAG,qBAAqB,CAAC;CACtC"}
+{"version":3,"file":"form-button-list.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button-list/form-button-list.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,mBACX,SAAQ,eACR,YAAW,uBAAuB;IAElC;;;;;OAKG;IACH,YAAY,EAAG,qBAAqB,CAAC;CACtC"}

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

@@ -0,0 +1,31 @@
+import { IDEFormDetail } from '@ibiz/model-core';
+import { IApiFormContainerController } from '../../../../../interface';
+import { FormDetailController } from '../form-detail/form-detail.controller';
+import { FormContainerState } from './form-container.state';
+export declare class FormContainerController<T extends IDEFormDetail = IDEFormDetail> extends FormDetailController<T> implements IApiFormContainerController {
+    /**
+     * @description 表单容器状态
+     * @type {FormContainerState}
+     * @memberof FormContainerController
+     */
+    state: FormContainerState;
+    /**
+     * @description 创建表单容器状态对象
+     * @protected
+     * @returns {*}  {FormContainerState}
+     * @memberof FormContainerController
+     */
+    protected createState(): FormContainerState;
+    /**
+     * @description 开始加载中
+     * @param {(string | undefined)} [loadingText] 加载提示文本
+     * @memberof FormContainerController
+     */
+    startLoading(loadingText?: string): void;
+    /**
+     * @description 结束加载中
+     * @memberof FormContainerController
+     */
+    endLoading(): void;
+}
+//# sourceMappingURL=form-container.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"form-container.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-container/form-container.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAC1E,SAAQ,oBAAoB,CAAC,CAAC,CAC9B,YAAW,2BAA2B;IAEtC;;;;OAIG;IACH,KAAK,EAAG,kBAAkB,CAAC;IAE3B;;;;;OAKG;IACH,SAAS,CAAC,WAAW,IAAI,kBAAkB;IAI3C;;;;OAIG;IACH,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IASxC;;;OAGG;IACH,UAAU,IAAI,IAAI;CAGnB"}

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

@@ -0,0 +1,36 @@
+import { isNotNil } from 'ramda';
+import { FormDetailController } from '../form-detail/form-detail.controller';
+import { FormContainerState } from './form-container.state';
+export class FormContainerController extends FormDetailController {
+    /**
+     * @description 创建表单容器状态对象
+     * @protected
+     * @returns {*}  {FormContainerState}
+     * @memberof FormContainerController
+     */
+    createState() {
+        var _a;
+        return new FormContainerState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
+    }
+    /**
+     * @description 开始加载中
+     * @param {(string | undefined)} [loadingText] 加载提示文本
+     * @memberof FormContainerController
+     */
+    startLoading(loadingText) {
+        this.state.loading = true;
+        if (isNotNil(loadingText)) {
+            this.state.loadingText = loadingText;
+        }
+        else {
+            this.state.loadingText = '';
+        }
+    }
+    /**
+     * @description 结束加载中
+     * @memberof FormContainerController
+     */
+    endLoading() {
+        this.state.loading = false;
+    }
+}

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

@@ -0,0 +1,14 @@
+import { IApiFormContainerState } from '../../../../../interface';
+import { FormDetailState } from '../form-detail/form-detail.state';
+/**
+ * @description 表单容器状态
+ * @export
+ * @class FormContainerState
+ * @extends {FormDetailState}
+ * @implements {IApiFormContainerState}
+ */
+export declare class FormContainerState extends FormDetailState implements IApiFormContainerState {
+    loading: boolean;
+    loadingText: string;
+}
+//# sourceMappingURL=form-container.state.d.ts.map