@ibiz-template/runtime 0.2.11 → 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":"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"}
+{"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;IA+BpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAkBvC;;;;;;;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) {
                 // 在多数据部件里面选项设置回显。
@@ -225,16 +225,29 @@ export class ExpBarControlController extends ControlController {
             this._evt.emit('onNavViewChange', {
                 navViewMsg: {
                     key: this.state.srfnav,
+                    isRoutePushed: true,
                     isCache: this.isCache,
                 },
                 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,
+            });
+        }
     }
     /**
      * 导航页面首次打开且没有回显时，
@@ -244,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) {
             // 导航视图传空让他导航占位绘制空界面
@@ -378,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/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.d.ts

@@ -19,7 +19,7 @@ export declare class FormMDCtrlDataViewController extends FormMDCtrlControlContr
      * @type {IListController}
      * @memberof FormMDCtrlDataViewController
      */
-    dataViewController: IListController;
+    dataViewController?: IListController;
     /**
      * 表格选中数据
      *
@@ -41,14 +41,14 @@ export declare class FormMDCtrlDataViewController extends FormMDCtrlControlContr
         isSelect: boolean;
     };
     /**
-     * 表格挂载后把控制器抛出来
+     * 卡片挂载后把控制器抛出来
      *
      * @author zk
      * @date 2023-07-30 07:07:25
      * @param {EventBase} event
      * @memberof FormMDCtrlDataViewController
      */
-    onDataViewMounted(event: EventBase): void;
+    onDataViewCreated(event: EventBase): void;
     /**
      * 表格选中事件
      *

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

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-data-view.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,4BAA6B,SAAQ,2BAA2B;IAC3E;;;;;;;OAOG;IACH,kBAAkB,EAAG,eAAe,CAAC;IAErC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IAMpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKpC"}
+{"version":3,"file":"form-mdctrl-data-view.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,4BAA6B,SAAQ,2BAA2B;IAC3E;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC;IAErC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IASpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKpC"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.js

@@ -32,14 +32,14 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
         this.state = { isSelect: false };
     }
     /**
-     * 表格挂载后把控制器抛出来
+     * 卡片挂载后把控制器抛出来
      *
      * @author zk
      * @date 2023-07-30 07:07:25
      * @param {EventBase} event
      * @memberof FormMDCtrlDataViewController
      */
