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

package/out/model/utils/util.js

@@ -1,4 +1,7 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
 import { RuntimeModelError } from '@ibiz-template/core';
+import { createUUID, isArray } from 'qx-util';
+import { PredefinedControlRender } from '../../constant';
 /**
  * 在数据模型中查找对应 id 模型
  *
@@ -132,7 +135,7 @@ export function getControlPanel(control) {
         // 排除空数据显示内容绘制器
         const panelRender = control.controlRenders.find(item => item.renderType === 'LAYOUTPANEL' &&
             !!item.layoutPanel &&
-            item.id !== 'emptypanel');
+            !Object.values(PredefinedControlRender).includes(item.id));
         layoutPanel = panelRender === null || panelRender === void 0 ? void 0 : panelRender.layoutPanel;
     }
     return layoutPanel;
@@ -191,3 +194,164 @@ export function getCtrlTeleportParams(control) {
         teleportFlag,
     };
 }
+/**
+ * @description 计算单个动态界面行为组项数据
+ * @export
+ * @param {IData} refUIActionGroup
+ * @param {IContext} context
+ * @param {IParams} params
+ * @returns {*}  {Promise<IAppDEUIActionGroupDetail[]>}
+ */
+export async function calcDyUiactionGroup(refUIActionGroup, context, params) {
+    const { appId, detailAppDataEntityId, detailAppDEDataSetId, 
+    // 界面行为标记
+    uiactionTagAppDEFieldId, 
+    // 文本属性
+    textAppDEFieldId, 
+    // 提示值属性
+    tipsAppDEFieldId, 
+    // 可见逻辑属性
+    visibleScriptAppDEFieldId, 
+    // 图标样式属性
+    iconClsAppDEFieldId, 
+    // 样式表属性
+    clsAppDEFieldId, 
+    // 按钮样式属性
+    buttonStyleAppDEFieldId, 
+    // 行为级别属性
+    actionLevelAppDEFieldId, 
+    // 启用逻辑属性
+    enableScriptAppDEFieldId, } = refUIActionGroup;
+    const details = [];
+    try {
+        if (detailAppDEDataSetId && detailAppDataEntityId) {
+            const response = await ibiz.hub
+                .getApp(appId)
+                .deService.exec(detailAppDataEntityId, detailAppDEDataSetId, context, params);
+            if (response.ok && isArray(response.data)) {
+                response.data.forEach((_item) => {
+                    const action = {
+                        uiactionId: _item[uiactionTagAppDEFieldId],
+                        caption: _item[textAppDEFieldId],
+                        tooltip: _item[tipsAppDEFieldId],
+                        visibleScriptCode: _item[visibleScriptAppDEFieldId],
+                        sysImage: _item[iconClsAppDEFieldId],
+                        sysCss: _item[clsAppDEFieldId],
+                        buttonStyle: _item[buttonStyleAppDEFieldId],
+                        actionLevel: _item[actionLevelAppDEFieldId],
+                        enableScriptCode: _item[enableScriptAppDEFieldId],
+                        // 适配显示逻辑
+                        showCaption: !!_item[textAppDEFieldId],
+                        showIcon: !!_item[iconClsAppDEFieldId],
+                        detailType: 'DEUIACTION',
+                        itemType: 'DEUIACTION',
+                        id: `${createUUID()}`,
+                        appId,
+                    };
+                    // 界面行为标识不能为空
+                    if (action.uiactionId)
+                        details.push(action);
+                });
+            }
+        }
+    }
+    catch (error) {
+        ibiz.log.error(error);
+    }
+    return details;
+}
+/**
+ * @description 处理界面行为组（替换动态行为组模型为实际的行为项集合）
+ * @export
+ * @param {IUIActionGroupDetail[]} uiactionGroupDetails
+ * @param {IContext} context
+ * @param {IParams} params
+ * @returns {*}  {Promise<IUIActionGroupDetail[]>}
+ */
+export async function calcUIActionDetails(uiactionGroupDetails, context, params) {
+    // 筛选需要替换的项（保留原始索引）
+    const refActionDetails = [];
+    uiactionGroupDetails.forEach((detail, index) => {
+        var _a;
+        // 过滤静态界面行为组
+        if (detail.detailType === 'DEUIACTIONGROUP' &&
+            detail.refUIActionGroup &&
+            !((_a = detail.refUIActionGroup) === null || _a === void 0 ? void 0 : _a.uiactionGroupDetails)) {
+            refActionDetails.push({ detail, index });
+        }
+    });
+    // 批量执行异步任务，获取所有替换数据
+    const asyncTasks = [];
+    refActionDetails.forEach(({ detail }) => {
+        const { refUIActionGroup } = detail;
+        const task = calcDyUiactionGroup(refUIActionGroup, context, params);
+        asyncTasks.push(task);
+    });
+    // 替换数据
+    const replaceDataList = await Promise.all(asyncTasks);
+    // 倒序排序：先替换数组后面的项，不会影响前面项的原始索引
+    const sortedRefDetails = [...refActionDetails].sort((a, b) => b.index - a.index);
+    sortedRefDetails.forEach(({ index }, i) => {
+        const replaceData = replaceDataList[i];
+        uiactionGroupDetails.splice(index, 1, ...replaceData);
+    });
+    return uiactionGroupDetails;
+}
+/**
+ * @description 递归获取所有界面行为项（处理多层嵌套的动态行为组、替换动态行为组模型为实际的行为项集合）
+ * @export
+ * @param {IDEUIActionGroupDetail[]} details
+ * @param {IContext} context
+ * @param {IParams} params
+ * @returns {*}  {Promise<IDEUIActionGroupDetail[]>}
+ */
+export async function calcAllUIActionDetails(details, context, params) {
+    const actions = [];
+    // 收集所有遍历过程中的异步任务
+    const asyncTasks = [];
+    const addAction = (items) => {
+        if (!isArray(items) || !(items === null || items === void 0 ? void 0 : items.length))
+            return;
+        const task = calcUIActionDetails(items, context, params);
+        asyncTasks.push(task);
+        items.forEach(item => {
+            var _a, _b;
+            if (item.detailType === 'DEUIACTIONGROUP') {
+                if ((_b = (_a = item.refUIActionGroup) === null || _a === void 0 ? void 0 : _a.uiactionGroupDetails) === null || _b === void 0 ? void 0 : _b.length)
+                    addAction(item.refUIActionGroup.uiactionGroupDetails);
+            }
+        });
+    };
+    addAction(details || []);
+    const allActionDetails = await Promise.all(asyncTasks);
+    allActionDetails.forEach(_details => {
+        _details.forEach(detail => {
+            actions.push(detail);
+        });
+    });
+    return actions;
+}
+/**
+ * @description 获取所有的界面行为项模型集合
+ * @export
+ * @param {IDEUIActionGroupDetail[]} details
+ * @returns {*}  {IDEUIActionGroupDetail[]}
+ */
+export function getAllUIActionItems(details = []) {
+    const actions = [];
+    const addAction = (items) => {
+        items.forEach(item => {
+            var _a;
+            if (item.detailType === 'DEUIACTIONGROUP') {
+                const childrenDetails = (_a = item.refUIActionGroup) === null || _a === void 0 ? void 0 : _a.uiactionGroupDetails;
+                if (childrenDetails === null || childrenDetails === void 0 ? void 0 : childrenDetails.length)
+                    addAction(childrenDetails);
+            }
+            else {
+                actions.push(item);
+            }
+        });
+    };
+    addAction(details);
+    return actions;
+}

