@ibiz-template/runtime 0.1.3 → 0.1.6

package/src/interface/controller/work-flow/wf-link.ts

@@ -21,7 +21,7 @@ export interface WFLink {
    * @date 2023-06-20 03:30:20
    * @type {string}
    */
-  sequenceFlowView: string;
+  sequenceflowview: string;
 
   /**
    * pc端流程操作表单
@@ -29,7 +29,7 @@ export interface WFLink {
    * @date 2023-06-20 03:30:21
    * @type {string}
    */
-  sequenceFlowForm: string;
+  sequenceflowform: string;
 
   /**
    * 移动端流程操作视图
@@ -37,7 +37,7 @@ export interface WFLink {
    * @date 2023-06-20 03:31:45
    * @type {string}
    */
-  sequenceFlowMobView: string;
+  sequenceflowmobview: string;
 
   /**
    * 移动端流程操作表单
@@ -45,7 +45,7 @@ export interface WFLink {
    * @date 2023-06-20 03:31:43
    * @type {string}
    */
-  sequenceFlowMobForm: string;
+  sequenceflowmobform: string;
 
   /**
    * 流程ID

package/src/service/dto/method.dto.ts

@@ -1,4 +1,5 @@
 /* eslint-disable no-await-in-loop */
+import { clone } from 'ramda';
 import {
   IAppDataEntity,
   IAppDEMethodDTO,
@@ -52,17 +53,21 @@ export class MethodDto {
    */
   async get(context: IParams, data: IData): Promise<IData> {
     const params: IData = {};
+    // 拷贝数据
+    const copyData = clone(data);
     for (let i = 0; i < this.fields.length; i++) {
       const field = this.fields[i];
       const key = field.codeName!.toLowerCase();
       switch (field.type) {
         case 'SIMPLE': {
-          const val = data[key];
+          const val = copyData[key];
           if (isNilOrEmpty(val)) {
             params[key] = null;
           } else {
             params[key] = val;
           }
+          // 取值后删除
+          delete copyData[key];
           break;
         }
         case 'DTOS': {
@@ -87,6 +92,8 @@ export class MethodDto {
           );
       }
     }
+    // 合并剩余参数
+    Object.assign(params, copyData);
     return params;
   }
 

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/wf-helper/wf-helper.ts

@@ -29,11 +29,11 @@ export function getWFSubmitViewId(
   view: IAppView,
   link: WFLink,
 ): string | undefined {
-  const { type, sequenceFlowView, sequenceFlowMobView } = link;
+  const { type, sequenceflowview, sequenceflowmobview } = link;
   const appViewRefs = view.viewLayoutPanel?.appViewRefs || view.appViewRefs;
   const key = type
     ? `WFUTILACTION@${type.toUpperCase()}`
-    : `WFACTION@${ibiz.env.isMob ? sequenceFlowMobView : sequenceFlowView}`;
+    : `WFACTION@${ibiz.env.isMob ? sequenceflowmobview : sequenceflowview}`;
   const submitViewRef = appViewRefs!.find(viewRef => {
     return viewRef.name === key;
   });