@ibiz-template/runtime 0.1.12-dev.0 → 0.1.12

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -72,7 +72,7 @@ export class AppUILogicExecutor extends LogicExecutor {
             tempParams = convertNavData(navParams, params, context, data[0]);
         }
         // 打开视图
-        await ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
+        return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
     }
     /**
      * 执行应用预置界面逻辑newdata
@@ -95,7 +95,7 @@ export class AppUILogicExecutor extends LogicExecutor {
             newViewRef = await this.getWizardNewViewRef(appUILogic, parameters);
             if (!newViewRef) {
                 // 选择视图取消操作直接返回
-                return;
+                return { ok: false };
             }
         }
         else if (enableBatchAdd) {
@@ -133,7 +133,7 @@ export class AppUILogicExecutor extends LogicExecutor {
             tempParams = Object.assign(tempParams, _data.$origin);
         }
         // 打开视图
-        await ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
+        return ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
     }
     /**
      * 获取向导新建视图引用

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

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA0B3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IAuB3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}

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

@@ -91,7 +91,7 @@ export class CodeListService {
             // todo代码项其他属性，表单数据
             let text = codeItem.text;
             if (codeItem.textLanguageRes) {
-                text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag, codeItem.textLanguageRes.defaultContent);
+                text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag, codeItem.text);
             }
             const _codeItem = {
                 text,

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

@@ -88,7 +88,7 @@ export class DynamicCodeListCache {
         if (this.isPredefined) {
             // 特殊处理，避免预置代码表加载不全
             if (!params.size) {
-                params.size = 10000;
+                params = Object.assign(Object.assign({}, params), { size: 10000 });
             }
             const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
             return Object.freeze(res.data.items);

package/out/ui-action/uiaction-util.js

@@ -41,7 +41,7 @@ export class UIActionUtil {
         var _a, _b;
         const result = await this.exec(actionId, params);
         if (result.closeView) {
-            params.view.closeView();
+            params.view.closeView({ ok: true });
         }
         else if (result.refresh) {
             switch (result.refreshMode) {

package/out/utils/script/script-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAyC9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
+{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA4C9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}

package/out/utils/script/script-function.js

@@ -120,6 +120,9 @@ export class ScriptFunction {
                     openView: ibiz.openView,
                 };
                 break;
+            case 'viewParam': // 视图参数
+                param.viewParam = param.params;
+                break;
             case 'env': // 全局环境变量
                 param.env = ibiz.env;
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.12-dev.0",
+  "version": "0.1.12",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.12-dev.0",
+    "@ibiz-template/core": "^0.1.12",
     "@ibiz/model-core": "^0.0.15",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -55,5 +55,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "a249a3aa80e42e2e67ff8654753d23095aec69c5"
+  "gitHead": "980e348c7fa465d0a62e655991c1bb816fca100a"
 }

package/src/controller/common/control/md-control.controller.ts

@@ -157,6 +157,9 @@ export class MDControlController<
       await this._evt.emit('onLoadSuccess', {
         isInitialLoad,
       });
+    } catch (error) {
+      await this._evt.emit('onLoadError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -210,6 +213,7 @@ export class MDControlController<
       }
     }
 
+    await this._evt.emit('onBeforeRemove', undefined);
     await this.startLoading();
     let needRefresh = false;
     try {
@@ -241,6 +245,9 @@ export class MDControlController<
       if (needRefresh) {
         this.refresh();
       }
+    } catch (error) {
+      await this._evt.emit('onRemoveError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -64,7 +64,11 @@ export class AppMenuController
    * @param {string} id
    * @return {*}  {Promise<void>}
    */
