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

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

@@ -1,15 +1,4 @@
-// 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/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';
+import { FormMDCtrlRepeaterFormController } from '../form-mdctrl-repeater-form/form-mdctrl-repeater-form.controller';
 
 /**
  * 表单多数据部件表格类型控制器
@@ -21,7 +10,7 @@ import { CTX } from '../../../../../../ctx';
  * @extends {EditFormController}
  * @implements {IFormController}
  */
-export class FormMDCtrlRepeaterFormOneController extends FormMDCtrlContentTypeController {
+export class FormMDCtrlRepeaterFormOneController extends FormMDCtrlRepeaterFormController {
   /**
    * 数据
    *
@@ -35,112 +24,6 @@ export class FormMDCtrlRepeaterFormOneController extends FormMDCtrlContentTypeCo
     return this.parent.state.contentCtrlData as IData[];
   }
 
-  /**
-   * 表单项控制器的集合（二维数组）
-   *
-   * @author zk
-   * @date 2023-07-25 05:07:56
-   * @type {Array<Array<FormItemController>>}
-   * @memberof FormMDCtrlController
-   */
-  formDetail: Array<{
-    name: string;
-    detailType: string;
-    c: IFormDetailController;
-  }> = [];
-
-  private formCtx!: CTX;
-
-  state: { isInit: boolean } = { isInit: false };
-
-  /**
-   * 初始化表单成员控制器
-   *
-   * @author lxm
-   * @date 2022-08-24 21:08:48
-   * @protected
-   */
-  protected async initFormMDCtrlItemControllers(
-    details: IDEFormDetail[],
-    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]);
-      }
-    });
-
-    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.formDetail) {
-          this.formDetail = [];
-        }
-        this.formDetail.push({
-          name: detail.id!,
-          detailType: detail.detailType!,
-          c: detailController,
-        });
-        // 有子成员的生成子控制器
-        const childDetails = findChildFormDetails(detail);
-        if (childDetails.length) {
-          await this.initFormMDCtrlItemControllers(
-            childDetails,
-            formController,
-            data,
-            detailController as FormGroupPanelController,
-          );
-        }
-      }),
-    );
-    return data;
-  }
-
-  /**
-   * 初始化formCtx
-   *
-   * @author zk
-   * @date 2023-07-29 05:07:21
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  useFormMdCtrlCtx(): void {
-    // this.formCtx = useCtx();
-  }
-
-  async initData(): Promise<void> {
-    super.initData();
-    await this.initFormMDCtrlItemControllers(
-      this.model.deformDetails!,
-      this.parent.form,
-      this.data,
-    );
-    this.state.isInit = true;
-  }
-
   /**
    * 内部表单项数据发生改变，同步contentCtrlData并设置外部表单值
    *
@@ -154,25 +37,4 @@ export class FormMDCtrlRepeaterFormOneController extends FormMDCtrlContentTypeCo
     this.parent.state.contentCtrlData = data;
     this.parent.setFormDataValue();
   }
-
-  /**
-   * 表单值校验
-   *
-   * @author zzq
-   * @date 2023-08-23 19:07:11
-   * @memberof FormMDCtrlController
-   */
-  async validate(): Promise<boolean> {
-    const values: Promise<boolean>[] = [];
-    this.formDetail.forEach(detail => {
-      if (detail.detailType === 'FORMITEM') {
-        const c = detail.c as FormItemController;
-        values.push(c.validate());
-      }
-    });
-
-    const results = await Promise.all(values);
-    // 找不到value为false即全部是true
-    return results.findIndex(value => !value) === -1;
-  }
 }

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

@@ -54,7 +54,7 @@ export class SearchFormController
     // 新建默认值给到graft接口，接口会回来
     const params = await this.getDraftParams();
     Object.assign(queryParams, params);
-
+    await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
     const res = await this.service.getDraft(this.context, queryParams);
     this.state.data = res.data;
     mergeDefaultInLeft(this.data, params);

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

@@ -26,10 +26,9 @@ export class SearchFormService<
    */
   async getDraft(
     _context: IParams,
-    _params: IParams = {},
+    params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
-    // let res = await this.exec(this.model.getDraftAction, context, params);
-    let res = { ok: true, status: 200, data: {} } as IHttpResponse;
+    let res = { ok: true, status: 200, data: { ...params } } as IHttpResponse;
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
   }

package/src/controller/control/grid/grid/grid-column.controller.ts

