@ibiz-template/runtime 0.4.8-dev.0 → 0.4.8

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts

@@ -11,7 +11,7 @@ import { LogicExecutor } from './logic-executor';
  */
 export declare class AppUILogicExecutor extends LogicExecutor {
     type: 'APPUILOGIC';
-    execute(executeParams: IUILogicParams): any;
+    execute(executeParams: IUILogicParams): Promise<any>;
     /**
      * 执行应用预置界面逻辑 opendata
      *

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;OAQG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;cAsDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA+BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA0FtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAmC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}
+{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAGrB,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAsB1D;;;;;;;;OAQG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;cAsDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA+BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA0FtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAqC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -26,15 +26,22 @@ import { Srfuf } from '../../service';
  */
 export class AppUILogicExecutor extends LogicExecutor {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    execute(executeParams) {
-        if (this.logic.id === 'opendata' && this.logic.builtinAppUILogic) {
-            // 执行打开数据界面逻辑
-            return this.executeOpenDataAppUILogic(this.logic.builtinAppUILogic, executeParams);
+    async execute(executeParams) {
+        let result;
+        try {
+            if (this.logic.id === 'opendata' && this.logic.builtinAppUILogic) {
+                // 执行打开数据界面逻辑
+                result = await this.executeOpenDataAppUILogic(this.logic.builtinAppUILogic, executeParams);
+            }
+            else if (this.logic.id === 'newdata' && this.logic.builtinAppUILogic) {
+                // 执行新建数据逻辑
+                result = await this.executeNewDataAppUILogic(this.logic.builtinAppUILogic, executeParams);
+            }
         }
-        if (this.logic.id === 'newdata' && this.logic.builtinAppUILogic) {
-            // 执行新建数据逻辑
-            return this.executeNewDataAppUILogic(this.logic.builtinAppUILogic, executeParams);
+        catch (error) {
+            ibiz.log.error(error);
         }
+        return result;
     }
     /**
      * 执行应用预置界面逻辑 opendata
@@ -210,7 +217,7 @@ export class AppUILogicExecutor extends LogicExecutor {
             throw new RuntimeError('请选中一条数据');
         }
         const indexType = selectData.srfkey;
-        const findView = newDataAppViews === null || newDataAppViews === void 0 ? void 0 : newDataAppViews.find(item => item.refMode === indexType);
+        const findView = newDataAppViews === null || newDataAppViews === void 0 ? void 0 : newDataAppViews.find(item => { var _a; return ((_a = item.refMode) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === indexType.toUpperCase(); });
         if (!findView) {
             throw new RuntimeError(`没有找到与索引类型${indexType}相关的实体的编辑视图`);
         }

package/out/model/ui-action/ui-action.d.ts

@@ -1,10 +1,12 @@
 import { IAppDEUIAction } from '@ibiz/model-core';
 /**
  * 通过id获取界面行为模型方法
- * @author lxm
- * @date 2023-05-18 09:24:40
+ *
+ * @author chitanda
+ * @date 2023-12-07 17:12:16
  * @export
  * @param {string} id
+ * @param {string} appId
  * @return {*}  {(Promise<IAppDEUIAction | undefined>)}
  */
 export declare function getUIActionById(id: string, appId: string): Promise<IAppDEUIAction | undefined>;

package/out/model/ui-action/ui-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action.d.ts","sourceRoot":"","sources":["../../../src/model/ui-action/ui-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAGrC"}
+{"version":3,"file":"ui-action.d.ts","sourceRoot":"","sources":["../../../src/model/ui-action/ui-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAGrC"}

package/out/model/ui-action/ui-action.js

@@ -1,9 +1,11 @@
 /**
  * 通过id获取界面行为模型方法
- * @author lxm
- * @date 2023-05-18 09:24:40
+ *
+ * @author chitanda
+ * @date 2023-12-07 17:12:16
  * @export
  * @param {string} id
+ * @param {string} appId
  * @return {*}  {(Promise<IAppDEUIAction | undefined>)}
  */
 export async function getUIActionById(id, appId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.8-dev.0",
+  "version": "0.4.8",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "7ee2d66f0b84abba32b842f6b78fc77862cc3c55"
+  "gitHead": "54f1322c5e90608479187318be4de3cfaea79f56"
 }

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -29,21 +29,26 @@ export class AppUILogicExecutor extends LogicExecutor {
   declare type: 'APPUILOGIC';
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  execute(executeParams: IUILogicParams): any {
-    if (this.logic.id === 'opendata' && this.logic.builtinAppUILogic) {
-      // 执行打开数据界面逻辑
-      return this.executeOpenDataAppUILogic(
-        this.logic.builtinAppUILogic as IAppUIOpenDataLogic,
-        executeParams,
-      );
-    }
-    if (this.logic.id === 'newdata' && this.logic.builtinAppUILogic) {
-      // 执行新建数据逻辑
-      return this.executeNewDataAppUILogic(
-        this.logic.builtinAppUILogic as IAppUINewDataLogic,
-        executeParams,
-      );
+  async execute(executeParams: IUILogicParams): Promise<any> {
+    let result;
+    try {
+      if (this.logic.id === 'opendata' && this.logic.builtinAppUILogic) {
+        // 执行打开数据界面逻辑
+        result = await this.executeOpenDataAppUILogic(
+          this.logic.builtinAppUILogic as IAppUIOpenDataLogic,
+          executeParams,
+        );
+      } else if (this.logic.id === 'newdata' && this.logic.builtinAppUILogic) {
+        // 执行新建数据逻辑
+        result = await this.executeNewDataAppUILogic(
+          this.logic.builtinAppUILogic as IAppUINewDataLogic,
+          executeParams,
+        );
+      }
+    } catch (error) {
+      ibiz.log.error(error);
     }
+    return result;
   }
 
   /**
@@ -291,7 +296,9 @@ export class AppUILogicExecutor extends LogicExecutor {
       throw new RuntimeError('请选中一条数据');
     }
     const indexType = selectData.srfkey;
-    const findView = newDataAppViews?.find(item => item.refMode === indexType);
+    const findView = newDataAppViews?.find(
+      item => item.refMode?.toUpperCase() === indexType.toUpperCase(),
+    );
     if (!findView) {
       throw new RuntimeError(
         `没有找到与索引类型${indexType}相关的实体的编辑视图`,

package/src/model/ui-action/ui-action.ts

@@ -2,10 +2,12 @@ import { IAppDEUIAction } from '@ibiz/model-core';
 
 /**
  * 通过id获取界面行为模型方法
- * @author lxm
- * @date 2023-05-18 09:24:40
+ *
+ * @author chitanda
+ * @date 2023-12-07 17:12:16
  * @export
  * @param {string} id
+ * @param {string} appId
  * @return {*}  {(Promise<IAppDEUIAction | undefined>)}
  */
 export async function getUIActionById(