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

package/out/utils/app-de-ui-action-util/app-de-ui-action-util.js

@@ -1,3 +1,5 @@
+import { IBizContext } from '@ibiz-template/core';
+import { UnsupportedModelError, } from '@ibiz-template/model';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { convertNavData } from '../nav-params/nav-params';
@@ -17,19 +19,18 @@ 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]
      * @return {*}  {Promise<IUIActionResult>}
      */
     static async exec(action, context, data, params, opts) {
-        console.log(action);
         // **用户操作确认**
         if (action.enableConfirm && action.confirmMsg) {
             // todo 用户操作确认
         }
-        const { intercom } = opts;
+        const { neuron } = opts;
         const result = {
             refresh: action.reloadData,
             closeView: action.closeEditView,
@@ -61,17 +62,17 @@ 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;
     }
@@ -83,11 +84,11 @@ 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; 处理后的视图参数
      *   }>}
@@ -104,7 +105,7 @@ export class AppDEUIActionUtil {
             resultData = [];
         }
         // 处理上下文导航参数
-        let resultContext = {};
+        let tempContext = {};
         const navContexts = action.getPSNavigateContexts() || [];
         // 单项数据主键时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
         const appDataEntity = action.getPSAppDataEntity();
@@ -119,8 +120,9 @@ export class AppDEUIActionUtil {
             });
         }
         if (notNilEmpty(navContexts)) {
-            resultContext = convertNavData(navContexts, context, params, (data === null || data === void 0 ? void 0 : data[0]) || {});
+            tempContext = convertNavData(navContexts, context, params, (data === null || data === void 0 ? void 0 : data[0]) || {});
         }
+        const resultContext = new IBizContext(tempContext, context);
         // 处理导航视图参数
         let resultParams = {};
         const navParams = action.getPSNavigateParams();
