@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.51

package/out/controller/control/form/edit-form/edit-form.controller.js

@@ -4,7 +4,7 @@ import { createUUID } from 'qx-util';
 import { clone, isNil } from 'ramda';
 import { calcDeCodeNameById, findChildFormDetails, hasDeCodeName, } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
-import { ScriptFactory } from '../../../../utils';
+import { ChangeTracker, ScriptFactory } from '../../../../utils';
 import { FormNotifyState } from '../../../constant';
 import { FormController } from '../form';
 import { EditFormService } from './edit-form.service';
@@ -20,6 +20,13 @@ import { EditFormService } from './edit-form.service';
 export class EditFormController extends FormController {
     constructor() {
         super(...arguments);
+        /**
+         * @description 变更记录器
+         * @protected
+         * @type {IApiChangeTracker<ControlVO>}
+         * @memberof EditFormController
+         */
+        this.changeTracker = new ChangeTracker();
         /**
          * 表单旧数据
          *
@@ -98,9 +105,9 @@ export class EditFormController extends FormController {
                     id: `${this.view.model.codeName}_${this.model.codeName}_${detail.codeName}`,
                     title: detail.caption,
                 });
-                if (detail.deformDetails) {
-                    this.parseAnchorModel(page, detail.deformDetails);
-                }
+            }
+            if (detail.deformDetails) {
+                this.parseAnchorModel(page, detail.deformDetails);
             }
         });
     }
@@ -141,6 +148,7 @@ export class EditFormController extends FormController {
             }
         }
         this.state.data = res.data;
+        this.changeTracker.reset(this.data.clone());
         this.formStateNotify(FormNotifyState.DRAFT);
         await this.evt.emit('onLoadDraftSuccess', undefined);
         this.actionNotification('GETDRAFTSUCCESS');
@@ -186,8 +194,11 @@ export class EditFormController extends FormController {
         // 清空主键，重置临时主键
         res.data.srfkey = undefined;
         res.data.tempsrfkey = createUUID();
+        // 主键清空后重置为新建数据
+        res.data.srfuf = Srfuf.CREATE;
         this.state.modified = false;
         this.state.data = res.data;
+        this.changeTracker.reset(this.data.clone());
         this.formStateNotify(FormNotifyState.LOAD);
         await this.evt.emit('onLoadSuccess', { args: res.data });
         this.actionNotification('GETSUCCESS');
@@ -238,6 +249,7 @@ export class EditFormController extends FormController {
         this.state.data = res.data;
         // 缓存旧数据
         this.oldData = this.data.clone();
+        this.changeTracker.reset(this.oldData);
         this.formStateNotify(FormNotifyState.LOAD);
         await this.evt.emit('onLoadSuccess', { args: res.data });
         this.actionNotification('GETSUCCESS');
@@ -270,7 +282,7 @@ export class EditFormController extends FormController {
             if ((args === null || args === void 0 ? void 0 : args.silentVerify) === true) {
                 return this.data;
             }
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.form.formCompletion'));
+            this.handleValidateFail();
         }
         if (!silent) {
             await this.startLoading();
@@ -282,8 +294,8 @@ export class EditFormController extends FormController {
                 srfactiontrusted: false,
             });
         }
-        const saveData = data[0];
-        await this.checkIgnoreInput(saveData);
+        let saveData = data[0];
+        saveData = this.checkIgnoreInput(saveData);
         const isCreate = saveData.srfuf === Srfuf.CREATE;
         let res;
         try {
@@ -318,6 +330,7 @@ export class EditFormController extends FormController {
             }
             // 保存结束后更新旧数据
             this.oldData = this.data.clone();
+            this.changeTracker.reset(this.oldData);
             this.data.tempsrfkey = this.data.srfkey;
         }
         this.state.modified = false;
@@ -396,6 +409,7 @@ export class EditFormController extends FormController {
         // 删除完成后都要置空当前表单数据
         this.state.data = new ControlVO();
         this.state.modified = false;
+        this.changeTracker.reset(this.data.clone());
         await this.evt.emit('onRemoveSuccess', { args: this.data });
         this.actionNotification('REMOVESUCCESS');
         return ok;
@@ -478,7 +492,7 @@ export class EditFormController extends FormController {
     async wfStart(args) {
         const isValid = await this.validate();
         if (!isValid) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.form.formCompletion'));
+            this.handleValidateFail();
         }
         const silent = (args === null || args === void 0 ? void 0 : args.silent) === true;
         if (!silent) {
@@ -519,7 +533,7 @@ export class EditFormController extends FormController {
     async wfSubmit(args) {
         const isValid = await this.validate();
         if (!isValid) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.form.formCompletion'));
+            this.handleValidateFail();
         }
         const silent = (args === null || args === void 0 ? void 0 : args.silent) === true;
         if (!silent) {
@@ -651,8 +665,15 @@ export class EditFormController extends FormController {
      * @param {IData} data
      */
     setSimpleData(data) {
+        // fix:修复向导面板后退时data变成vo对象导致界面异常（#PLM评审新建向导）
+        const newData = {};
+        if (Object.keys(data).length > 0) {
+            Object.keys(data).forEach(key => {
+                newData[key] = data[key];
+            });
+        }
         // data由外部直接修改，先克隆一份隔离跟外部的对象。补全对应表单项字段不存在的时候设置为null，避免响应式问题。
-        const UIData = this.service.toUIData(data);
+        const UIData = this.service.toUIData(newData);
         const cloneData = UIData.clone();
         this.oldData = this.state.data.clone();
         this.formItems.forEach(item => {
@@ -662,6 +683,7 @@ export class EditFormController extends FormController {
         });
         this.state.modified = false;
         this.state.data = cloneData;
+        this.changeTracker.reset(this.data.clone());
         if (!this.state.isLoaded) {
             // 第一次设置的时候走更新通知，触发更新默认值
             this.formStateNotify(FormNotifyState.LOAD);
@@ -780,4 +802,26 @@ export class EditFormController extends FormController {
         };
         deformPages.forEach(clacVisible);
     }
+    /**
+     * @description 取消变更，'UNDO' | 'REDO'暂未支持
+     * @param {('INIT' | 'UNDO' | 'REDO')} [targetState] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {Promise<void>}
+     * @memberof FormController
+     */
+    async cancelChanges(targetState = 'INIT') {
+        if (targetState !== 'INIT') {
+            return;
+        }
+        // 后续需支持undo和redo后再行调整
+        const initSate = this.changeTracker.getState();
+        if (initSate) {
+            this.state.modified = false;
+            this.state.data = initSate;
+            this.oldData = this.data.clone();
+            this.changeTracker.reset(this.oldData);
+            this.formStateNotify(FormNotifyState.LOAD);
+            await this.evt.emit('onLoadSuccess', { args: initSate });
+            this.state.isLoaded = true;
+        }
+    }
 }

package/out/controller/control/form/edit-form/edit-form.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EAKZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,WAAW,CAAC,CAAC,CAAC;IACtB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAkBpC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAehC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAuBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA8D/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;CAOlE"}
+{"version":3,"file":"edit-form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EAKZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAc,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,eAAe,CAC1B,CAAC,SAAS,WAAW,GAAG,WAAW,CACnC,SAAQ,WAAW,CAAC,CAAC,CAAC;IACtB;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAgBpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAkBpC;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAehC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAuBhC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA+D/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;CAOlE"}

package/out/controller/control/form/edit-form/edit-form.service.js

@@ -119,7 +119,11 @@ export class EditFormService extends FormService {
      * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
      */
     async updateFormItem(methodName, context, data = {}, params = {}) {
-        Object.assign(params, { srfupdateitem: true });
+        var _a;
+        const { controlParam } = this.model;
+        // 识别控件动态参数ignoreupdateitem
+        const srfupdateitem = ((_a = controlParam === null || controlParam === void 0 ? void 0 : controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.IGNOREUPDATEITEM) !== 'false';
+        Object.assign(params, { srfupdateitem });
         let res = await this.exec(methodName, context, data, params);
         res = this.handleResponse(res);
         return res;
@@ -188,8 +192,10 @@ export class EditFormService extends FormService {
         // *初始化表单的属性映射
         recursiveIterate(this.model, (item, parent) => {
             // 重复器中的子表单属性项不应挂在主表单中
-            if (parent.detailType !== 'MDCTRL' &&
-                (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL')) {
+            if (parent.detailType === 'MDCTRL') {
+                return true;
+            }
+            if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
                 const formItem = item;
                 // 复合表单项
                 if (formItem.compositeItem) {
@@ -224,6 +230,7 @@ export class EditFormService extends FormService {
             }
         }, {
             childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+            isBreak: true,
         });
     }
     /**

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

@@ -1,10 +1,11 @@
 import { IControlLogic, IDEForm, IDEFormDetail } from '@ibiz/model-core';
-import { IFormState, IFormEvent, IFormController, IFormDetailController, IFormDetailProvider } from '../../../../interface';
+import { IFormState, IFormEvent, IFormController, IFormDetailController, IFormDetailProvider, IApiFormDetailMapping } from '../../../../interface';
 import { AppCounter } from '../../../../service';
 import { ControlController } from '../../../common';
 import { FormNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
 import type { FormDRUIPartController, FormGroupPanelController, FormItemController, FormMDCtrlController } from '../form-detail';
+import { FormService } from './form.service';
 /**
  * 表单控制器
  *
@@ -16,6 +17,7 @@ import type { FormDRUIPartController, FormGroupPanelController, FormItemControll
  * @template T
  */
 export declare abstract class FormController<T extends IDEForm = IDEForm, S extends IFormState = IFormState, E extends IFormEvent = IFormEvent> extends ControlController<T, S, E> implements IFormController<T, S, E> {
+    service: FormService;
     protected get _evt(): ControllerEvent<IFormEvent>;
     /**
      * 所有表单项成员的控制器
@@ -77,6 +79,40 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      * @type {IData}
      */
     get data(): IData;
+    /**
+     * @description 校验模式
+     * @readonly
+     * @type {('default' | 'notification')}
+     * @memberof FormController
+     */
+    get validateMode(): 'default' | 'notification';
+    /**
+     * @description 是否启用缓存
+     * @readonly
+     * @type {boolean}
+     * @memberof FormController
+     */
+    get srfCachePos(): boolean;
+    /**
+     * @description 缓存标识
+     * @readonly
+     * @type {string}
+     * @memberof FormController
+     */
+    get srfcachekeytempl(): string;
+    /**
+     * @description jsonSchema属性集合对象
+     * @type {IData}
+     * @memberof FormController
+     */
+    jsonSchemaProperties?: IData;
+    /**
+     * @description 是否启用jsonschema
+     * @readonly
+     * @type {boolean}
+     * @memberof FormController
+     */
+    get enableJsonSchema(): boolean;
     protected initState(): void;
     /**
      * 设置激活分页
@@ -85,6 +121,30 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      * @memberof FormController
      */
     setActiveTab(name: string): void;
+    /**
+     * @description 设置简单模式数据索引
+     * @param {number} [index]
+     * @memberof EditFormController
+     */
+    setSimpleDataIndex(index?: number): void;
+    /**
+     * @description 获取简单模式数据索引
+     * @returns {*}  {number}
+     * @memberof EditFormController
+     */
+    getSimpleDataIndex(): number;
+    /**
+     * @description 获取多数据部件表单模式下当前表单索引
+     * @returns {*}  {number}
+     * @memberof FormController
+     */
+    getMdCtrlFormIndex(): number;
+    /**
+     * @description 设置多数据部件表单模式下当前表单的索引
+     * @param {number} index
+     * @memberof FormController
+     */
+    setMdCtrlFormIndex(index: number): void;
     /**
      * 更新表单分页面板
      *
@@ -140,6 +200,12 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      * @returns {*}
      */
     getData(): IData[];
+    /**
+     * @description 获取原始实体数据
+     * @returns {*}  {IData[]}
+     * @memberof FormController
+     */
+    getReal(): IData[];
     /**
      * 设置表单数据的值
      *
@@ -157,9 +223,9 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      * @author tony001
      * @date 2025-01-09 16:01:29
      * @param {IData} data
-     * @return {*}  {Promise<void>}
+     * @return {*}  {IData}
      */
-    checkIgnoreInput(data: IData): Promise<void>;
+    checkIgnoreInput(data: IData): IData;
     /**
      * 校验表单的全部表单项
      *
@@ -168,6 +234,11 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      * @returns {*}  {Promise<boolean>}
      */
     validate(): Promise<boolean>;
+    /**
+     * @description 处理校验失败
+     * @memberof FormController
+     */
+    handleValidateFail(): void;
     /**
      * 静默校验
      * - 只校验无提示信息
@@ -220,9 +291,28 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      */
     refresh(): Promise<void>;
     /**
-     * @description 切换分组折叠
+     * @description 切换折叠，其中tag表示操作指定分组标识，若不传则操作当前表单的所有分组展开状态，expand表示是否展开，若不传则以当前分组状态为基准切换
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
+     * @memberof FormController
+     */
+    changeCollapse(params?: {
+        tag?: string;
+        expand?: boolean;
+    }): void;
+    /**
+     * @description 获取表单成员
+     * @template K
+     * @param {K} type
+     * @param {string} id
+     * @returns {*}  {IApiFormDetailMapping[K]}
+     * @memberof FormController
+     */
+    getFormDetail<K extends keyof IApiFormDetailMapping>(type: K, id: string): IApiFormDetailMapping[K];
+    /**
+     * @description 初始化jsonschema
+     * @returns {*}  {Promise<void>}
      * @memberof FormController
      */
-    changeCollapse(params?: IData): void;
+    initByEntitySchema(): Promise<void>;
 }
 //# sourceMappingURL=form.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/form/form/form.controller.js

@@ -5,9 +5,9 @@ import { clone } from 'ramda';
 import { calcDeCodeNameById, findChildFormDetails, isFormDataContainer, } from '../../../../model';
 import { getFormDetailProvider } from '../../../../register';
 import { ControlVO, CounterService, Srfuf, } from '../../../../service';
-import { handleAllSettled } from '../../../../utils';
+import { convertNavData, handleAllSettled } from '../../../../utils';
 import { ControlController } from '../../../common';
-import { isValueChange } from '../../../utils';
+import { getEntitySchema, isValueChange, } from '../../../utils';
 /**
  * 表单控制器
  *
@@ -81,6 +81,54 @@ export class FormController extends ControlController {
     get data() {
         return this.state.data;
     }
+    /**
+     * @description 校验模式
+     * @readonly
+     * @type {('default' | 'notification')}
+     * @memberof FormController
+     */
+    get validateMode() {
+        if (this.controlParams.validatemode) {
+            return this.controlParams.validatemode;
+        }
+        return ibiz.config.form.validateMode;
+    }
+    /**
+     * @description 是否启用缓存
+     * @readonly
+     * @type {boolean}
+     * @memberof FormController
+     */
+    get srfCachePos() {
+        if (this.controlParams.srfcachepos)
+            return this.controlParams.srfcachepos === 'true';
+        return ibiz.config.form.srfCachePos;
+    }
+    /**
+     * @description 缓存标识
+     * @readonly
+     * @type {string}
+     * @memberof FormController
+     */
+    get srfcachekeytempl() {
+        if (this.controlParams.srfcachekeytempl)
+            return this.controlParams.srfcachekeytempl;
+        if (ibiz.config.form.srfCacheKeyTempl)
+            return ibiz.config.form.srfCacheKeyTempl;
+        return `${this.context.srfuserid}_${this.view.model.codeName}_${this.model.codeName}`;
+    }
+    /**
+     * @description 是否启用jsonschema
+     * @readonly
+     * @type {boolean}
+     * @memberof FormController
+     */
+    get enableJsonSchema() {
+        if (this.controlParams.enablejsonschema) {
+            return this.controlParams.enablejsonschema === 'true';
+        }
+        return ibiz.config.form.enableDynaFormJsonSchema;
+    }
     initState() {
         var _a, _b;
         super.initState();
@@ -90,6 +138,8 @@ export class FormController extends ControlController {
         this.state.processing = false;
         this.state.modified = false;
         this.state.formIsDestroyed = false;
+        this.state.simpleDataIndex = 0;
+        this.state.mdCtrlFormIndex = 0;
     }
     /**
      * 设置激活分页
@@ -100,6 +150,38 @@ export class FormController extends ControlController {
     setActiveTab(name) {
         this.state.activeTab = name;
     }
+    /**
+     * @description 设置简单模式数据索引
+     * @param {number} [index]
+     * @memberof EditFormController
+     */
+    setSimpleDataIndex(index) {
+        this.state.simpleDataIndex = index || 0;
+    }
+    /**
+     * @description 获取简单模式数据索引
+     * @returns {*}  {number}
+     * @memberof EditFormController
+     */
+    getSimpleDataIndex() {
+        return this.state.simpleDataIndex;
+    }
+    /**
+     * @description 获取多数据部件表单模式下当前表单索引
+     * @returns {*}  {number}
+     * @memberof FormController
+     */
+    getMdCtrlFormIndex() {
+        return this.state.mdCtrlFormIndex;
+    }
+    /**
+     * @description 设置多数据部件表单模式下当前表单的索引
+     * @param {number} index
+     * @memberof FormController
+     */
+    setMdCtrlFormIndex(index) {
+        this.state.mdCtrlFormIndex = index;
+    }
     /**
      * 更新表单分页面板
      *
@@ -149,10 +231,11 @@ export class FormController extends ControlController {
      * @returns {*}  {Promise<void>}
      */
     async onCreated() {
+        await this.initByEntitySchema();
         await super.onCreated();
-        await this.initDetailControllers();
         // 初始化计数器
         await this.initCounter();
+        await this.initDetailControllers();
         // 数据变更通知防抖，且合并参数
         this.dataChangeNotify = debounceAndAsyncMerge(this.dataChangeNotify.bind(this), (arr1, arr2) => {
             return [Array.from(new Set([...arr1[0], ...arr2[0]]))];
@@ -228,6 +311,19 @@ export class FormController extends ControlController {
     getData() {
         return [this.state.data];
     }
+    /**
+     * @description 获取原始实体数据
+     * @returns {*}  {IData[]}
+     * @memberof FormController
+     */
+    getReal() {
+        let formData = this.getData()[0] || {};
+        formData = this.checkIgnoreInput(formData);
+        const originData = formData instanceof ControlVO ? formData.getOrigin() : formData;
+        const filterData = this.service.getFilteredData(formData);
+        Object.assign(originData, filterData);
+        return [originData];
+    }
     /**
      * 设置表单数据的值
      *
@@ -270,9 +366,9 @@ export class FormController extends ControlController {
      * @author tony001
      * @date 2025-01-09 16:01:29
      * @param {IData} data
-     * @return {*}  {Promise<void>}
+     * @return {*}  {IData}
      */
-    async checkIgnoreInput(data) {
+    checkIgnoreInput(data) {
         const formData = clone(data);
         const formDataUIMap = formData.$dataUIMap;
         const isCreate = formData.srfuf === Srfuf.CREATE;
@@ -303,6 +399,7 @@ export class FormController extends ControlController {
                     break;
             }
         });
+        return formData;
     }
     /**
      * 校验表单的全部表单项
@@ -313,9 +410,28 @@ export class FormController extends ControlController {
      */
     async validate() {
         const values = await Promise.all([...this.formItems, ...this.formMDCtrls, ...this.formDruipart].map(formItem => formItem.validate()));
-        // 找不到value为false即全部是true
         return values.findIndex(value => !value) === -1;
     }
+    /**
+     * @description 处理校验失败
+     * @memberof FormController
+     */
+    handleValidateFail() {
+        // 校验模式为通知模式时校验时提示错误信息
+        if (this.validateMode === 'notification') {
+            // 此处只处理表单项错误信息，多数据部件与关系界面暂不考虑
+            const errorItems = [...this.formItems].filter(formItem => formItem.state.error);
+            const errors = errorItems.map(formItem => formItem.state.error);
+            ibiz.notification.error({
+                title: ibiz.i18n.t('runtime.controller.control.form.formCompletion'),
+                desc: errors.join('<br/>'),
+                isHtmlDesc: true,
+            });
+            // 抛出Error错误，只打印错误信息，不抛出错误提示
+            throw new Error(ibiz.i18n.t('runtime.controller.control.form.formCompletion'));
+        }
+        throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.form.formCompletion'));
+    }
     /**
      * 静默校验
      * - 只校验无提示信息
@@ -369,6 +485,9 @@ export class FormController extends ControlController {
         await super.onDestroyed();
         // 销毁视图计数器
         Object.values(this.counters).forEach(counter => counter.destroy());
+        Object.values(this.formItems).forEach(item => {
+            item.destroy();
+        });
     }
     /**
      * 初始化计数器
@@ -378,6 +497,8 @@ export class FormController extends ControlController {
      * @return {*}  {Promise<void>}
      */
     async initCounter() {
+        if (this.state.isCounterDisabled)
+            return;
         this.counters = {};
         const { appCounterRefs } = this.model;
         if (appCounterRefs && appCounterRefs.length > 0) {
@@ -422,7 +543,8 @@ export class FormController extends ControlController {
         });
     }
     /**
-     * @description 切换分组折叠
+     * @description 切换折叠，其中tag表示操作指定分组标识，若不传则操作当前表单的所有分组展开状态，expand表示是否展开，若不传则以当前分组状态为基准切换
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof FormController
      */
     changeCollapse(params = {}) {
@@ -452,9 +574,39 @@ export class FormController extends ControlController {
                 if (group.model.detailType === 'GROUPPANEL') {
                     group.state.collapse = isBoolean(expand)
                         ? !expand
-                        : group.state.collapse;
+                        : !group.state.collapse;
                 }
             });
         }
     }
+    /**
+     * @description 获取表单成员
+     * @template K
+     * @param {K} type
+     * @param {string} id
+     * @returns {*}  {IApiFormDetailMapping[K]}
+     * @memberof FormController
+     */
+    getFormDetail(type, id) {
+        return this.details[id];
+    }
+    /**
+     * @description 初始化jsonschema
+     * @returns {*}  {Promise<void>}
+     * @memberof FormController
+     */
+    async initByEntitySchema() {
+        if (!this.enableJsonSchema) {
+            return;
+        }
+        const jsonSchemaParams = JSON.parse(this.controlParams.jsonschemaparams || '{}');
+        const jsonSchemaQuery = convertNavData(jsonSchemaParams, this.params, this.context);
+        const tempParams = clone(jsonSchemaQuery);
+        Object.assign(tempParams, this.params);
+        const json = await getEntitySchema(this.model.appDataEntityId, this.context, tempParams);
+        if (!json) {
+            return;
+        }
+        this.jsonSchemaProperties = json.properties;
+    }
 }

package/out/controller/control/form/form/form.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,OAAO,EAAiB,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AAG5E;;;;;;;;GAQG;AACH,qBAAa,WAAW,CACtB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,YAAY,wBAA+B;IAE3C;;;;;;;;OAQG;IACH,UAAU,CACR,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,QAAQ,GAAG,QAAQ,GACxB,IAAI;IAoCP;;;;;;;OAOG;IACH,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;IAUvC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA0B/B;;;;;;;;OAQG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;CAsBpC"}
+{"version":3,"file":"form.service.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,OAAO,EAAiB,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AAG5E;;;;;;;;GAQG;AACH,qBAAa,WAAW,CACtB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,YAAY,wBAA+B;IAE3C;;;;;;;;OAQG;IACH,UAAU,CACR,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,QAAQ,GAAG,QAAQ,GACxB,IAAI;IAoCP;;;;;;;OAOG;IACH,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;IAUvC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IA+B/B;;;;;;;;OAQG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;CAsBpC"}

package/out/controller/control/form/form/form.service.js

@@ -84,7 +84,11 @@ export class FormService extends ControlService {
     initUIDataMap() {
         super.initUIDataMap();
         // 初始化表单属性key和界面key映射
-        recursiveIterate(this.model, (item) => {
+        recursiveIterate(this.model, (item, parent) => {
+            // 重复器中的子表单属性项不应挂在主表单中
+            if (parent.detailType === 'MDCTRL') {
+                return true;
+            }
             if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
                 const formItem = item;
                 const uiKey = formItem.id.toLowerCase();
@@ -100,6 +104,7 @@ export class FormService extends ControlService {
             }
         }, {
             childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+            isBreak: true,
         });
     }
     /**