@ibiz-template/runtime 0.7.4 → 0.7.6

package/out/service/service/util/util.service.js

@@ -0,0 +1,148 @@
+/**
+ * 应用功能组件服务
+ *
+ * @author tony001
+ * @date 2024-04-23 11:04:58
+ * @export
+ * @class UtilService
+ */
+export class UtilService {
+    /**
+     * Creates an instance of UtilService.
+     * @author tony001
+     * @date 2024-04-24 14:04:41
+     * @param {IAppUtil} appUtil
+     */
+    constructor(appUtil) {
+        this.appUtil = appUtil;
+        /**
+         * 存储实体模型
+         *
+         * @author tony001
+         * @date 2024-04-24 15:04:36
+         * @type {(IAppDataEntity | null)}
+         */
+        this.stoageAppDataEntity = null;
+        /**
+         * 存储服务
+         *
+         * @author tony001
+         * @date 2024-04-24 14:04:36
+         * @type {(IAppDEService | null)}
+         */
+        this.appDEService = null;
+    }
+    /**
+     * 获取存储服务
+     *
+     * @author tony001
+     * @date 2024-04-24 14:04:21
+     * @private
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {Promise<IAppDEService>}
+     */
+    async getAppDEService(context) {
+        if (this.appDEService) {
+            return this.appDEService;
+        }
+        const { appId, name, stoageAppDataEntityId } = this.appUtil;
+        if (appId && stoageAppDataEntityId) {
+            const app = ibiz.hub.getApp(appId);
+            this.stoageAppDataEntity = await ibiz.hub.getAppDataEntity(stoageAppDataEntityId, appId);
+            const appDEService = await app.deService.getService(context, stoageAppDataEntityId);
+            if (appDEService) {
+                this.appDEService = appDEService;
+                return appDEService;
+            }
+            throw new Error(`应用功能[${name}]未找到存储实体[${stoageAppDataEntityId}]`);
+        }
+        throw new Error(`应用功能[${name}]不存在`);
+    }
+    /**
+     * 加载指定数据
+     *
+     * @author tony001
+     * @date 2024-04-23 11:04:22
+     * @param {string} tag
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {Promise<IData>}
+     */
+    async load(tag, context, params) {
+        const tempContext = context.clone();
+        const dataService = await this.getAppDEService(tempContext);
+        // 设置数据主键
+        tempContext[this.stoageAppDataEntity.codeName.toLowerCase()] = tag;
+        const { getAppDEActionId } = this.appUtil;
+        try {
+            const res = await dataService.exec(getAppDEActionId || 'get', tempContext, params);
+            return this.handleResponse(res);
+        }
+        catch (error) {
+            return {};
+        }
+    }
+    /**
+     * 保存指定数据
+     *
+     * @author tony001
+     * @date 2024-04-23 12:04:36
+     * @param {string} tag
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {IData} data
+     * @return {*}  {Promise<IData>}
+     */
+    async save(tag, context, params, data) {
+        const dataService = await this.getAppDEService(context);
+        const { context: tempContext, params: tempParams, data: tempData, } = this.handleRequestData(tag, context, params, data);
+        return dataService.exec('save', tempContext, tempData, tempParams);
+    }
+    /**
+     * 处理请求数据
+     *
+     * @author tony001
+     * @date 2024-04-24 15:04:02
+     * @private
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {IData} data
+     * @return {*}  {{ context: IContext; params: IParams; data: IData }}
+     */
+    handleRequestData(tag, context, params, data) {
+        const { modelIdAppDEFieldId, modelAppDEFieldId, appIdAppDEFieldId, userIdAppDEFieldId, stoageAppDataEntityId, } = this.appUtil;
+        if (!this.stoageAppDataEntity) {
+            throw new Error(`未找到存储实体[${stoageAppDataEntityId}]`);
+        }
+        const tempContext = context.clone();
+        const tempData = {};
+        // 设置数据主键
+        tempContext[this.stoageAppDataEntity.codeName.toLowerCase()] = tag;
+        const { keyAppDEFieldId } = this.stoageAppDataEntity;
+        tempData[keyAppDEFieldId] = tag;
+        // 设置数据
+        tempData[modelIdAppDEFieldId] = params === null || params === void 0 ? void 0 : params.modelId;
+        tempData[modelAppDEFieldId] = JSON.stringify(data);
+        tempData[appIdAppDEFieldId] = tempContext.srfappid;
+        tempData[userIdAppDEFieldId] = tempContext.srfpersonid;
+        tempData.type = params === null || params === void 0 ? void 0 : params.type;
+        tempData.owner_type = params === null || params === void 0 ? void 0 : params.ownerType;
+        tempData.owner_id = params === null || params === void 0 ? void 0 : params.ownerId;
+        return { context: tempContext, params, data: tempData };
+    }
+    /**
+     * 处理响应数据
+     *
+     * @author tony001
+     * @date 2024-04-24 16:04:45
+     * @private
+     * @param {IData} response
+     * @return {*}  {IData}
+     */
+    handleResponse(response) {
+        const { data } = response;
+        const { modelAppDEFieldId } = this.appUtil;
+        return JSON.parse(data[modelAppDEFieldId]);
+    }
+}