package/out/model/view/view.d.ts

@@ -26,4 +26,11 @@ export declare function getViewLogics(view: IAppView): IAppViewLogic[];
  * @return {*}  {IAppViewEngine[]}
  */
 export declare function getViewEngines(view: IAppView): IAppViewEngine[];
+/**
+ * @description 获取部件引擎
+ * @export
+ * @param {IAppView} view
+ * @returns {*}  {IAppViewEngine[]}
+ */
+export declare function getCtrlEngines(view: IAppView): IAppViewEngine[];
 //# sourceMappingURL=view.d.ts.map

package/out/model/view/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/model/view/view.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,aAAa,EACb,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAO5D;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,aAAa,EAAE,CAO7D;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,EAAE,CAmB/D"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/model/view/view.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,aAAa,EACb,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAO5D;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,aAAa,EAAE,CAO7D;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,EAAE,CAc/D;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,EAAE,CAO/D"}

package/out/model/view/view.js

@@ -47,12 +47,23 @@ export function getViewEngines(view) {
     return appViewEngines.filter(engine => {
         switch (engine.engineCat) {
             case 'CTRL':
-                ibiz.log.warn(ibiz.i18n.t('runtime.model.view.engineClassifications', {
-                    engineType: engine.engineType,
-                }));
                 return false;
             default:
                 return true;
         }
     });
 }