@@ -91,6 +91,28 @@ export class GridColumnController<T extends IDEGridColumn = IDEGridColumn> {
     });
   }
 
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:03:07
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get valueFormat(): string | undefined {
+    return this.deGridDataItem?.format;
+  }
+
+  /**
+   * 数据类型（数值）
+   * @author lxm
+   * @date 2023-08-25 05:03:07
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get dataType(): number | undefined {
+    return this.deGridDataItem?.dataType;
+  }
+
   /**
    * Creates an instance of GridFieldColumnController.
    * @author lxm

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { ModelError } from '@ibiz-template/core';
+import { DataTypes, ModelError } from '@ibiz-template/core';
 import { IAppCodeList, IDEGridFieldColumn } from '@ibiz/model-core';
+import dayjs from 'dayjs';
 import { clone } from 'ramda';
 import { OpenAppViewCommand } from '../../../../../command';
 import { CodeListItem, IModalData } from '../../../../../interface';
@@ -267,4 +268,23 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
     }
     return formatValue;
   }
+
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:18:11
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  formatValue(value: unknown = ''): string {
+    const strVal = `${value}`;
+    if (!this.valueFormat) {
+      return strVal;
+    }
+    const isDate = DataTypes.isDate(this.dataType!);
+    if (isDate) {
+      return dayjs(strVal).format(this.valueFormat);
+    }
+    return ibiz.util.text.format(strVal, this.valueFormat);
+  }
 }

package/src/controller/control/index.ts

@@ -17,3 +17,4 @@ export * from './tab-exp-panel/index';
 export * from './toolbar/index';
 export * from './tree/index';
 export * from './wizard-panel/index';
+export * from './md-ctrl/index';

package/src/controller/control/md-ctrl/index.ts

@@ -0,0 +1,3 @@
+export * from './md-ctrl.controller';
+export * from './md-ctrl-row.state';
+export * from './md-ctrl.service';

package/src/controller/control/md-ctrl/md-ctrl-row.state.ts

@@ -0,0 +1,40 @@
+import {
+  IButtonContainerState,
+  IMobMDCtrlController,
+  IMobMDCtrlRowState,
+} from '../../../interface';
+import { ControlVO } from '../../../service';
+
+/**
+ * 多数据部件行状态
+ *
+ * @author chitanda
+ * @date 2023-06-19 18:06:44
+ * @export
+ * @class MobMDCtrlRowState
+ */
+export class MobMDCtrlRowState implements IMobMDCtrlRowState {
+  /**
+   * 行为状态
+   *
+   * @author chitanda
+   * @date 2023-06-19 18:06:27
+   * @type {{ [p: string]: IButtonContainerState }}
+   */
+  readonly uaColStates: { [p: string]: IButtonContainerState } = {};
+
+  /**
+   * Creates an instance of MDCtrlRowState.
+   *
+   * @author chitanda
+   * @date 2023-06-19 18:06:12
+   * @param {ControlVO} data 行数据
+   * @param {IMobMDCtrlController} controller 多数据部件控制器
+   */
+  constructor(
+    public data: ControlVO,
+    public controller: IMobMDCtrlController,
+  ) {
+    this.data = data;
+  }
+}

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

