@ibiz-template/runtime 0.2.12 → 0.2.13

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

@@ -1 +1 @@
-{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EACL,eAAe,EACf,UAAU,EACV,0BAA0B,EAC1B,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,eAAe,EACf,cAAc,EACd,WAAW,EACX,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAM9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;GAOG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,OAAO,EAAE,KAAK,CAAM;IAEpB,KAAK,EAAE,MAAM,CAAiB;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD,OAAO,EAAE,WAAW,EAAE,CAAM;IAE5B,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;KAAE,CAAM;IAEzC,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAM;IAE7C;;;;;OAKG;IACH,SAAS,CAAC,WAAW,eAAsB;IAE3C;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IAEvC;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,eAAe,GAAG,SAAS,CAE5C;IAED,SAAS,CAAC,SAAS,UAAQ;IAE3B,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAE/B,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IAEtC;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG;IAcpE;;;;;OAKG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAKrB;;;;;OAKG;IACH,SAAS,CAAC,WAAW,IAAI,IAAI;IAuB7B;;;;;OAKG;cACa,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB7C,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAiE1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAe5C;;;;;;OAMG;IACH,mBAAmB,IAAI,IAAI;IAiCrB,IAAI,CAAC,CAAC,SAAS,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAY1D,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAQ5B,SAAS,CACb,SAAS,GAAE,UAAoC,GAC9C,OAAO,CAAC,IAAI,CAAC;IAIhB,YAAY,IAAI,IAAI;IAKpB,UAAU,IAAI,IAAI;IAKlB;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAsBvD;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBlC;;;;;;OAMG;IACG,gBAAgB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBhE"}
+{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/common/view/view.controller.js

@@ -353,6 +353,12 @@ export class ViewController extends BaseController {
             title: message.title,
             desc: message.message,
         };
+        // userTag为确认按钮文本
+        if (message.extraParams.userTag) {
+            Object.assign(modalParams, {
+                confirmButtonText: message.extraParams.userTag,
+            });
+        }
         if (message.messageType === 'WARN') {
             await ibiz.modal.warning(modalParams);
         }

package/out/controller/control/calendar/calendar.controller.js

@@ -82,18 +82,18 @@ export class CalendarController extends MDControlController {
      */
     getCurSelectDate(param) {
         const { selectedDate } = this.state;
-        const { start, end } = param;
-        if (!start || !end) {
+        const { srfstartdate, srfenddate } = param;
+        if (!srfstartdate || !srfenddate) {
             // 获取当前月份的第一天
             const firstDayOfMonth = new Date(selectedDate.getFullYear(), selectedDate.getMonth(), 1);
             // 获取下个月的第一天，然后减去一天
             const lastDayOfMonth = new Date(selectedDate.getFullYear(), selectedDate.getMonth() + 1, 1);
             return {
-                start: dayjs(firstDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
-                end: dayjs(lastDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
+                srfstartdate: dayjs(firstDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
+                srfenddate: dayjs(lastDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
             };
         }
-        return { start, end };
+        return { srfstartdate, srfenddate };
     }
     /**
      * 获取请求参数

package/out/controller/control/chart/generator/base-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAQnC,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAyF/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAzFjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA+BjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAiBrB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IA2DjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;IAIjD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAQnC,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAyF/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAzFjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA+BjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAiBrB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IA8DjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;IAIjD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}

package/out/controller/control/chart/generator/base-series-generator.js

@@ -1,4 +1,4 @@
-import { RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
+import { plus, RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import minMax from 'dayjs/plugin/minMax';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -159,7 +159,7 @@ export class BaseSeriesGenerator {
                 groupData[group].set(catalog, { value: 0 });
             }
             // 相同分类属性的值属性数据累加
-            groupData[group].get(catalog).value += item[this.valueField];
+            groupData[group].get(catalog).value = plus(groupData[group].get(catalog).value, item[this.valueField]);
             groupData[group].get(catalog).deData = item;
         });
         return groupData;

package/out/controller/control/exp-bar/calendar-exp-bar.controller.d.ts

@@ -20,7 +20,7 @@ export declare class CalendarExpBarController extends ExpBarControlController<IC
     navKeyName: string;
     protected getCalendarItemModel(itemTypeName: string): ISysCalendarItem | undefined;
     get xDataController(): ICalendarController;
-    defaultNavBySrfnav(): void;
+    navBySrfnav(): void;
     /**
      *  获取导航视图
      *

package/out/controller/control/exp-bar/calendar-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calendar-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/calendar-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAEf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,wBACX,SAAQ,uBAAuB,CAC7B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAEpC;;;;;;OAMG;IACH,UAAU,SAAW;IAErB,SAAS,CAAC,oBAAoB,CAC5B,YAAY,EAAE,MAAM,GACnB,gBAAgB,GAAG,SAAS;IAQ/B,IAAI,eAAe,IAAI,mBAAmB,CASzC;IAEM,kBAAkB,IAAI,IAAI;IAajC;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CAwB3D"}
+{"version":3,"file":"calendar-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/calendar-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAEf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,wBACX,SAAQ,uBAAuB,CAC7B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAEpC;;;;;;OAMG;IACH,UAAU,SAAW;IAErB,SAAS,CAAC,oBAAoB,CAC5B,YAAY,EAAE,MAAM,GACnB,gBAAgB,GAAG,SAAS;IAQ/B,IAAI,eAAe,IAAI,mBAAmB,CASzC;IAEM,WAAW,IAAI,IAAI;IAa1B;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CAwB3D"}

package/out/controller/control/exp-bar/calendar-exp-bar.controller.js

@@ -34,10 +34,10 @@ export class CalendarExpBarController extends ExpBarControlController {
         }
         return controller;
     }
-    defaultNavBySrfnav() {
+    navBySrfnav() {
         var _a;
         const selectItem = (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.state.items.find(item => item.navId === this.state.srfnav);
-        super.defaultNavBySrfnav();
+        super.navBySrfnav();
         if (!selectItem) {
             return;
         }

package/out/controller/control/exp-bar/exp-bar.controller.d.ts

@@ -127,7 +127,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @date 2023-08-10 04:04:08
      * @protected
      */
-    protected defaultNavBySrfnav(): void;
+    protected navBySrfnav(): void;
     /**
      * 导航页面首次打开且没有回显时，
      * 默认取第一条数据进行导航
@@ -136,7 +136,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @date 2023-08-10 03:58:15
      * @protected
      */
-    protected defaultNavByFirstItem(): void;
+    protected navByFirstItem(): void;
     /**
      * 多数据激活
      *
@@ -198,7 +198,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
     onRouterChange(info: {
         srfnav: string;
         path: string;
-    }): void;
+    }): Promise<void>;
 }
 export {};
 //# sourceMappingURL=exp-bar.controller.d.ts.map

package/out/controller/control/exp-bar/exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgCpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAmBvC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA8BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAYd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAcvD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAM7D"}
+{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAe,MAAM,aAAa,CAAC;AAE3D,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,WAAW,IAAI,IAAI;IA0C7B;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAkBhC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA8BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAYd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAcvD;;;;;OAKG;IACG,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAM5E"}

package/out/controller/control/exp-bar/exp-bar.controller.js

@@ -2,6 +2,7 @@ import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
+import { hasSubRoute } from '../../utils';
 /**
  * 导航部件控制器
  *
@@ -169,7 +170,7 @@ export class ExpBarControlController extends ControlController {
                 this.xDataLoadSuccess(event);
             });
             this.xDataController.evt.on('onRemoveSuccess', () => {
-                this.defaultNavByFirstItem();
+                this.navByFirstItem();
             });
         }
         if (this.toolbarController) {
@@ -195,11 +196,11 @@ export class ExpBarControlController extends ControlController {
             // 只处理默认第一次加载
             if (this.state.srfnav && this.routeDepth) {
                 // 路由srfnav回显
-                this.defaultNavBySrfnav();
+                this.navBySrfnav();
             }
             else {
                 // 默认选中第一条并导航
-                this.defaultNavByFirstItem();
+                this.navByFirstItem();
             }
         }
     }
@@ -209,13 +210,12 @@ export class ExpBarControlController extends ControlController {
      * @date 2023-08-10 04:04:08
      * @protected
      */
-    defaultNavBySrfnav() {
+    navBySrfnav() {
         var _a;
         // 找到选中项，如果没有就模拟选中数据
         const selectItem = (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.state.items.find(item => item[this.navKeyName] === this.state.srfnav);
         // 是否是路由模式且有子路由
-        const routeAndHasSub = this.routeDepth &&
-            window.location.hash.split('/').length > this.routeDepth * 2 + 2;
+        const routeAndHasSub = this.routeDepth && hasSubRoute(this.routeDepth);
         if (routeAndHasSub) {
             if (selectItem) {
                 // 在多数据部件里面选项设置回显。
@@ -230,12 +230,24 @@ export class ExpBarControlController extends ControlController {
                 },
                 context: this.context,
             });
+            return;
         }
-        else if (selectItem) {
+        if (selectItem) {
             // 非路由模式,或者有路由模式下有srfnav没有子路由时，需要在多数据部件里面选项设置回显。
             this.xDataController.setActive(selectItem);
             this.xDataController.setSelection([selectItem]);
         }
+        else {
+            // 找不到匹配的选中项的情况，告诉导航占位显示404
+            this._evt.emit('onNavViewChange', {
+                navViewMsg: {
+                    key: this.state.srfnav,
+                    is404: true,
+                    isCache: this.isCache,
+                },
+                context: this.context,
+            });
+        }
     }
     /**
      * 导航页面首次打开且没有回显时，
@@ -245,7 +257,7 @@ export class ExpBarControlController extends ControlController {
      * @date 2023-08-10 03:58:15
      * @protected
      */
-    defaultNavByFirstItem() {
+    navByFirstItem() {
         const data = this.xDataController.state.items[0];
         if (!data) {
             // 导航视图传空让他导航占位绘制空界面
@@ -253,7 +265,6 @@ export class ExpBarControlController extends ControlController {
             this._evt.emit('onNavViewChange', {
                 navViewMsg: {
                     key: '',
-                    isRoutePushed: true,
                     isCache: this.isCache,
                 },
             });
@@ -380,10 +391,10 @@ export class ExpBarControlController extends ControlController {
      * @date 2023-09-14 07:03:39
      * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
      */
-    onRouterChange(info) {
+    async onRouterChange(info) {
         if (this.state.srfnav !== info.srfnav) {
             this.state.srfnav = info.srfnav;
-            this.defaultNavBySrfnav();
+            this.navBySrfnav();
         }
     }
 }

package/out/controller/control/exp-bar/tree-exp-bar.controller.d.ts

@@ -60,7 +60,19 @@ export declare class TreeExpBarController extends ExpBarControlController<ITreeE
      * @memberof TabExpPanelController
      */
     getNavViewMsg(node: ITreeNodeData, context: IContext, params: IParams): INavViewMsg;
-    protected defaultNavByFirstItem(): void;
+    protected navByFirstItem(): void;
     protected onCreated(): Promise<void>;
+    /**
+     * 根据srfnav计算需要展开的节点标识
+     * @author lxm
+     * @date 2023-11-07 02:42:45
+     * @param {string} srfnav
+     * @return {*}  {string[]}
+     */
+    calcExpandKeys(srfnav: string): string[];
+    onRouterChange(info: {
+        srfnav: string;
+        path: string;
+    }): Promise<void>;
 }
 //# sourceMappingURL=tree-exp-bar.controller.d.ts.map

package/out/controller/control/exp-bar/tree-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/tree-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,aAAa,EACb,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,uBAAuB,CAC7B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CAElB,YAAW,qBAAqB;IAEhC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B,IAAI,eAAe,IAAI,eAAe,CASrC;IAED;;;;;;OAMG;IACH,UAAU,OAAiB;IAE3B;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAM;IAE/B;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAarD;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI;IAMzD;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAkBd,SAAS,CAAC,qBAAqB,IAAI,IAAI;cAwBvB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB3C"}
+{"version":3,"file":"tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/tree-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,aAAa,EACb,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,uBAAuB,CAC7B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CAElB,YAAW,qBAAqB;IAEhC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B,IAAI,eAAe,IAAI,eAAe,CASrC;IAED;;;;;;OAMG;IACH,UAAU,OAAiB;IAE3B;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAM;IAE/B;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAarD;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI;IAMzD;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAkBd,SAAS,CAAC,cAAc,IAAI,IAAI;cAwBhB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;;OAMG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAalC,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAO5E"}

package/out/controller/control/exp-bar/tree-exp-bar.controller.js

@@ -87,7 +87,7 @@ export class TreeExpBarController extends ExpBarControlController {
         this.state.srfnav = nodeId;
         return Object.assign({ key: nodeId, viewId: nodeModel.navAppViewId, isCache: this.isCache }, result);
     }
-    defaultNavByFirstItem() {
+    navByFirstItem() {
         const data = this.xDataController.state.items.find(node => {
             // 根节点不显示的时候排除根节点
             if (!this.xDataController.model.rootVisible &&
@@ -119,17 +119,34 @@ export class TreeExpBarController extends ExpBarControlController {
         });
         // 计算树的默认展开集合
         if (this.state.srfnav) {
-            const expandedKeys = [];
-            this.state.srfnav.split(':').forEach((item, index) => {
-                if (index === 0) {
-                    expandedKeys.push(item);
-                }
-                else {
-                    expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
-                }
-            });
-            expandedKeys.pop(); // 删除最后一个
-            this.defaultExpandedKeys = expandedKeys;
+            this.defaultExpandedKeys = this.calcExpandKeys(this.state.srfnav);
+        }
+    }
+    /**
+     * 根据srfnav计算需要展开的节点标识
+     * @author lxm
+     * @date 2023-11-07 02:42:45
+     * @param {string} srfnav
+     * @return {*}  {string[]}
+     */
+    calcExpandKeys(srfnav) {
+        const expandedKeys = [];
+        srfnav.split(':').forEach((item, index) => {
+            if (index === 0) {
+                expandedKeys.push(item);
+            }
+            else {
+                expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
+            }
+        });
+        expandedKeys.pop(); // 删除最后一个
+        return expandedKeys;
+    }
+    async onRouterChange(info) {
+        if (this.state.srfnav !== info.srfnav) {
+            const expandKeys = this.calcExpandKeys(info.srfnav);
+            await this.xDataController.expandNodeByKey(expandKeys);
         }
+        await super.onRouterChange(info);
     }
 }

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DataTypes, ModelError } from '@ibiz-template/core';
+import { DataTypes, ModelError, plus } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash-es';
 import { clone, isNil } from 'ramda';
@@ -190,13 +190,13 @@ export class GridFieldColumnController extends GridColumnController {
                 case 'SUM':
                     aggValue = items
                         .map(item => item[fieldName])
-                        .reduce((a, b) => a + b, 0);
+                        .reduce((a, b) => plus(a, b), 0);
                     break;
                 case 'AVG':
                     aggValue =
                         items
                             .map(item => item[fieldName])
-                            .reduce((a, b) => a + b, 0) / items.length;
+                            .reduce((a, b) => plus(a, b), 0) / items.length;
                     break;
                 case 'MAX':
                     aggValue = Math.max(...items.map(item => item[fieldName]));

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts

@@ -34,6 +34,16 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
      * @memberof ExpBarControlController
      */
     get isCache(): boolean;
+    /**
+     * 当前路由视图的层级
+     *
+     * @author zk
+     * @date 2023-07-11 10:07:20
+     * @readonly
+     * @type {(number | undefined)}
+     * @memberof ExpBarControlController
+     */
+    get routeDepth(): number | undefined;
     /**
      * 初始化state的属性
      *
@@ -76,7 +86,7 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
      * @protected
      * @param {IDETabViewPanel} [tab=this.activeTabViewPanelModel!]
      */
-    protected changeToTab(tab?: IDETabViewPanel): void;
+    protected changeToTab(tab?: IDETabViewPanel, isRoutePushed?: boolean): void;
     /**
      * 当前激活tab模型
      *

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAoBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,GACnD,IAAI;IAKP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CAUjE"}
+{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IAQP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CAUjE"}

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js

@@ -1,6 +1,7 @@
 import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
+import { hasSubRoute } from '../../utils';
 /**
  * 分页导航面板
  *
@@ -45,6 +46,18 @@ export class TabExpPanelController extends ControlController {
         }
         return ibiz.config.view.expCacheMode.includes(this.model.controlType);
     }
+    /**
+     * 当前路由视图的层级
+     *
+     * @author zk
+     * @date 2023-07-11 10:07:20
+     * @readonly
+     * @type {(number | undefined)}
+     * @memberof ExpBarControlController
+     */
+    get routeDepth() {
+        return this.view.modal.routeDepth;
+    }
     /**
      * 初始化state的属性
      *
@@ -124,23 +137,20 @@ export class TabExpPanelController extends ControlController {
      * @memberof TabExpPanelController
      */
     initDefaultPage() {
-        const initFirstPage = () => {
-            this.state.activeName = this.state.tabPages[0].tabTag;
-            this.handleTabChange();
-        };
-        if (!this.state.defaultTabName) {
-            initFirstPage();
-        }
-        else {
+        // 跳转指定的默认分页
+        if (this.state.defaultTabName) {
             const activeTab = this.state.tabPages.find(item => item.tabTag === this.state.defaultTabName);
-            if (!activeTab) {
-                initFirstPage();
-            }
-            else {
+            if (activeTab) {
                 this.state.activeName = activeTab.tabTag;
-                this.changeToTab();
+                this.changeToTab(this.activeTabViewPanelModel, 
+                // 路由模式下并且有子路由
+                this.routeDepth !== undefined && hasSubRoute(this.routeDepth));
+                return;
             }
         }
+        // 没有默认分页或者匹配不到时，跳转第一个分页
+        this.state.activeName = this.state.tabPages[0].tabTag;
+        this.handleTabChange();
     }
     /**
      * 切换分页
@@ -149,8 +159,11 @@ export class TabExpPanelController extends ControlController {
      * @protected
      * @param {IDETabViewPanel} [tab=this.activeTabViewPanelModel!]
      */
-    changeToTab(tab = this.activeTabViewPanelModel) {
+    changeToTab(tab = this.activeTabViewPanelModel, isRoutePushed = false) {
         const navViewMsg = this.getNavViewMsg(tab);
+        if (isRoutePushed === true) {
+            navViewMsg.isRoutePushed = true;
+        }
         this.evt.emit('onNavViewChange', { navViewMsg });
     }
     /**

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

@@ -114,5 +114,6 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
      * @return {*}  {Promise<void>}
      */
     refreshNodeChildren(nodeData: ITreeNodeData | IData, refreshParent?: boolean): Promise<void>;
+    expandNodeByKey(expandKeys: string[]): Promise<void>;
 }
 //# sourceMappingURL=tree.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
+{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;IAgCV,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA0B3D"}

package/out/controller/control/tree/tree.controller.js

@@ -29,6 +29,7 @@ export class TreeController extends MDControlController {
         // 根节点初始化
         this.state.defaultExpandedKeys = [];
         this.state.expandedKeys = [];
+        this.state.navigational = false;
         this.state.size = 0;
     }
     async onCreated() {
@@ -121,6 +122,13 @@ export class TreeController extends MDControlController {
      * @memberof TreeController
      */
     async onTreeNodeClick(nodeData) {
+        // 导航的时候，没有导航视图的时候，节点后续点击逻辑都不走，也不选中
+        if (this.state.navigational) {
+            const nodeModel = this.getNodeModel(nodeData.nodeId);
+            if (!(nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.navAppViewId)) {
+                return;
+            }
+        }
         // 单选时，单击才会触发选中逻辑
         if (this.state.singleSelect) {
             // 选中相关处理
@@ -296,4 +304,21 @@ export class TreeController extends MDControlController {
             children: nodes,
         });
     }
+    async expandNodeByKey(expandKeys) {
+        const noExpandKeys = expandKeys.filter(key => !this.state.expandedKeys.includes(key));
+        if (noExpandKeys.length === 0) {
+            return;
+        }
+        // 找到已存在的要展开的节点
+        const existNodes = this.state.items.filter(item => noExpandKeys.includes(item.id));
+        // 补充所有未展开的节点标识，查询过程中会自动加载后续展开
+        this.state.expandedKeys.push(...noExpandKeys);
+        if (existNodes.length === 0) {
+            return;
+        }
+        // 展开加载节点
+        await Promise.all(existNodes.map(node => {
+            return this.loadNodes(node);
+        }));
+    }
 }

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

@@ -2,6 +2,7 @@ export * from './counter';
 export * from './loading/loading.state';
 export * from './button-state';
 export * from './event';
+export * from './route/route';
 export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC"}

package/out/controller/utils/index.js

@@ -2,6 +2,7 @@ export * from './counter';
 export * from './loading/loading.state';
 export * from './button-state';
 export * from './event';
+export * from './route/route';
 export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';

package/out/controller/utils/route/route.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 是否有子路由路径
+ * @author lxm
+ * @date 2023-11-08 10:12:54
+ * @export
+ * @param {number} routeDepth
+ * @return {*}  {boolean}
+ */
+export declare function hasSubRoute(routeDepth: number): boolean;
+//# sourceMappingURL=route.d.ts.map

package/out/controller/utils/route/route.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/route/route.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAEvD"}

package/out/controller/utils/route/route.js

@@ -0,0 +1,11 @@
+/**
+ * 是否有子路由路径
+ * @author lxm
+ * @date 2023-11-08 10:12:54
+ * @export
+ * @param {number} routeDepth
+ * @return {*}  {boolean}
+ */
+export function hasSubRoute(routeDepth) {
+    return window.location.hash.split('/').length > routeDepth * 2 + 2;
+}

package/out/controller/utils/view-msg/view-msg-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-msg-controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/view-msg/view-msg-controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,iBAAiB;IAgBhB,SAAS,CAAC,UAAU,EAAE,MAAM;IAfxC;;;;;OAKG;IACH,QAAQ,EAAG,gBAAgB,CAAC;IAE5B;;;;OAIG;IACH,UAAU,2BAAkC;gBAEtB,UAAU,EAAE,MAAM;IAExC;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5C,cAAc,CACZ,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS;IAOrB;;;;;;;;;OASG;WACU,YAAY,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBnB;;;;;;;OAOG;IACG,gBAAgB,CACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;IAsB1B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,sBAAsB,GAAG,YAAY;IAoBrE;;;;;;;;;OASG;cACa,YAAY,CAC1B,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;CAqE3B"}
+{"version":3,"file":"view-msg-controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/view-msg/view-msg-controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,iBAAiB;IAgBhB,SAAS,CAAC,UAAU,EAAE,MAAM;IAfxC;;;;;OAKG;IACH,QAAQ,EAAG,gBAAgB,CAAC;IAE5B;;;;OAIG;IACH,UAAU,2BAAkC;gBAEtB,UAAU,EAAE,MAAM;IAExC;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5C,cAAc,CACZ,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS;IAOrB;;;;;;;;;OASG;WACU,YAAY,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBnB;;;;;;;OAOG;IACG,gBAAgB,CACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;IAsB1B;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,sBAAsB,GAAG,YAAY;IA8BrE;;;;;;;;;OASG;cACa,YAAY,CAC1B,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,EAAE,CAAC;CAqE3B"}

package/out/controller/utils/view-msg/view-msg-controller.js

@@ -107,7 +107,9 @@ export class ViewMsgController {
      */
     calcStaticMsg(detail) {
         const { position: position1 } = detail;
-        const { title, message, removeMode, position: position2, messageType, } = this.viewMsgMap.get(detail.appViewMsgId);
+        const viewMsg = this.viewMsgMap.get(detail.appViewMsgId);
+        const { title, message, removeMode, position: position2, messageType, } = viewMsg;
+        const { userTag, userTag2, userTag3, userTag4 } = viewMsg;
         // detail里的位置优先
         const position = position1 || position2;
         return {
@@ -116,6 +118,13 @@ export class ViewMsgController {
             position,
             messageType,
             removeMode,
+            // 额外参数
+            extraParams: {
+                userTag,
+                userTag2,
+                userTag3,
+                userTag4,
+            },
         };
     }
     /**

package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts

@@ -59,5 +59,14 @@ export interface INavViewMsg {
      * @memberof INavViewMsg
      */
     isCache?: boolean;
+    /**
+     * 是否404
+     *
+     * @author zk
+     * @date 2023-09-26 06:09:17
+     * @type {string}
+     * @memberof INavViewMsg
+     */
+    is404?: boolean;
 }
 //# sourceMappingURL=i-nav-view-msg.d.ts.map