@ibiz-template/runtime 0.3.5-alpha.0 → 0.3.6-dev.0

package/src/controller/control/chart/generator/funnel-series-generator.ts

@@ -19,7 +19,7 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunne
   protected calcStaticOptions(): SeriesOption {
     const options = super.calcStaticOptions() as FunnelSeriesOption;
 
-    options.label!.formatter = '{b}: {d}%({c})';
+    options.label!.formatter = '{b}: {d}%';
     options.label!.position = 'outer';
 
     return options;

package/src/controller/control/chart/generator/pie-series-generator.ts

@@ -19,7 +19,7 @@ export class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
   protected calcStaticOptions(): SeriesOption {
     const options = super.calcStaticOptions() as PieSeriesOption;
 
-    options.label!.formatter = '{b}: {d}%({c})';
+    options.label!.formatter = '{b}: {d}%';
     options.label!.position = 'outside';
 
     return options;

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

@@ -78,8 +78,8 @@ export class EditFormController
   protected async onMounted(): Promise<void> {
     await super.onMounted();
 
-    // 如果外面没有配置默认不加载的话，默认部件自己加载
-    if (this.state.loadDefault) {
+    // 如果外面没有配置默认不加载的话，默认部件自己加载,simple模式不加载
+    if (!this.state.isSimple && this.state.loadDefault) {
       this.load();
     }
   }
@@ -517,4 +517,31 @@ export class EditFormController
       }
     }
   }
+
+  /**
+   * 设置simple模式的数据
+   * @author lxm
+   * @date 2023-11-22 07:11:21
+   * @param {IData} data
+   */
+  setSimpleData(data: IData): void {
+    // data由外部直接修改，先克隆一份隔离跟外部的对象。补全对应表单项字段不存在的时候设置为null，避免响应式问题。
+    const cloneData = { ...data };
+    this.formItems.forEach(item => {
+      if (!Object.prototype.hasOwnProperty.call(cloneData, item.name)) {
+        cloneData[item.name] = null;
+      }
+    });
+    this.state.modified = false;
+    this.state.data = cloneData;
+
+    if (!this.state.isLoaded) {
+      // 第一次设置的时候走更新通知，触发更新默认值
+      this.formStateNotify(FormNotifyState.LOAD);
+      this.state.isLoaded = true;
+    } else {
+      // 后续的变更都只走值变更触发
+      this.dataChangeNotify(Object.keys(this.state.data));
+    }
+  }
 }

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

@@ -8,7 +8,7 @@ import {
   IFormDetailController,
   IFormDetailProvider,
 } from '../../../../interface';
-import { findChildFormDetails } from '../../../../model';
+import { findChildFormDetails, isFormDataContainer } from '../../../../model';
 import { getFormDetailProvider } from '../../../../register';
 import { ControlVO } from '../../../../service';
 import { handleAllSettled } from '../../../../utils';
@@ -18,6 +18,7 @@ import { ControllerEvent, isValueChange } from '../../../utils';
 import type {
   FormGroupPanelController,
   FormItemController,
+  FormMDCtrlController,
 } from '../form-detail';
 
 /**
@@ -69,6 +70,15 @@ export abstract class FormController<
    */
   formItems: FormItemController[] = [];
 
+  /**
+   * 表单多数据部件控制器的集合
+   *
+   * @author lxm
+   * @date 2022-09-05 00:09:52
+   * @type {FormMDCtrlController[]}
+   */
+  formMDCtrls: FormMDCtrlController[] = [];
+
   /**
    * 表单数据
    *
@@ -188,12 +198,18 @@ export abstract class FormController<
           parent,
         );
         form.details[detail.id!] = detailController;
-        if (
-          detail.detailType === 'FORMITEM' ||
-          detail.detailType === 'MDCTRL'
-        ) {
+        if (detail.detailType === 'FORMITEM') {
           form.formItems.push(detailController as FormItemController);
         }
+        if (detail.detailType === 'MDCTRL') {
+          form.formMDCtrls.push(detailController as FormMDCtrlController);
+        }
+
+        // 数据容器的子不递归了
+        if (isFormDataContainer(detail)) {
+          return;
+        }
+
         // 有子成员的生成子控制器
         const childDetails = findChildFormDetails(detail);
         if (childDetails.length) {
@@ -259,6 +275,10 @@ export abstract class FormController<
     }
   }
 
+  async updateFormItem(_formItemUpdateId: string): Promise<void> {
+    // 子类实现
+  }
+
   /**
    * 校验表单的全部表单项
    *
@@ -268,7 +288,9 @@ export abstract class FormController<
    */
   async validate(): Promise<boolean> {
     const values = await Promise.all(
-      this.formItems.map(formItem => formItem.validate()),
+      [...this.formItems, ...this.formMDCtrls].map(formItem =>
+        formItem.validate(),
+      ),
     );
 
     // 找不到value为false即全部是true

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

@@ -20,17 +20,6 @@ export class FormButtonController extends FormDetailController<IDEFormButton> {
     return new FormButtonState(this.parent?.state);
   }
 
-  /**
-   * 表单数据
-   *
-   * @author lxm
-   * @date 2022-09-01 22:09:48
-   * @readonly
-   */
-  get data(): IData {
-    return this.form.data;
-  }
-
   /**
    * 按钮点击处理回调
    *

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();
+    }
+  }
+}