@@ -0,0 +1,199 @@
+import {
+  IDEMobMDCtrl,
+  IUIActionGroup,
+  IUIActionGroupDetail,
+} from '@ibiz/model-core';
+import {
+  IMobMDCtrlEvent,
+  IMobMDCtrlController,
+  IMobMdCtrlState,
+  IMobMDCtrlRowState,
+  MDCtrlLoadParams,
+} from '../../../interface';
+import { MDCtrlService } from './md-ctrl.service';
+import { MobMDCtrlRowState } from './md-ctrl-row.state';
+import { MDControlController } from '../../common';
+import { ControlVO } from '../../../service';
+import { UIActionUtil } from '../../../ui-action';
+import { ButtonContainerState, UIActionButtonState } from '../../utils';
+
+export class MDCtrlController
+  extends MDControlController<IDEMobMDCtrl, IMobMdCtrlState, IMobMDCtrlEvent>
+  implements IMobMDCtrlController
+{
+  declare service: MDCtrlService;
+
+  protected initState(): void {
+    super.initState();
+    this.state.rows = [];
+    this.state.noSort = this.model.noSort === true;
+    // 多数据默认激活值为1
+    this.state.mdctrlActiveMode = 1;
+  }
+
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    this.service = new MDCtrlService(this.model);
+    await this.service.init(this.context);
+    // 设置默认排序
+    this.setSort();
+  }
+
+  /**
+   * 设置排序
+   *
+   * @author lxm
+   * @date 2022-09-28 13:09:44
+   * @param {string} key 排序字段
+   * @param {string} order 排序顺序
+   */
+  setSort(key?: string, order?: 'asc' | 'desc'): void {
+    if (key && order) {
+      super.setSort(key, order);
+    } else {
+      // 设置默认排序或者置空
+      const { minorSortAppDEFieldId, minorSortDir } = this.model;
+      if (minorSortAppDEFieldId && minorSortDir) {
+        this.state.sortQuery = `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`;
+      } else {
+        this.state.sortQuery = '';
+      }
+    }
+  }
+
+  /**
+   * 加载更多
+   * @author lxm
+   * @date 2023-05-22 07:33:59
+   * @return {*}  {Promise<void>}
+   */
+  async loadMore(): Promise<void> {
+    // 修复加载更多时，数据未加载成功 但是还是会继续加载的问题
+    if (this.state.total > this.state.items.length && !this.state.isLoading) {
+      await this.load({ isLoadMore: true });
+    }
+  }
+
+  /**
+   * 列表多数据刷新 需重置分页
+   *
+   * @author zk
+   * @date 2023-08-11 05:08:20
+   * @return {*}  {Promise<void>}
+   * @memberof MDCtrlController
+   */
+  async refresh(): Promise<void> {
+    await this.load({ isInitialLoad: true });
+  }
+
+  afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<IData[]> {
+    if (args.isInitialLoad) {
+      this.state.rows = [];
+    }
+    if (items && items.length > 0) {
+      this.state.rows.push(
+        ...items.map(item => {
+          const row = new MobMDCtrlRowState(item, this);
+          this.initActionStates(row);
+          return row;
+        }),
+      );
+    }
+    return super.afterLoad(args, items);
+  }
+
+  /**
+   * 设置列表数据
+   *
+   * @author zk
+   * @date 2023-05-26 02:05:46
+   * @param {IData[]} items
+   * @memberof ListController
+   */
+  setData(items: IData[]): void {
+    const rows = items.map(item => {
+      const row = new MobMDCtrlRowState(item as ControlVO, this);
+      return row;
+    });
+    this.state.rows = rows;
+  }
+
+  /**
+   * 获取列表数据
+   *
+   * @author zk
+   * @date 2023-05-26 02:05:35
+   * @return {*}  {IData[]}
+   * @memberof ListController
+   */
+  getAllData(): IData[] {
+    return this.state.rows.map(row => row.data);
+  }
+
+  /**
+   * 界面行为组项点击
+   *
+   * @author chitanda
+   * @date 2023-06-19 18:06:18
+   * @param {IUIActionGroupDetail} detail
+   * @param {MDCtrlRowState} row
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   */
+  async onActionClick(
+    detail: IUIActionGroupDetail,
+    row: IMobMDCtrlRowState,
+    event: MouseEvent,
+  ): Promise<void> {
+    const actionId = detail.uiactionId;
+    await UIActionUtil.execAndResolved(actionId!, {
+      context: this.context,
+      params: this.params,
+      data: [row.data],
+      view: this.view,
+      event,
+    });
+  }
+
+  /**
+   * 初始化按钮状态
+   *
+   * @author chitanda
+   * @date 2023-06-21 16:06:55
+   * @protected
+   * @param {MobMDCtrlRowState} row
+   */
+  protected initActionStates(row: MobMDCtrlRowState): void {
+    const { deuiactionGroup, deuiactionGroup2 } = this.model;
+    if (deuiactionGroup) {
+      this.initUIActionGroup(row, deuiactionGroup);
+    }
+    if (deuiactionGroup2) {
+      this.initUIActionGroup(row, deuiactionGroup2);
+    }
+  }
+
+  protected initUIActionGroup(
+    row: MobMDCtrlRowState,
+    group: IUIActionGroup,
+  ): void {
+    if (!group!.uiactionGroupDetails?.length) {
+      ibiz.log.debug('操作列界面行为组没有配置界面行为');
+    }
+    const containerState = new ButtonContainerState();
+    const details = group!.uiactionGroupDetails || [];
+    details.forEach(detail => {
+      const actionid = detail.uiactionId;
+      if (actionid) {
+        const buttonState = new UIActionButtonState(
+          detail.id!,
+          this.context.srfappid!,
+          actionid,
+        );
+        containerState.addState(detail.id!, buttonState);
+      }
+    });
+    containerState.update(row.data.getOrigin());
+    row.uaColStates[group.id!] = containerState;
+  }
+}

