@ibiz-template/runtime 0.3.5 → 0.4.0

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

@@ -61,6 +61,29 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     return this.form.data;
   }
 
+  /**
+   * 上下文
+   *
+   * @author lxm
+   * @date 2023-11-22 11:43:47
+   * @readonly
+   * @type {IContext}
+   */
+  get context(): IContext {
+    return this.form.context;
+  }
+
+  /**
+   *  视图参数
+   * @author lxm
+   * @date 2023-11-22 11:43:41
+   * @readonly
+   * @type {IParams}
+   */
+  get params(): IParams {
+    return this.form.params;
+  }
+
   /**
    * 获取容器类名集合
    * @author lxm
@@ -222,7 +245,7 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
       // name是动态逻辑涉及到的时或state存在时
       if (mustCalc || isOverlap(relatedNames, names)) {
         try {
-          const ok = verifyFormGroupLogic(this.form.data, logic);
+          const ok = verifyFormGroupLogic(this.data, logic);
           switch (logic.logicCat) {
             // 动态空输入，不满足则必填
             case 'ITEMBLANK':

package/src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts

@@ -146,7 +146,7 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
         newContext,
         convertNavData(
           navContexts!,
-          this.form.data,
+          this.data,
           this.form.params,
           this.form.context,
         ),
@@ -156,7 +156,7 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
     // 处理导航视图参数
     const newParams = convertNavData(
       this.model.navigateParams!,
-      this.form.data,
+      this.data,
       this.form.params,
       this.form.context,
     );

package/src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts

@@ -61,7 +61,8 @@ export class FormGroupPanelController<
     super.formStateNotify(state);
     // 只在加载后台数据之后，更新界面行为组状态
     if (this.state.actionGroupState) {
-      this.state.actionGroupState.update(this.form.data.getOrigin());
+      const deData = this.data.getOrigin ? this.data.getOrigin() : this.data;
+      this.state.actionGroupState.update(deData);
     }
   }
 

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

@@ -33,24 +33,6 @@ export class FormItemController
     return new FormItemState(this.parent?.state);
   }
 
-  /**
-   * 上下文
-   *
-   * @author lxm
-   * @date 2022-08-24 20:08:55
-   * @type {IContext}
-   */
-  readonly context: IContext;
-
-  /**
-   * 视图参数
-   *
-   * @author lxm
-   * @date 2022-08-24 20:08:52
-   * @type {IParams}
-   */
-  readonly params: IParams;
-
   /**
    * 编辑器控制器
    *
@@ -107,7 +89,7 @@ export class FormItemController
    * @type {unknown}
    */
   get value(): unknown {
-    return this.form.data[this.name];
+    return this.data[this.name];
   }
 
   /**
@@ -139,8 +121,6 @@ export class FormItemController
     parent?: IFormDetailContainerController,
   ) {
     super(model, form, parent);
-    this.context = form.context;
-    this.params = form.params;
   }
 
   /**

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

@@ -0,0 +1,215 @@
+import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { IDEEditForm } from '@ibiz/model-core';
+import { createUUID } from 'qx-util';
+import {
+  IControlProvider,
+  IEditFormController,
+} from '../../../../../interface';
+import { calcDeCodeNameById } from '../../../../../model';
+import { getControlProvider } from '../../../../../register';
+import { FormNotifyState } from '../../../../constant';
+import { EditFormService } from '../../edit-form';
+import { FormMDCtrlFormState } from './form-mdctrl-form.state';
+import { FormMDCtrlController } from './form-mdctrl.controller';
+
+/**
+ * 表单多数据部件(引用实体表单部件模型)控制器
+ * 类型是表单
+ *
+ * @author lxm
+ * @date 2023-11-09 04:32:02
+ * @export
+ * @class FormMDCtrlController
+ * @extends {FormDetailController<IDEFormMDCtrl>}
+ */
+export class FormMDCtrlFormController extends FormMDCtrlController {
+  /**
+   * 表单多数据部件控制器状态
+   *
+   * @author lxm
+   * @date 2023-11-09 04:33:47
+   * @type {FormMDCtrlFormState}
+   */
+  declare state: FormMDCtrlFormState;
+
+  protected createState(): FormMDCtrlFormState {
+    return new FormMDCtrlFormState(this.parent?.state);
+  }
+
+  /**
+   * 表单控制器Map
+   * @author lxm
+   * @date 2023-11-11 08:03:56
+   */
+  formMap = new Map<string, IEditFormController>();
+
+  /**
+   * 表单部件的适配器
+   *
+   * @author lxm
+   * @date 2022-08-24 20:08:07
+   * @type {{ [key: string]: IControlProvider }}
+   */
+  formProvider!: IControlProvider;
+
+  /**
+   * 编辑表单服务
+   * @author lxm
+   * @date 2023-05-15 11:03:34
+   * @type {EditFormService}
+   */
+  service!: EditFormService;
+
+  /**
+   * 实体上下文主键标识
+   * @author lxm
+   * @date 2023-11-11 08:33:08
+   * @type {string}
+   */
+  deName!: string;
+
+  /**
+   * 初始化
+   *
+   * @author zk
+   * @date 2023-07-25 10:07:11
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof FormMDCtrlController
+   */
+  async onInit(): Promise<void> {
+    super.onInit();
+    const { contentControl } = this.model;
+
+    // 初始化适配器
+    if (!contentControl) {
+      throw new RuntimeModelError(this.model, '多数据部件未配置内容部件');
+    }
+
+    // 修改自动保存
+    (contentControl as IDEEditForm).enableAutoSave =
+      this.enableCreate || this.enableUpdate;
+
+    const controlProvider = await getControlProvider(contentControl);
+    if (controlProvider) {
+      this.formProvider = controlProvider;
+    }
+
+    const { appDataEntityId } = this.model.contentControl!;
+    this.deName = calcDeCodeNameById(appDataEntityId!);
+  }
+
+  /**
+   * 加载实体的数据
+   * @author lxm
+   * @date 2023-11-10 05:02:40
+   * @return {*}  {Promise<void>}
+   */
+  async fetchData(): Promise<void> {
+    const { appDataEntityId } = this.model.contentControl!;
+    const fetchAction = 'fetchdefault';
+    const res = await ibiz.hub
+      .getApp()
+      .deService.exec(appDataEntityId!, fetchAction, this.context, this.params);
+    if (res.ok) {
+      this.state.items = (res.data as IData[]).map(item => {
+        const context = this.context.clone();
+        context[this.deName] = item.srfkey;
+        const params = { ...this.params };
+        return {
+          id: item.srfkey,
+          context,
+          params,
+        };
+      });
+    }
+  }
+
+  /**
+   * 表单状态变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:07
+   */
+  async formStateNotify(state: FormNotifyState): Promise<void> {
+    await super.formStateNotify(state);
+    await this.fetchData();
+  }
+
+  /**
+   * 设置表单控制器
+   * @author lxm
+   * @date 2023-11-11 08:03:06
+   * @param {string} id
+   * @param {IEditFormController} controller
+   */
+  setFormController(id: string, controller: IEditFormController): void {
+    this.formMap.set(id, controller);
+
+    controller.evt.on('onSaveSuccess', event => {
+      const formData = event.data[0];
+      const item = this.state.items!.find(x => x.id === id);
+
+      // 创建之后更新上下文的主键
+      if (item) {
+        if (item.context[this.deName] !== formData.srfkey) {
+          item.context[this.deName] = formData.srfkey;
+        }
+      }
+      this.updateFormItem();
+    });
+    controller.evt.on('onRemoveSuccess', () => {
+      this.updateFormItem();
+    });
+  }
+
+  /**
+   * 删除数据
+   * @author lxm
+   * @date 2023-11-11 08:06:12
+   * @param {string} id
+   * @return {*}  {Promise<void>}
+   */
+  async remove(id: string): Promise<void> {
+    const controller = this.formMap.get(id);
+    if (!controller) {
+      throw new RuntimeError(`没有找到对应${id}的表单控制器`);
+    }
+    await controller.remove();
+    const index = this.state.items!.findIndex(item => item.id === id);
+    if (index !== -1) {
+      this.state.items!.splice(index, 1);
+    }
+  }
+
+  /**
+   * 新建一条数据
+   * @author lxm
+   * @date 2023-11-11 08:01:49
+   */
+  create(): void {
+    const context = this.context.clone();
+    const params = { ...this.params };
+    if (!this.state.items) {
+      this.state.items = [];
+    }
+    this.state.items!.push({
+      id: createUUID(),
+      context,
+      params,
+    });
+  }
+
+  refresh(): void {
+    this.fetchData();
+  }
+
+  async dataChangeNotify(names: string[]): Promise<void> {
+    await super.dataChangeNotify(names);
+
+    // 表单项更新的时候修改数据的时候需要刷新
+    if (names.includes(this.model.id!)) {
+      this.refresh();
+    }
+  }
+}

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

