@ibiz-template/runtime 0.0.3-beta.5 → 0.0.4-beta.1

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

@@ -0,0 +1,27 @@
+/**
+ * 视图逻辑触发器
+ * @author lxm
+ * @date 2023-03-23 02:00:50
+ * @export
+ * @class ViewLogicTrigger
+ */
+export class ViewLogicTrigger {
+    /**
+     *
+     * @author lxm
+     * @date 2023-03-20 01:30:56
+     * @param {IAppViewLogic[]} viewLogics 所有视图逻辑集合
+     */
+    constructor(defaultContext, defaultParams) {
+        this.defaultContext = defaultContext;
+        this.defaultParams = defaultParams;
+    }
+    /**
+     * 销毁方法
+     * @author lxm
+     * @date 2023-03-20 02:00:49
+     */
+    destroy() {
+        // 子类实现
+    }
+}

package/out/view-logic/view-logic-trigger/view-logic-view-event-trigger.d.ts

@@ -0,0 +1,16 @@
+import { IAppViewLogic } from '@ibiz/model-core';
+import { ViewLogicEventTrigger } from './view-logic-event-trigger';
+/**
+ * 视图逻辑-视图事件类型触发器
+ * @author lxm
+ * @date 2023-03-23 02:33:29
+ * @export
+ * @class ViewLogicEventTrigger
+ * @extends {ViewLogicTrigger}
+ */
+export declare class ViewLogicViewEventTrigger extends ViewLogicEventTrigger {
+    protected noTarget: boolean;
+    protected getTemplateEventName(name: string): string;
+    listenViewLogic(viewlogic: IAppViewLogic): Promise<void>;
+}
+//# sourceMappingURL=view-logic-view-event-trigger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"view-logic-view-event-trigger.d.ts","sourceRoot":"","sources":["../../../src/view-logic/view-logic-trigger/view-logic-view-event-trigger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,yBAA0B,SAAQ,qBAAqB;IAClE,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAQ;IAEnC,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM;IAOrC,eAAe,CAAC,SAAS,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAO/D"}

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

@@ -0,0 +1,29 @@
+import { StudioViewEvents } from '../../constant';
+import { ViewLogicEventTrigger } from './view-logic-event-trigger';
+/**
+ * 视图逻辑-视图事件类型触发器
+ * @author lxm
+ * @date 2023-03-23 02:33:29
+ * @export
+ * @class ViewLogicEventTrigger
+ * @extends {ViewLogicTrigger}
+ */
+export class ViewLogicViewEventTrigger extends ViewLogicEventTrigger {
+    constructor() {
+        super(...arguments);
+        this.noTarget = true;
+    }
+    getTemplateEventName(name) {
+        if (name in StudioViewEvents) {
+            return StudioViewEvents[name];
+        }
+        return super.getTemplateEventName(name);
+    }
+    async listenViewLogic(viewlogic) {
+        if (viewlogic.logicTrigger !== 'VIEWEVENT') {
+            // 非视图事件类视图逻辑不监听
+            return;
+        }
+        super.listenViewLogic(viewlogic);
+    }
+}

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