package/src/controller/control/md-ctrl/md-ctrl.service.ts

@@ -0,0 +1,40 @@
+import { IDEMobMDCtrl } from '@ibiz/model-core';
+import { MDControlService, UIMapField } from '../../../service';
+
+/**
+ * 多数据部件服务
+ *
+ * @author lxm
+ * @date 2023-05-15 09:53:35
+ * @export
+ * @class MDCtrlService
+ * @extends {MDControlService<IDEMobMDCtrl>}
+ */
+export class MDCtrlService extends MDControlService<IDEMobMDCtrl> {
+  /**
+   * 初始化属性映射
+   *
+   * @author lxm
+   * @date 2022-08-31 18:08:37
+   */
+  initUIDataMap(): void {
+    super.initUIDataMap();
+    // *初始化表格数据项的属性映射
+    this.model.delistDataItems?.forEach(item => {
+      const uiKey = item.id!.toLowerCase();
+      const deField = item.appDEFieldId;
+      let mapField: UIMapField;
+      // 后台实体属性
+      if (deField) {
+        const deFieldKey = deField.toLowerCase();
+        mapField = new UIMapField(uiKey, deFieldKey, {
+          isOriginField: true,
+        });
+      } else {
+        // 前台属性
+        mapField = new UIMapField(uiKey, uiKey);
+      }
+      this.dataUIMap.set(uiKey, mapField);
+    });
+  }
+}

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -178,7 +178,7 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
       // name是动态逻辑涉及到的时或state存在时
       if (mustCalc || isOverlap(relatedNames, names)) {
         try {
-          const ok = verifyPanelGroupLogic(this.panel.data, logic);
+          const ok = verifyPanelGroupLogic(this.data, logic);
           switch (logic.logicCat) {
             // 动态空输入，不满足则必填
             case 'ITEMBLANK':

package/src/controller/control/panel/panel/panel.controller.ts

@@ -123,8 +123,12 @@ export class PanelController<
           parent,
         );
         panel.panelItems[panelItem.id!] = panelItemController;
-        // 有子成员的生成子控制器
-        if ((panelItem as IPanelContainer).panelItems?.length) {
+        // 有子成员的,且不是数据容器的。生成子控制器
+        if (
+          (panelItem as IPanelContainer).panelItems?.length &&
+          !(panelItemController as IPanelItemContainerController)
+            .isDataContainer
+        ) {
           await this.initPanelItemControllers(
             (panelItem as IPanelContainer).panelItems,
             panel,

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

@@ -30,6 +30,11 @@ export class SearchBarController
   protected initState(): void {
     super.initState();
     this.state.query = '';
+    this.state.visible = !!(
+      this.model.enableQuickSearch ||
+      this.model.enableGroup ||
+      this.model.enableFilter
+    );
   }
 
   protected async onCreated(): Promise<void> {
@@ -39,16 +44,24 @@ export class SearchBarController
       this.context.srfappid,
     )!;
     if (appDataEntity) {
-      const searchField = appDataEntity.appDEFields?.find(field => {
+      const searchFields = appDataEntity.appDEFields?.filter(field => {
         return field.enableQuickSearch;
       });
-      if (searchField?.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
-        this.placeHolder = ibiz.i18n.t(
-          searchField.lnlanguageRes.lanResTag,
-          searchField.lnlanguageRes.defaultContent,
-        );
-      } else if (searchField?.logicName) {
-        this.placeHolder = searchField.logicName;
+      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.placeHolder = placeHolders.join('、');
       }
     }
   }

package/src/engine/md-view.engine.ts

@@ -213,7 +213,9 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result === -1) {
+    if (result instanceof Object && result.ok) {
+      this.refresh();
+    } else if (result === -1) {
       ibiz.log.warn(`视图[${this.view.model.codeName}]，未配置编辑打开视图`);
     }
   }
@@ -253,7 +255,9 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result === -1) {
+    if (result instanceof Object && result.ok) {
+      this.refresh();
+    } else if (result === -1) {
       throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
     }
   }
@@ -356,7 +360,7 @@ export class MDViewEngine extends ViewEngineBase {
   protected calcViewHeaderVisible(): boolean {
     let showHeader = super.calcViewHeaderVisible();
     // 搜索栏
-    if (!this.searchBar) {
+    if (!this.searchBar || !this.searchBar.state.visible) {
       const controller = this.viewLayoutPanel!.panelItems.view_searchbar;
       if (controller) {
         controller.state.visible = false;