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

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

@@ -157,6 +157,9 @@ export class MDControlController<
       await this._evt.emit('onLoadSuccess', {
         isInitialLoad,
       });
+    } catch (error) {
+      await this._evt.emit('onLoadError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -210,6 +213,7 @@ export class MDControlController<
       }
     }
 
+    await this._evt.emit('onBeforeRemove', undefined);
     await this.startLoading();
     let needRefresh = false;
     try {
@@ -241,6 +245,9 @@ export class MDControlController<
       if (needRefresh) {
         this.refresh();
       }
+    } catch (error) {
+      await this._evt.emit('onRemoveError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }

package/src/controller/common/editor/editor.controller.ts

@@ -110,7 +110,7 @@ export class EditorController<T extends IEditor = IEditor>
     }
     if (this.model.editorParams) {
       Object.keys(this.model.editorParams).forEach(key => {
-        this.editorParams[key.toLowerCase()] = this.model.editorParams![key];
+        this.editorParams[key] = this.model.editorParams![key];
       });
     }
   }
@@ -126,21 +126,18 @@ export class EditorController<T extends IEditor = IEditor>
     data: IData,
     context: IContext,
     params: IParams,
-  ): { context: IContext; params: IParams } {
+  ): { context: IData; params: IParams } {
     const { navigateContexts, navigateParams } = this
       .model as INavigateParamContainer;
     let selfContext = {};
     if (navigateContexts && data) {
       selfContext = convertNavData(navigateContexts!, context, params, data);
     }
-    const _context = Object.assign(context.clone(), selfContext);
-
     let selfParams = {};
     if (navigateParams && data) {
       selfParams = convertNavData(navigateParams!, context, params, data);
     }
-    const _params: IParams = { ...params, ...selfParams };
-    return { context: _context, params: _params };
+    return { context: selfContext, params: selfParams };
   }
 
   /**

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -64,7 +64,11 @@ export class AppMenuController
    * @param {string} id
    * @return {*}  {Promise<void>}
    */