@@ -0,0 +1,43 @@
+import { FormDetailState } from '../form-detail';
+
+export interface MDCtrlFormItem {
+  /**
+   * 唯一标识
+   * @author lxm
+   * @date 2023-11-11 07:50:42
+   * @type {string}
+   */
+  id: string;
+
+  /**
+   * 上下文
+   * @author lxm
+   * @date 2023-11-11 07:51:04
+   * @type {IContext}
+   */
+  context: IContext;
+
+  /**
+   * 视图参数
+   * @author lxm
+   * @date 2023-11-11 07:51:11
+   * @type {IParams}
+   */
+  params: IParams;
+}
+
+/**
+ * 表单多数据部件状态
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-01-04 10:26:34
+ */
+export class FormMDCtrlFormState extends FormDetailState {
+  /**
+   * 每个表单绘制相关参数
+   * @author lxm
+   * @date 2023-11-11 07:51:40
+   * @type {MDCtrlFormItem[]}
+   */
+  items?: MDCtrlFormItem[];
+}

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

@@ -0,0 +1,118 @@
+import {
+  mergeInLeft,
+  ModelError,
+  RuntimeModelError,
+} from '@ibiz-template/core';
+import {
+  IControlProvider,
+  IGridController,
+  IMDControlController,
+} from '../../../../../interface';
+import { getControlProvider } from '../../../../../register';
+import { FormMDCtrlController } from './form-mdctrl.controller';
+
+/**
+ * 表单多数据部件(引用实体多数据部件模型)控制器
+ * 类型是列表，卡片，表格时
+ *
+ * @author lxm
+ * @date 2023-11-09 04:32:02
+ * @export
+ * @class FormMDCtrlController
+ * @extends {FormDetailController<IDEFormMDCtrl>}
+ */
+export class FormMDCtrlMDController extends FormMDCtrlController {
+  /**
+   * 多数据部件的适配器
+   *
+   * @author lxm
+   * @date 2022-08-24 20:08:07
+   * @type {{ [key: string]: IControlProvider }}
+   */
+  mdProvider!: IControlProvider;
+
+  /**
+   * 多数据部件控制器
+   * @author lxm
+   * @date 2023-11-10 03:30:34
+   * @type {IMDControlController}
+   */
+  mdController!: IMDControlController;
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    const { contentControl } = this.model;
+    if (!contentControl) {
+      throw new RuntimeModelError(this.model, '多数据部件未配置内容部件');
+    }
+
+    // 把修改表格的模型，把行编辑打开，行新建看多数据部件的新建是否开启
+    if (contentControl.controlType === 'GRID') {
+      mergeInLeft(contentControl, {
+        enableRowEdit: this.enableCreate || this.enableUpdate,
+        enableRowNew: this.enableCreate,
+      });
+    }
+
+    const controlProvider = await getControlProvider(contentControl);
+    if (controlProvider) {
+      this.mdProvider = controlProvider;
+    }
+  }
+
+  /**
+   * 设置多数据部件控制器
+   * @author lxm
+   * @date 2023-11-10 03:31:16
+   * @param {IMDControlController} controller
+   */
+  setMDControl(controller: IMDControlController): void {
+    this.mdController = controller;
+
+    // 多数据部件保存，删除之后触发表单项更新
+    controller.evt.on('onSaveSuccess', () => {
+      this.updateFormItem();
+    });
+    controller.evt.on('onRemoveSuccess', () => {
+      this.updateFormItem();
+    });
+  }
+
+  /**
+   * 删除多数据选中的数据
+   * @author lxm
+   * @date 2023-11-10 03:32:30
+   */
+  remove(): void {
+    this.mdController.remove();
+  }
+
+  /**
+   * 多数据新建一条数据
+   * @author lxm
+   * @date 2023-11-10 03:32:30
+   */
+  create(): void {
+    if (this.model.contentType === 'GRID') {
+      (this.mdController as IGridController).newRow();
+    } else {
+      throw new ModelError(
+        this.model,
+        `多数据部件类型${this.model.contentType}暂不支持添加数据`,
+      );
+    }
+  }
+
+  refresh(): void {
+    this.mdController.refresh();
+  }
+
+  async dataChangeNotify(names: string[]): Promise<void> {
+    await super.dataChangeNotify(names);
+
+    // 表单项更新的时候修改数据的时候需要刷新
+    if (names.includes(this.model.id!)) {
+      this.refresh();
+    }
+  }
+}

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