@@ -139,7 +141,7 @@ export class AppDEUIActionUtil {
      * @returns {*}  {Promise<IUIActionResult>}
      */
     static async executeSysUIAction(action, data, opts) {
-        const { intercom, event } = opts;
+        const { neuron, event } = opts;
         const { uIActionTag } = action;
         const result = {};
         // todo 暂未支持部分
@@ -151,54 +153,73 @@ export class AppDEUIActionUtil {
             'RefreshAll',
             '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 === null || data === void 0 ? void 0 : data[0], event);
+            await neuron.call.openData(data === null || data === void 0 ? void 0 : 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;
         }
         // 需要刷新界面的
@@ -214,7 +235,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]
@@ -236,7 +257,7 @@ 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>}

package/out/utils/index.d.ts

@@ -1,3 +1,4 @@
 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';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC"}

package/out/utils/index.js

@@ -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/out/utils/open-redirect-view/open-redirect-view.d.ts

@@ -0,0 +1,42 @@
+import { IBizContext } from '@ibiz-template/core';
+import { IPSAppDataEntity, IPSAppDERedirectView, IPSAppRedirectView } from '@ibiz-template/model';
+import { IModalData } from '../../interface';
+/**
+ * 打开重定向视图
+ *
+ * @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 declare function openRedirectView(appView: IPSAppRedirectView, context?: IBizContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+/**
+ * 打开实体重定向视图
+ *
+ * @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 declare function openDERedirectView(appView: IPSAppDERedirectView, context?: IBizContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+/**
+ * 计算重定向标识
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:47
+ * @export
+ * @param {IPSAppDERedirectView} rdView
+ * @param {boolean} isWf
+ * @param {IData} data
+ * @return {*}  {Promise<string>}
+ */
+export declare function calcDERdTag(entity: IPSAppDataEntity, rdView: IPSAppDERedirectView, isWf: boolean, data: IData): Promise<string>;
+//# sourceMappingURL=open-redirect-view.d.ts.map

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,GAAE,WAA+B,EACxC,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAarB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,GAAE,WAA+B,EACxC,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CA2ErB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CAgCjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -0,0 +1,149 @@
+import { IBizContext } from '@ibiz-template/core';
+import { DefectModelError, UnsupportedModelError, } from '@ibiz-template/model';
+import { OpenAppViewCommand } from '../../command';
+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, context = new IBizContext(), params = {}, data = []) {
+    if (appView.instanceof('app.view.IPSAppDERedirectView')) {
+        return openDERedirectView(appView, 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, context = new IBizContext(), params = {}, data = []) {
+    // 计算重定向视图上下文参数转换
+    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 = 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 = 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 === null || allRefViews === void 0 ? void 0 : allRefViews.find(view => {
+        return view.name === findRdTag;
+    });
+    if (!refView) {
+        findRdTag = `${rdTag.split(':')[0]}`;
+        refView = allRefViews === null || allRefViews === void 0 ? void 0 : 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, rdView, isWf, data) {
+    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/out/view-logic/view-logic.d.ts

@@ -1,3 +1,4 @@
+import { IBizContext } from '@ibiz-template/core';
 import { IPSAppUINewDataLogic, IPSAppUIOpenDataLogic, IPSAppViewLogic } from '@ibiz-template/model';
 import { IUIActionResult } from '../interface';
 /**
@@ -7,12 +8,12 @@ import { IUIActionResult } from '../interface';
  * @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 declare function executeViewLogic(viewLogic: IPSAppViewLogic, context: IContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+export declare function executeViewLogic(viewLogic: IPSAppViewLogic, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 /**
  * 执行应用预置界面逻辑opendata
  *
@@ -20,12 +21,12 @@ export declare function executeViewLogic(viewLogic: IPSAppViewLogic, context: IC
  * @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 declare function executeOpenDataAppUILogic(appUILogic: IPSAppUIOpenDataLogic, context: IContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+export declare function executeOpenDataAppUILogic(appUILogic: IPSAppUIOpenDataLogic, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 /**
  * 执行应用预置界面逻辑newdata
  *
@@ -33,10 +34,10 @@ export declare function executeOpenDataAppUILogic(appUILogic: IPSAppUIOpenDataLo
  * @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 declare function executeNewDataAppUILogic(appUILogic: IPSAppUINewDataLogic, context: IContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+export declare function executeNewDataAppUILogic(appUILogic: IPSAppUINewDataLogic, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 //# sourceMappingURL=view-logic.d.ts.map

package/out/view-logic/view-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-logic.d.ts","sourceRoot":"","sources":["../../src/view-logic/view-logic.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA8B1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA4C1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,oBAAoB,EAChC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA2C1B"}
+{"version":3,"file":"view-logic.d.ts","sourceRoot":"","sources":["../../src/view-logic/view-logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAIL,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA8B1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CAoD1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,oBAAoB,EAChC,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CAmD1B"}

package/out/view-logic/view-logic.js

@@ -1,3 +1,4 @@
+import { IBizContext } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import { AppEntityModel, getPSUIActionByModelObject, } from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../command';
@@ -9,7 +10,7 @@ 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原生事件
@@ -19,7 +20,7 @@ export async function executeViewLogic(viewLogic, context, data, params, opts =
         // 执行打开数据界面逻辑
         return executeOpenDataAppUILogic(viewLogic.getPSAppUILogic(), context, data, params, opts);
     }
-    if (viewLogic.name === 'newdata') {
+    if (viewLogic.name === 'newdata' && viewLogic.getPSAppUILogic()) {
         // 执行新建数据逻辑
         return executeNewDataAppUILogic(viewLogic.getPSAppUILogic(), context, data, params, opts);
     }
@@ -37,7 +38,7 @@ export async function executeViewLogic(viewLogic, context, data, params, opts =
  * @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原生事件
@@ -57,7 +58,6 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
     const appDataEntity = new AppEntityModel(openView.getPSAppDataEntity());
     await appDataEntity.init();
     // 处理导航参数
-    let tempContext = {};
     // 处理上下文导航参数
     const navContexts = openViewRef.getPSNavigateContexts() || [];
     // 默认添加主键的上下文导航参数
@@ -69,7 +69,7 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
             rawValue: false,
         });
     }
-    tempContext = convertNavData(navContexts, context, params, data[0]);
+    const tempContext = new IBizContext(convertNavData(navContexts, context, params, data[0]), context);
     // 处理导航视图参数
     let tempParams = {};
     const navParams = openViewRef.getPSNavigateParams();
@@ -77,7 +77,11 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
         tempParams = convertNavData(navParams, params, context, data[0]);
     }
     // 打开视图
-    return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, opts);
+    await ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, opts);
+    // 刷新上一个视图
+    const { neuron } = opts;
+    neuron.call.refresh();
+    return {};
 }
 /**
  * 执行应用预置界面逻辑newdata
@@ -86,7 +90,7 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
  * @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原生事件
@@ -110,12 +114,14 @@ export async function executeNewDataAppUILogic(appUILogic, context, data, params
     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 向导添加
@@ -127,5 +133,9 @@ export async function executeNewDataAppUILogic(appUILogic, context, data, params
         // todo 只支持批添加
     }
     // 打开视图
-    return ibiz.commands.execute(OpenAppViewCommand.TAG, newView, tempContext, tempParams, opts);
+    await ibiz.commands.execute(OpenAppViewCommand.TAG, newView, tempContext, tempParams, opts);
+    // 刷新上一个视图
+    const { neuron } = opts;
+    neuron.call.refresh();
+    return {};
 }

package/package.json

@@ -1,35 +1,45 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.0.1-alpha.2",
+  "version": "0.0.1-alpha.21",
   "description": "控制器包",
+  "type": "module",
   "main": "out/index.js",
   "types": "out/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/iBizModeling/ibiz-template.git"
+  },
   "files": [
+    "dist",
     "out",
     "src"
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "npm run lint && npm run clean && tsc --build",
+    "build": "npm run lint && npm run clean && npm run build:rollup && tsc --build",
+    "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
-    "clean": "rimraf out",
+    "clean": "rimraf out dist",
     "publish:next": "npm run build && npm publish --access public --tag next",
     "publish:npm": "npm run build && npm publish --access public"
   },
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz-template/command": "^0.0.1-alpha.2",
-    "@ibiz-template/core": "^0.0.1-alpha.2",
-    "@ibiz-template/model": "^0.0.1-alpha.2",
-    "@ibiz-template/service": "^0.0.1-alpha.2"
+    "@ibiz-template/command": "^0.0.1-alpha.21"
   },
   "devDependencies": {
-    "qx-util": "^0.4.0"
+    "@ibiz-template/core": "^0.0.1-alpha.21",
+    "@ibiz-template/model": "^0.0.1-alpha.21",
+    "@ibiz-template/service": "^0.0.1-alpha.21",
+    "qx-util": "^0.4.1"
   },
   "peerDependencies": {
-    "qx-util": "^0.4.0"
+    "@ibiz-template/core": "^0.0.1-alpha.2",
+    "@ibiz-template/model": "^0.0.1-alpha.2",
+    "@ibiz-template/service": "^0.0.1-alpha.2",
+    "qx-util": "^0.4.1"
   },
-  "gitHead": "03023d73d45b9dc3b6156e996c196ce6705d31cd"
+  "gitHead": "f4c1b8725d21f05789f7763d0065dad9e753f523"
 }