+/**
+ * @description 获取部件引擎
+ * @export
+ * @param {IAppView} view
+ * @returns {*}  {IAppViewEngine[]}
+ */
+export function getCtrlEngines(view) {
+    const { viewLayoutPanel } = view;
+    const appViewEngines = view.appViewEngines || [];
+    if (viewLayoutPanel) {
+        appViewEngines.push(...(viewLayoutPanel.appViewEngines || []));
+    }
+    return appViewEngines.filter(engine => engine.engineCat === 'CTRL');
+}

package/out/platform/platform-util.d.ts

@@ -1,4 +1,10 @@
 import { PlatformType } from '../constant';
+export declare const ua: string;
+export declare function isAndroid(): boolean;
+export declare function isIos(): boolean;
+export declare function isWeChat(): boolean;
+export declare function isDingDing(): boolean;
+export declare function isWxMp(): boolean;
 /**
  * 获取搭载平台名称
  *

package/out/platform/platform-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-util.d.ts","sourceRoot":"","sources":["../../src/platform/platform-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA8B3C;;;;;;;GAOG;AACH,wBAAgB,eAAe,IAAI,YAAY,CAkB9C"}
+{"version":3,"file":"platform-util.d.ts","sourceRoot":"","sources":["../../src/platform/platform-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,eAAO,MAAM,EAAE,QAA2C,CAAC;AAG3D,wBAAgB,SAAS,IAAI,OAAO,CAEnC;AAGD,wBAAgB,KAAK,IAAI,OAAO,CAE/B;AAED,wBAAgB,QAAQ,IAAI,OAAO,CAElC;AAGD,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED,wBAAgB,MAAM,IAAI,OAAO,CAKhC;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,IAAI,YAAY,CAkB9C"}

package/out/platform/platform-util.js

@@ -1,23 +1,23 @@
 import { PlatformType } from '../constant';
-const ua = window.navigator.userAgent.toLowerCase();
+export const ua = window.navigator.userAgent.toLowerCase();
 // android平台
-function isAndroid() {
+export function isAndroid() {
     return /Android|Adr/i.test(ua);
 }
 // ios平台
-function isIos() {
+export function isIos() {
     return /iPhone|iPod|iPad/i.test(ua);
 }
 // 微信生态
-function isWeChat() {
+export function isWeChat() {
     return /MicroMessenger/i.test(ua);
 }
 // 钉钉环境
-function isDingDing() {
+export function isDingDing() {
     return /DingTalk/i.test(ua);
 }
 // 微信小程序
-function isWxMp() {
+export function isWxMp() {
     return (/miniProgram/i.test(ua) ||
         window.__wxjs_environment === 'miniprogram');
 }

package/out/platform/provider/platform-provider-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-provider-base.d.ts","sourceRoot":"","sources":["../../../src/platform/provider/platform-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD;;;;;;;;;GASG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IAErE,WAAW,SAAkB;IAE7B,IAAI,IAAI,IAAI;IAEN,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAE1B,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,GACrC,OAAO,CAAC,OAAO,CAAC;IAIb,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB3D;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAgBrC"}
+{"version":3,"file":"platform-provider-base.d.ts","sourceRoot":"","sources":["../../../src/platform/provider/platform-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD;;;;;;;;;GASG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IAErE,WAAW,SAAkB;IAE7B,IAAI,IAAI,IAAI;IAEN,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAE1B,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,GACrC,OAAO,CAAC,OAAO,CAAC;IAIb,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB3D;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAmBrC"}

package/out/platform/provider/platform-provider-base.js

@@ -58,7 +58,11 @@ export class PlatformProviderBase {
         else {
             tabTitle = this.sourceTitle;
         }
-        if (title) {
+        // 隐藏应用标题时，有视图标题就显示视图标题，没有时则显示应用标题
+        if (ibiz.env.isMob && !ibiz.config.mob.mobShowAppTitle) {
+            document.title = title || tabTitle;
+        }
+        else if (title) {
             document.title = `${tabTitle} - ${title}`;
         }
         else {

package/out/plugin/remote-plugin-item/remote-plugin-item.d.ts

@@ -125,6 +125,12 @@ export interface RemotePluginConfig {
      * @memberof RemotePluginConfig
      */
     appId: string;
