@ibiz-template/runtime 0.2.5 → 0.2.7

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

@@ -114,13 +114,20 @@ export class FormMDCtrlContentTypeController {
     const name =
       this.model.appDEFieldId || this.model.fieldName || this.model.id;
     if (name) {
+      const data = this.parent.data[name];
       if (
         this.model.contentType === 'REPEATER' &&
         this.model.detailStyle === 'STYLE3'
       ) {
-        this.parent.state.contentCtrlData = this.parent.data[name] || {};
+        if (Array.isArray(data)) {
+          this.parent.state.contentCtrlData = {};
+        } else {
+          this.parent.state.contentCtrlData = data || {};
+        }
+      } else if (!Array.isArray(data)) {
+        this.parent.state.contentCtrlData = [];
       } else {
-        this.parent.state.contentCtrlData = this.parent.data[name] || [];
+        this.parent.state.contentCtrlData = data || [];
       }
     }
   }

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

@@ -9,6 +9,7 @@ import { FormMDCtrlRepeaterFormOneController } from './form-mdctrl-repeater/form
 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';
 
 /**
  * 表单多数据部件控制器
@@ -30,6 +31,8 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
    */
   declare state: FormMDCtrlState;
 
+  declare form: EditFormController;
+
   /**
    * Creates an instance of FormMDCtrlController.
    *
@@ -101,6 +104,15 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
     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();
+    });
   }
 
   /**
@@ -118,17 +130,6 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
     }
   }
 
-  /**
-   * 加载数据，要在表单加载完成之后再去加载
-   *
-   * @author zk
-   * @date 2023-07-28 11:07:09
-   * @memberof FormMDCtrlController
-   */
-  async loadData(): Promise<void> {
-    await this.mdCtrlContentController.initData();
-  }
-
   /**
    * 表单校验，通知子表单进行校验
    *

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

@@ -25,6 +25,7 @@ import {
   IGridColumnProvider,
   CodeListItem,
   MDCtrlLoadParams,
+  IGridRowState,
 } from '../../../../interface';
 import { calcDeCodeNameById } from '../../../../model';
 import { getGridColumnProvider } from '../../../../register';
@@ -393,9 +394,7 @@ export class GridController
   afterRemove(data: IData): void {
     super.afterRemove(data);
     // 删除this.state.rows里的表格行数据
-    const index = this.state.rows.findIndex(
-      item => item.data.srfkey === data.srfkey,
-    );
+    const index = this.findRowStateIndex(data);
     this.state.rows.splice(index, 1);
 
     // 删除分组里的那条数据
@@ -419,18 +418,21 @@ export class GridController
    */
   async newRow(): Promise<void> {
     const { enableRowEdit, enableRowNew } = this.model;
+    const { editShowMode } = ibiz.config.grid;
     if (
       !enableRowEdit ||
       !enableRowNew ||
-      ibiz.config.grid.editShowMode !== 'row'
+      !['row', 'all'].includes(editShowMode)
     ) {
       ibiz.log.error('不支持新建行');
       return;
     }
 
-    const editingRow = this.state.rows.find(item => item.showRowEdit);
-    if (editingRow) {
-      throw new RuntimeError('请先完成当前行编辑中的行的操作');
+    if (editShowMode === 'row') {
+      const editingRow = this.state.rows.find(item => item.showRowEdit);
+      if (editingRow) {
+        throw new RuntimeError('请先完成当前行编辑中的行的操作');
+      }
     }
 
     const queryParams = { ...this.params };
@@ -456,7 +458,11 @@ export class GridController
     const newRow = new GridRowState(draftData, this);
     this.state.rows.unshift(newRow);
     this.gridStateNotify(newRow, GridNotifyState.DRAFT);
-    this.switchRowEdit(this.state.rows[0], true);
+
+    if (editShowMode === 'row') {
+      this.switchRowEdit(this.state.rows[0], true);
+    }
+
     this.actionNotification('GETDRAFTSUCCESS', { data: draftData });
   }
 
@@ -472,9 +478,10 @@ export class GridController
     if (this.state.isSimple) {
       return;
     }
-    const rowState = this.state.rows.find(
-      item => item.data.srfkey === data.srfkey,
-    );
+
+    const isCreate = data.srfuf === Srfuf.CREATE;
+
+    const rowState = this.findRowState(data);
     if (!rowState) {
       throw new RuntimeError('行数据不存在');
     }
@@ -495,7 +502,6 @@ export class GridController
     }
     await this.startLoading();
     let res;
-    const isCreate = data.srfuf === Srfuf.CREATE;
     const deName = calcDeCodeNameById(this.model.appDataEntityId!);
     const tempContext = this.context.clone();
     tempContext[deName] = data.srfkey;