-  async onClickMenuItem(id: string, event?: MouseEvent): Promise<void> {
+  async onClickMenuItem(
+    id: string,
+    event?: MouseEvent,
+    useDepth: boolean = true,
+  ): Promise<void> {
     const menuItem = findRecursiveChild(this.model, id, {
       compareField: 'id',
       childrenFields: ['appMenuItems'],
@@ -83,8 +87,7 @@ export class AppMenuController
     }
 
     const tempContext = this.context.clone();
-
-    if (this.routeDepth) {
+    if (this.routeDepth && useDepth) {
       Object.assign(tempContext, {
         toRouteDepth: this.routeDepth + 1,
       });

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

@@ -24,8 +24,7 @@ export class CaptionBarController
     if (this.view.model.capLanguageRes) {
       this.state.caption = ibiz.i18n.t(
         this.view.model.capLanguageRes.lanResTag!,
-        this.view.model.capLanguageRes.defaultContent ||
-          this.view.model.caption,
+        this.view.model.caption,
       );
     } else {
       this.state.caption = this.view.model.caption!;

package/src/controller/control/chart/chart.controller.ts

@@ -45,7 +45,7 @@ export class ChartController
     this.service = new ChartService(this.model);
     await this.service.init(this.context);
     this.generator = new ChartOptionsGenerator(this.model);
-    await this.generator.loadCodeList(this.context, this.params);
+    await this.generator.init(this.context, this.params);
 
     // 监听resize调整图表大小
     window.addEventListener('resize', this.resizeChart);

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

@@ -147,9 +147,11 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
     if (!model.valueField) {
       throw new RuntimeModelError(model, '缺少值属性配置');
     }
-    this.catalogField = model.catalogField!.toLowerCase();
-    this.valueField = model.valueField!.toLowerCase();
-    this.groupField = model.seriesField?.toLowerCase();
+    this.catalogField = chartGenerator.getFieldKey(model.catalogField);
+    this.valueField = chartGenerator.getFieldKey(model.valueField);
+    this.groupField = model.seriesField
+      ? chartGenerator.getFieldKey(model.seriesField)
+      : undefined;
 
     const { chartXAxisId, chartYAxisId } = (chartSeriesEncode ||
       {}) as IChartSeriesCSCartesian2DEncode;

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -6,6 +6,7 @@ import type {
   ECElementEvent,
 } from 'echarts';
 import {
+  IAppDataEntity,
   IChartXAxis,
   IChartYAxis,
   IDEChart,
@@ -54,6 +55,14 @@ export function parseUserParams(userParams: Record<string, string>): IData {
 }
 
 export class ChartOptionsGenerator {
+  /**
+   * 实体模型
+   * @author lxm
+   * @date 2023-08-29 06:39:01
+   * @type {IAppDataEntity}
+   */
+  entity!: IAppDataEntity;
+
   /**
    * 根据模型配置算出来的静态echarts配置
    * @author lxm
@@ -106,7 +115,6 @@ export class ChartOptionsGenerator {
   codeListMap: Map<string, Readonly<CodeListItem[]>> = new Map();
 
   constructor(private model: IDEChart) {
-    this.initSeriesGenerators();
     const {
       dechartTitle,
       dechartLegend,
@@ -199,6 +207,10 @@ export class ChartOptionsGenerator {
     const { showLegend, legendPos } = chartLegend;
     const legendOption: EChartsOption['legend'] = {};
     legendOption.show = showLegend;
+    // 图表单序列不应出图例
+    if (this.model.dechartSerieses?.length === 1) {
+      legendOption.show = false;
+    }
     const position = legendPos?.toLowerCase();
     if (position === 'left' || position === 'right') {
       legendOption.left = position;
@@ -252,6 +264,32 @@ export class ChartOptionsGenerator {
     return AxisOption;
   }
 
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2023-08-29 06:34:04
+   * @param {IContext} context
+   * @param {IParams} params
+   * @return {*}  {Promise<void>}
+   */
+  async init(context: IContext, params: IParams): Promise<void> {
+    await this.loadCodeList(context, params);
+    this.entity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId!);
+    this.initSeriesGenerators();
+  }
+
+  /**
+   * 找到实体属性的codeName小写
+   * @author lxm
+   * @date 2023-08-29 06:42:06
+   * @param {string} fieldName 属性的name
+   * @return {*}  {string}
+   */
+  getFieldKey(fieldName: string): string {
+    const find = this.entity.appDEFields!.find(item => item.name === fieldName);
+    return find ? find.codeName!.toLowerCase() : fieldName.toLowerCase();
+  }
+
   /**
    * 加载代码表，
    * - 如果已经加载过会清空缓存重新加载

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

@@ -164,6 +164,31 @@ export class ExpBarControlController<
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     this.childNames.push(this.model.xdataControlName!);
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId!,
+      this.context.srfappid,
+    )!;
+    if (appDataEntity) {
+      const searchFields = appDataEntity.appDEFields?.filter(field => {
+        return field.enableQuickSearch;
+      });
+      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.state.placeHolder = placeHolders.join('、');
+      }
+    }
   }
 
   /**

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

@@ -59,6 +59,41 @@ export class EditFormController
     }) as () => Promise<void>;
   }
 
+  /**
+   * 加载草稿行为
+   * @author lxm
+   * @date 2023-08-25 02:45:11
+   * @return {*}  {Promise<IData>}
+   */
+  async loadDraft(): Promise<IData> {
+    const queryParams = { ...this.params };
+    // 新建默认值给到graft接口，接口会回来
+    const params = await this.getDraftParams(); // 新建默认值
+    Object.assign(queryParams, params);
+
+    let res;
+    try {
+      await this.startLoading();
+      await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
+      res = await this.service.getDraft(this.context, queryParams);
+    } catch (error) {
+      await this.evt.emit('onLoadDraftError', undefined);
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+
+    this.state.data = res.data;
+    // 处理后台导致的新建默认值丢失
+    mergeDefaultInLeft(this.data, params);
+
+    this.formStateNotify(FormNotifyState.DRAFT);
+
+    await this.evt.emit('onLoadDraftSuccess', undefined);
+    this.state.isLoaded = true;
+    return this.data;
+  }
+
   /**
    * 部件加载数据行为
    *
@@ -70,42 +105,30 @@ export class EditFormController
       this.context,
       this.model.appDataEntityId!,
     );
-    const queryParams = { ...this.params };
-
-    // 新建默认值给到graft接口，接口会回来
-    let params: IData = {};
+    // 加载草稿单独走一个方法
     if (isLoadDraft) {
-      params = await this.getDraftParams();
-      Object.assign(queryParams, params);
+      return this.loadDraft();
     }
 
-    await this.startLoading();
+    const queryParams = { ...this.params };
+
     let res;
     try {
-      res = isLoadDraft
-        ? await this.service.getDraft(this.context, queryParams)
-        : await this.service.get(this.context, queryParams);
+      await this.startLoading();
+      await this.evt.emit('onBeforeLoad', undefined);
+      res = await this.service.get(this.context, queryParams);
+    } catch (error) {
+      await this.evt.emit('onLoadError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }
 
-    if (isLoadDraft) {
-      // !getDraft的时候不替换，进行合并，空值不覆盖
-      mergeInLeft(this.data, res.data);
-    } else {
-      this.state.data = res.data;
-    }
     this.state.modified = false;
     this.state.data = res.data;
-    mergeDefaultInLeft(this.data, params);
-    this.formStateNotify(
-      isLoadDraft ? FormNotifyState.DRAFT : FormNotifyState.LOAD,
-    );
+    this.formStateNotify(FormNotifyState.LOAD);
 
-    await this.evt.emit(
-      isLoadDraft ? 'onLoadDraftSuccess' : 'onLoadSuccess',
-      undefined,
-    );
+    await this.evt.emit('onLoadSuccess', undefined);
     this.state.isLoaded = true;
     return this.data;
   }
@@ -128,12 +151,16 @@ export class EditFormController
       throw new RuntimeError('请检查表单填写！');
     }
     await this.startLoading();
+    await this.evt.emit('onBeforeSave', undefined);
     let res;
     try {
       res =
         this.data.srfuf === Srfuf.CREATE
           ? await this.service.create(this.context, this.data)
           : await this.service.update(this.context, this.data);
+    } catch (error) {
+      await this.evt.emit('onSaveError', undefined);
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -159,6 +186,7 @@ export class EditFormController
     // 新建数据清空数据
     let res: IHttpResponse | undefined;
     let ok: boolean = false;
+    await this.evt.emit('onBeforeRemove', undefined);
     // 新建的数据不用进行后台删除
     if (this.data.srfuf === Srfuf.UPDATE) {
       ok = await ibiz.modal.confirm({
@@ -172,6 +200,9 @@ export class EditFormController
       await this.startLoading();
       try {
         res = await this.service.remove(this.context, this.params);
+      } catch (error) {
+        await this.evt.emit('onRemoveError', undefined);
+        throw error;
       } finally {
         await this.endLoading();
       }

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

@@ -1,7 +1,12 @@
-import { IControl, IDEFormMDCtrl } from '@ibiz/model-core';
+import { IControl, IDEFormDetail, IDEFormMDCtrl } from '@ibiz/model-core';
 import { IFormController } from '../../../../../../../interface';
+import { findChildFormDetails } from '../../../../../../../model';
+import { getFormDetailProvider } from '../../../../../../../register';
 import { CTX } from '../../../../../../ctx';
 import { EditFormController } from '../../../../edit-form';
+import { FormController } from '../../../../form';
+import { FormGroupPanelController } from '../../../form-group-panel';
+import { FormItemController } from '../../../form-item';
 
 /**
  * 表单多数据部件项控制器
@@ -28,9 +33,41 @@ export class FormMDCtrlItemController
     this.state.isSimple = true;
   }
 
-  public async onInit(): Promise<void> {
-    await this.initDetailControllers(
-      (this.model as IDEFormMDCtrl).deformDetails,
+  protected async initDetailControllers(
+    details: IDEFormDetail[] = (this.model as IDEFormMDCtrl).deformDetails!,
+    form: FormController = this,
+    parent: FormGroupPanelController | undefined = undefined,
+  ): Promise<void> {
+    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,
+          form,
+          parent,
+        );
+        form.details[detail.id!] = detailController;
+        if (
+          detail.detailType === 'FORMITEM' ||
+          detail.detailType === 'MDCTRL'
+        ) {
+          form.formItems.push(detailController as FormItemController);
+        }
+        // 有子成员的生成子控制器
+        const childDetails = findChildFormDetails(detail);
+        if (childDetails.length) {
+          await this.initDetailControllers(
+            childDetails,
+            form,
+            detailController as FormGroupPanelController,
+          );
+        }
+      }),
     );
   }
 }

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

@@ -1,15 +1,5 @@
-// 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-item.controller';
-import { FormItemController } from '../../../form-item';
-import { IFormDetailController } from '../../../../../../../interface';
-import { findChildFormDetails } from '../../../../../../../model';
-import { getFormDetailProvider } from '../../../../../../../register';
-import { CTX } from '../../../../../../ctx';
 
 /**
  * 表单多数据部件表格类型控制器
@@ -22,108 +12,6 @@ import { CTX } from '../../../../../../ctx';
  * @implements {IFormController}
  */
 export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeController {
-  /**
-   * 表单项控制器的集合（二维数组）
-   *
-   * @author zk
-   * @date 2023-07-25 05:07:56
-   * @type {Array<Array<FormItemController>>}
-   * @memberof FormMDCtrlController
-   */
-  formDetails: Array<
-    Array<{ name: string; detailType: string; c: IFormDetailController }>
-  > = [];
-
-  /**
-   * 表单ctx
-   *
-   * @author zk
-   * @date 2023-07-31 12:07:00
-   * @private
-   * @type {CTX}
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  private formCtx!: CTX;
-
-  /**
-   * uiState
-   *
-   * @author zk
-   * @date 2023-07-31 12:07:07
-   * @type {{ isInit: boolean }}
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  state: { isInit: boolean } = { isInit: false };
-
-  /**
-   * 初始化表单成员控制器
-   *
-   * @author lxm
-   * @date 2022-08-24 21:08:48
-   * @protected
-   */
-  protected async initFormMDCtrlItemControllers(
-    details: IDEFormDetail[],
-    index: number,
-    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], index);
-      }
-    });
-
-    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.formDetails[index]) {
-          this.formDetails[index] = [];
-        }
-        this.formDetails[index].push({
-          name: detail.id!,
-          detailType: detail.detailType!,
-          c: detailController,
-        });
-        // 有子成员的生成子控制器
-        const childDetails = findChildFormDetails(detail);
-        if (childDetails.length) {
-          await this.initFormMDCtrlItemControllers(
-            childDetails,
-            index,
-            formController,
-            data,
-            detailController as FormGroupPanelController,
-          );
-        }
-      }),
-    );
-    return data;
-  }
-
   /**
    * 数据插入
    *
@@ -132,10 +20,7 @@ export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeContr
    * @memberof FormMDCtrlRepeaterFormController
    */
   async onDataInsert(): Promise<void> {
-    const data = await this.initFormMDCtrlItemControllers(
-      this.model.deformDetails!,
-      this.data.length,
-    );
+    const data = {};
     super.onDataInsert(data);
   }
 
