@ibiz-template/runtime 0.1.2 → 0.1.5

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

@@ -13,17 +13,6 @@ import { IMDControlController } from './i-md-control.controller';
  */
 export interface ITreeController
   extends IMDControlController<IDETree, ITreeState, ITreeEvent> {
-  /**
-   * 设置展开节点
-   *
-   * @author zk
-   * @date 2023-07-10 08:07:36
-   * @param {string[]} nodeKey
-   * @param {boolean} isExpanded
-   * @memberof ITreeController
-   */
-  setExpandedKeys(nodeKeys: string[], isReplace?: boolean): void;
-
   /**
    * 树节点点击事件
    *

package/src/interface/controller/controller/control/index.ts

@@ -27,3 +27,5 @@ export * from './i-drbar.controller';
 export * from './i-drtab.controller';
 export * from './i-dashboard.controller';
 export * from './portlet/index';
+export * from './i-calendar.controller';
+export * from './i-calendar-exp-bar.controller';

package/src/interface/controller/event/control/i-calendar-exp-bar.event.ts

@@ -0,0 +1,10 @@
+import { IExpBarControlEvent } from './i-exp-bar-control.event';
+
+/**
+ * 日历导航栏事件
+ *
+ * @export
+ * @interface ICalendarExpBarEvent
+ * @extends {IExpBarControlEvent}
+ */
+export interface ICalendarExpBarEvent extends IExpBarControlEvent {}

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

@@ -0,0 +1,11 @@
+import { IMDControlEvent } from './i-md-control.event';
+
+/**
+ * 日历部件事件
+ *
+ * @author zk
+ * @date 2022-08-30 16:08:43
+ * @export
+ * @interface IMDControlEvent
+ */
+export type ICalendarEvent = IMDControlEvent;

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

@@ -1,3 +1,5 @@
+import { ITreeNodeData } from '../../state';
+import { EventBase } from '../argument';
 import { IMDControlEvent } from './i-md-control.event';
 
 /**
@@ -8,4 +10,15 @@ import { IMDControlEvent } from './i-md-control.event';
  * @export
  * @interface IMDControlEvent
  */
-export type ITreeEvent = IMDControlEvent;
+export interface ITreeEvent extends IMDControlEvent {
+  /**
+   * 数据激活事件
+   *
+   * @author lxm
+   * @date 2022-08-31 14:08:22
+   */
+  onActive: {
+    event: EventBase & { nodeData: ITreeNodeData };
+    emitArgs: { data: IData[]; nodeData: ITreeNodeData };
+  };
+}

package/src/interface/controller/event/control/index.ts

@@ -24,3 +24,5 @@ export * from './i-search-bar.event';
 export * from './i-chart.event';
 export * from './i-drbar.event';
 export * from './i-drtab.event';
+export * from './i-calendar.event';
+export * from './i-calendar-exp-bar.event';

package/src/interface/controller/event/view/i-calendar-exp-view.event.ts

@@ -0,0 +1,11 @@
+import { IExpViewEvent } from './i-exp-view.event';
+
+/**
+ * 日历导航视图事件
+ *
+ * @author zk
+ * @export
+ * @interface ICalendarViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type ICalendarExpViewEvent = IExpViewEvent;

package/src/interface/controller/event/view/i-calendar-view.event.ts

@@ -0,0 +1,12 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 日历视图事件
+ *
+ * @author lxm
+ * @date 2022-09-13 10:09:00
+ * @export
+ * @interface ICalendarViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type ICalendarViewEvent = IMDViewEvent;

package/src/interface/controller/event/view/index.ts

@@ -33,3 +33,5 @@ export * from './i-wf-step-trace-view.event';
 export * from './i-portal-view.event';
 export * from './i-app-portal-view.event';
 export * from './i-de-portal-view.event';
+export * from './i-calendar-view.event';
+export * from './i-calendar-exp-view.event';

package/src/interface/controller/state/control/i-calendar-exp-bar.state.ts

@@ -0,0 +1,10 @@
+import { IExpBarControlState } from './i-exp-bar-control.state';
+
+/**
+ * 日历导航栏部件状态
+ * @author zk
+ * @export
+ * @interface ICalendarExpBarState
+ * @extends {IExpBarControlState}
+ */
+export interface ICalendarExpBarState extends IExpBarControlState {}

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

@@ -0,0 +1,172 @@
+import { IMDControlState } from './i-md-control.state';
+
+/**
+ * 日历部件状态
+ * @author zk
+ * @date 2023-05-22 02:18:43
+ * @export
+ * @interface ICalendarState
+ * @extends {IMDControlState}
+ */
+
+export interface ICalendarState extends IMDControlState {
+  /**
+   * 多数据部件数据集合
+   * @author lxm
+   * @date 2022-08-17 19:08:11
+   * @type {IData[]}
+   */
+  items: ICalendarItemData[];
+
+  /**
+   * 选中的日期
+   *
+   * @author zk
+   * @date 2023-08-08 07:08:39
+   * @type {Date}
+   * @memberof ICalendarState
+   */
+  selectedDate: Date;
+}
+
+/**
+ * 日历项数据
+ *
+ * @author zk
+ * @date 2023-08-08 01:08:52
+ * @export
+ * @interface ICalendarItemData
+ */
+export interface ICalendarItemData {
+  /**
+   * 背景色
+   *
+   * @author zk
+   * @date 2023-08-08 01:08:17
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  bkColor: string;
+
+  /**
+   * 开始时间
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  beginTime: string;
+
+  /**
+   * 颜色
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  color: string;
+
+  /**
+   * 内容
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  content: string;
+  /**
+   * 结束时间
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  endTime: string;
+
+  /**
+   * 图标
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  icon: string;
+  /**
+   * id标识
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  id: string;
+  /**
+   * 级别
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  level: string;
+  /**
+   * 标记2
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  tag2: string;
+  /**
+   * 标记1
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  tag: string;
+  /**
+   * 文本
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  text: string;
+  /**
+   * 提示
+   *
+   * @date 2023-08-08 01:08:46
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  tips: string;
+
+  /**
+   * 实体数据
+   *
+   * @author zk
+   * @date 2023-08-08 01:08:12
+   * @type {IData}
+   * @memberof ICalendarItemData
+   */
+  deData: IData;
+
+  /**
+   * 日历项名称
+   *
+   * @author zk
+   * @date 2023-08-08 01:08:12
+   * @type {IData}
+   * @memberof ICalendarItemData
+   */
+  itemType: string;
+
+  /**
+   * 导航标识
+   *
+   * @author zk
+   * @date 2023-08-08 04:08:25
+   * @type {string}
+   * @memberof ICalendarItemData
+   */
+  navId: string;
+}

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

@@ -11,6 +11,31 @@ export interface IGridState extends IMDControlState {
    * @type {IGridRowState[]}
    */
   rows: IGridRowState[];
+
+  /**
+   * 表格列状态数组
+   * 顺序就是列的排序
+   * @author lxm
+   * @date 2023-08-04 07:08:16
+   * @type {IColumnState[]}
+   */
+  columnStates: IColumnState[];
+
+  /**
+   * 聚合计算的结果
+   * @author lxm
+   * @date 2023-08-07 04:09:08
+   * @type {IData}
+   */
+  aggResult: IData;
+
+  /**
+   * 远程聚合计算结果
+   * @author lxm
+   * @date 2023-08-07 05:36:54
+   * @type {IData}
+   */
+  remoteAggResult?: IData;
 }
 
 export interface IGridRowState {
@@ -82,3 +107,36 @@ export interface IGridRowState {
    */
   processing: boolean;
 }
+
+/**
+ * 表格列状态
+ * @author lxm
+ * @date 2023-08-04 07:19:02
+ * @export
+ * @interface IColumnState
+ */
+export interface IColumnState {
+  /**
+   * 列标识,是列模型的codeName
+   * @author lxm
+   * @date 2023-08-04 07:16:07
+   * @type {string}
+   */
+  key: string;
+
+  /**
+   * 列的中文标题
+   * @author lxm
+   * @date 2023-08-04 07:17:57
+   * @type {string}
+   */
+  caption: string;
+
+  /**
+   * 显示隐藏
+   * @author lxm
+   * @date 2023-08-04 07:18:47
+   * @type {boolean}
+   */
+  hidden: boolean;
+}

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

@@ -16,16 +16,24 @@ export interface ITreeState extends IMDControlState {
    * @type {ITreeNodeData}
    * @memberof TreeState
    */
-  rootNode: ITreeNodeData;
+  rootNodes: ITreeNodeData[];
 
   /**
-   * 展开的节点集合
+   * 外部提供的默认展开的节点集合
    *
    * @author zk
    * @date 2023-07-10 08:07:25
    * @type {string[]}
    * @memberof ITreeState
    */
+  defaultExpandedKeys: string[];
+
+  /**
+   * 实际默认展开节点集合
+   * @author lxm
+   * @date 2023-08-09 05:06:56
+   * @type {string[]}
+   */
   expandedKeys: string[];
 
   /**

package/src/interface/controller/state/control/index.ts

@@ -29,3 +29,5 @@ export * from './i-chart.state';
 export * from './i-drbar.state';
 export * from './i-drtab.state';
 export * from './i-dashboard.state';
+export * from './i-calendar.state';
+export * from './i-calendar-exp-bar.state';

package/src/interface/controller/state/view/i-calendar-exp-view.state.ts

@@ -0,0 +1,10 @@
+import { IExpViewState } from './i-exp-view.state';
+
+/**
+ * 日历导航视图UI状态
+ *
+ * @export
+ * @class ICalendarExpViewState
+ * @extends {IExpViewState}
+ */
+export interface ICalendarExpViewState extends IExpViewState {}

package/src/interface/controller/state/view/i-calendar-view.state.ts

@@ -0,0 +1,10 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 日历视图UI状态
+ *
+ * @export
+ * @class ICalendarViewState
+ * @extends {IMDViewState}
+ */
+export interface ICalendarViewState extends IMDViewState {}

package/src/interface/controller/state/view/index.ts

@@ -33,3 +33,5 @@ export * from './i-portal-view.state';
 export * from './i-app-portal-view.state';
 export * from './i-de-portal-view.state';
 export * from './i-panel-view.state';
+export * from './i-calendar-view.state';
+export * from './i-calendar-exp-view.state';

package/src/model/layout/layout.ts

@@ -19,7 +19,9 @@ export function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
   if (widthMode === 'FULL') {
     result.width = '100%';
   } else if (width && width > 0) {
-    if (widthMode === 'PERCENTAGE') {
+    if (width > 0 && width <= 1) {
+      result.width = `${width * 100}%`;
+    } else if (widthMode === 'PERCENTAGE') {
       result.width = `${width}%`;
     } else {
       result.width = `${width}px`;
@@ -28,7 +30,9 @@ export function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
   if (heightMode === 'FULL') {
     result.height = '100%';
   } else if (height && height > 0) {
-    if (heightMode === 'PERCENTAGE') {
+    if (height > 0 && height <= 1) {
+      result.height = `${height * 100}%`;
+    } else if (heightMode === 'PERCENTAGE') {
       result.height = `${height}%`;
     } else {
       result.height = `${height}px`;

package/src/service/vo/calendar-item-data/calendar-item-data.ts

@@ -0,0 +1,94 @@
+import { ISysCalendarItem } from '@ibiz/model-core';
+import { ICalendarItemData } from '../../../interface';
+
+/**
+ * 日历项数据
+ *
+ * @export
+ * @class CalendarItemData
+ * @implements {ICalendarItemData}
+ */
+export class CalendarItemData implements ICalendarItemData {
+  constructor(
+    private model: ISysCalendarItem,
+    private data: IData,
+  ) {}
+
+  get deData(): IData {
+    return this.data;
+  }
+
+  get navId(): string {
+    return `${this.itemType}@${this.id}`;
+  }
+
+  get itemType(): string {
+    return this.model.itemType!;
+  }
+
+  get bkColor(): string {
+    const fieldName = this.model.bkcolorAppDEFieldId;
+    return fieldName && this.data[fieldName]
+      ? this.data[fieldName]
+      : this.model.bkcolor;
+  }
+
+  get beginTime(): string {
+    const fieldName = this.model.beginTimeAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get color(): string {
+    const fieldName = this.model.colorAppDEFieldId;
+    return fieldName && this.data[fieldName]
+      ? this.data[fieldName]
+      : this.model.color;
+  }
+
+  get content(): string {
+    const fieldName = this.model.contentAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get endTime(): string {
+    const fieldName = this.model.endTimeAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get icon(): string {
+    const fieldName = this.model.iconAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get id(): string {
+    const fieldName = this.model.idAppDEFieldId;
+    return fieldName && this.data[fieldName]
+      ? this.data[fieldName]
+      : this.data.srfkey;
+  }
+
+  get level(): string {
+    const fieldName = this.model.levelAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get tag2(): string {
+    const fieldName = this.model.tag2AppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get tag(): string {
+    const fieldName = this.model.tagAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get text(): string {
+    const fieldName = this.model.textAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+
+  get tips(): string {
+    const fieldName = this.model.tipsAppDEFieldId;
+    return fieldName ? this.data[fieldName] : undefined;
+  }
+}

package/src/service/vo/calendar-item-data/index.ts

@@ -0,0 +1 @@
+export * from './calendar-item-data';

package/src/service/vo/index.ts

@@ -1,3 +1,4 @@
 export * from './control.vo';
 export * from './tree-node-data';
 export * from './ui-map-field';
+export * from './calendar-item-data';

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -223,7 +223,7 @@ export async function openDERedirectView(
     );
     throw new RuntimeModelError(
       appView,
-      `未找到重定向标识[${rdTag}]或[${deRdTag}]或[${wfRdTag}]对应视图`,
+      `未找到重定向标识[${rdTag}]或[${deRdTag}]或工作流[${wfRdTag}]对应视图`,
     );
   }
   return { ok: true, data: [] };
@@ -248,16 +248,6 @@ export async function calcDERdTag(
   data: IData,
 ): Promise<string> {
   let rdTag = '';
-  // 重定向视图自定义类别属性
-  const typeFieldId = rdView.typeAppDEFieldId;
-  // 自定义重定向
-  if (typeFieldId) {
-    const { codeName } = findFieldById(entity, typeFieldId)!;
-    const value = data[codeName!.toLowerCase()];
-    if (notNilEmpty(value)) {
-      return value;
-    }
-  }
   const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
   // 如果流程步骤存在，按照工作流优先
   const srfWf = params.srfwf;
@@ -268,10 +258,22 @@ export async function calcDERdTag(
     return `${defView}:${srfWf.toUpperCase()}`;
   }
   let typeValue = '';
-  // 从索引属性获取重定向视图类型
-  if (entity.indexTypeAppDEFieldId) {
-    const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
-    typeValue = data[codeName!.toLowerCase()];
+  // 重定向视图自定义类别属性
+  const typeFieldId = rdView.typeAppDEFieldId;
+  // 自定义重定向
+  if (typeFieldId) {
+    const { codeName } = findFieldById(entity, typeFieldId)!;
+    const value = data[codeName!.toLowerCase()];
+    if (notNilEmpty(value)) {
+      typeValue = value;
+    }
+  }
+  if (isNilOrEmpty(typeValue)) {
+    // 从索引属性获取重定向视图类型
+    if (entity.indexTypeAppDEFieldId) {
+      const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
+      typeValue = data[codeName!.toLowerCase()];
+    }
   }
   if (isNilOrEmpty(typeValue)) {
     // 从多表单属性判断重定向视图类型
@@ -281,7 +283,7 @@ export async function calcDERdTag(
     }
   }
   if (notNilEmpty(typeValue)) {
-    rdTag = `${defView}:${typeValue}`;
+    rdTag = `${defView}:${typeValue.toUpperCase()}`;
   } else {
     rdTag = `${defView}`;
   }