@ibiz-template/runtime 0.2.11 → 0.2.13

package/src/controller/common/view/view.controller.ts

@@ -464,6 +464,12 @@ export class ViewController<
       title: message.title!,
       desc: message.message,
     };
+    // userTag为确认按钮文本
+    if (message.extraParams.userTag) {
+      Object.assign(modalParams, {
+        confirmButtonText: message.extraParams.userTag,
+      });
+    }
     if (message.messageType === 'WARN') {
       await ibiz.modal.warning(modalParams);
     } else if (message.messageType === 'ERROR') {

package/src/controller/control/calendar/calendar.controller.ts

@@ -106,8 +106,8 @@ export class CalendarController
    */
   protected getCurSelectDate(param: IParams): IData {
     const { selectedDate } = this.state;
-    const { start, end } = param;
-    if (!start || !end) {
+    const { srfstartdate, srfenddate } = param;
+    if (!srfstartdate || !srfenddate) {
       // 获取当前月份的第一天
       const firstDayOfMonth = new Date(
         selectedDate.getFullYear(),
@@ -121,11 +121,11 @@ export class CalendarController
         1,
       );
       return {
-        start: dayjs(firstDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
-        end: dayjs(lastDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
+        srfstartdate: dayjs(firstDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
+        srfenddate: dayjs(lastDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
       };
     }
-    return { start, end };
+    return { srfstartdate, srfenddate };
   }
 
   /**

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

@@ -1,4 +1,4 @@
-import { RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
+import { plus, RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
 import {
   IChartSeriesCSCartesian2DEncode,
   IDEChartSeries,
@@ -282,7 +282,10 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
         groupData[group].set(catalog, { value: 0 });
       }
       // 相同分类属性的值属性数据累加
-      groupData[group].get(catalog)!.value += item[this.valueField];
+      groupData[group].get(catalog)!.value = plus(
+        groupData[group].get(catalog)!.value,
+        item[this.valueField],
+      );
       groupData[group].get(catalog)!.deData = item;
     });
 

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

@@ -60,12 +60,12 @@ export class CalendarExpBarController
     return controller as ICalendarController;
   }
 
-  public defaultNavBySrfnav(): void {
+  public navBySrfnav(): void {
     const selectItem: ICalendarItemData | undefined =
       this.xDataController?.state.items.find(
         item => item.navId === this.state.srfnav,
       );
-    super.defaultNavBySrfnav();
+    super.navBySrfnav();
     if (!selectItem) {
       return;
     }

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

@@ -22,7 +22,7 @@ import {
 import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
-import { ControllerEvent } from '../../utils';
+import { ControllerEvent, hasSubRoute } from '../../utils';
 
 type XDataControlModel = IDEGrid | IDEList | IDEDataView;
 
@@ -229,7 +229,7 @@ export class ExpBarControlController<
         this.xDataLoadSuccess(event);
       });
       this.xDataController.evt.on('onRemoveSuccess', () => {
-        this.defaultNavByFirstItem();
+        this.navByFirstItem();
       });
     }
 
@@ -261,10 +261,10 @@ export class ExpBarControlController<
       // 只处理默认第一次加载
       if (this.state.srfnav && this.routeDepth) {
         // 路由srfnav回显
-        this.defaultNavBySrfnav();
+        this.navBySrfnav();
       } else {
         // 默认选中第一条并导航
-        this.defaultNavByFirstItem();
+        this.navByFirstItem();
       }
     }
   }
@@ -275,17 +275,14 @@ export class ExpBarControlController<
    * @date 2023-08-10 04:04:08
    * @protected
    */
-  protected defaultNavBySrfnav(): void {
+  protected navBySrfnav(): void {
     // 找到选中项，如果没有就模拟选中数据
     const selectItem = this.xDataController?.state.items.find(
       item => item[this.navKeyName] === this.state.srfnav,
     );
 
     // 是否是路由模式且有子路由
-    const routeAndHasSub =
-      this.routeDepth &&
-      window.location.hash.split('/').length > this.routeDepth * 2 + 2;
-
+    const routeAndHasSub = this.routeDepth && hasSubRoute(this.routeDepth);
     if (routeAndHasSub) {
       if (selectItem) {
         // 在多数据部件里面选项设置回显。
@@ -295,14 +292,28 @@ export class ExpBarControlController<
       this._evt.emit('onNavViewChange', {
         navViewMsg: {
           key: this.state.srfnav,
+          isRoutePushed: true,
           isCache: this.isCache,
         },
         context: this.context,
       });
-    } else if (selectItem) {
+      return;
+    }
+
+    if (selectItem) {
       // 非路由模式,或者有路由模式下有srfnav没有子路由时，需要在多数据部件里面选项设置回显。
       this.xDataController.setActive(selectItem);
       this.xDataController.setSelection([selectItem]);
+    } else {
+      // 找不到匹配的选中项的情况，告诉导航占位显示404
+      this._evt.emit('onNavViewChange', {
+        navViewMsg: {
+          key: this.state.srfnav,
+          is404: true,
+          isCache: this.isCache,
+        },
+        context: this.context,
+      });
     }
   }
 
@@ -314,7 +325,7 @@ export class ExpBarControlController<
    * @date 2023-08-10 03:58:15
    * @protected
    */
-  protected defaultNavByFirstItem(): void {
+  protected navByFirstItem(): void {
     const data = this.xDataController.state.items[0];
     if (!data) {
       // 导航视图传空让他导航占位绘制空界面
@@ -474,10 +485,10 @@ export class ExpBarControlController<
    * @date 2023-09-14 07:03:39
    * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
    */
-  onRouterChange(info: { srfnav: string; path: string }): void {
+  async onRouterChange(info: { srfnav: string; path: string }): Promise<void> {
     if (this.state.srfnav !== info.srfnav) {
       this.state.srfnav = info.srfnav;
-      this.defaultNavBySrfnav();
+      this.navBySrfnav();
     }
   }
 }

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

@@ -128,7 +128,7 @@ export class TreeExpBarController
     };
   }
 
-  protected defaultNavByFirstItem(): void {
+  protected navByFirstItem(): void {
     const data = this.xDataController.state.items.find(node => {
       // 根节点不显示的时候排除根节点
       if (
@@ -165,16 +165,35 @@ export class TreeExpBarController
 
     // 计算树的默认展开集合
     if (this.state.srfnav) {
-      const expandedKeys: string[] = [];
-      this.state.srfnav.split(':').forEach((item, index) => {
-        if (index === 0) {
-          expandedKeys.push(item);
-        } else {
-          expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
-        }
-      });
-      expandedKeys.pop(); // 删除最后一个
-      this.defaultExpandedKeys = expandedKeys;
+      this.defaultExpandedKeys = this.calcExpandKeys(this.state.srfnav);
+    }
+  }
+
+  /**
+   * 根据srfnav计算需要展开的节点标识
+   * @author lxm
+   * @date 2023-11-07 02:42:45
+   * @param {string} srfnav
+   * @return {*}  {string[]}
+   */
+  calcExpandKeys(srfnav: string): string[] {
+    const expandedKeys: string[] = [];
+    srfnav.split(':').forEach((item, index) => {
+      if (index === 0) {
+        expandedKeys.push(item);
+      } else {
+        expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
+      }
+    });
+    expandedKeys.pop(); // 删除最后一个
+    return expandedKeys;
+  }
+
+  async onRouterChange(info: { srfnav: string; path: string }): Promise<void> {
+    if (this.state.srfnav !== info.srfnav) {
+      const expandKeys = this.calcExpandKeys(info.srfnav);
+      await this.xDataController.expandNodeByKey(expandKeys);
     }
+    await super.onRouterChange(info);
   }
 }

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

@@ -20,7 +20,7 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
    * @type {IListController}
    * @memberof FormMDCtrlDataViewController
    */
-  dataViewController!: IListController;
+  dataViewController?: IListController;
 
   /**
    * 表格选中数据
@@ -43,14 +43,14 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
   state: { isSelect: boolean } = { isSelect: false };
 
   /**
-   * 表格挂载后把控制器抛出来
+   * 卡片挂载后把控制器抛出来
    *
    * @author zk
    * @date 2023-07-30 07:07:25
    * @param {EventBase} event
    * @memberof FormMDCtrlDataViewController
    */
-  onDataViewMounted(event: EventBase): void {
+  onDataViewCreated(event: EventBase): void {
     this.dataViewController = event.ctrl as IListController;
   }
 
@@ -75,6 +75,9 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlController
    */
   onDataRemove(): void {
+    if (!this.dataViewController) {
+      return;
+    }
     this.dataViewController.remove();
     this.parent.state.contentCtrlData = this.dataViewController.state.items;
     this.parent.setFormDataValue();
@@ -101,7 +104,7 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlContentTypeController
    */
   async initData(): Promise<void> {
-    this.dataViewController.load();
+    this.dataViewController?.load();
   }
 
   /**

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

@@ -45,14 +45,14 @@ export class FormMDCtrlFormController extends FormMDCtrlControlController {
   service!: EditFormService;
 
   /**
-   * 表格挂载后把控制器抛出来
+   * 表单初始化后把控制器抛出来
    *
    * @author zk
    * @date 2023-07-30 07:07:25
    * @param {EventBase} event
    * @memberof FormMDCtrlGridController
    */
-  onControlMounted(event: EventBase, index: number): void {
+  onControlCreated(event: EventBase, index: number): void {
     const formController = event.ctrl as IEditFormController;
     this.controlControllerArray[index] = formController;
     formController.load();

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

@@ -22,7 +22,7 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
    * @type {IGridController}
    * @memberof FormMDCtrlGridController
    */
-  gridController!: IGridController;
+  gridController?: IGridController;
 
   /**
    * 表格选中数据
@@ -45,14 +45,14 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
   state: { isSelect: boolean } = { isSelect: false };
 
   /**
-   * 表格挂载后把控制器抛出来
+   * 表格初始化后把控制器抛出来
    *
    * @author zk
    * @date 2023-07-30 07:07:25
    * @param {EventBase} event
    * @memberof FormMDCtrlGridController
    */
-  onGridMounted(event: EventBase): void {
+  onGridCreated(event: EventBase): void {
     this.gridController = event.ctrl as IGridController;
   }
 
@@ -77,6 +77,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlController
    */
   onDataRemove(): void {
+    if (!this.gridController) {
+      return;
+    }
     this.gridController.remove();
     this.parent.state.contentCtrlData = this.gridController.state.items;
     this.parent.setFormDataValue();
@@ -103,7 +106,7 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlContentTypeController
    */
   async initData(): Promise<void> {
-    this.gridController.load();
+    this.gridController?.load();
   }
 
   /**
@@ -115,6 +118,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlContentTypeController
    */
   async onDataInsert(): Promise<void> {
+    if (!this.gridController) {
+      return;
+    }
     await this.gridController.newRow();
     this.parent.state.contentCtrlData = this.gridController.state.items;
     this.parent.setFormDataValue();
@@ -150,9 +156,12 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlFormController
    */
   async validate(): Promise<boolean> {
+    if (!this.gridController) {
+      return true;
+    }
     const { rows } = this.gridController.state;
     const values = await Promise.all(
-      rows.map(row => this.gridController.validate(row)),
+      rows.map(row => this.gridController!.validate(row)),
     );
 
     // 找不到value为false即全部是true

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

@@ -20,7 +20,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @type {IListController}
    * @memberof FormMDCtrlListController
    */
-  listController!: IListController;
+  listController?: IListController;
 
   /**
    * 表格选中数据
@@ -50,7 +50,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @param {EventBase} event
    * @memberof FormMDCtrlListController
    */
-  onListMounted(event: EventBase): void {
+  onListCreated(event: EventBase): void {
     this.listController = event.ctrl as IListController;
   }
 
@@ -75,6 +75,9 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlController
    */
   onDataRemove(): void {
+    if (!this.listController) {
+      return;
+    }
     this.listController.remove();
     this.parent.state.contentCtrlData = this.listController.state.items;
     this.parent.setFormDataValue();
@@ -101,7 +104,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
    * @memberof FormMDCtrlContentTypeController
    */
   async initData(): Promise<void> {
-    this.listController.load();
+    this.listController?.load();
   }
 
   /**

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

@@ -1,4 +1,5 @@
 import { IControl, IDEFormDetail, IDEFormMDCtrl } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { IFormController } from '../../../../../../../interface';
 import { findChildFormDetails } from '../../../../../../../model';
 import { getFormDetailProvider } from '../../../../../../../register';
@@ -29,10 +30,10 @@ export class FormMDCtrlItemController
     data: IData,
     form: FormController,
   ) {
-    const { model: _model } = form;
+    const tempModel = clone(form.model);
     // 合并父级表单模型 兼容值规则 和 父表单模型
-    Object.assign(_model, model);
-    super(_model, context, params, ctx);
+    Object.assign(tempModel, model, { name: undefined });
+    super(tempModel, context, params, ctx);
     this.state.data = data;
     this.state.isSimple = true;
   }

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

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DataTypes, ModelError } from '@ibiz-template/core';
+import { DataTypes, ModelError, plus } from '@ibiz-template/core';
 import { IAppCodeList, IDEGridFieldColumn } from '@ibiz/model-core';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash-es';
@@ -236,13 +236,13 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
         case 'SUM':
           aggValue = items
             .map(item => item[fieldName] as number)
-            .reduce((a, b) => a + b, 0);
+            .reduce((a, b) => plus(a, b), 0);
           break;
         case 'AVG':
           aggValue =
             items
               .map(item => item[fieldName] as number)
-              .reduce((a, b) => a + b, 0) / items.length;
+              .reduce((a, b) => plus(a, b), 0) / items.length;
           break;
         case 'MAX':
           aggValue = Math.max(...items.map(item => item[fieldName] as number));

package/src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts

@@ -9,6 +9,7 @@ import {
 import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
+import { hasSubRoute } from '../../utils';
 
 /**
  * 分页导航面板
@@ -57,6 +58,19 @@ export class TabExpPanelController
     return ibiz.config.view.expCacheMode.includes(this.model.controlType!);
   }
 
+  /**
+   * 当前路由视图的层级
+   *
+   * @author zk
+   * @date 2023-07-11 10:07:20
+   * @readonly
+   * @type {(number | undefined)}
+   * @memberof ExpBarControlController
+   */
+  get routeDepth(): number | undefined {
+    return this.view.modal.routeDepth;
+  }
+
   /**
    * 初始化state的属性
    *
@@ -141,23 +155,25 @@ export class TabExpPanelController
    * @memberof TabExpPanelController
    */
   initDefaultPage(): void {
-    const initFirstPage = (): void => {
-      this.state.activeName = this.state.tabPages[0].tabTag;
-      this.handleTabChange();
-    };
-    if (!this.state.defaultTabName) {
-      initFirstPage();
-    } else {
+    // 跳转指定的默认分页
+    if (this.state.defaultTabName) {
       const activeTab = this.state.tabPages.find(
         item => item.tabTag === this.state.defaultTabName,
       );
-      if (!activeTab) {
-        initFirstPage();
-      } else {
+      if (activeTab) {
         this.state.activeName = activeTab.tabTag;
-        this.changeToTab();
+        this.changeToTab(
+          this.activeTabViewPanelModel,
+          // 路由模式下并且有子路由
+          this.routeDepth !== undefined && hasSubRoute(this.routeDepth),
+        );
+        return;
       }
     }
+
+    // 没有默认分页或者匹配不到时，跳转第一个分页
+    this.state.activeName = this.state.tabPages[0].tabTag;
+    this.handleTabChange();
   }
 
   /**
@@ -169,8 +185,12 @@ export class TabExpPanelController
    */
   protected changeToTab(
     tab: IDETabViewPanel = this.activeTabViewPanelModel!,
+    isRoutePushed = false,
   ): void {
     const navViewMsg = this.getNavViewMsg(tab);
+    if (isRoutePushed === true) {
+      navViewMsg.isRoutePushed = true;
+    }
     this.evt.emit('onNavViewChange', { navViewMsg });
   }
 

package/src/controller/control/tree/tree.controller.ts

@@ -41,6 +41,7 @@ export class TreeController
     // 根节点初始化
     this.state.defaultExpandedKeys = [];
     this.state.expandedKeys = [];
+    this.state.navigational = false;
     this.state.size = 0;
   }
 
@@ -154,6 +155,14 @@ export class TreeController
    * @memberof TreeController
    */
   async onTreeNodeClick(nodeData: ITreeNodeData): Promise<void> {
+    // 导航的时候，没有导航视图的时候，节点后续点击逻辑都不走，也不选中
+    if (this.state.navigational) {
+      const nodeModel = this.getNodeModel(nodeData.nodeId);
+      if (!nodeModel?.navAppViewId) {
+        return;
+      }
+    }
+
     // 单选时，单击才会触发选中逻辑
     if (this.state.singleSelect) {
       // 选中相关处理
@@ -363,4 +372,31 @@ export class TreeController
       children: nodes,
     });
   }
+
+  async expandNodeByKey(expandKeys: string[]): Promise<void> {
+    const noExpandKeys = expandKeys.filter(
+      key => !this.state.expandedKeys.includes(key),
+    );
+    if (noExpandKeys.length === 0) {
+      return;
+    }
+
+    // 找到已存在的要展开的节点
+    const existNodes = this.state.items.filter(item =>
+      noExpandKeys.includes(item.id),
+    );
+
+    // 补充所有未展开的节点标识，查询过程中会自动加载后续展开
+    this.state.expandedKeys.push(...noExpandKeys);
+
+    if (existNodes.length === 0) {
+      return;
+    }
+    // 展开加载节点
+    await Promise.all(
+      existNodes.map(node => {
+        return this.loadNodes(node);
+      }),
+    );
+  }
 }

package/src/controller/utils/index.ts

@@ -2,6 +2,7 @@ export * from './counter';
 export * from './loading/loading.state';
 export * from './button-state';
 export * from './event';
+export * from './route/route';
 export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';

package/src/controller/utils/route/route.ts

@@ -0,0 +1,11 @@
+/**
+ * 是否有子路由路径
+ * @author lxm
+ * @date 2023-11-08 10:12:54
+ * @export
+ * @param {number} routeDepth
+ * @return {*}  {boolean}
+ */
+export function hasSubRoute(routeDepth: number): boolean {
+  return window.location.hash.split('/').length > routeDepth * 2 + 2;
+}

package/src/controller/utils/view-msg/view-msg-controller.ts

@@ -146,13 +146,16 @@ export class ViewMsgController {
    */
   protected calcStaticMsg(detail: IAppViewMsgGroupDetail): IViewMessage {
     const { position: position1 } = detail;
+    const viewMsg = this.viewMsgMap.get(detail.appViewMsgId!)!;
     const {
       title,
       message,
       removeMode,
       position: position2,
       messageType,
-    } = this.viewMsgMap.get(detail.appViewMsgId!)!;
+    } = viewMsg;
+    const { userTag, userTag2, userTag3, userTag4 } = viewMsg as IData;
+
     // detail里的位置优先
     const position = position1 || position2;
     return {
@@ -161,6 +164,13 @@ export class ViewMsgController {
       position,
       messageType,
       removeMode,
+      // 额外参数
+      extraParams: {
+        userTag,
+        userTag2,
+        userTag3,
+        userTag4,
+      },
     };
   }
 

package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts

@@ -46,6 +46,16 @@ export interface INavViewMsg {
    */
   viewId?: string;
 
+  /**
+   * 是否路由已经跳转
+   *
+   * @author zk
+   * @date 2023-09-26 06:09:17
+   * @type {string}
+   * @memberof INavViewMsg
+   */
+  isRoutePushed?: boolean;
+
   /**
    * 是否缓存
    *
@@ -55,4 +65,14 @@ export interface INavViewMsg {
    * @memberof INavViewMsg
    */
   isCache?: boolean;
+
+  /**
+   * 是否404
+   *
+   * @author zk
+   * @date 2023-09-26 06:09:17
+   * @type {string}
+   * @memberof INavViewMsg
+   */
+  is404?: boolean;
 }

package/src/interface/controller/common/view-message/i-view-message.ts

@@ -39,4 +39,14 @@ export interface IViewMessage {
    * @type {string}
    */
   message?: string;
+
+  /**
+   * 额外参数
+   *
+   * @author zk
+   * @date 2023-11-06 11:11:50
+   * @type {IData}
+   * @memberof IViewMessage
+   */
+  extraParams: IData;
 }