@@ -0,0 +1,204 @@
+import { ModelError } from '@ibiz-template/core';
+import { IDEForm } from '@ibiz/model-core';
+import { clone } from 'ramda';
+import { FormMDCtrlController } from './form-mdctrl.controller';
+
+/**
+ * 表单多数据部件(重复器)控制器
+ * 类型是重复器
+ *
+ * @author lxm
+ * @date 2023-11-09 04:32:02
+ * @export
+ * @class FormMDCtrlController
+ * @extends {FormDetailController<IDEFormMDCtrl>}
+ */
+export class FormMDCtrlRepeaterController extends FormMDCtrlController {
+  /**
+   * 名称
+   * @author lxm
+   * @date 2023-11-22 03:31:02
+   * @readonly
+   * @type {string}
+   */
+  get name(): string {
+    return this.model.id!;
+  }
+
+  /**
+   * 多数据重复器对应的表单里的值
+   *
+   * @author lxm
+   * @date 2022-08-24 22:08:25
+   * @readonly
+   * @type {unknown}
+   */
+  get value(): IData[] | IData | null {
+    return this.data[this.model.id!];
+  }
+
+  /**
+   * 重复器样式
+   * @author lxm
+   * @date 2023-11-09 05:03:20
+   * @type {('Grid' | 'MultiForm' | 'SingleForm')}
+   */
+  repeaterStyle: 'Grid' | 'MultiForm' | 'SingleForm' = 'MultiForm';
+
+  /**
+   * 重复器的值是否是单项数据类型，true为数组格式，反之为对象格式
+   * @author lxm
+   * @date 2023-11-09 05:09:19
+   * @type {boolean}
+   */
+  isSingleData: boolean = false;
+
+  /**
+   * 重复表单
+   * @author lxm
+   * @date 2023-11-22 02:28:13
+   * @type {IDEForm}
+   */
+  repeatedForm!: IDEForm;
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+
+    // 初始化样式类型和数据类型
+    switch (this.model.detailStyle) {
+      // 表单
+      case 'DEFAULT':
+        this.repeaterStyle = 'MultiForm';
+        this.isSingleData = false;
+        break;
+      // 表格
+      case 'STYLE2':
+        this.repeaterStyle = 'Grid';
+        this.isSingleData = false;
+        break;
+      // 1：1表单
+      case 'STYLE3':
+        this.repeaterStyle = 'SingleForm';
+        this.isSingleData = true;
+        break;
+      default:
+        throw new ModelError(
+          this.model,
+          `暂不支持重复器样式${this.model.detailStyle}`,
+        );
+    }
+
+    this.prepareRepeatedForm();
+  }
+
+  /**
+   * 准备重复器表单模型
+   * @author lxm
+   * @date 2023-11-22 02:56:00
+   */
+  prepareRepeatedForm(): void {
+    const id = `${this.model.id}repeatedform`;
+    const tempForm: IDEForm = {
+      id,
+      codeName: id,
+      name: id,
+      deformPages: [
+        {
+          id: 'formpage1',
+          deformDetails: this.model.deformDetails,
+          detailType: 'FORMPAGE',
+          detailStyle: 'DEFAULT',
+          layout: this.model.layout,
+        },
+      ],
+    };
+
+    const copyFields: Array<keyof IDEForm> = [
+      'appId',
+      'controlType',
+      'deformItemVRs',
+    ];
+    copyFields.forEach(key => {
+      (tempForm as IData)[key] = (this.form.model as IData)[key];
+    });
+
+    this.repeatedForm = clone(tempForm);
+  }
+
+  /**
+   * 设置重复器数据（修改主表单里重复器对应属性）
+   * @author lxm
+   * @date 2023-11-22 06:07:04
+   * @param {(IData[] | IData | null)} value
+   */
+  setValue(value: IData[] | IData | null): void {
+    this.form.setDataValue(this.name, value);
+  }
+
+  /**
+   * 添加或创建一条数据
+   * @author lxm
+   * @date 2023-11-22 04:50:19
+   */
+  create(): void {
+    if (this.isSingleData) {
+      this.setValue({});
+    } else {
+      // 多数据，拷贝数组再添加新对象
+      let tempValue = this.value as IData[] | null;
+      tempValue = tempValue ? [...tempValue] : [];
+      tempValue.push({});
+      this.setValue(tempValue);
+    }
+  }
+
+  /**
+   * 删除数据
+   * @author lxm
+   * @date 2023-11-22 08:53:42
+   * @param {number} index
+   */
+  remove(index?: number): void {
+    if (this.isSingleData) {
+      // 单项数据的时候删除就是清空
+      this.setValue(null);
+      return;
+    }
+    const newArr = (this.value! as IData[]).filter((_, i) => {
+      return index !== i;
+    });
+
+    this.setValue(newArr);
+  }
+
+  /**
+   * 表单数据变更通知
+   *
+   * @author lxm
+   * @date 2023-11-24 04:37:03
+   * @param {string[]} names
+   * @return {*}  {Promise<void>}
+   */
+  async dataChangeNotify(names: string[]): Promise<void> {
+    await super.dataChangeNotify(names);
+    const { resetItemNames } = this.model;
+
+    // 重置项，变更时自己的值置空
+    let isReset = false;
+    if (resetItemNames && resetItemNames.length > 0) {
+      resetItemNames.forEach((resetItemName: string) => {
+        if (names.includes(resetItemName)) {
+          isReset = true;
+        }
+      });
+    }
+    if (isReset) {
+      this.setValue(null);
+    }
+
+    // 自身对应属性变更时，触发表单项更新
+    if (names.includes(this.name)) {
+      await this.updateFormItem();
+    }
+  }
+}