@ibiz-template/runtime 0.0.1-beta.1 → 0.0.1-beta.17

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

@@ -0,0 +1,65 @@
+import { isNil } from 'ramda';
+
+/**
+ * 界面映射字段信息
+ *
+ * @author lxm
+ * @date 2022-10-18 14:10:24
+ * @export
+ * @class UIMapField
+ */
+export class UIMapField {
+  /**
+   * 界面字段名
+   *
+   * @author lxm
+   * @date 2022-10-18 14:10:32
+   * @type {string}
+   */
+  uiKey: string;
+
+  /**
+   * 映射数据字段名
+   *
+   * @author lxm
+   * @date 2022-10-18 14:10:34
+   * @type {string}
+   */
+  dataKey: string;
+
+  /**
+   * 是否存储到origin里面(默认false)
+   *
+   * @author lxm
+   * @date 2022-10-18 14:10:24
+   * @type {boolean}
+   */
+  isOriginField: boolean = false;
+
+  /**
+   * 是否是请求需要的字段(默认true)
+   *
+   * @author lxm
+   * @date 2022-10-18 14:10:44
+   * @type {boolean}
+   */
+  isRequestNeed: boolean = true;
+
+  constructor(
+    uiKey: string,
+    dataKey: string,
+    opts: {
+      isOriginField?: boolean;
+      isRequestNeed?: boolean;
+    } = {},
+  ) {
+    this.uiKey = uiKey;
+    this.dataKey = dataKey;
+    if (!isNil(opts.isOriginField)) {
+      this.isOriginField = opts.isOriginField;
+    }
+    if (!isNil(opts.isRequestNeed)) {
+      this.isRequestNeed = opts.isRequestNeed;
+    }
+  }
+}

package/src/types.ts

@@ -1,5 +1,3 @@
-import { CommandController } from '@ibiz-template/command';
-import '@ibiz-template/service';
 import {
   IMessageUtil,
   INotificationUtil,
@@ -8,19 +6,18 @@ import {
   ILoadingUtil,
   IPluginFactory,
   IOverlayController,
+  IGlobalConfig,
 } from './interface';
 import { RegisterCenter } from './register/register-center';
+import {
+  AuthorityService,
+  AuthService,
+  CodeListService,
+  ServiceUtil,
+} from './service';
 
 declare module '@ibiz-template/core' {
   interface IBizSys {
-    /**
-     * 认证服务
-     *
-     * @author chitanda
-     * @date 2022-07-20 10:07:33
-     * @type {AuthService}
-     */
-    commands: CommandController;
     /**
      * 全局加载动画工具
      *
@@ -81,6 +78,7 @@ declare module '@ibiz-template/core' {
      * @type {IPluginFactory}
      */
     plugin: IPluginFactory;
+
     /**
      * 注册中心
      *
@@ -89,5 +87,50 @@ declare module '@ibiz-template/core' {
      * @type {Register}
      */
     register: RegisterCenter;
+
+    /**
+     * 全局配置
+     *
+     * @author lxm
+     * @date 2022-12-09 14:12:14
+     * @type {IGlobalConfig}
+     */
+    config: IGlobalConfig;
+
+    /**
+     * 认证服务
+     *
+     * @author chitanda
+     * @date 2022-07-20 10:07:33
+     * @type {AuthService}
+     */
+    auth: AuthService;
+
+    /**
+     * 权限服务
+     *
+     * @author lxm
+     * @date 2022-10-12 17:10:56
+     * @type {AuthorityService}
+     */
+    authority: AuthorityService;
+
+    /**
+     * 代码表服务
+     *
+     * @author chitanda
+     * @date 2022-08-25 15:08:47
+     * @type {CodeListService}
+     */
+    codeListService: CodeListService;
+
+    /**
+     * 实体服务工具类
+     *
+     * @author chitanda
+     * @date 2022-08-18 14:08:59
+     * @type {ServiceUtil}
+     */
+    entityService: ServiceUtil;
   }
 }

package/src/utils/app-de-ui-action-util/handler/index.ts

@@ -2,3 +2,4 @@ export * from './ui-action-handler';
 export * from './common-sys-ui-action-handler';
 export * from './backend-ui-action-handler';
 export * from './front-ui-action-handler';
+export * from './wf-withdraw-handler';

package/src/utils/app-de-ui-action-util/handler/ui-action-handler.ts

@@ -177,13 +177,14 @@ export abstract class UIActionHandler implements IUIActionHandler {
     const navContexts = action.getPSNavigateContexts() || [];
 
     // 单项数据主键时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
+    // 数据项名称替换主键的取值属性，参数项名称替换处理后主键在上下文的名称
     const appDataEntity = action.getPSAppDataEntity();
+    const { valueItem, paramItem } = action;
     if (appDataEntity && action.actionTarget === 'SINGLEKEY') {
       await appDataEntity?.fill(true);
       const appDeName = appDataEntity.codeName.toLowerCase();
-      const { valueItem } = action;
       navContexts.unshift({
-        key: appDeName,
+        key: paramItem || appDeName,
         value: valueItem || 'srfkey',
         rawValue: false,
       } as IPSNavigateContext);

package/src/utils/app-de-ui-action-util/handler/wf-withdraw-handler.ts

@@ -0,0 +1,37 @@
+import { IBizContext } from '@ibiz-template/core';
+import { IPSAppDEUIAction } from '@ibiz-template/model';
+import { IUIActionResult } from '../../../interface';
+import { UIActionHandler } from './ui-action-handler';
+
+/**
+ * 工作流流程撤回界面行为处理器
+ *
+ * @author lxm
+ * @date 2022-10-25 15:10:20
+ * @export
+ * @class WFWithdrawUIActionHandler
+ * @extends {UIActionHandler}
+ */
+export class WFWithdrawUIActionHandler extends UIActionHandler {
+  async execAction(
+    action: IPSAppDEUIAction,
+    context: IBizContext,
+    data: IData[] | null,
+    params: IParams,
+    opts?: IData | undefined,
+  ): Promise<IUIActionResult> {
+    const isWithdraw = await ibiz.modal.confirm({
+      title: '提示',
+      desc: '是否确认执行撤回操作？',
+    });
+    let isCloseView = false;
+    if (isWithdraw && opts?.neuron) {
+      await opts!.neuron.call.wfWithdraw(context, params, data?.[0] || []);
+      isCloseView = true;
+    }
+    return {
+      refresh: false,
+      closeView: isCloseView,
+    };
+  }
+}

package/src/utils/nav-params/nav-params.ts

@@ -60,10 +60,10 @@ export function convertNavDataByArray(
         );
       });
       if (findOrigin) {
-        result[naviData.key] = findOrigin[naviData.value];
+        result[naviData.key.toLowerCase()] = findOrigin[naviData.value];
       }
     } else {
-      result[naviData.key] = naviData.value;
+      result[naviData.key.toLowerCase()] = naviData.value;
     }
   }
   return result;
@@ -95,10 +95,10 @@ export function convertNavDataByObject(naviData: IData, ...origins: IData[]) {
         return Object.prototype.hasOwnProperty.call(item, valueKey);
       });
       if (findOrigin) {
-        result[key] = findOrigin[valueKey];
+        result[key.toLowerCase()] = findOrigin[valueKey];
       }
     } else {
-      result[key] = naviData[key];
+      result[key.toLowerCase()] = naviData[key];
     }
   }
   return result;