-  async onClickMenuItem(id: string, event?: MouseEvent): Promise<void> {
+  async onClickMenuItem(
+    id: string,
+    event?: MouseEvent,
+    useDepth: boolean = true,
+  ): Promise<void> {
     const menuItem = findRecursiveChild(this.model, id, {
       compareField: 'id',
       childrenFields: ['appMenuItems'],
@@ -83,8 +87,7 @@ export class AppMenuController
     }
 
     const tempContext = this.context.clone();
-
-    if (this.routeDepth) {
+    if (this.routeDepth && useDepth) {
       Object.assign(tempContext, {
         toRouteDepth: this.routeDepth + 1,
       });

package/src/controller/control/caption-bar/caption-bar.controller.ts

@@ -24,8 +24,7 @@ export class CaptionBarController
     if (this.view.model.capLanguageRes) {
       this.state.caption = ibiz.i18n.t(
         this.view.model.capLanguageRes.lanResTag!,
-        this.view.model.capLanguageRes.defaultContent ||
-          this.view.model.caption,
+        this.view.model.caption,
       );
     } else {
       this.state.caption = this.view.model.caption!;

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -199,6 +199,10 @@ export class ChartOptionsGenerator {
     const { showLegend, legendPos } = chartLegend;
     const legendOption: EChartsOption['legend'] = {};
     legendOption.show = showLegend;
+    // 图表单序列不应出图例
+    if (this.model.dechartSerieses?.length === 1) {
+      legendOption.show = false;
+    }
     const position = legendPos?.toLowerCase();
     if (position === 'left' || position === 'right') {
       legendOption.left = position;

package/src/controller/control/exp-bar/exp-bar.controller.ts

@@ -164,6 +164,31 @@ export class ExpBarControlController<
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     this.childNames.push(this.model.xdataControlName!);
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId!,
+      this.context.srfappid,
+    )!;
+    if (appDataEntity) {
+      const searchFields = appDataEntity.appDEFields?.filter(field => {
+        return field.enableQuickSearch;
+      });
+      const placeHolders: string[] = [];
+      searchFields?.forEach(searchField => {
+        if (searchField?.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
+          placeHolders.push(
+            ibiz.i18n.t(
+              searchField.lnlanguageRes.lanResTag,
+              searchField.logicName,
+            ),
+          );
+        } else if (searchField?.logicName) {
+          placeHolders.push(searchField.logicName);
+        }
+      });
+      if (placeHolders.length > 0) {
+        this.state.placeHolder = placeHolders.join('、');
+      }
+    }
   }
 
   /**

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -59,6 +59,43 @@ export class EditFormController
     }) as () => Promise<void>;
   }
 
+  /**
+   * 加载草稿行为
+   * @author lxm
+   * @date 2023-08-25 02:45:11
+   * @return {*}  {Promise<IData>}
+   */
+  async loadDraft(): Promise<IData> {
+    const queryParams = { ...this.params };
+    // 新建默认值给到graft接口，接口会回来
+    const params = await this.getDraftParams(); // 新建默认值
+    Object.assign(queryParams, params);
+
+    let res;
+    try {
+      await this.startLoading();
+      await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
+      res = await this.service.getDraft(this.context, queryParams);
+    } catch (error) {
+      await this.evt.emit('onLoadDraftError', undefined);
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+
+    // !getDraft的时候不替换，进行合并，空值不覆盖
+    mergeInLeft(this.data, res.data);
+
+    // 处理后台导致的新建默认值丢失
+    mergeDefaultInLeft(this.data, params);
+
+    this.formStateNotify(FormNotifyState.DRAFT);
+
+    await this.evt.emit('onLoadDraftSuccess', undefined);
+    this.state.isLoaded = true;
+    return this.data;
+  }
+
   /**
    * 部件加载数据行为
    *
@@ -70,42 +107,30 @@ export class EditFormController
       this.context,
       this.model.appDataEntityId!,
     );
-    const queryParams = { ...this.params };
-
-    // 新建默认值给到graft接口，接口会回来
-    let params: IData = {};
+    // 加载草稿单独走一个方法
     if (isLoadDraft) {
-      params = await this.getDraftParams();
-      Object.assign(queryParams, params);
+      return this.loadDraft();
     }
 
-    await this.startLoading();
+    const queryParams = { ...this.params };
+
     let res;
     try {
-      res = isLoadDraft
-        ? await this.service.getDraft(this.context, queryParams)
-        : await this.service.get(this.context, queryParams);
+      await this.startLoading();
+      await this.evt.emit('onBeforeLoad', undefined);
+      res = await this.service.get(this.context, queryParams);
+    } catch (error) {
+      await this.evt.emit('onLoadError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }
 
-    if (isLoadDraft) {
-      // !getDraft的时候不替换，进行合并，空值不覆盖
-      mergeInLeft(this.data, res.data);
-    } else {
-      this.state.data = res.data;
-    }
     this.state.modified = false;
     this.state.data = res.data;
-    mergeDefaultInLeft(this.data, params);
-    this.formStateNotify(
-      isLoadDraft ? FormNotifyState.DRAFT : FormNotifyState.LOAD,
-    );
+    this.formStateNotify(FormNotifyState.LOAD);
 
-    await this.evt.emit(
-      isLoadDraft ? 'onLoadDraftSuccess' : 'onLoadSuccess',
-      undefined,
-    );
+    await this.evt.emit('onLoadSuccess', undefined);
     this.state.isLoaded = true;
     return this.data;
   }
@@ -128,12 +153,16 @@ export class EditFormController
       throw new RuntimeError('请检查表单填写！');
     }
     await this.startLoading();
+    await this.evt.emit('onBeforeSave', undefined);
     let res;
     try {
       res =
         this.data.srfuf === Srfuf.CREATE
           ? await this.service.create(this.context, this.data)
           : await this.service.update(this.context, this.data);
+    } catch (error) {
+      await this.evt.emit('onSaveError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -159,6 +188,7 @@ export class EditFormController
     // 新建数据清空数据
     let res: IHttpResponse | undefined;
     let ok: boolean = false;
+    await this.evt.emit('onBeforeRemove', undefined);
     // 新建的数据不用进行后台删除
     if (this.data.srfuf === Srfuf.UPDATE) {
       ok = await ibiz.modal.confirm({
@@ -172,6 +202,9 @@ export class EditFormController
       await this.startLoading();
       try {
         res = await this.service.remove(this.context, this.params);
+      } catch (error) {
+        await this.evt.emit('onRemoveError', undefined);
+        throw error;
       } finally {
         await this.endLoading();
       }

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

@@ -1,7 +1,12 @@
-import { IControl, IDEFormMDCtrl } from '@ibiz/model-core';
+import { IControl, IDEFormDetail, IDEFormMDCtrl } from '@ibiz/model-core';
 import { IFormController } from '../../../../../../../interface';
+import { findChildFormDetails } from '../../../../../../../model';
+import { getFormDetailProvider } from '../../../../../../../register';
 import { CTX } from '../../../../../../ctx';
 import { EditFormController } from '../../../../edit-form';
+import { FormController } from '../../../../form';
+import { FormGroupPanelController } from '../../../form-group-panel';
+import { FormItemController } from '../../../form-item';
 
 /**
  * 表单多数据部件项控制器
@@ -28,9 +33,41 @@ export class FormMDCtrlItemController
     this.state.isSimple = true;
   }
 
-  public async onInit(): Promise<void> {
-    await this.initDetailControllers(
-      (this.model as IDEFormMDCtrl).deformDetails,
+  protected async initDetailControllers(
+    details: IDEFormDetail[] = (this.model as IDEFormMDCtrl).deformDetails!,
+    form: FormController = this,
+    parent: FormGroupPanelController | undefined = undefined,
+  ): Promise<void> {
+    await Promise.all(
+      details.map(async detail => {
+        // 生成表单成员控制器
+        const detailProvider = await getFormDetailProvider(detail);
+        if (!detailProvider) {
+          return;
+        }
+        form.providers[detail.id!] = detailProvider;
+        const detailController = await detailProvider.createController(
+          detail,
+          form,
+          parent,
+        );
+        form.details[detail.id!] = detailController;
+        if (
+          detail.detailType === 'FORMITEM' ||
+          detail.detailType === 'MDCTRL'
+        ) {
+          form.formItems.push(detailController as FormItemController);
+        }
+        // 有子成员的生成子控制器
+        const childDetails = findChildFormDetails(detail);
+        if (childDetails.length) {
+          await this.initDetailControllers(
+            childDetails,
+            form,
+            detailController as FormGroupPanelController,
+          );
+        }
+      }),
     );
   }
 }

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

@@ -1,15 +1,5 @@
-// import { useCtx } from '@ibiz-template/vue3-util';
-import { IDEFormDetail } from '@ibiz/model-core';
-// import { reactive } from 'vue';
-import { FormController } from '../../../../form';
-import { FormGroupPanelController } from '../../../form-group-panel';
 import { FormMDCtrlContentTypeController } from '../../form-mdctrl-content-type.controller';
 import { FormMDCtrlItemController } from './form-mdctrl-repeater-form-item.controller';
-import { FormItemController } from '../../../form-item';
-import { IFormDetailController } from '../../../../../../../interface';
-import { findChildFormDetails } from '../../../../../../../model';
-import { getFormDetailProvider } from '../../../../../../../register';
-import { CTX } from '../../../../../../ctx';
 
 /**
  * 表单多数据部件表格类型控制器
@@ -22,108 +12,6 @@ import { CTX } from '../../../../../../ctx';
  * @implements {IFormController}
  */
 export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeController {
-  /**
-   * 表单项控制器的集合（二维数组）
-   *
-   * @author zk
-   * @date 2023-07-25 05:07:56
-   * @type {Array<Array<FormItemController>>}
-   * @memberof FormMDCtrlController
-   */
-  formDetails: Array<
-    Array<{ name: string; detailType: string; c: IFormDetailController }>
-  > = [];
-
-  /**
-   * 表单ctx
-   *
-   * @author zk
-   * @date 2023-07-31 12:07:00
-   * @private
-   * @type {CTX}
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  private formCtx!: CTX;
-
-  /**
-   * uiState
-   *
-   * @author zk
-   * @date 2023-07-31 12:07:07
-   * @type {{ isInit: boolean }}
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  state: { isInit: boolean } = { isInit: false };
-
-  /**
-   * 初始化表单成员控制器
-   *
-   * @author lxm
-   * @date 2022-08-24 21:08:48
-   * @protected
-   */
-  protected async initFormMDCtrlItemControllers(
-    details: IDEFormDetail[],
-    index: number,
-    form: FormController = this.parent.form,
-    data: IData = {},
-    parent: FormGroupPanelController | undefined = undefined,
-  ): Promise<IData> {
-    const formData = data;
-    // const formData = reactive(data);
-
-    const formController = new FormMDCtrlItemController(
-      this.model,
-      this.parent.form.context,
-      this.parent.form.params,
-      this.formCtx,
-      formData,
-    );
-    await formController.onInit();
-    formController.evt.on('onFormDataChange', arg => {
-      if (arg.data.length > 0) {
-        this.onDataItemChange(arg.data[0], index);
-      }
-    });
-
-    formController.state.isLoaded = true;
-    await Promise.all(
-      details.map(async detail => {
-        // 生成表单成员控制器
-        const detailProvider = await getFormDetailProvider(detail);
-        if (!detailProvider) {
-          return;
-        }
-        form.providers[detail.id!] = detailProvider;
-        const detailController = await detailProvider.createController(
-          detail,
-          formController,
-          parent,
-        );
-        if (!this.formDetails[index]) {
-          this.formDetails[index] = [];
-        }
-        this.formDetails[index].push({
-          name: detail.id!,
-          detailType: detail.detailType!,
-          c: detailController,
-        });
-        // 有子成员的生成子控制器
-        const childDetails = findChildFormDetails(detail);
-        if (childDetails.length) {
-          await this.initFormMDCtrlItemControllers(
-            childDetails,
-            index,
-            formController,
-            data,
-            detailController as FormGroupPanelController,
-          );
-        }
-      }),
-    );
-    return data;
-  }
-
   /**
    * 数据插入
    *
@@ -132,10 +20,7 @@ export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeContr
    * @memberof FormMDCtrlRepeaterFormController
    */
   async onDataInsert(): Promise<void> {
-    const data = await this.initFormMDCtrlItemControllers(
-      this.model.deformDetails!,
-      this.data.length,
-    );
+    const data = {};
     super.onDataInsert(data);
   }
 
@@ -152,41 +37,9 @@ export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeContr
       return;
     }
     super.onDataRemove(index);
-    this.formDetails.splice(index, 1);
   }
 
-  /**
-   * 初始化formCtx
-   *
-   * @author zk
-   * @date 2023-07-29 05:07:21
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  useFormMdCtrlCtx(): void {
-    // this.formCtx = useCtx();
-  }
-
-  /**
-   * 初始化数据
-   *
-   * @author zk
-   * @date 2023-07-31 12:07:37
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  async initData(): Promise<void> {
-    super.initData();
-    await Promise.all(
-      this.data.map(async (item, index) => {
-        await this.initFormMDCtrlItemControllers(
-          this.model.deformDetails!,
-          index,
-          this.parent.form,
-          item,
-        );
-      }),
-    );
-    this.state.isInit = true;
-  }
+  formControllerArray: Array<FormMDCtrlItemController> = [];
 
   /**
    * 表单项值规则校验
@@ -196,18 +49,17 @@ export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeContr
    * @memberof FormMDCtrlRepeaterFormController
    */
   async validate(): Promise<boolean> {
-    const values: Promise<boolean>[] = [];
-    this.formDetails.forEach(details => {
-      details.forEach(detail => {
-        if (detail.detailType === 'FORMITEM') {
-          const c = detail.c as FormItemController;
-          values.push(c.validate());
-        }
-      });
-    });
-
+    const values: Promise<boolean>[] = this.formControllerArray.map(
+      (c: FormMDCtrlItemController) => {
+        return c.validate();
+      },
+    );
     const results = await Promise.all(values);
     // 找不到value为false即全部是true
     return results.findIndex(value => !value) === -1;
   }
+
+  setFromController(c: FormMDCtrlItemController): void {
+    this.formControllerArray.push(c);
+  }
 }