@ibiz-template/runtime 0.1.21 → 0.1.23-alpha.0

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

@@ -1,7 +1,7 @@
 import { IMDViewEvent } from './i-md-view.event';
 
 /**
- * 看板视图事件
+ * 看板kanban视图事件
  *
  * @author lxm
  * @date 2022-09-13 10:09:00

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

@@ -0,0 +1,35 @@
+import { IButtonContainerState } from '../../common';
+import { IDataViewControlState } from './i-data-view-control.state';
+
+/**
+ * 看板部件（kanban）部件状态
+ *
+ * @export
+ * @interface IDataViewControlState
+ * @extends {IMDControlState}
+ */
+export interface IKanbanState extends IDataViewControlState {
+  /**
+   * 可拖拽的
+   * @author lxm
+   * @date 2023-08-29 04:18:04
+   * @type {boolean}
+   */
+  draggable: boolean;
+
+  /**
+   * 是否正在更新
+   * @author lxm
+   * @date 2023-09-11 09:09:30
+   * @type {boolean}
+   */
+  updating: boolean;
+
+  /**
+   * 分组界面行为组状态
+   *
+   * @type {(IButtonContainerState)}
+   * @memberof PortletPartState
+   */
+  groupActionGroupState?: IButtonContainerState;
+}

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

@@ -106,4 +106,12 @@ export interface IMDControlGroupState {
    * @memberof IMDControlGroupState
    */
   caption: string;
+
+  /**
+   * 分组唯一标识（分组属性对应的值）
+   * @author lxm
+   * @date 2023-08-30 04:37:05
+   * @type {string}
+   */
+  key: string | number;
 }

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

@@ -32,3 +32,4 @@ export * from './i-dashboard.state';
 export * from './i-calendar.state';
 export * from './i-calendar-exp-bar.state';
 export * from './i-context-menu.state';
+export * from './i-kanban.state';

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

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

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

@@ -36,4 +36,5 @@ export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
 export * from './i-pickup-md-view.state';
+export * from './i-kanban-view.state';
 export * from './i-form-pickup-data-view.state';

package/src/logic-scheduler/trigger/timer-trigger.ts