-    onDataViewMounted(event) {
+    onDataViewCreated(event) {
         this.dataViewController = event.ctrl;
     }
     /**
@@ -62,6 +62,9 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlController
      */
     onDataRemove() {
+        if (!this.dataViewController) {
+            return;
+        }
         this.dataViewController.remove();
         this.parent.state.contentCtrlData = this.dataViewController.state.items;
         this.parent.setFormDataValue();
@@ -86,7 +89,8 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlContentTypeController
      */
     async initData() {
-        this.dataViewController.load();
+        var _a;
+        (_a = this.dataViewController) === null || _a === void 0 ? void 0 : _a.load();
     }
     /**
      * 数据插入

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

@@ -42,14 +42,14 @@ export declare class FormMDCtrlFormController extends FormMDCtrlControlControlle
      */
     service: EditFormService;
     /**
-     * 表格挂载后把控制器抛出来
+     * 表单初始化后把控制器抛出来
      *
      * @author zk
      * @date 2023-07-30 07:07:25
      * @param {EventBase} event
      * @memberof FormMDCtrlGridController
      */
-    onControlMounted(event: EventBase, index: number): void;
+    onControlCreated(event: EventBase, index: number): void;
     /**
      * 初始化
      *

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

@@ -35,14 +35,14 @@ export class FormMDCtrlFormController extends FormMDCtrlControlController {
         this.state = { data: [] };
     }
     /**
-     * 表格挂载后把控制器抛出来
+     * 表单初始化后把控制器抛出来
      *
      * @author zk
      * @date 2023-07-30 07:07:25
      * @param {EventBase} event
      * @memberof FormMDCtrlGridController
      */
-    onControlMounted(event, index) {
+    onControlCreated(event, index) {
         const formController = event.ctrl;
         this.controlControllerArray[index] = formController;
         formController.load();

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

@@ -19,7 +19,7 @@ export declare class FormMDCtrlGridController extends FormMDCtrlControlControlle
      * @type {IGridController}
      * @memberof FormMDCtrlGridController
      */
-    gridController: IGridController;
+    gridController?: IGridController;
     /**
      * 表格选中数据
      *
@@ -41,14 +41,14 @@ export declare class FormMDCtrlGridController extends FormMDCtrlControlControlle
         isSelect: boolean;
     };
     /**
-     * 表格挂载后把控制器抛出来
+     * 表格初始化后把控制器抛出来
      *
      * @author zk
      * @date 2023-07-30 07:07:25
      * @param {EventBase} event
      * @memberof FormMDCtrlGridController
      */
-    onGridMounted(event: EventBase): void;
+    onGridCreated(event: EventBase): void;
     /**
      * 表格选中事件
      *

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

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,EAAG,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IAMpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAMnC;;;;;;;OAOG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CASnC"}
+{"version":3,"file":"form-mdctrl-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IASpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC;;;;;;;OAOG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAYnC"}

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

@@ -34,14 +34,14 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
         this.state = { isSelect: false };
     }
     /**
-     * 表格挂载后把控制器抛出来
+     * 表格初始化后把控制器抛出来
      *
      * @author zk
      * @date 2023-07-30 07:07:25
      * @param {EventBase} event
      * @memberof FormMDCtrlGridController
      */
-    onGridMounted(event) {
+    onGridCreated(event) {
         this.gridController = event.ctrl;
     }
     /**
@@ -64,6 +64,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlController
      */
     onDataRemove() {
+        if (!this.gridController) {
+            return;
+        }
         this.gridController.remove();
         this.parent.state.contentCtrlData = this.gridController.state.items;
         this.parent.setFormDataValue();
@@ -88,7 +91,8 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlContentTypeController
      */
     async initData() {
-        this.gridController.load();
+        var _a;
+        (_a = this.gridController) === null || _a === void 0 ? void 0 : _a.load();
     }
     /**
      * 数据插入
@@ -99,6 +103,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlContentTypeController
      */
     async onDataInsert() {
+        if (!this.gridController) {
+            return;
+        }
         await this.gridController.newRow();
         this.parent.state.contentCtrlData = this.gridController.state.items;
         this.parent.setFormDataValue();
@@ -132,6 +139,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlFormController
      */
     async validate() {
+        if (!this.gridController) {
+            return true;
+        }
         const { rows } = this.gridController.state;
         const values = await Promise.all(rows.map(row => this.gridController.validate(row)));
         // 找不到value为false即全部是true

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

@@ -19,7 +19,7 @@ export declare class FormMDCtrlListController extends FormMDCtrlControlControlle
      * @type {IListController}
      * @memberof FormMDCtrlListController
      */
-    listController: IListController;
+    listController?: IListController;
     /**
      * 表格选中数据
      *
@@ -48,7 +48,7 @@ export declare class FormMDCtrlListController extends FormMDCtrlControlControlle
      * @param {EventBase} event
      * @memberof FormMDCtrlListController
      */
-    onListMounted(event: EventBase): void;
+    onListCreated(event: EventBase): void;
     /**
      * 表格选中事件
      *

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

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,EAAG,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IAMpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKpC"}
+{"version":3,"file":"form-mdctrl-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IASpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKpC"}

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

@@ -39,7 +39,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
      * @param {EventBase} event
      * @memberof FormMDCtrlListController
      */
-    onListMounted(event) {
+    onListCreated(event) {
         this.listController = event.ctrl;
     }
     /**
@@ -62,6 +62,9 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlController
      */
     onDataRemove() {
+        if (!this.listController) {
+            return;
+        }
         this.listController.remove();
         this.parent.state.contentCtrlData = this.listController.state.items;
         this.parent.setFormDataValue();
@@ -86,7 +89,8 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
      * @memberof FormMDCtrlContentTypeController
      */
     async initData() {
-        this.listController.load();
+        var _a;
+        (_a = this.listController) === null || _a === void 0 ? void 0 : _a.load();
     }
     /**
      * 数据插入

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-repeater-form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAGrE;;;;;;;;GAQG;AACH,qBAAa,wBACX,SAAQ,kBACR,YAAW,eAAe;gBAGxB,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,cAAc;cAUN,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAAiD,EACvE,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;CAiCjB"}
+{"version":3,"file":"form-mdctrl-repeater-form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAGrE;;;;;;;;GAQG;AACH,qBAAa,wBACX,SAAQ,kBACR,YAAW,eAAe;gBAGxB,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,cAAc;cAUN,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAAiD,EACvE,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;CAiCjB"}

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

@@ -1,3 +1,4 @@
+import { clone } from 'ramda';
 import { findChildFormDetails } from '../../../../../../../model';
 import { getFormDetailProvider } from '../../../../../../../register';
 import { EditFormController } from '../../../../edit-form';
@@ -12,10 +13,10 @@ import { EditFormController } from '../../../../edit-form';
  */
 export class FormMDCtrlItemController extends EditFormController {
     constructor(model, context, params, ctx, data, form) {
-        const { model: _model } = form;
+        const tempModel = clone(form.model);
         // 合并父级表单模型 兼容值规则 和 父表单模型
-        Object.assign(_model, model);
-        super(_model, context, params, ctx);
+        Object.assign(tempModel, model, { name: undefined });
+        super(tempModel, context, params, ctx);
         this.state.data = data;
         this.state.isSimple = true;
     }