@ibiz-template/runtime 0.2.5 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.2.4",
+    "@ibiz-template/core": "^0.2.6",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "fab2e0edf52082dcbd450b48716dac8b63809b3f"
+  "gitHead": "9e2ff8788567c10c7f048f95797e1a533b0027e8"
 }

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

@@ -1,5 +1,10 @@
-import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
-import { NoticeError } from '@ibiz-template/core';
+import {
+  IControl,
+  IControlLogic,
+  IMDControl,
+  IViewLayoutPanel,
+} from '@ibiz/model-core';
+import { IBizContext, IBizParams, NoticeError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
@@ -82,6 +87,8 @@ export class ControlController<
    */
   providers: { [key: string]: IProvider } = {};
 
+  declare params: IBizParams;
+
   /**
    * Creates an instance of ControlController.
    *
@@ -92,7 +99,12 @@ export class ControlController<
    * @param {IParams} [params={}]
    */
   constructor(model: T, context: IContext, params: IParams, ctx: CTX) {
-    super(model, context, params, ctx);
+    super(
+      model,
+      IBizContext.create({}, context),
+      new IBizParams({}, params),
+      ctx,
+    );
     this.registerToCtx();
     const panelModel = ibiz.util.layoutPanel.get(
       `${model.controlType}_DEFAULT`,
@@ -100,6 +112,8 @@ export class ControlController<
     if (panelModel) {
       this.controlPanel = panelModel;
     }
+
+    this.updateContextParams({});
   }
 
   /**
@@ -170,6 +184,39 @@ export class ControlController<
     if (this.scheduler) {
       this.scheduler.destroy();
     }
+    this.params.destroy();
+  }
+
+  /**
+   * 处理上下文和导航参数相关的，如自定义导航参数的处理
+   *
+   * @author lxm
+   * @date 2022-09-08 15:09:47
+   * @protected
+   */
+  updateContextParams(opts: { context?: IContext; params?: IParams }): void {
+    // 不改变引用的情况下，重置控制器里的上下文和视图参数。
+    if (opts.context) {
+      this.context.reset({}, opts.context);
+    }
+    if (opts.params) {
+      this.params.reset({}, opts.params);
+    }
+
+    const { controlNavContexts, controlNavParams } = this.model as IMDControl;
+    // 处理自定义导航上下文
+    let context = {};
+    if (notNilEmpty(controlNavContexts)) {
+      context = convertNavData(controlNavContexts!, this.params, this.context);
+    }
+    Object.assign(this.context, context);
+
+    // 处理自定义视图参数
+    let params = {};
+    if (notNilEmpty(controlNavParams)) {
+      params = convertNavData(controlNavParams!, this.params, this.context);
+    }
+    Object.assign(this.params, params);
   }
 
   /**

package/src/controller/control/dashboard/dashboard.controller.ts

@@ -84,9 +84,19 @@ export class DashboardController
     if (!portletModels?.length) {
       return;
     }
+    // 这块只初始化子门户部件，忽略子门户部件里面嵌入的部件
+    const ignorePortletTypes: string[] = [
+      ControlType.CHART,
+      ControlType.APP_MENU,
+      ControlType.TOOLBAR,
+      ControlType.LIST,
+    ];
     await Promise.all(
       portletModels.map(async portlet => {
-        if (portlet.controlType === ControlType.CHART) {
+        if (
+          portlet.controlType &&
+          ignorePortletTypes.includes(portlet.controlType)
+        ) {
           return;
         }
         const provider = await getPortletProvider(portlet);

package/src/controller/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBToolbarPortlet } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class ActionBarPortletController extends PortletPartController<IDBToolbarPortlet> {}

package/src/controller/control/dashboard/portlet/actionbar-portlet/index.ts

@@ -0,0 +1 @@
+export * from './actionbar-portlet.controller';

package/src/controller/control/dashboard/portlet/html-portlet/html-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBHtmlPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class HtmlPortletController extends PortletPartController<IDBHtmlPortletPart> {}

package/src/controller/control/dashboard/portlet/html-portlet/index.ts

@@ -0,0 +1 @@
+export * from './html-portlet.controller';

package/src/controller/control/dashboard/portlet/index.ts

@@ -3,3 +3,7 @@ export * from './container-portlet';
 export * from './view-portlet';
 export * from './menu-portlet';
 export * from './chart-portlet';
+export * from './actionbar-portlet';
+export * from './html-portlet';
+export * from './list-portlet';
+export * from './rawitem-portlet';

package/src/controller/control/dashboard/portlet/list-portlet/index.ts

@@ -0,0 +1 @@
+export * from './list-portlet.controller';

package/src/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBListPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class ListPortletController extends PortletPartController<IDBListPortletPart> {}

package/src/controller/control/dashboard/portlet/rawitem-portlet/index.ts

@@ -0,0 +1 @@
+export * from './rawitem-portlet.controller';

package/src/controller/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBRawItemPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class RawItemPortletController extends PortletPartController<IDBRawItemPortletPart> {}

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

@@ -7,8 +7,8 @@ import {
 import { calcLayoutHeightWidth, calcDynaClass } from '../../../../../model';
 import { verifyFormGroupLogic } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
-import { FormController } from '../../form/form.controller';
 import { FormDetailState } from './form-detail.state';
+import { FormController } from '../../form';
 
 export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
   implements IFormDetailController
@@ -45,7 +45,7 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    *
    * @author lxm
    * @date 2022-08-24 22:08:59
-   * @type {FormController}
+   * @type {IFormDetailContainerController}
    */
   readonly parent?: IFormDetailContainerController;
 

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/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,
     };
   });
   // 过滤掉所有不能满足填充的路径, 并且按照填充参数个数排序，填充参数最多的优先依次递减排序