@@ -514,9 +520,7 @@ export class GridController
       await this.endLoading();
     }
     // 后续处理
-    const index = this.state.items.findIndex(
-      item => item.srfkey === data.srfkey,
-    );
+    const index = this.findRowStateIndex(data);
     this.state.items.splice(index, 1, res.data);
     rowState.data = res.data;
     rowState.modified = false;
@@ -1035,4 +1039,31 @@ export class GridController
     });
     return result;
   }
+
+  /**
+   * 查找rowState
+   * @author lxm
+   * @date 2023-10-27 07:27:48
+   * @param {IData} data
+   * @return {*}  {(IGridRowState)}
+   */
+  findRowStateIndex(data: IData): number {
+    const isCreate = data.srfuf === Srfuf.CREATE;
+    const compareKey = isCreate ? 'tempsrfkey' : 'srfkey';
+    return this.state.rows.findIndex(
+      item => item.data[compareKey] === data[compareKey],
+    );
+  }
+
+  /**
+   * 查找rowState
+   * @author lxm
+   * @date 2023-10-27 07:27:48
+   * @param {IData} data
+   * @return {*}  {(IGridRowState | undefined)}
+   */
+  findRowState(data: IData): IGridRowState | undefined {
+    const index = this.findRowStateIndex(data);
+    return index !== -1 ? this.state.rows[index] : undefined;
+  }
 }

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

@@ -308,7 +308,11 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
     }
     const isDate = DataTypes.isDate(this.dataType!);
     if (isDate) {
-      return dayjs(strVal).format(this.valueFormat);
+      const formatVal = dayjs(strVal).format(this.valueFormat);
+      if (formatVal !== 'Invalid Date') {
+        return formatVal;
+      }
+      return strVal;
     }
     return ibiz.util.text.format(strVal, this.valueFormat);
   }

package/src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts

@@ -50,6 +50,13 @@ export class PickupViewPanelController
     await super.onCreated();
     // 等待嵌入视图mounted完成，选择视图面板才mounted
     this.mountCounter.enroll(this.model.embeddedAppDEViewId!);
+  }
+
+  updateContextParams(opts: {
+    context?: IContext | undefined;
+    params?: IParams | undefined;
+  }): void {
+    super.updateContextParams(opts);
     this.initNavParam();
   }
 

package/src/interface/common/i-global-config/i-global-config.ts

@@ -12,6 +12,15 @@ import { IGlobalViewConfig } from './i-global-view-config';
  * @interface IGlobalConfig
  */
 export interface IGlobalConfig {
+  /**
+   * 设置应用主题
+   *
+   * @author chitanda
+   * @date 2023-10-30 21:10:01
+   * @type {string}
+   */
+  theme?: string;
+
   /**
    * 全局视图配置
    * @return {*}

package/src/interface/controller/controller/control/i-control.controller.ts

@@ -49,4 +49,13 @@ export interface IControlController<
    * @date 2022-09-19 14:09:09
    */
   endLoading(): Promise<void>;
+
+  /**
+   * 在不改变引用的前提下，更新上下文和导航参数
+   * 并处理如自定义导航参数的后续处理
+   * @author lxm
+   * @date 2023-10-27 01:47:59
+   * @param {{ context?: IContext; params?: IParams }} opts
+   */
+  updateContextParams(opts: { context?: IContext; params?: IParams }): void;
 }

package/src/service/utils/res-path/res-path.ts

@@ -1,7 +1,7 @@
 import { IAppDataEntity } from '@ibiz/model-core';
 
 // 匹配 ${} 中间的内容
-const reg = /(?<=\$\{)(.*?)(?=\})/g;
+const reg = /\$\{(.*?)\}/g;
 
 /**
  * 获取匹配的资源路径
@@ -23,9 +23,11 @@ export function getMatchResPath(
   const pathItems = entity.requestPaths || [];
   // 获取所有的路径需要匹配的参数
   const items: { path: string; keys: string[] }[] = pathItems.map(str => {
+    const match = str.match(reg);
+    const keys = match?.map(item => item.substring(2, item.length - 1)) || [];
     return {
       path: str,
-      keys: str.match(reg) || [],
+      keys,
     };
   });
   // 过滤掉所有不能满足填充的路径, 并且按照填充参数个数排序，填充参数最多的优先依次递减排序

package/src/service/vo/control.vo.ts

@@ -147,10 +147,10 @@ export class ControlVO {
       if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
         Object.defineProperty(this, key, {
           get() {
-            return this.$origin.srfkey;
+            return this.$origin[key];
           },
           set(val: unknown) {
-            this.$origin.srfkey = val;
+            this.$origin[key] = val;
           },
           enumerable: false,
           configurable: true,