@@ -152,41 +37,9 @@ export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeContr
       return;
     }
     super.onDataRemove(index);
-    this.formDetails.splice(index, 1);
   }
 
-  /**
-   * 初始化formCtx
-   *
-   * @author zk
-   * @date 2023-07-29 05:07:21
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  useFormMdCtrlCtx(): void {
-    // this.formCtx = useCtx();
-  }
-
-  /**
-   * 初始化数据
-   *
-   * @author zk
-   * @date 2023-07-31 12:07:37
-   * @memberof FormMDCtrlRepeaterFormController
-   */
-  async initData(): Promise<void> {
-    super.initData();
-    await Promise.all(
-      this.data.map(async (item, index) => {
-        await this.initFormMDCtrlItemControllers(
-          this.model.deformDetails!,
-          index,
-          this.parent.form,
-          item,
-        );
-      }),
-    );
-    this.state.isInit = true;
-  }
+  formControllerArray: Array<FormMDCtrlItemController> = [];
 
   /**
    * 表单项值规则校验
@@ -196,18 +49,17 @@ export class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeContr
    * @memberof FormMDCtrlRepeaterFormController
    */
   async validate(): Promise<boolean> {
-    const values: Promise<boolean>[] = [];
-    this.formDetails.forEach(details => {
-      details.forEach(detail => {
-        if (detail.detailType === 'FORMITEM') {
-          const c = detail.c as FormItemController;
-          values.push(c.validate());
-        }
-      });
-    });
-
+    const values: Promise<boolean>[] = this.formControllerArray.map(
+      (c: FormMDCtrlItemController) => {
+        return c.validate();
+      },
+    );
     const results = await Promise.all(values);
     // 找不到value为false即全部是true
     return results.findIndex(value => !value) === -1;
   }
+
+  setFromController(c: FormMDCtrlItemController): void {
+    this.formControllerArray.push(c);
+  }
 }