package/out/ui-logic/ui-logic-param/ui-logic-param.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAqG/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAiBjC"}
+{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAgH/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAiBjC"}

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 import { ModelError } from '@ibiz-template/core';
 /**
  * 界面逻辑参数
@@ -46,14 +47,15 @@ export class UILogicParam {
             }
         }
         else if (m.activeContainerParam) {
+            // 当前容器对象
             ctx.params[tag] = parameters.ctrl || parameters.view;
         }
         else if (m.activeCtrlParam) {
-            // 当前部件
+            // 当前部件对象
             ctx.params[tag] = parameters.ctrl;
         }
         else if (m.ctrlParam) {
-            // 指定部件
+            // 指定部件对象
             // 部件模型名称会被小写
             const control = parameters.view.getController(m.codeName.toLowerCase());
             if (control) {
@@ -64,13 +66,16 @@ export class UILogicParam {
             }
         }
         else if (m.activeViewParam) {
-            // 当前视图
+            // 当前视图对象
             ctx.params[tag] = parameters.view;
         }
         else if (m.appGlobalParam) {
             // 应用全局变量
             let value = ibiz.util.getGlobalParam();
             if (m.paramFieldName) {
+                if (!value.hasOwnProperty(m.paramFieldName)) {
+                    value[m.paramFieldName] = {};
+                }
                 value = value[m.paramFieldName];
             }
             ctx.params[tag] = value;
@@ -80,10 +85,11 @@ export class UILogicParam {
             ctx.params[tag] = app;
         }
         else if (m.entityListParam) {
-            // 数据对象列表
+            // 数据对象列表变量
             ctx.params[tag] = [];
         }
         else if (m.entityPageParam) {
+            // 分页查询结果变量
             ctx.params[tag] = [];
         }
         else if (m.entityParam) {
@@ -95,37 +101,43 @@ export class UILogicParam {
             ctx.initLastReturnParam(tag);
         }
         else if (m.navContextParam) {
-            // 应用上下文
+            // 应用上下文变量
             ctx.params[tag] = context;
         }
         else if (m.navViewParamParam) {
-            // 视图路由参数
+            // 视图路由参数变量
             ctx.params[tag] = ibiz.util.getRouterParams();
         }
         else if (m.routeViewSessionParam) {
             // 路由视图会话
             let value = parameters.view.getTopView().state;
             if (m.paramFieldName) {
+                if (!value.hasOwnProperty(m.paramFieldName)) {
+                    value[m.paramFieldName] = {};
+                }
                 value = value[m.paramFieldName];
             }
             ctx.params[tag] = value;
         }
         else if (m.simpleListParam) {
-            // 简单数据列表
+            // 简单数据列表变量
             ctx.params[tag] = [];
         }
         else if (m.simpleParam) {
-            // 简单数据
+            // 简单数据变量
             ctx.params[tag] = {};
         }
         else if (m.viewNavDataParam) {
-            // 视图导航数据
+            // 视图导航数据变量
             ctx.params[tag] = params;
         }
         else if (m.viewSessionParam) {
             // 当前视图会话
             let value = parameters.view.state;
             if (m.paramFieldName) {
+                if (!value.hasOwnProperty(m.paramFieldName)) {
+                    value[m.paramFieldName] = {};
+                }
                 value = value[m.paramFieldName];
             }
             ctx.params[tag] = value;

package/out/utils/nav-params/nav-params.d.ts

@@ -13,6 +13,7 @@ export declare function convertObjectToNavParams(navParams: IData): INavigatePar
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
  * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
  * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
+ * - naviData里%a.b.c%,origins里找到origins.a.b.c,没找到则不做处理
  * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
  *
  * @author lxm
@@ -27,6 +28,7 @@ export declare function convertNavData(navParams: INavigateParam[] | IData | und
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
  * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
  * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
+ * - naviData里%a.b.c%,origins里找到origins.a.b.c,没找到则不做处理
  * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
  *
  * @author lxm

package/out/utils/nav-params/nav-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB3E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAYP;AA8BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAkCP;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}
+{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB3E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAYP;AAqDD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAkCP;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}

package/out/utils/nav-params/nav-params.js

@@ -32,6 +32,7 @@ export function convertObjectToNavParams(navParams) {
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
  * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
  * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
+ * - naviData里%a.b.c%,origins里找到origins.a.b.c,没找到则不做处理
  * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
  *
  * @author lxm
@@ -61,24 +62,47 @@ export function convertNavData(navParams, ...origins) {
  * @return {*}  {{ find: boolean; value: unknown }} 返回find是否找到值，value为找到的值，可以是空值
  */
 function getVal(origins, key) {
+    const keys = key.split('.');
+    let currentVal;
     // 找到origins里第一个有该属性的的项
     const findOrigin = origins.find(item => {
         if (isNilOrEmpty(item)) {
             return false;
         }
+        // 处理%a.b.c%的情况
+        if (keys.length > 1) {
+            currentVal = item;
+            for (let i = 0; i < keys.length; i++) {
+                const k = keys[i];
+                if (currentVal &&
+                    (currentVal[k] ||
+                        Object.prototype.hasOwnProperty.call(currentVal, k))) {
+                    currentVal = currentVal[k];
+                }
+                else {
+                    currentVal = undefined;
+                    break;
+                }
+            }
+            return currentVal !== undefined;
+        }
         return (
         // proxy数据判断是否能拿到值
         item[key] ||
             // 上下文等判断是否有这个属性，如果有且值为空，则赋该空值
             Object.prototype.hasOwnProperty.call(item, key));
     });
-    return { find: !!findOrigin, value: findOrigin === null || findOrigin === void 0 ? void 0 : findOrigin[key] };
+    return {
+        find: !!findOrigin,
+        value: keys.length > 1 ? currentVal : findOrigin === null || findOrigin === void 0 ? void 0 : findOrigin[key],
+    };
 }
 /**
  * 通过模型中的导航数组 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
  * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
  * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
+ * - naviData里%a.b.c%,origins里找到origins.a.b.c,没找到则不做处理
  * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
  *
  * @author lxm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@ibiz-template/core": "^0.7.3",
-    "@ibiz/model-core": "^0.1.20",
+    "@ibiz/model-core": "^0.1.21",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -54,7 +54,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.20",
+    "@ibiz/model-core": "^0.1.21",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",