+    /**
+     * @description 扩展参数
+     * @type {IParams}
+     * @memberof RemotePluginConfig
+     */
+    extraParams: IParams;
 }
 /**
  * 远程插件项

package/out/plugin/remote-plugin-item/remote-plugin-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-plugin-item.d.ts","sourceRoot":"","sources":["../../../src/plugin/remote-plugin-item/remote-plugin-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;IACxC;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC;;;;;;;;OAQG;gBACS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKlE"}
+{"version":3,"file":"remote-plugin-item.d.ts","sourceRoot":"","sources":["../../../src/plugin/remote-plugin-item/remote-plugin-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACpC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;IACxC;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC;;;;;;;;OAQG;gBACS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKlE"}

package/out/service/app-data-entity/app-data-entity.d.ts

@@ -21,6 +21,7 @@ export declare class AppDataEntity implements IDataEntity {
     srfmajortext: string;
     tempsrfkey: string;
     srfordervalue: number;
+    srfunionkey: string;
     get srfuf(): Srfuf;
     /**
      * Creates an instance of AppDataEntity.

package/out/service/app-data-entity/app-data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,EAAE,MAAM,CAAC;IAE9B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,GAAE,KAAK,GAAG,aAAkB;IAyFpE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAOtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IAiBlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CA6B5E"}
+{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAE5B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,GAAE,KAAK,GAAG,aAAkB;IAiGpE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IA+ClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAQtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IAiBlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CA6B5E"}

package/out/service/app-data-entity/app-data-entity.js

@@ -97,6 +97,13 @@ export class AppDataEntity {
             writable: true,
             value: isNil(this.srfkey) ? createUUID() : this.srfkey,
         });
+        // 设置联合主键（存在联合主键属性集合才有值）
+        Object.defineProperty(this, 'srfunionkey', {
+            enumerable: false,
+            configurable: true,
+            writable: true,
+            value: '',
+        });
         this.defineProperties();
     }
     /**
@@ -110,17 +117,32 @@ export class AppDataEntity {
         var _a;
         const { _data, convertVal } = this;
         const properties = {};
+        // fix：odoo#0059
+        const excludeKeys = [
+            '_entity',
+            '_data',
+            'srfdeid',
+            'srfdecodename',
+            'srfkeyfield',
+            'srfkey',
+            'srfmajorfield',
+            'srfmajortext',
+            'tempsrfkey',
+            'srfunionkey',
+        ];
         const keys = Object.keys(_data);
         keys.forEach(key => {
-            properties[key] = {
-                enumerable: true,
-                set(val) {
-                    _data[key] = val;
-                },
-                get() {
-                    return _data[key];
-                },
-            };
+            if (excludeKeys.indexOf(key) === -1) {
+                properties[key] = {
+                    enumerable: true,
+                    set(val) {
+                        _data[key] = val;
+                    },
+                    get() {
+                        return _data[key];
+                    },
+                };
+            }
         });
         (_a = this._entity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
             const key = field.codeName.toLowerCase();
@@ -149,6 +171,7 @@ export class AppDataEntity {
         const entity = new AppDataEntity(this._entity, this._data);
         entity.srfkey = this.srfkey;
         entity.srfordervalue = this.srfordervalue;
+        entity.srfunionkey = this.srfunionkey;
         return entity;
     }
     /**

package/out/service/de-service-util.d.ts

@@ -155,5 +155,20 @@ export declare class DEServiceUtil implements IApiDEServiceUtil {
      * @return {*}  {Promise<IData>}
      */
     computeAppDEMappingParam(context: IContext, appDataEntityId: string): Promise<IData>;
