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

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,EACjB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAMrB;IAGF,IAAI,EAAE,iBAAiB,CAMrB;IAGF,OAAO,EAAE,oBAAoB,CAG3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAEjC;IAGF,IAAI,EAAE,iBAAiB,CAErB;IAGF,MAAM,EAAE,mBAAmB,CAEzB;IAGF,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,SAAS,GAAG,OAAO,CAAW;IAGjD,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAQ;CAClD"}
+{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAMrB;IAGF,IAAI,EAAE,iBAAiB,CAMrB;IAGF,OAAO,EAAE,oBAAoB,CAI3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;IAGF,IAAI,EAAE,iBAAiB,CAOrB;IAGF,YAAY,EAAE,yBAAyB,CAErC;IAGF,UAAU,EAAE,uBAAuB,CAEjC;IAGF,IAAI,EAAE,iBAAiB,CAErB;IAGF,MAAM,EAAE,mBAAmB,CAEzB;IAGF,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,SAAS,GAAG,OAAO,CAAW;IAGjD,iBAAiB,EAAE,MAAM,CAAM;IAG/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAQ;CAClD"}

package/out/config/global-config.js

@@ -29,6 +29,7 @@ export class GlobalConfig {
         this.appMenu = {
             enableEcho: true,
             echoMode: 'VIEW',
+            defaultCollapse: false,
         };
         // 全局代码表配置
         this.codeList = {

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

@@ -5,7 +5,7 @@ import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import { EventBase, IControlController, IControlEvent, IControlState, IViewController, IViewLayoutPanelController } from '../../../interface/controller';
 import { ControllerEvent } from '../../utils';
-import { IDataAbilityParams, IProvider } from '../../../interface';
+import { IApiMaskOption, IDataAbilityParams, IProvider } from '../../../interface';
 import { ControlLogicScheduler } from '../../../logic-scheduler';
 export type DEDataChangeType = 'create' | 'update' | 'remove';
 /**
@@ -266,5 +266,16 @@ export declare class ControlController<T extends IControl = IControl, S extends
         key: string;
         delay?: number;
     }): void;
+    /**
+     * @description 取消部件禁用
+     * @memberof ControlController
+     */
+    enable(): void;
+    /**
+     * @description 设置部件禁用
+     * @param {IApiMaskOption} [options={ mode: 'BLANK' }]
+     * @memberof ControlController
+     */
+    disabled(options?: IApiMaskOption): void;
 }
 //# sourceMappingURL=control.controller.d.ts.map

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

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

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

@@ -127,6 +127,8 @@ export class ControlController extends BaseController {
         super.initState();
         this.state.activated = true;
         this.state.isLoading = false;
+        this.state.disabled = false;
+        this.state.maskOption = { mode: 'BLANK' };
     }
     async onCreated() {
         var _a;
@@ -513,4 +515,21 @@ export class ControlController extends BaseController {
             cb();
         }
     }
+    /**
+     * @description 取消部件禁用
+     * @memberof ControlController
+     */
+    enable() {
+        this.state.disabled = false;
+        this.state.maskOption = { mode: 'BLANK' };
+    }
+    /**
+     * @description 设置部件禁用
+     * @param {IApiMaskOption} [options={ mode: 'BLANK' }]
+     * @memberof ControlController
+     */
+    disabled(options = { mode: 'BLANK' }) {
+        this.state.disabled = true;
+        this.state.maskOption = options;
+    }
 }

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

@@ -1,6 +1,6 @@
 import { IPortalMessage } from '@ibiz-template/core';
 import { IMDControl, IAppDataEntity } from '@ibiz/model-core';
-import { EventBase, IMDControlEvent, IMDControlState, MDCtrlLoadParams, MDCtrlRemoveParams, IToolbarController, IMDControlController } from '../../../interface';
+import { EventBase, IMDControlEvent, IMDControlState, MDCtrlLoadParams, IApiMDGroupParams, MDCtrlRemoveParams, IToolbarController, IMDControlController } from '../../../interface';
 import { MDControlService } from '../../../service';
 import { ControllerEvent } from '../../utils';
 import { ControlController } from './control.controller';
@@ -38,6 +38,13 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
      * @type {boolean}
      */
     enableLoad: boolean;
+    /**
+     * @description 分组日期格式化
+     * @protected
+     * @type {(('year' | 'quarter' | 'month' | 'week' | 'day')[])}
+     * @memberof MDControlController
+     */
+    protected groupDateFormat: ('year' | 'quarter' | 'month' | 'week' | 'day')[];
     /**
      * 刷新模式
      *
@@ -93,6 +100,15 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
     protected get quickToolbarController(): IToolbarController | undefined;
     protected onCreated(): Promise<void>;
     protected onMounted(): Promise<void>;
+    /**
+     * @description 执行多数据分组
+     * - 子类实现
+     * @param {IApiMDGroupParams[]} [_arg] 分组参数集合（多层分组暂未支持）
+     * @param {IParams} [_params] 额外参数
+     * @returns {*}  {Promise<void>}
+     * @memberof MDControlController
+     */
+    execGroup(_arg: IApiMDGroupParams[], _params?: IParams): Promise<void>;
     /**
      * 获取部件默认排序模型
      * @return {*}

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":"AACA,OAAO,EAGL,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,UAAU,EAEV,cAAc,EAEf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,SAAS,EACT,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAkB,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACI,SAAS,UAAS;IAEzB;;;;;;OAMG;IACI,UAAU,EAAE,OAAO,CAAQ;IAElC;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,SAAS,GAAG,OAAO,CAKrC;IAED,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAW5C,SAAS,CAAC,SAAS,IAAI,IAAI;IAyB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;cAEe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAoB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;OAIG;IACH,mBAAmB,IAAI,IAAI;IAI3B;;;;;OAKG;IACH,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI;IAkB/B;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAsCnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6C7D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4EzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAezE;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0EtD;;;;;OAKG;IACG,gBAAgB,CACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;IAanB;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAM7B,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzD,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,MAAM,GAAE,OAAc,GAAG,IAAI;IAuB9D;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjE;;;;;;OAMG;IACG,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC7D;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IA4CnD;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAYvC;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAY1C;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBtC;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAkBtC;;;;;OAKG;IACH,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI;IAchC;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;CAyBnE"}
+{"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

@@ -34,6 +34,13 @@ export class MDControlController extends ControlController {
          * @type {boolean}
          */
         this.enableLoad = true;
+        /**
+         * @description 分组日期格式化
+         * @protected
+         * @type {(('year' | 'quarter' | 'month' | 'week' | 'day')[])}
+         * @memberof MDControlController
+         */
+        this.groupDateFormat = [];
         /**
          * 实体属性映射，key是id，value是name
          * @author lxm
@@ -92,6 +99,7 @@ export class MDControlController extends ControlController {
         this.state.mdctrlActiveMode = 0;
         this.state.groups = [];
         this.state.hideNoDataImage = false;
+        this.state.enableGroup = !!this.model.enableGroup;
     }
     /**
      * 批操作工具栏
@@ -141,6 +149,15 @@ export class MDControlController extends ControlController {
             this.load({ isInitialLoad: true });
         }
     }
+    /**
+     * @description 执行多数据分组
+     * - 子类实现
+     * @param {IApiMDGroupParams[]} [_arg] 分组参数集合（多层分组暂未支持）
+     * @param {IParams} [_params] 额外参数
+     * @returns {*}  {Promise<void>}
+     * @memberof MDControlController
+     */
+    async execGroup(_arg, _params) { }
     /**
      * 获取部件默认排序模型
      * @return {*}

package/out/controller/control/data-view/data-view.controller.d.ts

@@ -1,7 +1,7 @@
 import { IDEDataView, IDEDataViewItem, IUIActionGroupDetail } from '@ibiz/model-core';
-import { IDataViewControlState, IDataViewControlEvent, IDataViewControlController, MDCtrlLoadParams, IMDControlGroupState, CodeListItem } from '../../../interface';
+import { CodeListItem, MDCtrlLoadParams, IApiMDGroupParams, IMDControlGroupState, IDataViewControlState, IDataViewControlEvent, IDataViewControlController } from '../../../interface';
 import { MDControlController } from '../../common';
-import { ButtonContainerState, ControllerEvent } from '../../utils';
+import { ControllerEvent, ButtonContainerState } from '../../utils';
 import { DataViewControlService } from './data-view.service';
 export declare class DataViewControlController<T extends IDEDataView = IDEDataView, S extends IDataViewControlState = IDataViewControlState, E extends IDataViewControlEvent = IDataViewControlEvent> extends MDControlController<T, S, E> implements IDataViewControlController {
     /**
@@ -118,6 +118,14 @@ export declare class DataViewControlController<T extends IDEDataView = IDEDataVi
      * @memberof DataViewControlController
      */
     onActionClick(detail: IUIActionGroupDetail, item: IData, event: MouseEvent): Promise<void>;
+    /**
+     * @description 执行多数据分组
+     * @param {IApiMDGroupParams[]} [arg] 分组参数集合（多层分组暂未支持）
+     * @param {IParams} [_params] 额外参数
+     * @returns {*}  {Promise<void>}
+     * @memberof DataViewControlController
+     */
+    execGroup(arg: IApiMDGroupParams[], _params?: IParams): Promise<void>;
     /**
      * 处理数据分组
      *

package/out/controller/control/data-view/data-view.controller.d.ts.map

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

package/out/controller/control/data-view/data-view.controller.js

@@ -1,10 +1,10 @@
-import { RuntimeModelError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
-import { isBoolean } from 'qx-util';
+import { RuntimeModelError, isElementSame } from '@ibiz-template/core';
+import { clone, isNil } from 'ramda';
+import { createUUID, isBoolean } from 'qx-util';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
-import { ButtonContainerState, UIActionButtonState, } from '../../utils';
+import { formatDate, UIActionButtonState, ButtonContainerState, } from '../../utils';
 import { DataViewControlService } from './data-view.service';
 export class DataViewControlController extends MDControlController {
     /**
@@ -268,13 +268,44 @@ export class DataViewControlController extends MDControlController {
             event,
         }, detail.appId);
     }
+    /**
+     * @description 执行多数据分组
+     * @param {IApiMDGroupParams[]} [arg] 分组参数集合（多层分组暂未支持）
+     * @param {IParams} [_params] 额外参数
+     * @returns {*}  {Promise<void>}
+     * @memberof DataViewControlController
+     */
+    async execGroup(arg, _params) {
+        const group = arg[0];
+        this.model = clone(this.model);
+        this.model.groupMode = 'AUTO';
+        if (!group || !group.groupFieldId) {
+            this.state.groups = [];
+            this.model.groupMode = 'NONE';
+            this.state.enableGroup = false;
+            this.model.groupCodeListId = undefined;
+            this.model.groupAppDEFieldId = undefined;
+            this.groupDateFormat = [];
+        }
+        else if (group.groupFieldId !== this.model.groupAppDEFieldId ||
+            (group.dateFormat &&
+                !isElementSame(group.dateFormat, this.groupDateFormat))) {
+            // 分组属性变更或日期格式不同时才重新初始化分组
+            this.state.enableGroup = true;
+            this.model.groupAppDEFieldId = group.groupFieldId;
+            this.model.groupCodeListId = group.groupCodeListId;
+            this.groupDateFormat = group.dateFormat || [];
+            await this.handleDataGroup();
+        }
+    }
     /**
      * 处理数据分组
      *
      * @memberof DataViewControlController
      */
     async handleDataGroup() {
-        const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
+        const { groupMode, groupAppDEFieldId } = this.model;
+        const { enableGroup } = this.state;
         if (enableGroup && groupMode) {
             if (!groupAppDEFieldId) {
                 throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.dataView.propertiesNoConfigured'));
@@ -293,6 +324,7 @@ export class DataViewControlController extends MDControlController {
      * @memberof DataViewControlController
      */
     async handleAutoGroup() {
+        var _a;
         const { groupAppDEFieldId, groupCodeListId } = this.model;
         // 自动分组且存在代码表时，使用代码表做一次转换
         let codeList = [];
@@ -302,17 +334,31 @@ export class DataViewControlController extends MDControlController {
         }
         if (groupAppDEFieldId) {
             const { items } = this.state;
+            // 判断分组属性是否为外键值
+            const deRss = (_a = this.dataEntity.minorAppDERSs) === null || _a === void 0 ? void 0 : _a.find(rss => rss.parentAppDEFieldId === groupAppDEFieldId);
+            // 获取外键值文本属性
+            const textDEFieldId = deRss === null || deRss === void 0 ? void 0 : deRss.parentTextAppDEFieldId;
+            const dateFormat = this.groupDateFormat[0];
             const groupMap = new Map();
+            const unclassified = {
+                key: createUUID(),
+                caption: ibiz.i18n.t('runtime.controller.common.md.unclassified'),
+                children: [],
+            };
             items.forEach((item) => {
-                const groupVal = item[groupAppDEFieldId];
+                // 如果有外键值文本属性，则根据外键值文本属性分组
+                let groupVal = item[textDEFieldId || groupAppDEFieldId];
+                // 特殊处理日期格式化
+                if (dateFormat)
+                    groupVal = formatDate(groupVal, dateFormat);
+                // 分组无值默认归为未分类
                 if (isNil(groupVal)) {
-                    // 分组无值的不显示
+                    unclassified.children.push(item);
                     return;
                 }
-                if (!groupMap.has(groupVal)) {
-                    groupMap.set(groupVal, []);
-                }
-                groupMap.get(groupVal).push(item);
+                const children = groupMap.get(groupVal) || [];
+                children.push(item);
+                groupMap.set(groupVal, children);
             });
             const groups = [];
             groupMap.forEach((value, key) => {
@@ -323,6 +369,9 @@ export class DataViewControlController extends MDControlController {
                     children: [...value],
                 });
             });
+            // 将未分类放到最后
+            if (unclassified.children.length)
+                groups.push(unclassified);
             this.state.groups = groups;
         }
     }

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

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

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

@@ -330,8 +330,10 @@ export class EditFormController extends FormController {
                 default: ibiz.i18n.t('runtime.controller.control.form.savedSuccessfully', { srfmajortext: this.data.srfmajortext || '' }),
             });
         }
-        // 发送数据变更事件
-        this.emitDEDataChange(isCreate ? 'create' : 'update', res.data);
+        // 发送数据变更事件(忽略数据变化不发送数据变更事件)
+        if (!this.context.srfignorechange) {
+            this.emitDEDataChange(isCreate ? 'create' : 'update', res.data);
+        }
         return this.data;
     }
     /**
@@ -388,7 +390,9 @@ export class EditFormController extends FormController {
             }
             ok = res.ok;
         }
-        this.emitDEDataChange('remove', this.data);
+        if (!this.context.srfignorechange) {
+            this.emitDEDataChange('remove', this.data);
+        }
         // 删除完成后都要置空当前表单数据
         this.state.data = new ControlVO();
         this.state.modified = false;
@@ -483,9 +487,11 @@ export class EditFormController extends FormController {
         const { context, params } = this.handlerAbilityParams(args);
         try {
             await this.service.wfStart(context, params, this.data);
-            this.emitDEDataChange('update', this.data);
-            // 刷新预定义todo实体数据
-            this.emitDEDataChange('update', { srfdecodename: 'SysTodo' });
+            if (!this.context.srfignorechange) {
+                this.emitDEDataChange('update', this.data);
+                // 刷新预定义todo实体数据
+                this.emitDEDataChange('update', { srfdecodename: 'SysTodo' });
+            }
         }
         catch (error) {
             this.actionNotification('WFSTARTERROR', {
@@ -522,9 +528,11 @@ export class EditFormController extends FormController {
         const { context, params } = this.handlerAbilityParams(args);
         try {
             await this.service.wfSubmit(context, params, this.data);
-            this.emitDEDataChange('update', this.data);
-            // 刷新预定义todo实体数据
-            this.emitDEDataChange('update', { srfdecodename: 'SysTodo' });
+            if (!this.context.srfignorechange) {
+                this.emitDEDataChange('update', this.data);
+                // 刷新预定义todo实体数据
+                this.emitDEDataChange('update', { srfdecodename: 'SysTodo' });
+            }
         }
         catch (error) {
             this.actionNotification('WFSUBMITERROR', {

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;CAkBpC"}
+{"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"}

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

@@ -114,6 +114,10 @@ export class FormService extends ControlService {
     getFilteredData(data) {
         const _data = data instanceof ControlVO ? data.getOrigin() : data;
         const tempData = {};
+        // 存在扩展数据附加扩展数据，主表单数据优先级大于扩展数据
+        if (data.srfexdata && Object.keys(data.srfexdata).length > 0) {
+            Object.assign(tempData, Object.assign({}, data.srfexdata));
+        }
         let tempDataUIMap = this.dataUIMap;
         if (data.$dataUIMap && data.$dataUIMap.size > 0) {
             tempDataUIMap = data.$dataUIMap;

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 { IFormDruipartController, IViewController } from '../../../../../interface';
+import { IAppDEService, IFormDruipartController, IViewController } from '../../../../../interface';
 import { FormNotifyState } from '../../../../constant';
 import { FormDetailController } from '../form-detail';
 import { FormDruipartState } from './form-druipart.state';
@@ -48,6 +48,18 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
      * @memberof FormDRUIPartController
      */
     isNewData: boolean;
+    /**
+     * @description 是否同步子界面数据服务（处理子应用同实体表单合并关系界面）
+     * @type {boolean}
+     * @memberof FormDRUIPartController
+     */
+    isNeedSyncEmbed: boolean;
+    /**
+     * @description 子界面数据服务
+     * @type {(IAppDEService | undefined)}
+     * @memberof FormDRUIPartController
+     */
+    embedDataService: IAppDEService | undefined;
     /**
      * @description 初始化
      * @protected
@@ -69,6 +81,12 @@ export declare class FormDRUIPartController extends FormDetailController<IDEForm
      * @memberof FormDRUIPartController
      */
     formStateNotify(state: FormNotifyState): Promise<void>;
+    /**
+     * @description 同步当前表单数据至子界面数据服务
+     * @returns {*}  {Promise<void>}
+     * @memberof FormDRUIPartController
+     */
+    SyncDataToEmbedService(): Promise<void>;
     /**
      * @description 计算视图上下文和视图参数, 调用该方法一定会刷新视图。
      * @returns {*}  {void}

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,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;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBvC;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5D;;;;OAIG;IACH,cAAc,IAAI,IAAI;IAgDtB;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAwBzC;;;;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,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"}

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

@@ -32,6 +32,12 @@ export class FormDRUIPartController extends FormDetailController {
          * @memberof FormDRUIPartController
          */
         this.isNewData = false;
+        /**
+         * @description 是否同步子界面数据服务（处理子应用同实体表单合并关系界面）
+         * @type {boolean}
+         * @memberof FormDRUIPartController
+         */
+        this.isNeedSyncEmbed = false;
     }
     createState() {
         var _a;
@@ -58,6 +64,17 @@ export class FormDRUIPartController extends FormDetailController {
         if (this.model.paramItem) {
             this.paramItem = this.model.paramItem;
         }
+        // 是否同步子界面数据服务(1.要求模型源于子应用、2.当前关系界面设置同时保存)
+        this.isNeedSyncEmbed =
+            this.model.appId !== ibiz.env.appId && !!this.model.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);
+        }
     }
     /**
      * @description 表单数据变更通知(由表单控制器调用)
@@ -69,6 +86,9 @@ export class FormDRUIPartController extends FormDetailController {
         await super.dataChangeNotify(names);
         // 关联刷新项发生变更时触发刷新
         if (isOverlap(this.refreshItems, names)) {
+            // 同步子界面数据服务
+            await this.SyncDataToEmbedService();
+            // 表单数据加载变更后，计算关系界面参数
             this.calcViewParams();
         }
     }
@@ -87,10 +107,27 @@ export class FormDRUIPartController extends FormDetailController {
         if (state === FormNotifyState.LOAD ||
             state === FormNotifyState.DRAFT ||
             state === FormNotifyState.SAVE) {
+            // 同步子界面数据服务
+            await this.SyncDataToEmbedService();
             // 表单数据加载变更后，计算关系界面参数
             this.calcViewParams();
         }
     }
+    /**
+     * @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 {*}  {void}
@@ -99,6 +136,8 @@ export class FormDRUIPartController extends FormDetailController {
     calcViewParams() {
         // 计算导航上下文
         let newContext = this.form.context.clone();
+        // 忽略数据变化(子应用表单合并场景)
+        newContext.srfignorechange = this.isNeedSyncEmbed;
         const navContexts = this.model.navigateContexts;
         if (notNilEmpty(navContexts)) {
             newContext = Object.assign(newContext, convertNavData(navContexts, this.data, this.form.params, this.form.context));
@@ -140,7 +179,7 @@ export class FormDRUIPartController extends FormDetailController {
                 this.embedView.call(ViewCallTag.LOAD);
             }
         });
-        this.embedView.evt.on('onDataChange', event => {
+        this.embedView.evt.on('onDataChange', async (event) => {
             if (['LOAD', 'LOADDRAFT'].includes(event.actionType)) {
                 return;
             }
@@ -149,6 +188,15 @@ export class FormDRUIPartController extends FormDetailController {
             if (this.model.deformItemUpdateId) {
                 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);
+            }
         });
     }
     /**

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

@@ -33,7 +33,8 @@ export class FormItemController extends FormDetailController {
      * @type {unknown}
      */
     get value() {
-        return this.data[this.name];
+        var _a;
+        return (_a = this.data) === null || _a === void 0 ? void 0 : _a[this.name];
     }
     /**
      * 值项

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

@@ -4,7 +4,7 @@ import { GridColumnController } from './grid-column.controller';
 import { GridRowState } from './grid-row.state';
 import { GridService } from './grid.service';
 import { GridUAColumnController, GridFieldEditColumnController } from '../grid-column';
-import { IGridState, IGridEvent, CodeListItem, IColumnState, IGridRowState, IExportColumn, IGridController, MDCtrlLoadParams, ISearchGroupData, IGridColumnProvider } from '../../../../interface';
+import { IGridState, IGridEvent, CodeListItem, IColumnState, IGridRowState, IExportColumn, IGridController, MDCtrlLoadParams, ISearchGroupData, IApiMDGroupParams, IGridColumnProvider } from '../../../../interface';
 import { ControlVO } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
@@ -287,6 +287,14 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @param rows
      */
     updateRows(rows: IGridRowState[]): Promise<void>;
+    /**
+     * @description 执行多数据分组
+     * @param {IApiMDGroupParams[]} [arg] 分组参数集合（多层分组暂未支持）
+     * @param {IParams} [_params] 额外参数
+     * @returns {*}  {Promise<void>}
+     * @memberof MDControlController
+     */
+    execGroup(arg: IApiMDGroupParams[], _params?: IParams): Promise<void>;
     /**
      * 计算分组数据
      * @author lxm