@ibiz-template/model-helper 0.7.6 → 0.7.7

package/out/model-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,UAAU,EAGX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC;;;;;;;GAOG;AACH,qBAAa,WAAW;IAgCpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACtE,SAAS,CAAC,YAAY,EAAE,MAAM;IAC9B,SAAS,CAAC,UAAU,EAAE,OAAO;IAjC/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,CAAM;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;;OAOG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC5D,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,OAAc;IAKtC;;;;;;;OAOG;IACG,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5C;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA+DlE;;;;;;;;;OASG;cACa,UAAU,CACxB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAWlE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI7D;;;;;;;;;OASG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,EACxB,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,cAAc,CAAC;IAoB1B;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAyBtD;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;;;;OASG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAUpB;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,OAAO,GAAE,OAAO,GAAG,MAA0B,GAC5C,SAAS;IAQZ;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,IAAI,GAAE,OAAO,GAAG,MAA0B,GAAG,MAAM;CASxE"}
+{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC;;;;;;;GAOG;AACH,qBAAa,WAAW;IAgCpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACtE,SAAS,CAAC,YAAY,EAAE,MAAM;IAC9B,SAAS,CAAC,UAAU,EAAE,OAAO;IAjC/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,CAAM;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;;OAOG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC5D,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,OAAc;IAKtC;;;;;;;OAOG;IACG,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5C;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA+DlE;;;;;;;;;OASG;cACa,UAAU,CACxB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAkBhB;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAWlE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI7D;;;;;;;;;OASG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,EACxB,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,cAAc,CAAC;IAoB1B;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAqCtD;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;;;;OASG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAUpB;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,OAAO,GAAE,OAAO,GAAG,MAA0B,GAC5C,SAAS;IAQZ;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,IAAI,GAAE,OAAO,GAAG,MAA0B,GAAG,MAAM;CASxE"}

package/out/model-helper.js

@@ -1,7 +1,7 @@
 import { DSLHelper } from '@ibiz/rt-model-api';
 import { ModelUtil } from './model-util';
 import { ModelLoader } from './model-loader';
-import { mergeAppMenu, plural } from './utils';
+import { mergeAppMenu, mergeDEDrControl, plural } from './utils';
 /**
  * 模型加载工具类
  *
@@ -146,12 +146,20 @@ export class ModelHelper {
      */
     async initSubApp(app, subApp, sourceSubApp) {
         this.subAppRefs.push(subApp);
-        const ids = subApp.appViewIds || [];
+        // 设置视图到hub中
+        const viewIds = subApp.appViewIds || [];
         const views = sourceSubApp.getAllPSAppViews || [];
-        ids.forEach((id, index) => {
+        viewIds.forEach((id, index) => {
             const view = views[index];
             ibiz.hub.setAppView(id, subApp.id, view.priority);
         });
+        // 设置DrCtrl到hub中
+        const drCtrlIds = subApp.dedrcontrolIds || [];
+        const drCtrls = this.dsl.controls(sourceSubApp.getAllPSDEDRControls || []);
+        drCtrlIds.forEach((id, index) => {
+            const drCtrl = drCtrls[index];
+            ibiz.hub.registerSubAppDrControls(subApp.id || ibiz.env.appId, drCtrl);
+        });
     }
     /**
      * 获取应用模型
@@ -219,26 +227,32 @@ export class ModelHelper {
      * @param {IAppView} view
      */
     calcAppViewSubAppModel(view) {
-        if (view.viewType === 'APPINDEXVIEW') {
-            // 预置视图布局面板
-            if (view.controls) {
-                view.controls.forEach((ctrl) => {
-                    if (ctrl.controlType === 'APPMENU') {
-                        ctrl = ctrl;
-                        mergeAppMenu(ctrl, this.subAppRefs);
-                    }
-                });
+        var _a;
+        const controls = view.controls
+            ? view.controls
+            : (_a = view.viewLayoutPanel) === null || _a === void 0 ? void 0 : _a.controls;
+        // 合并菜单
+        const dstAppMenu = view.viewType === 'APPINDEXVIEW' &&
+            (controls === null || controls === void 0 ? void 0 : controls.find(item => {
+                return item.controlType === 'APPMENU';
+            }));
+        if (dstAppMenu) {
+            for (let i = 0; i < this.subAppRefs.length; i++) {
+                const srcAppMenu = this.subAppRefs[i].appMenuModel;
+                if (srcAppMenu) {
+                    mergeAppMenu(dstAppMenu, srcAppMenu);
+                }
             }
-            else {
-                // 自定义视图布局面板
-                const { viewLayoutPanel } = view;
-                if (viewLayoutPanel === null || viewLayoutPanel === void 0 ? void 0 : viewLayoutPanel.controls) {
-                    viewLayoutPanel.controls.forEach((ctrl) => {
-                        if (ctrl.controlType === 'APPMENU') {
-                            ctrl = ctrl;
-                            mergeAppMenu(ctrl, this.subAppRefs);
-                        }
-                    });
+        }
+        // 合并DrCtrl
+        const dstDRCtrl = controls === null || controls === void 0 ? void 0 : controls.find(item => {
+            return item.controlType === 'DRBAR' || item.controlType === 'DRTAB';
+        });
+        if (dstDRCtrl) {
+            for (let i = 0; i < this.subAppRefs.length; i++) {
+                const srcDRCtrl = ibiz.hub.getSubAppDrControl(dstDRCtrl.uniqueTag, this.subAppRefs[i].appId);
+                if (srcDRCtrl) {
+                    mergeDEDrControl(dstDRCtrl, srcDRCtrl);
                 }
             }
         }

package/out/utils/index.d.ts

@@ -3,4 +3,5 @@ export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathDeep, ServicePathItem, ServicePathUtil, } from './service-path-util/service-path-util';
 export { mergeAppMenu } from './merge-model/merge-app-menu';
+export { mergeDEDrControl } from './merge-model/merge-de-drcontrol';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC"}

package/out/utils/index.js

@@ -3,3 +3,4 @@ export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathUtil, } from './service-path-util/service-path-util';
 export { mergeAppMenu } from './merge-model/merge-app-menu';
+export { mergeDEDrControl } from './merge-model/merge-de-drcontrol';

package/out/utils/merge-model/merge-app-menu.d.ts

@@ -1,11 +1,10 @@
-import { IAppMenuModel, ISubAppRef } from '@ibiz/model-core';
+import { IAppMenuModel } from '@ibiz/model-core';
 /**
- * 合并主应用首页菜单
+ * 合并主菜单和子菜单
  * @author lxm
- * @date 2023-12-07 02:26:57
- * @export
- * @param {IAppMenuModel} mainMenu
- * @param {ISubAppRef[]} subAppRefs
+ * @date 2023-12-07 03:15:54
+ * @param {IAppMenuModel} main
+ * @param {IAppMenuModel} sub
  */
-export declare function mergeAppMenu(mainMenu: IAppMenuModel, subAppRefs: ISubAppRef[]): void;
+export declare function mergeAppMenu(main: IAppMenuModel, sub: IAppMenuModel): void;
 //# sourceMappingURL=merge-app-menu.d.ts.map

package/out/utils/merge-model/merge-app-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-app-menu.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAyD3E;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,aAAa,EACvB,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI,CAeN"}
+{"version":3,"file":"merge-app-menu.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAiC/D;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAe1E"}

package/out/utils/merge-model/merge-app-menu.js

@@ -40,7 +40,7 @@ function mergeMenuItem(mainItem, subItem) {
  * @param {IAppMenuModel} main
  * @param {IAppMenuModel} sub
  */
-function mergeMenu(main, sub) {
+export function mergeAppMenu(main, sub) {
     var _a;
     const addItems = [];
     (_a = sub.appMenuItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
@@ -58,27 +58,3 @@ function mergeMenu(main, sub) {
     }
     main.appMenuItems.push(...addItems);
 }
-/**
- * 合并主应用首页菜单
- * @author lxm
- * @date 2023-12-07 02:26:57
- * @export
- * @param {IAppMenuModel} mainMenu
- * @param {ISubAppRef[]} subAppRefs
- */
-export function mergeAppMenu(mainMenu, subAppRefs) {
-    const subMenus = [];
-    subAppRefs.forEach(sub => {
-        var _a, _b;
-        if ((_b = (_a = sub.appMenuModel) === null || _a === void 0 ? void 0 : _a.appMenuItems) === null || _b === void 0 ? void 0 : _b.length) {
-            subMenus.push(sub.appMenuModel);
-        }
-    });
-    if (subMenus.length === 0) {
-        return;
-    }
-    // 依次合并主应用菜单和子应用菜单
-    subMenus.forEach(subMenu => {
-        mergeMenu(mainMenu, subMenu);
-    });
-}

package/out/utils/merge-model/merge-de-drcontrol.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 合并DrCtrl控件
+ *
+ * @author tony001
+ * @date 2024-04-29 19:04:44
+ * @export
+ * @param {IModel} dstDRCtrl
+ * @param {IModel} srcDRCtrl
+ * @return {*}  {void}
+ */
+export declare function mergeDEDrControl(dstDRCtrl: IModel, srcDRCtrl: IModel): void;
+//# sourceMappingURL=merge-de-drcontrol.d.ts.map

package/out/utils/merge-model/merge-de-drcontrol.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-de-drcontrol.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-de-drcontrol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAsC3E"}

package/out/utils/merge-model/merge-de-drcontrol.js

@@ -0,0 +1,48 @@
+/**
+ * 合并DrCtrl控件
+ *
+ * @author tony001
+ * @date 2024-04-29 19:04:44
+ * @export
+ * @param {IModel} dstDRCtrl
+ * @param {IModel} srcDRCtrl
+ * @return {*}  {void}
+ */
+export function mergeDEDrControl(dstDRCtrl, srcDRCtrl) {
+    if (!srcDRCtrl) {
+        return;
+    }
+    // 合并分组（相同name替换，没有则附加）
+    if (srcDRCtrl.dedrbarGroups) {
+        srcDRCtrl.dedrbarGroups.forEach((item1) => {
+            var _a;
+            let index = 0;
+            const result = (_a = dstDRCtrl.dedrbarGroups) === null || _a === void 0 ? void 0 : _a.find((item2, index2) => {
+                index = index2;
+                return item1.name === item2.name;
+            });
+            if (result) {
+                dstDRCtrl.dedrbarGroups[index] = item1;
+            }
+            else {
+                dstDRCtrl.dedrbarGroups.push(item1);
+            }
+        });
+    }
+    // 合并分组项（相同id替换，没有则附加）
+    if (srcDRCtrl.dedrctrlItems) {
+        srcDRCtrl.dedrctrlItems.forEach((item1) => {
+            let index = 0;
+            const result = dstDRCtrl.dedrctrlItems.find((item2, index2) => {
+                index = index2;
+                return item1.id === item2.id;
+            });
+            if (result) {
+                dstDRCtrl.dedrctrlItems[index] = item1;
+            }
+            else {
+                dstDRCtrl.dedrctrlItems.push(item1);
+            }
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -32,13 +32,13 @@
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz/model-core": "^0.1.21",
-    "@ibiz/rt-model-api": "^0.2.11",
+    "@ibiz/model-core": "^0.1.23",
+    "@ibiz/rt-model-api": "^0.2.13",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.7.6",
+    "@ibiz-template/runtime": "^0.7.7",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.10"
   },