+    /**
+     * @description 记录当前域变更
+     * @param {('ADD' | 'RESET' | 'UNDO' | 'REDO')} actionType 添加数据 | 重置数据
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    recordUIDomainChanges(srfsessionid: string, actionType: 'ADD' | 'RESET'): void;
+    /**
+     * @description 取消当前域变更，'UNDO' | 'REDO'暂未支持
+     * @param {string} srfsessionid 域标识
+     * @param {('INIT' | 'UNDO' | 'REDO')} targetState 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    cancelUIDomainDChanges(srfsessionid: string, targetState: 'INIT' | 'UNDO' | 'REDO'): void;
 }
 //# sourceMappingURL=de-service-util.d.ts.map

package/out/service/de-service-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IAiDzC,SAAS,CAAC,QAAQ,EAAE,YAAY;IAhD5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAa;IAEzE;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CACxD;IAEZ;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE,GAAG,CAC5B,MAAM,EACN;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CACxC,CAAa;IAEd;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAK5C;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAIpE;;;;OAIG;IACH,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAwB/D;;;;;;;;OAQG;IACG,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAyCvE;;;;;;;;OAQG;IACG,qBAAqB,CACzB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC;IAkBzB;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAc9B;;;;;OAKG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAY1C;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAWvC;;;;;;;;;OASG;IACH,kBAAkB,CAChB,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,IAAI;IA6BP;;;;;;;;;;OAUG;IACG,IAAI,CACR,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS,EACpC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,EAC7B,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IA2BhC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,OAAO,EAAE,QAAQ,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;CAqClB"}
+{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IAiDzC,SAAS,CAAC,QAAQ,EAAE,YAAY;IAhD5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAa;IAEzE;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CACxD;IAEZ;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE,GAAG,CAC5B,MAAM,EACN;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CACxC,CAAa;IAEd;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAK5C;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAIpE;;;;OAIG;IACH,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAwB/D;;;;;;;;OAQG;IACG,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAyCvE;;;;;;;;OAQG;IACG,qBAAqB,CACzB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC;IAkBzB;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAc9B;;;;;OAKG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAY1C;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAWvC;;;;;;;;;OASG;IACH,kBAAkB,CAChB,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,IAAI;IA6BP;;;;;;;;;;OAUG;IACG,IAAI,CACR,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS,EACpC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,EAC7B,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IA2BhC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,OAAO,EAAE,QAAQ,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAsCjB;;;;;OAKG;IACH,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,KAAK,GAAG,OAAO,GAC1B,IAAI;IAaP;;;;;;OAMG;IACH,sBAAsB,CACpB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GACpC,IAAI;CAiBR"}

package/out/service/de-service-util.js

@@ -315,6 +315,48 @@ export class DEServiceUtil {
         }
         return result;
     }
+    /**
+     * @description 记录当前域变更
+     * @param {('ADD' | 'RESET' | 'UNDO' | 'REDO')} actionType 添加数据 | 重置数据
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    recordUIDomainChanges(srfsessionid, actionType) {
+        if (!this.cache.has(srfsessionid)) {
+            return;
+        }
+        const map = this.cache.get(srfsessionid);
+        if (map.size > 0) {
+            const services = Array.from(map.values());
+            for (let i = 0; i < services.length; i++) {
+                services[i].local.recordChanges(actionType);
+            }
+        }
+    }
+    /**
+     * @description 取消当前域变更，'UNDO' | 'REDO'暂未支持
+     * @param {string} srfsessionid 域标识
+     * @param {('INIT' | 'UNDO' | 'REDO')} targetState 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    cancelUIDomainDChanges(srfsessionid, targetState) {
+        // 后续需支持undo和redo后再行调整
+        if (!this.cache.has(srfsessionid) || targetState !== 'INIT') {
+            return;
+        }
+        // 还原界面域变更数据
+        const map = this.cache.get(srfsessionid);
+        if (map.size > 0) {
+            const services = Array.from(map.values());
+            for (let i = 0; i < services.length; i++) {
+                services[i].local.cancelChanges(targetState);
+            }
+        }
+        // 还原界面域变更状态
+        const uiDomain = ibiz.uiDomainManager.get(srfsessionid);
+        uiDomain === null || uiDomain === void 0 ? void 0 : uiDomain.dataChangeCompleted();
+    }
 }
 /**
  * 实体服务构造方法缓存

package/out/service/service/code-list/code-list.service.d.ts

@@ -27,6 +27,13 @@ export declare class CodeListService implements IApiCodeListService {
      * @type {Map<string, CodeListItem[]>}
      */
     protected cache: Map<string, readonly CodeListItem[] | DynamicCodeListCache>;
