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

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

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

@@ -1,232 +1,103 @@
+import { BitMask } from '@ibiz-template/core';
 import { IDEFormMDCtrl } from '@ibiz/model-core';
-import { clone } from 'ramda';
 import { FormDetailController } from '../form-detail';
-import { FormMDCtrlContentTypeController } from './form-mdctrl-content-type.controller';
-import { FormMDCtrlDataViewController } from './form-mdctrl-data-view/form-mdctrl-data-view.controller';
-import { FormMDCtrlFormController } from './form-mdctrl-form/form-mdctrl-form.controller';
-import { FormMDCtrlGridController } from './form-mdctrl-grid/form-mdctrl-grid.controller';
-import { FormMDCtrlListController } from './form-mdctrl-list/form-mdctrl-list.controller';
-import { FormMDCtrlRepeaterFormOneController } from './form-mdctrl-repeater/form-mdctrl-repeater-form-one/form-mdctrl-repeater-form-one.controller';
-import { FormMDCtrlRepeaterFormController } from './form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form.controller';
-import { FormMDCtrlRepeaterGridController } from './form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller';
-import { FormMDCtrlState } from './form-mdctrl.state';
-import { EditFormController } from '../../edit-form';
 
 /**
  * 表单多数据部件控制器
  *
- * @author zk
- * @date 2023-08-02 09:08:55
+ * @author lxm
+ * @date 2023-11-09 04:32:02
  * @export
  * @class FormMDCtrlController
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
   /**
-   * 表单多数据部件控制器状态
+   * 上下文
    *
-   * @author zk
-   * @date 2023-07-28 09:07:14
-   * @type {FormMDCtrlState}
-   * @memberof FormMDCtrlController
-   */
-  declare state: FormMDCtrlState;
-
-  declare form: EditFormController;
-
-  /**
-   * 是否显示添加按钮
-   *
-   * @memberof FormMDCtrlController
+   * @author lxm
+   * @date 2022-08-24 20:08:55
+   * @type {IContext}
    */
