@ibiz-template/runtime 0.0.1-alpha.2 → 0.0.1-alpha.20

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

@@ -1,4 +1,9 @@
-import { IPSAppDEUIAction, IPSNavigateContext } from '@ibiz-template/model';
+import { IBizContext } from '@ibiz-template/core';
+import {
+  IPSAppDEUIAction,
+  IPSNavigateContext,
+  UnsupportedModelError,
+} from '@ibiz-template/model';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { IUIActionResult } from '../../interface';
@@ -20,7 +25,7 @@ export class AppDEUIActionUtil {
    * @date 2022-08-29 15:08:47
    * @static
    * @param {IPSAppDEUIAction} action
-   * @param {IContext} context
+   * @param {IBizContext} context
    * @param {(IData | null)} data
    * @param {IParams} [params]
    * @param {IData} [opts]
@@ -28,18 +33,17 @@ export class AppDEUIActionUtil {
    */
   static async exec(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     data: IData[] | null,
     params: IParams,
     opts?: IData,
   ): Promise<IUIActionResult> {
-    console.log(action);
     // **用户操作确认**
     if (action.enableConfirm && action.confirmMsg) {
       // todo 用户操作确认
     }
 
-    const { intercom } = opts!;
+    const { neuron } = opts!;
     const result: IUIActionResult = {
       refresh: action.reloadData,
       closeView: action.closeEditView,
@@ -85,18 +89,18 @@ export class AppDEUIActionUtil {
 
     // *刷新引用视图
     if (result.refresh) {
-      if (!intercom.call.refresh) {
+      if (!neuron.call.refresh) {
         throw new Error(`该视图不存在刷新能力`);
       }
-      await intercom.call.refresh();
+      await neuron.call.refresh();
     }
 
     // *关闭引用视图
     if (result.closeView) {
-      if (!intercom.call.closeView) {
+      if (!neuron.call.closeView) {
         throw new Error(`该视图不存在关闭视图能力`);
       }
-      await intercom.call.closeView();
+      await neuron.call.closeView();
     }
 
     return result;
@@ -110,22 +114,22 @@ export class AppDEUIActionUtil {
    * @protected
    * @static
    * @param {IPSAppDEUIAction} action 界面行为
-   * @param {IContext} context 上下文
+   * @param {IBizContext} context 上下文
    * @param {(IData[] | null)} data 数据集合
    * @param {IParams} params 视图参数
    * @returns {*}  {Promise<{
-   *     resultContext: IContext; 处理后的上下文
+   *     resultContext: IBizContext; 处理后的上下文
    *     resultData: IData[]; 处理后的数据集合
    *     resultParams: IParams; 处理后的视图参数
    *   }>}
    */
   protected static async handleParams(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     data: IData[] | null,
     params: IParams,
   ): Promise<{
-    resultContext: IContext;
+    resultContext: IBizContext;
     resultData: IData[];
     resultParams: IParams;
   }> {
@@ -146,7 +150,7 @@ export class AppDEUIActionUtil {
     }
 
     // 处理上下文导航参数
-    let resultContext: IData = {};
+    let tempContext = {};
     const navContexts = action.getPSNavigateContexts() || [];
 
     // 单项数据主键时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
@@ -163,13 +167,15 @@ export class AppDEUIActionUtil {
     }
 
     if (notNilEmpty(navContexts)) {
-      resultContext = convertNavData(
+      tempContext = convertNavData(
         navContexts!,
         context,
         params,
         data?.[0] || {},
       );
     }
+    const resultContext = new IBizContext(tempContext, context);
+
     // 处理导航视图参数
     let resultParams: IData = {};
     const navParams = action.getPSNavigateParams();
@@ -198,7 +204,7 @@ export class AppDEUIActionUtil {
     data: IData[] | null,
     opts?: IData,
   ): Promise<IUIActionResult> {
-    const { intercom, event } = opts!;
+    const { neuron, event } = opts!;
     const { uIActionTag } = action;
     const result: IUIActionResult = {};
 
@@ -213,64 +219,81 @@ export class AppDEUIActionUtil {
         'Import',
       ].indexOf(uIActionTag) !== -1
     ) {
-      console.log(`${uIActionTag}暂未支持`);
-      return result;
+      throw new UnsupportedModelError(action, `${uIActionTag}暂未支持`);
     }
 
     // 打开新建数据视图
     if (uIActionTag === 'New') {
-      if (!intercom.call.newData) {
+      if (!neuron.call.newData) {
         throw new Error(`该视图不存在newData能力`);
       }
-      await intercom.call.newData(event);
+      await neuron.call.newData(event);
     }
-    // 打开新建数据视图
+    // 打开编辑数据视图
     if (uIActionTag === 'Edit') {
-      if (!intercom.call.openData) {
+      if (!neuron.call.openData) {
         throw new Error(`该视图不存在openData能力`);
       }
-      await intercom.call.openData(data?.[0], event);
+      await neuron.call.openData(data?.[0], event);
     }
 
     // 保存能力
-    const saveTags = ['SaveAndExit', 'Save', 'SaveAndStart', 'SaveRow'];
+    const saveTags = ['SaveAndExit', 'Save', 'SaveRow'];
     if (saveTags.indexOf(uIActionTag) !== -1) {
-      if (!intercom.call.save) {
+      if (!neuron.call.save) {
         throw new Error(`该视图不存在save能力`);
       }
-      await intercom.call.save();
+      await neuron.call.save();
     }
 
     // 保存并新建
     if (uIActionTag === 'SaveAndNew') {
-      if (!intercom.call.saveAndNew) {
+      if (!neuron.call.saveAndNew) {
         throw new Error(`该视图不存在saveAndNew能力`);
       }
-      await intercom.call.saveAndNew();
+      await neuron.call.saveAndNew();
     }
 
     // 删除能力
     if (uIActionTag === 'Remove' || uIActionTag === 'RemoveAndExit') {
-      if (!intercom.call.remove) {
+      if (!neuron.call.remove) {
         throw new Error(`该视图不存在remove能力`);
       }
-      await intercom.call.remove();
+      await neuron.call.remove();
     }
 
     // 新建行能力
     if (uIActionTag === 'NewRow') {
-      if (!intercom.call.newRow) {
+      if (!neuron.call.newRow) {
         throw new Error(`该视图不存在newRow能力`);
       }
-      await intercom.call.newRow();
+      await neuron.call.newRow();
+    }
+
+    // 切换搜索表单能力
+    if (uIActionTag === 'ToggleFilter') {
+      if (!neuron.call.toggleFilter) {
+        throw new Error(`该视图不存在ToggleFilter能力`);
+      }
+      neuron.call.toggleFilter();
+    }
+
+    // 工作流相关
+    if (uIActionTag === 'SaveAndStart') {
+      if (!neuron.call.wfStart) {
+        throw new Error(`该视图不存在SaveAndStart能力`);
+      }
+      await neuron.call.wfStart();
+    }
+    if (uIActionTag === 'ViewWFStep') {
+      if (!neuron.call.wfSubmit) {
+        throw new Error(`该视图不存在ViewWFStep能力`);
+      }
+      await neuron.call.wfSubmit();
     }
 
     // 需要关闭视图的
-    if (
-      ['SaveAndExit', 'Exit', 'SaveAndStart', 'RemoveAndExit'].indexOf(
-        uIActionTag,
-      ) !== -1
-    ) {
+    if (['SaveAndExit', 'Exit', 'RemoveAndExit'].indexOf(uIActionTag) !== -1) {
       result.closeView = true;
     }
 
@@ -288,7 +311,7 @@ export class AppDEUIActionUtil {
    * @date 2022-08-29 15:08:51
    * @static
    * @param {IPSAppDEUIAction} action
-   * @param {IContext} context
+   * @param {IBizContext} context
    * @param {(IData[] | null)} data
    * @param {IParams} params
    * @param {IData} [opts]
@@ -296,7 +319,7 @@ export class AppDEUIActionUtil {
    */
   static async executeFrontUIAction(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     _data: IData[] | null,
     params: IParams,
     opts?: IData,
@@ -324,14 +347,14 @@ export class AppDEUIActionUtil {
    * @date 2022-08-28 20:08:35
    * @export
    * @param {IPSAppDEUIAction} action
-   * @param {IContext} context
+   * @param {IBizContext} context
    * @param {IData[]} data
    * @param {IParams} params
    * @returns {*}  {Promise<IUIActionResult>}
    */
   static async executeBackEndUIAction(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     _data: IData[],
     params: IParams,
   ): Promise<IUIActionResult> {

package/src/utils/index.ts

@@ -1,2 +1,3 @@
 export { AppDEUIActionUtil } from './app-de-ui-action-util/app-de-ui-action-util';
 export * from './nav-params/nav-params';
+export { openRedirectView } from './open-redirect-view/open-redirect-view';

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

@@ -0,0 +1,187 @@
+import { IBizContext } from '@ibiz-template/core';
+import {
+  DefectModelError,
+  IPSAppDataEntity,
+  IPSAppDERedirectView,
+  IPSAppRedirectView,
+  UnsupportedModelError,
+} from '@ibiz-template/model';
+import { OpenAppViewCommand } from '../../command';
+import { IModalData } from '../../interface';
+import { convertNavData } from '../nav-params/nav-params';
+
+/**
+ * 打开重定向视图
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:13
+ * @export
+ * @param {IPSAppRedirectView} appView 应用重定向视图
+ * @param {IBizContext} [context=new IBizContext()]
+ * @param {IParams} [params={}]
+ * @param {IData} [data={}]
+ * @return {*}  {Promise<IModalData>}
+ */
+export async function openRedirectView(
+  appView: IPSAppRedirectView,
+  context: IBizContext = new IBizContext(),
+  params: IParams = {},
+  data: IData[] = [],
+): Promise<IModalData> {
+  if (appView.instanceof('app.view.IPSAppDERedirectView')) {
+    return openDERedirectView(
+      appView as IPSAppDERedirectView,
+      context,
+      params,
+      data,
+    );
+  }
+  throw new UnsupportedModelError(
+    appView,
+    `未支持的重定向视图类型: ${appView.viewType}`,
+  );
+}
+
+/**
+ * 打开实体重定向视图
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:15
+ * @export
+ * @param {IPSAppDERedirectView} appView
+ * @param {IBizContext} [context=new IBizContext()]
+ * @param {IParams} [params={}]
+ * @param {IData[]} [data=[]]
+ * @return {*}  {Promise<IModalData>}
+ */
+export async function openDERedirectView(
+  appView: IPSAppDERedirectView,
+  context: IBizContext = new IBizContext(),
+  params: IParams = {},
+  data: IData[] = [],
+): Promise<IModalData> {
+  // 计算重定向视图上下文参数转换
+  const navContext = appView.getPSAppViewNavContexts() || [];
+  const navContextData = convertNavData(navContext, context, params);
+  context = new IBizContext(navContextData, context);
+  // 计算重定向视图视图参数转换
+  const navParams = appView.getPSAppViewNavParams() || [];
+  const navParamsData = convertNavData(navParams, context, params);
+  Object.assign(params, navParamsData);
+  // 重定向视图对应应用实体
+  const entity = appView.getPSAppDataEntity()!;
+  await entity.fill(true);
+  const key = entity.codeName.toLowerCase();
+  let curData: IData = data[0] || {};
+  // 将数据主键转换到上下文当中
+  context[key] = curData[key] || context[key] || params[key];
+  // 实体重定向视图获取数据行为
+  const action = appView.getGetDataPSAppDEAction();
+  const service = await ibiz.entityService.getService(entity.codeName);
+  ibiz.loading.showRedirect();
+  // 获取数据，未配置行为时，默认走 Get 行为
+  const res = await service.exec(
+    action ? action.codeName : 'Get',
+    context,
+    params,
+  );
+  ibiz.loading.hideRedirect();
+  if (res.ok) {
+    curData = res.data;
+    const linkUrl: string = curData.linkurl;
+    if (linkUrl) {
+      if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
+        window.open(linkUrl, '_blank');
+        return { ok: true, data: [] };
+      }
+      return { ok: false, data: [] };
+    }
+  }
+  // 根据参数中是否给了 srfwf 来判断是否为工作流
+  const isWf = !!params.srfwf;
+  const rdTag = await calcDERdTag(entity, appView, isWf, curData);
+  // 用于查找实际重定向视图的标识，根据不同重定向类型后续做不同处理
+  let findRdTag = rdTag;
+  if (isWf) {
+    findRdTag = `${rdTag.split(':')[0]}:${params.srfwf.toUpperCase()}`;
+  }
+  // 所有重定向引用视图
+  const allRefViews = appView.getRedirectPSAppViewRefs();
+  let refView = allRefViews?.find(view => {
+    return view.name === findRdTag;
+  });
+  if (!refView) {
+    findRdTag = `${rdTag.split(':')[0]}`;
+    refView = allRefViews?.find(view => {
+      return view.name === findRdTag;
+    });
+  }
+  if (refView) {
+    const view = refView.getRefPSAppView();
+    if (view) {
+      const result = await ibiz.commands.execute(
+        OpenAppViewCommand.TAG,
+        view,
+        context,
+        params,
+        { data: [curData] },
+      );
+      if (result) {
+        return result;
+      }
+    } else {
+      throw new DefectModelError(refView, `未配置实际引用视图`);
+    }
+  }
+  return { ok: true, data: [] };
+}
+
+/**
+ * 计算重定向标识
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:47
+ * @export
+ * @param {IPSAppDERedirectView} rdView
+ * @param {boolean} isWf
+ * @param {IData} data
+ * @return {*}  {Promise<string>}
+ */
+export async function calcDERdTag(
+  entity: IPSAppDataEntity,
+  rdView: IPSAppDERedirectView,
+  isWf: boolean,
+  data: IData,
+): Promise<string> {
+  const multiFormField = entity.getFormTypePSAppDEField();
+  const indexTypeField = entity.getIndexTypePSAppDEField();
+  // 重定向视图标识
+  let rdTag = '';
+  // 重定向视图类别属性
+  const typeField = rdView.getTypePSAppDEField();
+  // 自定义重定向
+  if (typeField) {
+    const value = data[typeField.codeName.toLowerCase()];
+    if (value) {
+      return value;
+    }
+  }
+  let typeValue = '';
+  if (multiFormField) {
+    typeValue = data[multiFormField.codeName.toLowerCase()];
+  } else if (indexTypeField) {
+    typeValue = data[indexTypeField.codeName.toLowerCase()];
+  }
+  if (typeValue) {
+    if (isWf) {
+      rdTag = `WFEDITVIEW:${typeValue}`;
+    } else {
+      rdTag = `EDITVIEW:${typeValue}`;
+    }
+  } else if (isWf) {
+    rdTag = `WFEDITVIEW:`;
+  } else {
+    rdTag = `EDITVIEW:`;
+  }
+  return rdTag;
+}

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

@@ -1,3 +1,4 @@
+import { IBizContext } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import {
   AppEntityModel,
@@ -19,14 +20,14 @@ import { AppDEUIActionUtil, convertNavData } from '../utils';
  * @date 2022-08-22 09:08:40
  * @export
  * @param {IPSAppViewLogic} viewLogic 视图逻辑模型对象
- * @param {IContext} context 上下文参数
+ * @param {IBizContext} context 上下文参数
  * @param {IParams} params 视图参数
  * @param {(IData | null)} data 数据集合
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeViewLogic(
   viewLogic: IPSAppViewLogic,
-  context: IContext,
+  context: IBizContext,
   data: IData[] | null,
   params: IParams,
   opts: IData = {},
@@ -41,7 +42,7 @@ export async function executeViewLogic(
       opts,
     );
   }
-  if (viewLogic.name === 'newdata') {
+  if (viewLogic.name === 'newdata' && viewLogic.getPSAppUILogic()) {
     // 执行新建数据逻辑
     return executeNewDataAppUILogic(
       viewLogic.getPSAppUILogic() as IPSAppUINewDataLogic,
@@ -69,14 +70,14 @@ export async function executeViewLogic(
  * @date 2022-08-22 14:08:03
  * @export
  * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
- * @param {IContext} context 上下文参数
+ * @param {IBizContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeOpenDataAppUILogic(
   appUILogic: IPSAppUIOpenDataLogic,
-  context: IContext,
+  context: IBizContext,
   data: IData[] | null,
   params: IParams,
   opts: IData = {},
@@ -94,7 +95,6 @@ export async function executeOpenDataAppUILogic(
   await appDataEntity.init();
 
   // 处理导航参数
-  let tempContext: IData = {};
   // 处理上下文导航参数
   const navContexts: IPSNavigateParam[] =
     openViewRef.getPSNavigateContexts() || [];
@@ -107,7 +107,10 @@ export async function executeOpenDataAppUILogic(
       rawValue: false,
     } as IPSNavigateParam);
   }
-  tempContext = convertNavData(navContexts!, context, params, data[0]);
+  const tempContext = new IBizContext(
+    convertNavData(navContexts!, context, params, data[0]),
+    context,
+  );
 
   // 处理导航视图参数
   let tempParams: IData = {};
@@ -117,13 +120,19 @@ export async function executeOpenDataAppUILogic(
   }
 
   // 打开视图
-  return ibiz.commands.execute(
+  await ibiz.commands.execute(
     OpenAppViewCommand.TAG,
     openView,
     tempContext,
     tempParams,
     opts,
   );
+
+  // 刷新上一个视图
+  const { neuron } = opts!;
+  neuron.call.refresh();
+
+  return {};
 }
 
 /**
@@ -133,14 +142,14 @@ export async function executeOpenDataAppUILogic(
  * @date 2022-08-22 14:08:03
  * @export
  * @param {IPSAppUINewDataLogic} appUILogic 应用预置界面逻辑newdata模型对象
- * @param {IContext} context 上下文参数
+ * @param {IBizContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeNewDataAppUILogic(
   appUILogic: IPSAppUINewDataLogic,
-  context: IContext,
+  context: IBizContext,
   data: IData[] | null,
   params: IParams,
   opts: IData = {},
@@ -162,14 +171,16 @@ export async function executeNewDataAppUILogic(
   if (notNilEmpty(navContexts)) {
     tempContext = convertNavData(navContexts!, context, params, _data);
   }
+  tempContext = new IBizContext(tempContext, context);
+  // 删除上下文内的主键
+  delete tempContext[appDataEntity.deName.toLowerCase()];
+  tempContext[appDataEntity.deName.toLowerCase()] = undefined;
+
   const navParams = newViewRef.getPSNavigateParams();
   if (notNilEmpty(navParams)) {
     tempParams = convertNavData(navParams!, params, context, _data);
   }
 
-  // 删除上下文内的主键
-  delete tempContext[appDataEntity.deName.toLowerCase()];
-
   // todo 拷贝
   if (appUILogic.enableWizardAdd) {
     // todo 向导添加
@@ -180,11 +191,17 @@ export async function executeNewDataAppUILogic(
   }
 
   // 打开视图
-  return ibiz.commands.execute(
+  await ibiz.commands.execute(
     OpenAppViewCommand.TAG,
     newView,
     tempContext,
     tempParams,
     opts,
   );
+
+  // 刷新上一个视图
+  const { neuron } = opts!;
+  neuron.call.refresh();
+
+  return {};
 }