@@ -1,5 +1,4 @@
-import { IBizContext } from '@ibiz-template/core';
-import { IPSAppUINewDataLogic, IPSAppUIOpenDataLogic, IPSAppViewLogic } from '@ibiz-template/model';
+import { IAppUINewDataLogic, IAppUIOpenDataLogic, IAppViewLogic } from '@ibiz/model-core';
 import { IUIActionResult } from '../interface';
 /**
  * 执行视图逻辑
@@ -7,37 +6,37 @@ import { IUIActionResult } from '../interface';
  * @author lxm
  * @date 2022-08-22 09:08:40
  * @export
- * @param {IPSAppViewLogic} viewLogic 视图逻辑模型对象
- * @param {IBizContext} context 上下文参数
- * @param {IParams} params 视图参数
+ * @param {IAppViewLogic} viewLogic 视图逻辑模型对象
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
+ * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
-export declare function executeViewLogic(viewLogic: IPSAppViewLogic, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+export declare function executeViewLogic(viewLogic: IAppViewLogic, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 /**
  * 执行应用预置界面逻辑opendata
  *
  * @author lxm
  * @date 2022-08-22 14:08:03
  * @export
- * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
- * @param {IBizContext} context 上下文参数
+ * @param {IAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
-export declare function executeOpenDataAppUILogic(appUILogic: IPSAppUIOpenDataLogic, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+export declare function executeOpenDataAppUILogic(appUILogic: IAppUIOpenDataLogic, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 /**
  * 执行应用预置界面逻辑newdata
  *
  * @author lxm
  * @date 2022-08-22 14:08:03
  * @export
- * @param {IPSAppUINewDataLogic} appUILogic 应用预置界面逻辑newdata模型对象
- * @param {IBizContext} context 上下文参数
+ * @param {IAppUINewDataLogic} appUILogic 应用预置界面逻辑newdata模型对象
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
-export declare function executeNewDataAppUILogic(appUILogic: IPSAppUINewDataLogic, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+export declare function executeNewDataAppUILogic(appUILogic: IAppUINewDataLogic, context: IContext, data: IDatum[] | 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":"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,CAkD1B"}
+{"version":3,"file":"view-logic.d.ts","sourceRoot":"","sources":["../../src/view-logic/view-logic.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA6C1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,mBAAmB,EAC/B,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CAkD1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CAkD1B"}

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

@@ -1,30 +1,45 @@
-import { notNilEmpty } from 'qx-util';
-import { AppEntityModel, getPSUIActionByModelObject, } from '@ibiz-template/model';
-import { OpenAppViewCommand } from '../command';
-import { AppDEUIActionUtil, convertNavData } from '../utils';
+import { AppDEUIActionUtil } from '../utils';
+import { execUILogic } from '../ui-logic';
 /**
  * 执行视图逻辑
  *
  * @author lxm
  * @date 2022-08-22 09:08:40
  * @export
- * @param {IPSAppViewLogic} viewLogic 视图逻辑模型对象
- * @param {IBizContext} context 上下文参数
- * @param {IParams} params 视图参数
+ * @param {IAppViewLogic} viewLogic 视图逻辑模型对象
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
+ * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeViewLogic(viewLogic, context, data, params, opts = {}) {
-    if (viewLogic.name === 'opendata' && viewLogic.getPSAppUILogic()) {
-        // 执行打开数据界面逻辑
-        return executeOpenDataAppUILogic(viewLogic.getPSAppUILogic(), context, data, params, opts);
+    if (viewLogic.logicType === 'DEUILOGIC') {
+        let deuilogic;
+        // if (!viewLogic.getPSAppDEUILogic()) {
+        //   throw new RuntimeModelError(viewLogic, '没有配置实体界面逻辑');
+        // }
+        if (deuilogic) {
+            await execUILogic(deuilogic, context, data, params, opts);
+        }
+        // todo 返回值处理
+        return {};
+    }
+    if (viewLogic.name === 'opendata') {
+        let appuilogic;
+        if (appuilogic) {
+            // 执行打开数据界面逻辑
+            return executeOpenDataAppUILogic(appuilogic, context, data, params, opts);
+        }
     }
-    if (viewLogic.name === 'newdata' && viewLogic.getPSAppUILogic()) {
-        // 执行新建数据逻辑
-        return executeNewDataAppUILogic(viewLogic.getPSAppUILogic(), context, data, params, opts);
+    if (viewLogic.name === 'newdata') {
+        let appuilogic;
+        if (appuilogic) {
+            // 执行新建数据逻辑
+            return executeNewDataAppUILogic(appuilogic, context, data, params, opts);
+        }
     }
     // 执行界面行为界面逻辑
-    const appUIAction = (await getPSUIActionByModelObject(viewLogic.getPSAppViewUIAction()));
+    let appUIAction;
     if (!appUIAction) {
         throw new Error('找不到界面行为');
     }
@@ -36,8 +51,8 @@ export async function executeViewLogic(viewLogic, context, data, params, opts =
  * @author lxm
  * @date 2022-08-22 14:08:03
  * @export
- * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
- * @param {IBizContext} context 上下文参数
+ * @param {IAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
@@ -47,39 +62,46 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
         throw Error('没有选中数据！');
     }
     // 准备需要的模型
-    const openViewRef = appUILogic.getOpenDataPSAppView();
+    const openViewRef = appUILogic.openDataAppView;
     if (!openViewRef)
         throw new Error('getOpenDataPSAppView为空');
-    const openView = openViewRef.getRefPSAppView();
-    if (!openView)
-        throw new Error('openView为空');
-    await openView.fill(true);
-    const appDataEntity = new AppEntityModel(openView.getPSAppDataEntity());
-    await appDataEntity.init();
-    // 处理导航参数
-    // 处理上下文导航参数
-    const navContexts = openViewRef.getPSNavigateContexts() || [];
-    // 默认添加主键的上下文导航参数
-    const keyProperty = appDataEntity.deName.toLowerCase();
-    if (navContexts.findIndex(nav => nav.key === keyProperty) === -1) {
-        navContexts.push({
-            key: keyProperty,
-            value: keyProperty,
-            rawValue: false,
-        });
-    }
-    const tempContext = Object.assign(context, convertNavData(navContexts, context, params, data[0]));
-    // 处理导航视图参数
-    let tempParams = {};
-    const navParams = openViewRef.getPSNavigateParams();
-    if (notNilEmpty(navParams)) {
-        tempParams = convertNavData(navParams, params, context, data[0]);
-    }
-    // 打开视图
-    await ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, opts);
-    // 刷新上一个视图
-    const { neuron } = opts;
-    neuron.call.refresh();
+    // const openView = openViewRef.refAppViewId;
+    // if (!openView) throw new Error('openView为空');
+    // const appDataEntity = new IAppDataEntity(openView.getPSAppDataEntity()!);
+    // // 处理导航参数
+    // // 处理上下文导航参数
+    // const navContexts: INavigateParam[] =
+    //   openViewRef.navigateContexts || [];
+    // // 默认添加主键的上下文导航参数
+    // const keyProperty = appDataEntity.deName.toLowerCase();
+    // if (navContexts.findIndex(nav => nav.key === keyProperty) === -1) {
+    //   navContexts.push({
+    //     key: keyProperty,
+    //     value: keyProperty,
+    //     rawValue: false,
+    //   } as INavigateParam);
+    // }
+    // const tempContext = Object.assign(
+    //   context,
+    //   convertNavData(navContexts!, context, params, data[0]),
+    // );
+    // // 处理导航视图参数
+    // let tempParams: IData = {};
+    // const navParams = openViewRef.navigateParams;
+    // if (notNilEmpty(navParams)) {
+    //   tempParams = convertNavData(navParams!, params, context, data[0]);
+    // }
+    // // 打开视图
+    // await ibiz.commands.execute(
+    //   OpenAppViewCommand.TAG,
+    //   openView,
+    //   tempContext,
+    //   tempParams,
+    //   opts,
+    // );
+    // // 刷新上一个视图
+    // const { neuron } = opts!;
+    // neuron.refresh();
     return {};
 }
 /**
@@ -88,52 +110,54 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
  * @author lxm
  * @date 2022-08-22 14:08:03
  * @export
- * @param {IPSAppUINewDataLogic} appUILogic 应用预置界面逻辑newdata模型对象
- * @param {IBizContext} context 上下文参数
+ * @param {IAppUINewDataLogic} appUILogic 应用预置界面逻辑newdata模型对象
+ * @param {IContext} context 上下文参数
  * @param {(IData | null)} data 数据集合
  * @param {IParams} params 视图参数
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeNewDataAppUILogic(appUILogic, context, data, params, opts = {}) {
-    // 准备需要的模型
-    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());
-    await appDataEntity.init();
-    // 处理导航参数
-    let tempContext = {};
-    let tempParams = {};
-    const _data = (data === null || data === void 0 ? void 0 : data[0]) || {};
-    const navContexts = newViewRef.getPSNavigateContexts();
-    if (notNilEmpty(navContexts)) {
-        tempContext = convertNavData(navContexts, context, params, _data);
-    }
-    tempContext = Object.assign(context.clone(), tempContext);
-    // 删除上下文内的主键
-    tempContext[appDataEntity.deName.toLowerCase()] = undefined;
-    const navParams = newViewRef.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(OpenAppViewCommand.TAG, newView, tempContext, tempParams, opts);
-    // 刷新上一个视图
-    const { neuron } = opts;
-    neuron.call.refresh();
+    // // 准备需要的模型
+    // 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 IAppDataEntity(newView.getPSAppDataEntity()!);
+    // await appDataEntity.init();
+    // // 处理导航参数
+    // let tempContext: IData = {};
+    // let tempParams: IData = {};
+    // const _data = data?.[0] || {};
+    // const navContexts = newViewRef.navigateContexts;
+    // if (notNilEmpty(navContexts)) {
+    //   tempContext = convertNavData(navContexts!, context, params, _data);
+    // }
+    // tempContext = Object.assign(context.clone(), tempContext);
+    // // 删除上下文内的主键
+    // tempContext[appDataEntity.deName.toLowerCase()] = undefined;
+    // const navParams = newViewRef.navigateParams;
+    // 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(
+    //   OpenAppViewCommand.TAG,
+    //   newView,
+    //   tempContext,
+    //   tempParams,
+    //   opts,
+    // );
+    // // 刷新上一个视图
+    // const { neuron } = opts!;
+    // neuron.refresh();
     return {};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.0.3-beta.5",
+  "version": "0.0.4-beta.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -17,11 +17,10 @@
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "npm run lint && npm run clean && npm run build:rollup && tsc --build",
+    "build": "npm run lint && node scripts/build.js && tsc --build",
     "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
-    "clean": "rimraf out dist",
     "prepublish": "npm run build",
     "publish:next": "npm publish --access public --tag next",
     "publish:npm": "npm publish --access public"
@@ -29,24 +28,25 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.0.3-beta.5",
-    "@ibiz-template/model": "^0.0.3-beta.5",
+    "@ibiz-template/core": "^0.0.4-beta.1",
+    "@ibiz/model-core": "^0.0.2",
     "@types/qs": "^6.9.7",
-    "@types/systemjs": "^6.13.1",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
+    "lodash-es": "^4.17.21",
     "qs": "^6.11.1",
     "qx-util": "^0.4.8",
-    "ramda": "^0.28.0"
+    "ramda": "^0.29.0"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.0.3-beta.0",
-    "@ibiz-template/model": "^0.0.3-beta.0",
+    "@ibiz-template/core": "^0.0.3-beta.5",
+    "@ibiz/model-core": "^0.0.2",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
+    "lodash-es": "^4.17.21",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.28.0"
   },
-  "gitHead": "51751136cf908d383f2f1bf48afa590e7c8228f7"
+  "gitHead": "2a299785cb6ccc9b25353e77d40d864d94c0c496"
 }