-  get isCreate(): boolean {
-    if (this.model.buildInActions) {
-      return [1, 3, 5, 7].includes(this.model.buildInActions);
-    }
-    return false;
+  get context(): IContext {
+    return this.form.context;
   }
 
   /**
-   * 是否显示删除按钮
+   * 视图参数
    *
-   * @memberof FormMDCtrlController
+   * @author lxm
+   * @date 2022-08-24 20:08:52
+   * @type {IParams}
    */
-  get isDelete(): boolean {
-    if (this.model.buildInActions) {
-      return [4, 5, 6, 7].includes(this.model.buildInActions);
-    }
-    return false;
+  get params(): IParams {
+    return this.form.params;
   }
 
   /**
-   * Creates an instance of FormMDCtrlController.
+   * 是否允许新建
    *
-   * @author zk
-   * @date 2023-07-28 09:07:25
-   * @protected
-   * @return {*}  {FormMDCtrlState}
-   * @memberof FormMDCtrlController
+   * @author lxm
+   * @date 2023-11-09 06:14:13
+   * @readonly
+   * @type {boolean}
    */
-  protected createState(): FormMDCtrlState {
-    return new FormMDCtrlState(this.parent?.state);
+  get enableCreate(): boolean {
+    return BitMask.checkPermission(this.model.buildInActions, 1);
   }
 
   /**
-   * 表单多数据部件内容控制器
+   * 是否允许更新
    *
-   * @author zk
-   * @date 2023-07-28 11:07:49
-   * @type {(FormMDCtrlFormController
-   *     | FormMDCtrlGridController)}
-   * @memberof FormMDCtrlController
-   */
-  public mdCtrlContentController!: FormMDCtrlContentTypeController;
-
-  /**
-   * 初始化
-   *
-   * @author zk
-   * @date 2023-07-25 10:07:11
-   * @protected
-   * @return {*}  {Promise<void>}
-   * @memberof FormMDCtrlController
+   * @author lxm
+   * @date 2023-11-09 06:14:13
+   * @readonly
+   * @type {boolean}
    */
-  protected async onInit(): Promise<void> {
-    await super.onInit();
-
-    switch (this.model.contentType) {
-      case 'FORM':
-        this.mdCtrlContentController = new FormMDCtrlFormController(this);
-        break;
-      case 'GRID':
-        this.mdCtrlContentController = new FormMDCtrlGridController(this);
-        break;
-      case 'LIST':
-        this.mdCtrlContentController = new FormMDCtrlListController(this);
-        break;
-      case 'DATAVIEW':
-        this.mdCtrlContentController = new FormMDCtrlDataViewController(this);
-        break;
-      case 'REPEATER':
-        if (this.model.detailStyle === 'DEFAULT') {
-          this.mdCtrlContentController = new FormMDCtrlRepeaterFormController(
-            this,
-          );
-        }
-        if (this.model.detailStyle === 'STYLE3') {
-          this.mdCtrlContentController =
-            new FormMDCtrlRepeaterFormOneController(this);
-        }
-        if (this.model.detailStyle === 'STYLE2') {
-          this.mdCtrlContentController = new FormMDCtrlRepeaterGridController(
-            this,
-          );
-        }
-        break;
-      default:
-        break;
-    }
-    if (this.mdCtrlContentController) {
-      await this.mdCtrlContentController.onInit();
-    }
-    if (this.form.state.isLoaded) {
-      this.mdCtrlContentController.initData();
-    }
-    this.form.evt.on('onLoadDraftSuccess', () => {
-      this.mdCtrlContentController.initData();
-    });
-    this.form.evt.on('onLoadSuccess', () => {
-      this.mdCtrlContentController.initData();
-    });
+  get enableUpdate(): boolean {
+    return BitMask.checkPermission(this.model.buildInActions, 2);
   }
 
   /**
-   * 手动通知外部表单值变更
-   *
-   * @author zk
-   * @date 2023-08-02 09:08:41
-   * @memberof FormMDCtrlController
-   */
-  setFormDataValue(): void {
-    const name =
-      this.model.appDEFieldId || this.model.fieldName || this.model.id;
-    if (name) {
-      this.form.setDataValue(name, clone(this.state.contentCtrlData));
-    }
-  }
-
-  /**
-   * 表单校验，通知子表单进行校验
-   *
-   * @author zzq
-   * @date 2023-08-23 11:07:09
-   * @memberof FormMDCtrlController
+   * 是否允许删除
+   * @author lxm
+   * @date 2023-11-09 06:14:17
+   * @readonly
+   * @type {boolean}
    */
-  async validate(): Promise<boolean> {
-    return this.mdCtrlContentController.validate();
+  get enableDelete(): boolean {
+    return BitMask.checkPermission(this.model.buildInActions, 4);
   }
 
   /**
-   * 设置默认值
-   *
-   * @author zzq
-   * @date 2023-08-23 19:00:09
-   * @memberof FormMDCtrlController
+   * 如果配置了表单项更新，则执行表单项更新
+   * @author lxm
+   * @date 2023-11-10 04:55:40
+   * @return {*}  {Promise<void>}
    */
-  setDefaultValue(): void {
-    // todo 设置默认值
+  async updateFormItem(): Promise<void> {
+    if (this.model.deformItemUpdateId) {
+      await this.form.updateFormItem(this.model.deformItemUpdateId);
+    }
   }
 
   /**
-   * 表单数据变更通知
-   *
+   * 刷新
    * @author lxm
-   * @date 2022-09-20 18:09:56
-   * @param {string[]} names
+   * @date 2023-11-13 11:21:06
    */
-  async dataChangeNotify(names: string[]): Promise<void> {
-    await super.dataChangeNotify(names);
-    const { resetItemNames } = this.model;
-    const mdctrlName =
-      this.model.appDEFieldId || this.model.fieldName || this.model.id!;
-
-    // 重置项，变更时自己的值置空
-    let isReset = false;
-    if (resetItemNames && resetItemNames.length > 0) {
-      resetItemNames.forEach((resetItemName: string) => {
-        if (names.includes(resetItemName)) {
-          isReset = true;
-        }
-      });
-    }
-    if (isReset) {
-      this.state.contentCtrlData = null;
-      this.setFormDataValue();
-    }
-
-    // 刚加载初始化时的值不校验,只校验自身值变更
-    if (names.includes(mdctrlName)) {
-      this.validate();
-    }
-
-    // 有表单项更新，且是自身变更时，触发表单项更新
-    if (names.includes(mdctrlName) && this.model.deformItemUpdateId) {
-      await (this.form as EditFormController).updateFormItem(
-        this.model.deformItemUpdateId,
-      );
-    }
-
-    if (names.includes(this.model.id!)) {
-      this.mdCtrlContentController.refresh();
-    }
+  refresh(): void {
+    // 子类实现
   }
 
   /**
-   *
+   * 校验内部数据
    * @author lxm
-   * @date 2023-11-13 11:21:06
+   * @date 2023-11-13 05:55:20
+   * @return {*}  {Promise<boolean>}
    */
-  refresh(): void {
-    this.mdCtrlContentController.refresh();
+  async validate(): Promise<boolean> {
+    // todo 子类校验实现
+    return true;
   }
 }

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

@@ -1,12 +1,4 @@
-export * from './form-mdctrl-content-type.controller';
 export * from './form-mdctrl.controller';
-export * from './form-mdctrl.state';
-export * from './form-mdctrl-control/form-mdctrl-control.controller';
-export * from './form-mdctrl-data-view/form-mdctrl-data-view.controller';
-export * from './form-mdctrl-form/form-mdctrl-form.controller';
-export * from './form-mdctrl-grid/form-mdctrl-grid.controller';
-export * from './form-mdctrl-list/form-mdctrl-list.controller';
-export * from './form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller';
-export * from './form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form.controller';
-export * from './form-mdctrl-repeater/form-mdctrl-repeater-form-one/form-mdctrl-repeater-form-one.controller';
-export * from './form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller';
+export * from './form-mdctrl-md.controller';
+export * from './form-mdctrl-form.controller';
+export * from './form-mdctrl-repeater.controller';

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

@@ -1,4 +1,4 @@
-import { mergeDefaultInLeft } from '@ibiz-template/core';
+import { RuntimeError, mergeDefaultInLeft } from '@ibiz-template/core';
 import { IDESearchForm } from '@ibiz/model-core';
 import {
   ISearchFormController,
@@ -8,6 +8,7 @@ import {
 import { FormNotifyState } from '../../../constant';
 import { FormController } from '../form/form.controller';
 import { SearchFormService } from './search-form.service';
+import { ConfigService } from '../../../../service';
 
 /**
  * 搜索表单控制器
@@ -32,23 +33,38 @@ export class SearchFormController
    */
   service!: SearchFormService;
 
+  /**
+   * 应用配置存储服务
+   * @author lxm
+   * @date 2023-11-27 02:52:45
+   * @type {ConfigService}
+   */
+  config!: ConfigService;
+
+  protected initState(): void {
+    super.initState();
+    this.state.storedFilters = [];
+  }
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+
+    this.config = new ConfigService(
+      this.model.appId!,
+      'dynafilter',
+      `searchform_${
+        this.model.appDataEntityId?.toLowerCase() || 'app'
+      }_${this.model.codeName?.toLowerCase()}`,
+    );
+
     this.preprocessLayoutPanel();
     // 实例部件服务
     this.service = new SearchFormService(this.model);
     await this.service.init(this.context);
     // 先加载数据，加载完后才会mounted
     await this.load();
-  }
 
-  protected async onMounted(): Promise<void> {
-    await super.onMounted();
-
-    // 如果外面没有配置默认不加载的话，默认部件自己加载
-    if (this.state.loadDefault) {
-      this.load();
-    }
+    await this.loadConfig();
   }
 
   /**
@@ -223,4 +239,78 @@ export class SearchFormController
       recursivePanelItems(this.controlPanel);
     }
   }
+
+  /**
+   * 加载存储的过滤条件
+   * @author lxm
+   * @date 2023-11-27 04:02:49
+   * @return {*}  {Promise<void>}
+   */
+  async loadConfig(): Promise<void> {
+    const res = await this.config.load();
+    if (res.model) {
+      this.state.storedFilters = res.model;
+    }
+  }
+
+  /**
+   * 保存存储的过滤条件
+   * @author lxm
+   * @date 2023-11-27 04:03:07
+   * @return {*}  {Promise<void>}
+   */
+  async saveConfig(): Promise<void> {
+    await this.config.save({
+      model: this.state.storedFilters,
+    });
+  }
+
+  /**
+   * 存储搜索条件
+   * @author lxm
+   * @date 2023-11-27 04:08:02
+   * @param {string} name 存储的名称
+   * @return {*}  {Promise<void>}
+   */
+  async storeFilter(name: string): Promise<void> {
+    this.state.storedFilters.push({
+      name,
+      data: { ...this.data },
+    });
+
+    await this.saveConfig();
+  }
+
+  /**
+   * 应用保存的过滤条件
+   * @author lxm
+   * @date 2023-11-27 04:11:53
+   * @param {number} index
+   */
+  applyStoredFilter(index: number): void {
+    const filter = this.state.storedFilters[index];
+    if (!filter) {
+      throw new RuntimeError('没有找到可以应用的搜索条件');
+    }
+    if (filter.data) {
+      Object.assign(this.data, filter.data);
+    }
+    // 修改后搜索
+    this.search();
+  }
+
+  /**
+   * 删除保存的过滤条件
+   * @author lxm
+   * @date 2023-11-27 04:15:22
+   * @param {number} index
+   */
+  async removeStoredFilter(index: number): Promise<void> {
+    const filter = this.state.storedFilters[index];
+    if (!filter) {
+      throw new RuntimeError('没有找到保存的搜索条件');
+    }
+    this.state.storedFilters.splice(index, 1);
+    await this.saveConfig();
+  }
 }

package/src/controller/control/index.ts

@@ -23,3 +23,4 @@ export * from './tree-grid-ex/index';
 export * from './tree-grid/index';
 export * from './medit-view-panel/index';
 export * from './map/index';
+export * from './report-panel/index';