@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.52

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;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"}

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;
     /**

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;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 { getAllUIActionItems } from '../../../../../model';
 /**
  * 表单按钮组控制器
  *
@@ -38,15 +39,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 +111,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,30 @@
+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 开始加载中
+     * @memberof FormContainerController
+     */
+    startLoading(): 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;AACjD,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;;;OAGG;IACH,YAAY,IAAI,IAAI;IAIpB;;;OAGG;IACH,UAAU,IAAI,IAAI;CAGnB"}

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

@@ -0,0 +1,28 @@
+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 开始加载中
+     * @memberof FormContainerController
+     */
+    startLoading() {
+        this.state.loading = true;
+    }
+    /**
+     * @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,13 @@
+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;
+}
+//# sourceMappingURL=form-container.state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"form-container.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-container/form-container.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE;;;;;;GAMG;AACH,qBAAa,kBACX,SAAQ,eACR,YAAW,sBAAsB;IAEjC,OAAO,EAAE,OAAO,CAAS;CAC1B"}

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

@@ -0,0 +1,14 @@
+import { FormDetailState } from '../form-detail/form-detail.state';
+/**
+ * @description 表单容器状态
+ * @export
+ * @class FormContainerState
+ * @extends {FormDetailState}
+ * @implements {IApiFormContainerState}
+ */
+export class FormContainerState extends FormDetailState {
+    constructor() {
+        super(...arguments);
+        this.loading = false;
+    }
+}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-container/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from './form-container.controller';
+export * from './form-container.state';

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

@@ -3,6 +3,7 @@ import { IFormDetailController, IFormDetailContainerController } from '../../../
 import { FormNotifyState } from '../../../../constant';
 import { FormDetailState } from './form-detail.state';
 import { FormController } from '../../form';