@@ -12,7 +12,7 @@ import { LogicTrigger } from './logic-trigger';
 export class TimerTrigger extends LogicTrigger {
   declare type: 'TIMER';
 
-  protected timer: NodeJS.Timer | null = null;
+  protected timer: number | null = null;
 
   start(): void {
     this.timer = setInterval(() => {
@@ -21,7 +21,7 @@ export class TimerTrigger extends LogicTrigger {
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor!.execute(params);
-    }, this.logic.timer);
+    }, this.logic.timer) as unknown as number;
   }
 
   destroy(): void {

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

@@ -5,7 +5,6 @@ import {
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
 import { ModelError } from '@ibiz-template/core';
-import { notNilEmpty } from 'qx-util';
 import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
@@ -58,7 +57,7 @@ export class MethodDto {
           break;
         }
         case 'DTOS': {
-          if (notNilEmpty(data[key])) {
+          if (data[key] !== undefined) {
             break;
           }
           // 没有实体id的不处理

package/src/service/service/entity/method/method.ts

@@ -117,12 +117,14 @@ export abstract class Method {
         case 'GET':
           res = await this.app.net.get(`${path}/${methodName}`, data);
           break;
-        case 'PUT':
+        case 'PUT': {
           res = await this.app.net.put(
             `${path}/${methodName}`,
             notNilEmpty(data) ? data : params,
           );
+          const entity = this.createEntity(data);
           break;
+        }
         case 'DELETE':
           res = await this.app.net.delete(`${path}/${methodName}`, data);
           break;

package/src/service/service/work-flow/work-flow.service.ts

@@ -278,6 +278,32 @@ export class WorkFlowService implements IWorkFlowService {
     );
   }
 
+  /**
+   * 后加签
+   *
+   * @author lxm
+   * @date 2022-09-30 17:09:51
+   * @param {IParams} context 路径参数
+   * @param {IParams} params 请求参数
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   */
+  async wfAddStepAfter(
+    context: IParams,
+    params: IParams,
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
+    return ibiz.net.post(
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/tasks/${params.taskId}/aftersign`,
+      {
+        ...params,
+        activedata: this.getActiveData(data, context),
+      },
+    );
+  }
+
   /**
    * 回退
    *
@@ -356,6 +382,8 @@ export class WorkFlowService implements IWorkFlowService {
         return this.wfReassign(context, params, data);
       case 'addstepbefore':
         return this.wfAddStepBefore(context, params, data);
+      case 'addstepafter':
+        return this.wfAddStepAfter(context, params, data);
       case 'sendback':
         return this.wfSendBack(context, params, data);
       case 'sendcopy':

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

@@ -1,3 +1,4 @@
+import { DataTypes } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 import { UIMapField } from './ui-map-field';
@@ -141,7 +142,10 @@ export class ControlVO {
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;
       // 关联映射属性
-      this.linkProperty(key, value, mapField.isOriginField);
+      const forceNumber =
+        mapField.dataType !== undefined &&
+        DataTypes.isNumber(mapField.dataType);
+      this.linkProperty(key, value, mapField.isOriginField, forceNumber);
     });
 
     // 映射属性里没有涉及到的建立直接关联，用于使用实体属性也要取到值的场景。
@@ -162,15 +166,17 @@ export class ControlVO {
    * @param {string} uiKey 界面字段
    * @param {string} dataKey 数据字段
    * @param {boolean} [isOriginField=true] 是否是后台存储字段，是的话存取都在$origin里
+   * @param {boolean} [forceNumber=false] 是否强制转换成数值，是的话set的时候转成数值
    * @returns {*}
    */
   private linkProperty(
     uiKey: string,
     dataKey: string,
     isOriginField: boolean = true,
+    forceNumber: boolean = false,
   ): void {
     // srfuf和srfkey不做处理
-    if (uiKey === 'srfuf' || uiKey === 'srfkey') {
+    if (uiKey === 'srfuf') {
       return;
     }
 
@@ -183,10 +189,19 @@ export class ControlVO {
         enumerable: true,
         configurable: true,
         get() {
-          return this.$origin[dataKey];
+          // srfkey 视图id优先，拿不到实体属性则拿界面属性(前端id)
+          return uiKey === 'srfkey'
+            ? this.$origin[dataKey] || this.$origin[uiKey]
+            : this.$origin[dataKey];
         },
         set(val) {
-          this.$origin[dataKey] = val;
+          // 非空且强制转数值时，转换值的类型
+          let val2 = forceNumber && !isNil(val) ? Number(val) : val;
+          if (Number.isNaN(val2)) {
+            val2 = val; // NaN时还原值
+            ibiz.log.error(`${val}不能转换成数字`);
+          }
+          this.$origin[dataKey] = val2;
         },
       });
     } else {

package/src/service/vo/ui-map-field.ts

@@ -27,6 +27,14 @@ export class UIMapField {
    */
   dataKey: string;
 
+  /**
+   * 数据类型
+   * @author lxm
+   * @date 2023-09-11 07:30:31
+   * @type {number}
+   */
+  dataType?: number;
+
   /**
    * 是否存储到origin里面(默认false)
    *
@@ -50,6 +58,7 @@ export class UIMapField {
     dataKey: string,
     opts: {
       isOriginField?: boolean;
+      dataType?: number;
     } = {},
   ) {
     this.uiKey = uiKey;
@@ -57,5 +66,8 @@ export class UIMapField {
     if (!isNil(opts.isOriginField)) {
       this.isOriginField = opts.isOriginField;
     }
+    if (!isNil(opts.dataType)) {
+      this.dataType = opts.dataType;
+    }
   }
 }

package/src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts

@@ -33,7 +33,7 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
   readonly dstParam: string;
 
   get dstField(): string {
-    return this.model.dstFieldName!.toLowerCase();
+    return this.model.dstFieldName!;
   }
 
   get op(): string {

package/src/ui-logic/ui-logic-node/append-param-node/append-param-node.ts

@@ -0,0 +1,44 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IDEUIAppendParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 附加到数组参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class AppendParamNode
+ * @extends {DELogicNode}
+ */
+export class AppendParamNode extends UILogicNode {
+  declare model: IDEUIAppendParamLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const {
+      dstDEUILogicParamId,
+      srcDEUILogicParamId,
+      dstIndex,
+      srcIndex,
+      srcSize,
+    } = this.model;
+    if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+      throw new RuntimeModelError(
+        this.model,
+        '缺少目标参数对象或者源参数对象配置',
+      );
+    }
+    const srcVal = handleSrcVal(ctx, this.model) as IData[];
+    const insertIndex = dstIndex || 0;
+    const _srcIndex = srcIndex || 0;
+    const _srcSize = srcSize || srcVal.length;
+
+    ctx.params[dstDEUILogicParamId].splice(
+      insertIndex,
+      0,
+      ...srcVal.slice(_srcIndex, _srcSize),
+    );
+  }
+}

package/src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts

@@ -0,0 +1,31 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IDEUICopyParamLogic } from '@ibiz/model-core';
+import { clone } from 'ramda';
+import { UILogicContext } from '../../ui-logic-context';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 拷贝参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class CopyParamNode
+ * @extends {UILogicNode}
+ */
+export class CopyParamNode extends UILogicNode {
+  declare model: IDEUICopyParamLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
+    if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+      throw new RuntimeModelError(
+        this.model,
+        '缺少目标参数对象或者源参数对象配置',
+      );
+    }
+    const srcVal = handleSrcVal(ctx, this.model);
+    ctx.params[dstDEUILogicParamId] = clone(srcVal);
+  }
+}

package/src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts

@@ -0,0 +1,37 @@
+import { IDEUIDEDataSetLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 数据集合节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:00
+ * @export
+ * @class DataSetNode
+ * @extends {UILogicNode}
+ */
+export class DataSetNode extends UILogicNode {
+  declare model: IDEUIDEDataSetLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const {
+      dstAppDEDataSetId,
+      dstAppDataEntityId,
+      dstDEUILogicParamId,
+      retDEUILogicParamId,
+    } = this.model;
+    const requestData = ctx.params[dstDEUILogicParamId!];
+    const app = ibiz.hub.getApp(ctx.context.srfappid);
+    const res = await app.deService.exec(
+      dstAppDataEntityId!,
+      dstAppDEDataSetId!,
+      ctx.context,
+      requestData,
+      ctx.viewParams,
+    );
+    if (res.ok) {
+      ctx.params[retDEUILogicParamId!] = res.data;
+    }
+  }
+}

package/src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts

@@ -0,0 +1,57 @@
+import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { IDEUIDELogicLogic } from '@ibiz/model-core';
+import { execDELogicById } from '../../../de-logic';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 执行实体逻辑节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:00
+ * @export
+ * @class ThrowExceptionNode
+ * @extends {UILogicNode}
+ */
+export class ExecuteDELogicNode extends UILogicNode {
+  declare model: IDEUIDELogicLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const {
+      dstAppDELogicId,
+      dstAppDataEntityId,
+      dstDEUILogicParamId,
+      retDEUILogicParamId,
+    } = this.model;
+
+    // 配置报错
+    if (!dstAppDataEntityId) {
+      throw new RuntimeModelError(this.model, '没有配置实体');
+    }
+    if (!dstAppDELogicId) {
+      throw new RuntimeModelError(this.model, '没有配置实体逻辑');
+    }
+    if (!dstDEUILogicParamId) {
+      throw new RuntimeModelError(this.model, '没有配置传入逻辑参数');
+    }
+
+    const dstParam = ctx.params[dstDEUILogicParamId];
+    if (!dstParam) {
+      throw new RuntimeError(`没有找到传入参数${dstDEUILogicParamId}`);
+    }
+
+    // todo 需要传入参数格式约束
+    const result = await execDELogicById(
+      dstAppDELogicId,
+      dstAppDataEntityId,
+      dstParam.context,
+      dstParam.data,
+      dstParam.params,
+    );
+
+    // 如果有返回值参数返回值填入。
+    if (retDEUILogicParamId) {
+      ctx.params[retDEUILogicParamId] = result;
+    }
+  }
+}

package/src/ui-logic/ui-logic-node/index.ts

@@ -8,3 +8,12 @@ export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-nod
 export { BindParamNode } from './bind-param-node/bind-param-node';
 export { MsgBoxNode } from './msg-box-node/msg-box-node';
 export { DebugParamNode } from './debug-param-node/debug-param-node';
+export { ResetParamNode } from './reset-param-node/reset-param-node';
+export { CopyParamNode } from './copy-param-node/copy-param-node';
+export { AppendParamNode } from './append-param-node/append-param-node';
+export { SortParamNode } from './sort-param-node/sort-param-node';
+export { RenewParamNode } from './renew-param-node/renew-param-node';
+export { DataSetNode } from './data-set-node/data-set-node';
+export { ThrowExceptionNode } from './throw-exception-node/throw-exception-node';
+export { ViewCtrlFireEventNode } from './view-ctrl-fire-event-node/view-ctrl-fire-event-node';
+export { ExecuteDELogicNode } from './execute-de-logic-node/execute-de-logic-node';

package/src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts

@@ -1,5 +1,7 @@
+/* eslint-disable no-await-in-loop */
 import { ModelError } from '@ibiz-template/core';
 import { IDEUILogicNodeParam } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { UILogicContext } from '../../ui-logic-context';
 import { handleSrcVal } from '../../utils';
 import { UILogicNode } from '../ui-logic-node';
@@ -16,21 +18,45 @@ import { UILogicNode } from '../ui-logic-node';
 export class PrepareJSParamNode extends UILogicNode {
   async exec(ctx: UILogicContext): Promise<void> {
     const nodeParams = this.model.deuilogicNodeParams;
-    if (nodeParams?.length) {
-      await Promise.all(
-        nodeParams.map(nodeParam => {
-          switch (nodeParam.paramAction) {
-            // 设置变量
-            case 'SETPARAMVALUE':
-              return this.setParamValue(nodeParam, ctx);
-            default:
-              throw new ModelError(
-                nodeParam,
-                `暂未支持逻辑处理参数操作${nodeParam.paramAction}`,
-              );
-          }
-        }),
-      );
+    if (!nodeParams?.length) {
+      return;
+    }
+    for (const nodeParam of nodeParams) {
+      switch (nodeParam.paramAction) {
+        // 设置变量
+        case 'SETPARAMVALUE':
+          await this.setParamValue(nodeParam, ctx);
+          break;
+        // 重置变量
+        case 'RESETPARAM':
+          await this.resetParam(nodeParam, ctx);
+          break;
+        // 拷贝变量
+        case 'COPYPARAM':
+          await this.copyParam(nodeParam, ctx);
+          break;
+        // 绑定参数
+        case 'BINDPARAM':
+          await this.bindParam(nodeParam, ctx);
+          break;
+        // 重新建立变量
+        case 'RENEWPARAM':
+          await this.renewParam(nodeParam, ctx);
+          break;
+        // 附加到数组变量
+        case 'APPENDPARAM':
+          await this.appendParam(nodeParam, ctx);
+          break;
+        // 排序数组变量
+        case 'SORTPARAM':
+          await this.sortParam(nodeParam, ctx);
+          break;
+        default:
+          throw new ModelError(
+            nodeParam,
+            `暂未支持逻辑处理参数操作${nodeParam.paramAction}`,
+          );
+      }
     }
   }
 
@@ -40,7 +66,7 @@ export class PrepareJSParamNode extends UILogicNode {
    * @date 2023-03-17 03:34:02
    * @protected
    * @param {IPSDELogicNodeParam} nodeParam
-   * @param {DELogicContext} ctx
+   * @param {UILogicContext} ctx
    */
   protected setParamValue(
     nodeParam: IDEUILogicNodeParam,
@@ -48,7 +74,7 @@ export class PrepareJSParamNode extends UILogicNode {
   ): void {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
     // 目标参数
-    const dstField = dstFieldName?.toLowerCase();
+    const dstField = dstFieldName;
     // 源参数
     const srcVal = handleSrcVal(ctx, nodeParam);
     if (dstField) {
@@ -57,4 +83,114 @@ export class PrepareJSParamNode extends UILogicNode {
       ctx.params[dstDEUILogicParamId!] = srcVal;
     }
   }
+
+  /**
+   * 拷贝变量
+   * @author lxm
+   * @date 2023-03-24 09:50:02
+   * @protected
+   * @param {IDEUILogicNodeParam} nodeParam
+   * @param {UILogicContext} ctx
+   * @return {*}  {*}
+   */
+  protected copyParam(
+    nodeParam: IDEUILogicNodeParam,
+    ctx: UILogicContext,
+  ): void {
+    const { dstDEUILogicParamId } = nodeParam;
+    const srcVal = handleSrcVal(ctx, nodeParam);
+    ctx.params[dstDEUILogicParamId!] = clone(srcVal);
+  }
+
+  /**
+   * 绑定参数
+   * @author lxm
+   * @date 2023-06-13 05:43:43
+   * @protected
+   * @param {IDEUILogicNodeParam} nodeParam
+   * @param {UILogicContext} ctx
+   */
+  protected bindParam(
+    nodeParam: IDEUILogicNodeParam,
+    ctx: UILogicContext,
+  ): void {
+    const srcVal = handleSrcVal(ctx, nodeParam);
+    ctx.params[nodeParam.dstDEUILogicParamId!] = srcVal;
+  }
+
+  /**
+   * 重置变量
+   * @author lxm
+   * @date 2023-03-24 09:46:57
+   * @protected
+   * @param {IDEUILogicNodeParam} nodeParam
+   * @param {UILogicContext} ctx
+   */
+  protected resetParam(
+    nodeParam: IDEUILogicNodeParam,
+    ctx: UILogicContext,
+  ): void {
+    const { dstDEUILogicParamId } = nodeParam;
+    ctx.resetParam(dstDEUILogicParamId!);
+  }
+
+  /**
+   * 重新建立变量
+   * @author lxm
+   * @date 2023-03-24 09:46:47
+   * @protected
+   * @param {IDEUILogicNodeParam} nodeParam
+   * @param {UILogicContext} ctx
+   */
+  protected renewParam(
+    nodeParam: IDEUILogicNodeParam,
+    ctx: UILogicContext,
+  ): void {
+    const { dstDEUILogicParamId } = nodeParam;
+    ctx.renewParam(dstDEUILogicParamId!);
+  }
+
+  /**
+   * 附加到数组变量
+   * @author lxm
+   * @date 2023-03-24 09:46:47
+   * @protected
+   * @param {IDEUILogicNodeParam} nodeParam
+   * @param {UILogicContext} ctx
+   */
+  protected appendParam(
+    nodeParam: IDEUILogicNodeParam,
+    ctx: UILogicContext,
+  ): void {
+    const { dstDEUILogicParamId, dstIndex, srcIndex, srcSize } = nodeParam;
+    const srcVal = handleSrcVal(ctx, nodeParam) as IData[];
+    const insertIndex = dstIndex || 0;
+    const _srcIndex = srcIndex || 0;
+    const _srcSize = srcSize || srcVal.length;
+    ctx.params[dstDEUILogicParamId!].splice(
+      insertIndex,
+      0,
+      ...srcVal.slice(_srcIndex, _srcSize),
+    );
+  }
+
+  /**
+   * 排序数组变量
+   * @author lxm
+   * @date 2023-03-24 10:23:01
+   * @protected
+   * @param {IDEUILogicNodeParam} nodeParam
+   * @param {UILogicContext} ctx
+   */
+  protected sortParam(
+    nodeParam: IDEUILogicNodeParam,
+    ctx: UILogicContext,
+  ): void {
+    const { dstDEUILogicParamId, dstFieldName, dstSortDir } = nodeParam;
+    const key = dstFieldName!;
+    const arr = ctx.params[dstDEUILogicParamId!] as IData[];
+    arr.sort((a, b) => {
+      return dstSortDir === 'ASC' ? a[key] - b[key] : b[key] - a[key];
+    });
+  }
 }