+    /**
+     * 已合并子应用代码表标识缓存
+     *
+     * @protected
+     * @type {Map<string, DynamicCodeListCache>}
+     */
+    protected mergedSubCodeListCache: Array<string>;
     constructor(appModel: IApplication);
     /**
      * 获取静态代码表

package/out/service/service/code-list/code-list.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IAoB7C,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA2C3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAiBnC;;;;;;;OAOG;IACH,gBAAgB,CACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,EAC9C,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,YAAY,GAAG,SAAS;IA2B3B;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAWpC;;;;;OAKG;IACG,mBAAmB,CACvB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAqB5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAQhB"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IA4B7C,SAAS,CAAC,QAAQ,EAAE,YAAY;IA3B5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;IAEZ;;;;;OAKG;IACH,SAAS,CAAC,sBAAsB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;gBAE/B,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAelD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA2C3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAiBnC;;;;;;;OAOG;IACH,gBAAgB,CACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,EAC9C,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,YAAY,GAAG,SAAS;IA2B3B;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAWpC;;;;;OAKG;IACG,mBAAmB,CACvB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAqB5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAQhB"}

package/out/service/service/code-list/code-list.service.js

@@ -30,6 +30,13 @@ export class CodeListService {
          * @type {Map<string, CodeListItem[]>}
          */
         this.cache = new Map();
+        /**
+         * 已合并子应用代码表标识缓存
+         *
+         * @protected
+         * @type {Map<string, DynamicCodeListCache>}
+         */
+        this.mergedSubCodeListCache = [];
     }
     /**
      * 获取静态代码表
@@ -76,7 +83,16 @@ export class CodeListService {
      * @returns {*}
      */
     getCodeList(tag) {
-        return this.allCodeLists.get(tag);
+        const codelist = this.allCodeLists.get(tag);
+        // 仅主应用合并所有子应用同代码表标识代码表
+        // mergedSubCodeListCache防止界面请求重复合并问题
+        if (this.appModel.appId === ibiz.env.appId &&
+            codelist &&
+            !this.mergedSubCodeListCache.includes(codelist.codeListTag)) {
+            ibiz.hub.mergeSubAppCodeList(codelist);
+            this.mergedSubCodeListCache.push(codelist.codeListTag);
+        }
+        return codelist;
     }
     /**
      * 格式化代码表

package/out/service/service/control/md-control.service.d.ts

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { IDEDataExport, IMDAjaxControl } from '@ibiz/model-core';
+import { IAppDEDataExport, IMDAjaxControl } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { ControlService } from './control.service';
 export declare class MDControlService<T extends IMDAjaxControl = IMDAjaxControl> extends ControlService<T> {
@@ -78,12 +78,12 @@ export declare class MDControlService<T extends IMDAjaxControl = IMDAjaxControl>
      *
      * @author lxm
      * @date 2022-11-25 14:11:09
-     * @param {IPSDEDataExport} dataExport 导出模型
+     * @param {IAppDEDataExport} dataExport 导出模型
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    exportData(dataExport: IDEDataExport, context: IContext, params?: IParams): Promise<IHttpResponse<Blob>>;
+    exportData(dataExport: IAppDEDataExport, context: IContext, params?: IParams): Promise<IHttpResponse<Blob>>;
     /**
      * 处理响应
      *

package/out/service/service/control/md-control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAa/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}
+{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAc/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}

package/out/service/service/control/md-control.service.js

@@ -117,14 +117,15 @@ export class MDControlService extends ControlService {
      *
      * @author lxm
      * @date 2022-11-25 14:11:09
-     * @param {IPSDEDataExport} dataExport 导出模型
+     * @param {IAppDEDataExport} dataExport 导出模型
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async exportData(dataExport, context, params = {}) {
         const entityService = await this.app.deService.getService(context, this.model.appDataEntityId);
-        return entityService.file.exportData(dataExport, this.model.fetchControlAction.appDEMethodId, context, params);
+        return entityService.file.exportData(dataExport, dataExport.appDEDataSetId ||
+            this.model.fetchControlAction.appDEMethodId, context, params);
     }
     /**
      * 处理响应