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

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

@@ -1,12 +1,14 @@
-import { IBizContext } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import {
   DefectModelError,
   IPSAppDataEntity,
   IPSAppDERedirectView,
   IPSAppRedirectView,
+  IPSModelService,
   UnsupportedModelError,
 } from '@ibiz-template/model';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
+import qs from 'qs';
 import { OpenAppViewCommand } from '../../command';
 import { IModalData } from '../../interface';
 import { convertNavData } from '../nav-params/nav-params';
@@ -18,14 +20,14 @@ import { convertNavData } from '../nav-params/nav-params';
  * @date 2022-09-28 16:09:13
  * @export
  * @param {IPSAppRedirectView} appView 应用重定向视图
- * @param {IBizContext} [context=new IBizContext()]
+ * @param {IContext}
  * @param {IParams} [params={}]
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
 export async function openRedirectView(
   appView: IPSAppRedirectView,
-  context: IBizContext = new IBizContext(),
+  context: IContext,
   params: IParams = {},
   data: IData[] = [],
 ): Promise<IModalData> {
@@ -43,6 +45,91 @@ export async function openRedirectView(
   );
 }
 
+/**
+ * 本地打开工作流重定向视图
+ *
+ * @description 工作流 appredirectview 特殊处理，全局通过 appredirectview 跳转工作流重定向，均使用此方法
+ * @author chitanda
+ * @date 2023-01-12 11:01:40
+ * @export
+ * @param {IPSAppDERedirectView} appView
+ * @param {IContext} context
+ * @param {string} linkUrl
+ */
+export async function toLocalOpenWFRedirectView(
+  modelService: IPSModelService,
+  context: IContext,
+  linkUrl: string,
+) {
+  const i = linkUrl.lastIndexOf('?');
+
+  const queryStr: string = decodeURIComponent(
+    linkUrl.substring(i + 1, linkUrl.length),
+  );
+
+  const params = qs.parse(queryStr, { delimiter: ';' }) as IData;
+
+  const deName: string = params.srfdename || '';
+
+  if (!deName) {
+    throw new RuntimeError('重定向参数缺少实体名称');
+  }
+
+  const upperDeName = deName.toUpperCase();
+
+  const { app } = modelService;
+
+  const entity = app.getAllPSAppDataEntities()!.find(item => {
+    return (item.name || item.refM.name) === upperDeName;
+  });
+
+  if (!entity) {
+    throw new RuntimeError(`未找到指定实体: ${deName}`);
+  }
+
+  const deCodeName: string = entity.codeName || entity.refM.codeName;
+
+  params[deCodeName.toLowerCase()] = params[deName.toLowerCase()];
+
+  const deRdView = app.getAllPSAppViews()?.find(view => {
+    const { refM } = view;
+    if (refM.resource === deCodeName && refM.view === 'RedirectView') {
+      return view;
+    }
+    return null;
+  });
+
+  if (!deRdView) {
+    throw new Error(`未找到实体[${deName}]默认重定向视图[RedirectView]`);
+  }
+
+  // 删除跳转用参数
+  delete params.srfdename;
+
+  // 转换 processDefinitionKey 中的工作流流程以及版本到参数中
+  if (params.srfwf !== 'undo') {
+    const tags = params.processDefinitionKey.split('-');
+    const wfTag = tags[3] as string;
+    const wf = wfTag.substring(0, wfTag.lastIndexOf('v'));
+    const wfVersion = wfTag.substring(wfTag.lastIndexOf('v'));
+    params.wf = wf;
+    params.wfVersion = wfVersion;
+  }
+
+  // 工作流附加参数转到上下文里
+  if (params.srfprocessinstanceid) {
+    context.srfprocessinstanceid = params.srfprocessinstanceid;
+    delete params.srfprocessinstanceid;
+  }
+
+  await ibiz.commands.execute(
+    OpenAppViewCommand.TAG,
+    deRdView,
+    context,
+    params,
+  );
+}
+
 /**
  * 打开实体重定向视图
  *
@@ -50,21 +137,21 @@ export async function openRedirectView(
  * @date 2022-09-28 16:09:15
  * @export
  * @param {IPSAppDERedirectView} appView
- * @param {IBizContext} [context=new IBizContext()]
+ * @param {IContext}
  * @param {IParams} [params={}]
  * @param {IData[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
 export async function openDERedirectView(
   appView: IPSAppDERedirectView,
-  context: IBizContext = new IBizContext(),
+  context: IContext,
   params: IParams = {},
   data: IData[] = [],
 ): Promise<IModalData> {
   // 计算重定向视图上下文参数转换
   const navContext = appView.getPSAppViewNavContexts() || [];
   const navContextData = convertNavData(navContext, context, params);
-  context = new IBizContext(navContextData, context);
+  context = Object.assign(context.clone(), navContextData);
   // 计算重定向视图视图参数转换
   const navParams = appView.getPSAppViewNavParams() || [];
   const navParamsData = convertNavData(navParams, context, params);
@@ -89,26 +176,58 @@ export async function openDERedirectView(
   ibiz.loading.hideRedirect();
   if (res.ok) {
     curData = res.data;
-    const linkUrl: string = curData.linkurl;
+    let linkUrl: string = curData.linkurl;
     if (linkUrl) {
+      // 工作流param09转的srfprocessinstanceid传递
+      if (context.srfprocessinstanceid) {
+        linkUrl += `;srfprocessinstanceid=${context.srfprocessinstanceid}`;
+      }
       if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
-        window.open(linkUrl, '_blank');
+        return new Promise(resolve => {
+          const newWindow = window.open(linkUrl, '_blank');
+          if (newWindow) {
+            (newWindow as IData).callback = () => {
+              resolve({ ok: true, data: [] });
+            };
+          }
+        });
+      }
+      if (linkUrl.startsWith('appredirectview?')) {
+        await toLocalOpenWFRedirectView(
+          appView.getPSModelService(),
+          context,
+          linkUrl,
+        );
         return { ok: true, data: [] };
       }
       return { ok: false, data: [] };
     }
   }
-  const rdTag = await calcDERdTag(entity, appView, params.srfwf, curData);
+  const rdTag = await calcDERdTag(entity, appView, params, curData);
+  // !!!工作流临时补充特殊处理标识, 避免补充了工作流流程匹配不上, 再从默认tag匹配!!!
+  const rdTagItems = rdTag.split(':');
+  const wfRdTag =
+    rdTagItems.length === 2 ? rdTag : rdTagItems.slice(0, 2).join(':');
   // 拼接当前重定向视图所在应用实体名称为前缀
   const deRdTag = `${entity.name.toUpperCase()}:${rdTag}`;
   // 所有重定向引用视图
   const allRefViews = appView.getRedirectPSAppViewRefs();
-  const refView = allRefViews?.find(view => {
+  let refView = allRefViews?.find(view => {
     return view.name === deRdTag || view.name === rdTag;
   });
+  if (!refView) {
+    // 特殊补充匹配，子流程应用特殊模式在没有配置具体流程的视图时，匹配不包含流程标识的
+    refView = allRefViews?.find(view => {
+      return view.name === wfRdTag;
+    });
+  }
   if (refView) {
     const view = refView.getRefPSAppView();
     if (view) {
+      // 工作流param09转的srfprocessinstanceid传递
+      if (context.srfprocessinstanceid) {
+        params.srfprocessinstanceid = context.srfprocessinstanceid;
+      }
       const result = await ibiz.commands.execute(
         OpenAppViewCommand.TAG,
         view,
@@ -122,6 +241,11 @@ export async function openDERedirectView(
     } else {
       throw new DefectModelError(refView, `未配置实际引用视图`);
     }
+  } else {
+    throw new DefectModelError(
+      appView,
+      `未找到重定向标识[${rdTag}]或[${deRdTag}]对应视图`,
+    );
   }
   return { ok: true, data: [] };
 }
@@ -134,14 +258,14 @@ export async function openDERedirectView(
  * @export
  * @param {IPSAppDataEntity} entity 重定向视图所在应用实体
  * @param {IPSAppDERedirectView} rdView 重定向视图
- * @param {string} wfStep 流程步骤
+ * @param {string} srfWf
  * @param {IData} data 当前数据
  * @return {*}  {Promise<string>}
  */
 export async function calcDERdTag(
   entity: IPSAppDataEntity,
   rdView: IPSAppDERedirectView,
-  wfStep: string,
+  params: IParams,
   data: IData,
 ): Promise<string> {
   let rdTag = '';
@@ -155,8 +279,12 @@ export async function calcDERdTag(
     }
   }
   // 如果流程步骤存在，按照工作流优先