+import { AppCounter } from '../../../../../service';
 export declare class FormDetailController<T extends IDEFormDetail = IDEFormDetail> implements IFormDetailController {
     /**
      * 表单成员模型
@@ -88,6 +89,12 @@ export declare class FormDetailController<T extends IDEFormDetail = IDEFormDetai
         disabled?: boolean;
         required?: boolean;
     };
+    /**
+     * @description 计数器对象
+     * @type {AppCounter}
+     * @memberof FormDetailController
+     */
+    counter?: AppCounter;
     /**
      * Creates an instance of FormDetailController.
      * @author lxm
@@ -104,6 +111,22 @@ export declare class FormDetailController<T extends IDEFormDetail = IDEFormDetai
      */
     init(): Promise<void>;
     protected onInit(): Promise<void>;
+    /**
+     * @description 初始化计数器
+     * @protected
+     * @returns {*}  {void}
+     * @memberof FormDetailController
+     */
+    protected initCounter(): void;
+    /**
+     * @description 处理计数器改变，并根据计数器模式计算显示状态
+     * @protected
+     * @param {IData} data
+     * @returns {*}  {void}
+     * @memberof FormDetailController
+     */
+    protected handleCounterChange(data: IData): void;
+    destroy(): void;
     /**
      * 创建表单状态对象
      *

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,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,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;IAmBzC;;;;;;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;IAuC5E;;;;;;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;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,QAAQ,EACJ,mBAAmB,GACnB,kBAAkB,GAClB,kBAAkB,GAClB,iBAAiB,GACpB,IAAI;IAkBP;;;;OAIG;IACG,OAAO,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAYjD"}
+{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"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"}

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

@@ -117,6 +117,46 @@ export class FormDetailController {
         if (capLanguageRes && capLanguageRes.lanResTag) {
             this.model.caption = ibiz.i18n.t(capLanguageRes.lanResTag, this.model.caption);
         }
+        this.handleCounterChange = this.handleCounterChange.bind(this);
+        this.initCounter();
+    }
+    /**
+     * @description 初始化计数器
+     * @protected
+     * @returns {*}  {void}
+     * @memberof FormDetailController
+     */
+    initCounter() {
+        var _a;
+        const { counters } = this.form;
+        const { appCounterRefId } = this.model;
+        if (appCounterRefId) {
+            this.counter = counters[appCounterRefId];
+            (_a = this.counter) === null || _a === void 0 ? void 0 : _a.onChange(this.handleCounterChange);
+        }
+    }
+    /**
+     * @description 处理计数器改变，并根据计数器模式计算显示状态
+     * @protected
+     * @param {IData} data
+     * @returns {*}  {void}
+     * @memberof FormDetailController
+     */
+    handleCounterChange(data) {
+        var _a;
+        this.state.counterData = data;
+        let state = true;
+        const { counterId, counterMode } = this.model;
+        if (counterId) {
+            const count = (_a = this.counter) === null || _a === void 0 ? void 0 : _a.getCounter(counterId);
+            if (counterMode === 1 && count === 0)
+                state = false;
+            this.state.visible = state;
+        }
+    }
+    destroy() {
+        var _a;
+        (_a = this.counter) === null || _a === void 0 ? void 0 : _a.offChange(this.handleCounterChange);
     }
     /**
      * 创建表单状态对象

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

@@ -53,6 +53,12 @@ export declare class FormDetailState implements IFormDetailState {
      * @type {boolean}
      */
     enableReadonly: boolean;
+    /**
+     * @description 计数器数据
+     * @type {IData}
+     * @memberof FormDetailState
+     */
+    counterData: IData;
     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;IAkE1C,SAAS,CAAC,MAAM,CAAC;IAjErB,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;IAEnB;;;;;;OAMG;IACH,cAAc,EAAE,OAAO,CAAQ;gBAET,MAAM,CAAC,uCAA2B;CA0EzD"}
+{"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;IAyE1C,SAAS,CAAC,MAAM,CAAC;IAxErB,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;IAEnB;;;;;;OAMG;IACH,cAAc,EAAE,OAAO,CAAQ;IAE/B;;;;OAIG;IACH,WAAW,EAAE,KAAK,CAAM;gBAEF,MAAM,CAAC,uCAA2B;CA0EzD"}

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

@@ -55,6 +55,12 @@ export class FormDetailState {
          * @type {boolean}
          */
         this.enableReadonly = true;
+        /**
+         * @description 计数器数据
+         * @type {IData}
+         * @memberof FormDetailState
+         */
+        this.counterData = {};
         // 定义是否显示，set方法需要返回true,否则vue proxy报错
         let $visible = true;
         Object.defineProperty(this, 'visible', {

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

@@ -1,5 +1,5 @@
 import { IDEFormDRUIPart } from '@ibiz/model-core';
-import { IAppDEService, IFormDruipartController, IViewController } from '../../../../../interface';
+import { IAppDEService, IViewController, IFormDruipartController } from '../../../../../interface';
 import { FormNotifyState } from '../../../../constant';
 import { FormDetailController } from '../form-detail';
 import { FormDruipartState } from './form-druipart.state';
@@ -82,13 +82,7 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
      */
     formStateNotify(state: FormNotifyState): Promise<void>;
     /**
-     * @description 同步当前表单数据至子界面数据服务
-     * @returns {*}  {Promise<void>}
-     * @memberof FormDRUIPartController
-     */
-    SyncDataToEmbedService(): Promise<void>;
-    /**
-     * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
+     * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图
      * @returns {*}  {void}
      * @memberof FormDRUIPartController
      */
@@ -111,5 +105,23 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
      * @memberof FormDRUIPartController
      */
     silentValidate(): Promise<boolean>;
+    /**
+     * @description 同步当前表单数据至子界面数据服务
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    SyncDataToEmbedService(): Promise<void>;
+    /**
+     * @description 同步子界面数据至表单
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    SyncEmbedDataToForm(): Promise<void>;
+    /**
+     * @description 保存嵌入视图数据
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    saveEmbedViewData(): Promise<void>;
 }
 //# sourceMappingURL=form-druipart.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,aAAa,EACb,uBAAuB,EAEvB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;GAKG;AACH,qBAAa,sBACX,SAAQ,oBAAoB,CAAC,eAAe,CAC5C,YAAW,uBAAuB;IAE1B,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;OAIG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;OAIG;IACH,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IAEvC;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;OAIG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,GAAG,SAAS,CAAC;IAE5C;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCvC;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5D;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW7C;;;;OAIG;IACH,cAAc,IAAI,IAAI;IAkDtB;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAiCzC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBlC;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;CAezC"}
+{"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,aAAa,EACb,eAAe,EAEf,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;GAKG;AACH,qBAAa,sBACX,SAAQ,oBAAoB,CAAC,eAAe,CAC5C,YAAW,uBAAuB;IAE1B,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;OAIG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;OAIG;IACH,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;IAEvC;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;OAIG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,GAAG,SAAS,CAAC;IAE5C;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA0CvC;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5D;;;;OAIG;IACH,cAAc,IAAI,IAAI;IAyDtB;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IA0BzC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBlC;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBxC;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW7C;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;OAIG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAKzC"}

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

@@ -54,26 +54,35 @@ export class FormDRUIPartController extends FormDetailController {
         Object.assign(this.state.layout.extraStyle, {
             overflow: 'auto',
         });
+        const { appViewId, refreshItems, paramItem, appId, needSave } = this.model;
         // 初始化关联刷新项
-        if (this.model.refreshItems) {
-            let strArr = this.model.refreshItems.split(';');
+        if (refreshItems) {
+            let strArr = refreshItems.split(';');
             strArr = strArr.filter(item => !!item); // 去除空字符串
             this.refreshItems.push(...strArr);
         }
         // 初始化参数项名称
-        if (this.model.paramItem) {
-            this.paramItem = this.model.paramItem;
-        }
+        if (paramItem)
+            this.paramItem = paramItem;
         // 是否同步子界面数据服务(1.要求模型源于子应用、2.当前关系界面设置同时保存)
-        this.isNeedSyncEmbed =
-            this.model.appId !== ibiz.env.appId && !!this.model.needSave;
+        this.isNeedSyncEmbed = appId !== ibiz.env.appId && !!needSave;
         // 初始化子界面数据服务
-        const embedView = await ibiz.hub.getAppView(this.model.appViewId);
-        const app = ibiz.hub.getApp(embedView.appId);
-        const tempContext = this.context.clone();
-        tempContext.srfappid = embedView.appId;
-        if (embedView.appDataEntityId) {
-            this.embedDataService = await app.deService.getService(tempContext, embedView.appDataEntityId);
+        if (appViewId) {
+            const embedView = await ibiz.hub.getAppView(appViewId);
+            const app = ibiz.hub.getApp(embedView.appId);
+            const tempContext = this.context.clone();
+            tempContext.srfappid = embedView.appId;
+            if (embedView.appDataEntityId) {
+                this.embedDataService = await app.deService.getService(tempContext, embedView.appDataEntityId);
+            }
+            // 主表单保存之前
+            this.form.evt.on('onBeforeSave', async () => {
+                // 处理子应用同实体表单合并关系界面（手动触发子数据保存、再将子数据同步到主表单）
+                if (this.isNeedSyncEmbed && this.embedView && this.embedDataService) {
+                    await this.saveEmbedViewData();
+                    await this.SyncEmbedDataToForm();
+                }
+            });
         }
     }
     /**
@@ -114,30 +123,20 @@ export class FormDRUIPartController extends FormDetailController {
         }
     }
     /**
-     * @description 同步当前表单数据至子界面数据服务
-     * @returns {*}  {Promise<void>}
-     * @memberof FormDRUIPartController
-     */
-    async SyncDataToEmbedService() {
-        if (this.isNeedSyncEmbed && this.embedDataService) {
-            const tempContext = this.context.clone();
-            tempContext.srfappid = this.model.appId;
-            const originData = this.form.state.data.$origin;
-            const res = await this.embedDataService.getTemp(tempContext);
-            const syncAction = res.data ? 'updateTemp' : 'createTemp';
-            await this.embedDataService[syncAction](tempContext, originData);
-        }
-    }
-    /**
-     * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
+     * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图
      * @returns {*}  {void}
      * @memberof FormDRUIPartController
      */
     calcViewParams() {
         // 计算导航上下文
         let newContext = this.form.context.clone();
-        // 忽略数据变化(子应用表单合并场景)
-        newContext.srfignorechange = this.isNeedSyncEmbed;
+        // 子应用表单合并场景
+        if (this.isNeedSyncEmbed) {
+            // 忽略数据变化
+            newContext.srfignorechange = true;
+            // 静默保存
+            newContext.srfsilent = true;
+        }
         const navContexts = this.model.navigateContexts;
         if (notNilEmpty(navContexts)) {
             newContext = Object.assign(newContext, convertNavData(navContexts, this.data, this.form.params, this.form.context));
@@ -189,14 +188,7 @@ export class FormDRUIPartController extends FormDetailController {
                 this.form.updateFormItem(this.model.deformItemUpdateId);
             }
             // 同步子界面数据
-            if (this.isNeedSyncEmbed && this.embedDataService) {
-                const tempContext = this.context.clone();
-                tempContext.srfappid = this.model.appId;
-                const res = await this.embedDataService.getTemp(tempContext);
-                const childData = res.data || {};
-                const exData = this.form.state.data.srfexdata || {};
-                this.form.state.data.srfexdata = Object.assign(exData, childData);
-            }
+            await this.SyncEmbedDataToForm();
         });
     }
     /**
@@ -235,4 +227,45 @@ export class FormDRUIPartController extends FormDetailController {
         }
         return true;
     }
+    /**
+     * @description 同步当前表单数据至子界面数据服务
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    async SyncDataToEmbedService() {
+        if (this.isNeedSyncEmbed && this.embedDataService) {
+            const tempContext = this.context.clone();
+            tempContext.srfappid = this.model.appId;
+            const originData = this.form.state.data.$origin;
+            const res = await this.embedDataService.getTemp(tempContext);
+            const syncAction = res.data ? 'updateTemp' : 'createTemp';
+            await this.embedDataService[syncAction](tempContext, originData);
+        }
+    }
+    /**
+     * @description 同步子界面数据至表单
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    async SyncEmbedDataToForm() {
+        if (this.isNeedSyncEmbed && this.embedDataService) {
+            const tempContext = this.context.clone();
+            tempContext.srfappid = this.model.appId;
+            const res = await this.embedDataService.getTemp(tempContext);
+            const childData = res.data || {};
+            const exData = this.form.state.data.srfexdata || {};
+            this.form.state.data.srfexdata = Object.assign(exData, childData);
+        }
+    }
+    /**
+     * @description 保存嵌入视图数据
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    async saveEmbedViewData() {
+        var _a;
+        if (this.isNeedSyncEmbed && this.embedView) {
+            await ((_a = this.embedView) === null || _a === void 0 ? void 0 : _a.call(SysUIActionTag.SAVE));
+        }
+    }
 }

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

@@ -1,8 +1,8 @@
 import { IDEFormGroupPanel, IUIActionGroupDetail } from '@ibiz/model-core';
-import { IFormDetailContainerController } from '../../../../../interface';
+import { IApiFormGroupPanelController } from '../../../../../interface';
 import { FormNotifyState } from '../../../../constant';
-import { FormDetailController } from '../form-detail/form-detail.controller';
 import { FormGroupPanelState } from './form-group-panel.state';
+import { FormContainerController } from '../form-container';
 /**
  * 表单分组面板控制器
  *
@@ -12,7 +12,7 @@ import { FormGroupPanelState } from './form-group-panel.state';
  * @class FormGroupPanelController
  * @extends {FormContainerController}
  */
-export declare class FormGroupPanelController<T extends IDEFormGroupPanel = IDEFormGroupPanel> extends FormDetailController<T> implements IFormDetailContainerController {
+export declare class FormGroupPanelController<T extends IDEFormGroupPanel = IDEFormGroupPanel> extends FormContainerController<T> implements IApiFormGroupPanelController {
     state: FormGroupPanelState;
     /**
      * 禁用关闭
@@ -42,7 +42,7 @@ export declare class FormGroupPanelController<T extends IDEFormGroupPanel = IDEF
      */
     initActionStates(): Promise<void>;
     /**
-     * 触发操作列点击事件
+     * 触发界面行为
      *
      * @author lxm
      * @date 2022-09-07 22:09:46