@ibiz-template/runtime 0.2.10 → 0.2.12

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.ts

@@ -20,7 +20,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @type {IListController}
    * @memberof FormMDCtrlListController
    */
-  listController!: IListController;
+  listController?: IListController;
 
   /**
    * 表格选中数据
@@ -50,7 +50,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @param {EventBase} event
    * @memberof FormMDCtrlListController
    */
-  onListMounted(event: EventBase): void {
+  onListCreated(event: EventBase): void {
     this.listController = event.ctrl as IListController;
   }
 
@@ -75,6 +75,9 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlController
    */
   onDataRemove(): void {
+    if (!this.listController) {
+      return;
+    }
     this.listController.remove();
     this.parent.state.contentCtrlData = this.listController.state.items;
     this.parent.setFormDataValue();
@@ -101,7 +104,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlContentTypeController
    */
   async initData(): Promise<void> {
-    this.listController.load();
+    this.listController?.load();
   }
 
   /**

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts

@@ -1,4 +1,5 @@
 import { IControl, IDEFormDetail, IDEFormMDCtrl } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { IFormController } from '../../../../../../../interface';
 import { findChildFormDetails } from '../../../../../../../model';
 import { getFormDetailProvider } from '../../../../../../../register';
@@ -27,8 +28,12 @@ export class FormMDCtrlItemController
     params: IParams,
     ctx: CTX,
     data: IData,
+    form: FormController,
   ) {
-    super(model, context, params, ctx);
+    const tempModel = clone(form.model);
+    // 合并父级表单模型 兼容值规则 和 父表单模型
+    Object.assign(tempModel, model, { name: undefined });
+    super(tempModel, context, params, ctx);
     this.state.data = data;
     this.state.isSimple = true;
   }

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

@@ -46,6 +46,16 @@ export interface INavViewMsg {
    */
   viewId?: string;
 
+  /**
+   * 是否路由已经跳转
+   *
+   * @author zk
+   * @date 2023-09-26 06:09:17
+   * @type {string}
+   * @memberof INavViewMsg
+   */
+  isRoutePushed?: boolean;
+
   /**
    * 是否缓存
    *