-  if (notNilEmpty(wfStep)) {
-    return `EDITVIEW:${wfStep.toUpperCase()}`;
+  const srfWf = params.srfwf;
+  if (notNilEmpty(srfWf)) {
+    if (notNilEmpty(params.wf)) {
+      return `EDITVIEW:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
+    }
+    return `EDITVIEW:${srfWf.toUpperCase()}`;
   }
   let typeValue = '';
   // 从索引属性获取重定向视图类型

package/src/utils/text-util/text-util.ts

@@ -0,0 +1,22 @@
+/**
+ * 文本工具类
+ *
+ * @author zhanghengfeng
+ * @date 2023-08-24 14:08:27
+ * @export
+ * @class TextUtil
+ */
+export class TextUtil {
+  /**
+   * 值格式化
+   *
+   * @author zhanghengfeng
+   * @date 2023-08-24 14:08:27
+   * @param {string} value
+   * @param {string} _code
+   * @return {*}  {string}
+   */
+  format(value: string, _code: string): string {
+    return value;
+  }
+}

package/src/utils/wf-helper/wf-helper.ts

@@ -0,0 +1,14 @@
+/**
+ * 预置工作流相关数据处理并生成需要的上下文参数
+ *
+ * @export
+ * @param {IData} data
+ * @returns {*}
+ */
+export function getWFContext(data: IData) {
+  const tempContext: IData = {};
+  if (data.param09) {
+    tempContext.srfprocessinstanceid = data.param09;
+  }
+  return tempContext;
+}

package/src/view-logic/view-logic.ts

@@ -1,16 +1,18 @@
-import { IBizContext } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import {
   AppEntityModel,
+  DefectModelError,
   getPSUIActionByModelObject,
   IPSAppDEUIAction,
+  IPSAppUILogicRefView,
   IPSAppUINewDataLogic,
   IPSAppUIOpenDataLogic,
   IPSAppViewLogic,
   IPSNavigateParam,
 } from '@ibiz-template/model';
+import { RuntimeError } from '@ibiz-template/core';
 import { OpenAppViewCommand } from '../command';
-import { IUIActionResult } from '../interface';
+import { IModalData, IUIActionResult } from '../interface';
 import { AppDEUIActionUtil, convertNavData } from '../utils';
 
 /**
@@ -20,14 +22,14 @@ import { AppDEUIActionUtil, convertNavData } from '../utils';
  * @date 2022-08-22 09:08:40
  * @export
  * @param {IPSAppViewLogic} viewLogic 视图逻辑模型对象
- * @param {IBizContext} context 上下文参数
+ * @param {IContext} context 上下文参数
  * @param {IParams} params 视图参数
  * @param {(IData | null)} data 数据集合
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeViewLogic(
   viewLogic: IPSAppViewLogic,
-  context: IBizContext,
+  context: IContext,
   data: IData[] | null,
   params: IParams,
   opts: IData = {},
@@ -70,14 +72,14 @@ export async function executeViewLogic(
  * @date 2022-08-22 14:08:03
  * @export
  * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
- * @param {IBizContext} context 上下文参数
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeOpenDataAppUILogic(
   appUILogic: IPSAppUIOpenDataLogic,
-  context: IBizContext,
+  context: IContext,
   data: IData[] | null,
   params: IParams,
   opts: IData = {},
@@ -107,9 +109,10 @@ export async function executeOpenDataAppUILogic(
       rawValue: false,
     } as IPSNavigateParam);
   }
-  const tempContext = new IBizContext(
+  const newContext = context.clone();
+  const tempContext = Object.assign(
+    newContext,
     convertNavData(navContexts!, context, params, data[0]),
-    context,
   );
 
   // 处理导航视图参数
@@ -142,63 +145,140 @@ export async function executeOpenDataAppUILogic(
  * @date 2022-08-22 14:08:03
  * @export
  * @param {IPSAppUINewDataLogic} appUILogic 应用预置界面逻辑newdata模型对象
- * @param {IBizContext} context 上下文参数
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeNewDataAppUILogic(
   appUILogic: IPSAppUINewDataLogic,
-  context: IBizContext,
+  context: IContext,
   data: IData[] | null,
   params: IParams,
   opts: IData = {},
 ): Promise<IUIActionResult> {
+  const { enableWizardAdd, enableBatchAdd, batchAddOnly } = appUILogic;
+  let openViewRef: IPSAppUILogicRefView | null | undefined = null;
+  let doBatchAdd = false;
   // 准备需要的模型
-  const newViewRef = appUILogic.getNewDataPSAppView();
-  if (!newViewRef) throw new Error('getNewDataPSAppView为空');
-  const newView = newViewRef.getRefPSAppView();
-  if (!newView) throw new Error('newView为空');
-  await newView.fill(true);
-  const appDataEntity = new AppEntityModel(newView.getPSAppDataEntity()!);
+  // todo 拷贝
+  if (enableWizardAdd) {
+    // todo 向导添加
+  } else if (enableBatchAdd) {
+    // 批添加
+    const batchViews = appUILogic.getBatchAddPSAppViews();
+    openViewRef = batchViews?.find(view => {
+      const openDeName = view.refMode.toLowerCase();
+      return openDeName !== context.srfparentdename;
+    });
+    doBatchAdd = true;
+  } else if (batchAddOnly) {
+    // todo 只支持批添加
+  } else {
+    // 普通新建视图打开
+    openViewRef = appUILogic.getNewDataPSAppView();
+  }
+
+  const openView = openViewRef?.getRefPSAppView();
+  if (!openViewRef || !openView) throw new RuntimeError('找不到新建视图');
+  await openView.fill(true);
+  const appDataEntity = new AppEntityModel(openView.getPSAppDataEntity()!);
   await appDataEntity.init();
 
   // 处理导航参数
   let tempContext: IData = {};
   let tempParams: IData = {};
   const _data = data?.[0] || {};
-  const navContexts = newViewRef.getPSNavigateContexts();
+  const navContexts = openViewRef.getPSNavigateContexts();
   if (notNilEmpty(navContexts)) {
     tempContext = convertNavData(navContexts!, context, params, _data);
   }
-  tempContext = new IBizContext(tempContext, context);
+  tempContext = Object.assign(context.clone(), tempContext);
   // 删除上下文内的主键
-  delete tempContext[appDataEntity.deName.toLowerCase()];
   tempContext[appDataEntity.deName.toLowerCase()] = undefined;
 
-  const navParams = newViewRef.getPSNavigateParams();
+  const navParams = openViewRef.getPSNavigateParams();
   if (notNilEmpty(navParams)) {
     tempParams = convertNavData(navParams!, params, context, _data);
   }
 
-  // todo 拷贝
-  if (appUILogic.enableWizardAdd) {
-    // todo 向导添加
-  } else if (appUILogic.enableBatchAdd) {
-    // todo 批添加
-  } else if (appUILogic.batchAddOnly) {
-    // todo 只支持批添加
-  }
-
   // 打开视图
-  await ibiz.commands.execute(
+  const result: IModalData | undefined = await ibiz.commands.execute(
     OpenAppViewCommand.TAG,
-    newView,
+    openView,
     tempContext,
     tempParams,
     opts,
   );
 
+  // 批添加新建选中数据后
+  if (doBatchAdd && result?.data?.length) {
+    const newView = appUILogic.getNewDataPSAppView()!.getRefPSAppView()!;
+    await newView.fill(true);
+    const selfDe = newView.getPSAppDataEntity()!;
+    const minorDERs = selfDe.getMinorPSAppDERSs();
+    const pickParentDeName = openViewRef.refMode.toLowerCase();
+    if (!minorDERs) {
+      throw new DefectModelError(selfDe, '实体没有从关系集合！');
+    }
+    let pickParentFieldName: string;
+    minorDERs?.forEach(item => {
+      const majorDeName = item
+        .getMajorPSAppDataEntity()!
+        .codeName.toLowerCase();
+      if (pickParentDeName === majorDeName) {
+        pickParentFieldName = item
+          .getParentPSAppDEField()!
+          .codeName.toLowerCase();
+      }
+    });
+
+    // 获取key为keymapping的特殊视图参数
+    const openViewKeyParam = openView
+      .getPSAppViewNavParams()
+      ?.find(navParam => {
+        return navParam.key === 'keymapping';
+      });
+    let addData: IData[] = [];
+    if (openViewKeyParam) {
+      const keyValuePairs = openViewKeyParam.value.split(';');
+      const keyMapping: IData = {};
+      // 遍历键值对数组并添加到 keyMapping 映射对象中
+      for (const pair of keyValuePairs) {
+        const [sourceKey, targetKey] = pair.split(':');
+        if (sourceKey && targetKey) {
+          keyMapping[sourceKey] = targetKey;
+        }
+      }
+      addData = result.data.map(item => {
+        const tempData: IData = {
+          [pickParentFieldName]: item.srfkey,
+        };
+        // 遍历映射对象，将属性从 item 复制到 tempData
+        for (const key in keyMapping) {
+          if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
+            const targetKey = keyMapping[key];
+            if (Object.prototype.hasOwnProperty.call(item, key)) {
+              tempData[targetKey] = item[key];
+            }
+          }
+        }
+        return tempData;
+      });
+    } else {
+      addData = result.data.map(item => ({
+        [pickParentFieldName]: item.srfkey,
+      }));
+    }
+
+    // 获取实体服务并调用创建接口
+    const service = await ibiz.entityService.getService(
+      selfDe.codeName,
+      context,
+    );
+    await service.exec('Create', context, addData);
+  }
+
   // 刷新上一个视图
   const { neuron } = opts!;
   neuron.call.refresh();

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 千反田丷
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.