@ibiz-template/runtime 0.1.25 → 0.1.26

package/out/de-logic/de-logic-node/end-node/end-node.js

@@ -21,7 +21,7 @@ export class EndNode extends DELogicNode {
                 ctx.result = null;
                 break;
             case 'SRCVALUE': // 直接值
-                ctx.result = rawValue;
+                ctx.result = ibiz.util.rawValue.format(rawValue);
                 break;
             case 'LOGICPARAM': // 逻辑参数对象
                 ctx.result = ctx.params[returnParamId];

package/out/de-logic/utils/handle-src-val.js

@@ -29,7 +29,7 @@ export function handleSrcVal(ctx, srcValParams) {
             return undefined;
         // 直接值
         case 'SRCVALUE':
-            return srcValue;
+            return ibiz.util.rawValue.format(srcValue);
         case 'WEBCONTEXT': // 网页请求上下文
         case 'VIEWPARAM': // 视图参数
             value = ctx.viewParams;

package/out/global/global-util/global-util.d.ts

@@ -1,5 +1,5 @@
 import { IExportExcelUtil } from '../../interface';
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil } from '../../utils';
 /**
  * 全局工具方法或对象
  *
@@ -30,6 +30,13 @@ export declare class GlobalUtil {
      * @date 2023-08-28 23:08:59
      */
     readonly hbs: HandlebarsUtil;
+    /**
+     * 直接值工具
+     *
+     * @author zhujiamin
+     * @date 2023-08-24 11:08:28
+     */
+    readonly rawValue: RawValueUtil;
     /**
      * 获取导出Excel工具类对象
      * @author lxm

package/out/global/global-util/global-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAExE;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}
+{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}

package/out/global/global-util/global-util.js

@@ -1,4 +1,4 @@
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, } from '../../utils';
 /**
  * 全局工具方法或对象
  *
@@ -30,6 +30,13 @@ export class GlobalUtil {
          * @date 2023-08-28 23:08:59
          */
         this.hbs = new HandlebarsUtil();
+        /**
+         * 直接值工具
+         *
+         * @author zhujiamin
+         * @date 2023-08-24 11:08:28
+         */
+        this.rawValue = new RawValueUtil();
     }
     /**
      * 显示应用级别的加载提示

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

@@ -25,6 +25,7 @@ export declare class AppUILogicExecutor extends LogicExecutor {
      * @param {IData} [opts] 额外参数，event是js原生事件
      */
     executeOpenDataAppUILogic(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IModalData>;
+    protected calcOpenViewRef(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase>;
     /**
      * 执行应用预置界面逻辑newdata
      *
@@ -50,6 +51,17 @@ export declare class AppUILogicExecutor extends LogicExecutor {
      * @return {*}  {(Promise<IAppUILogicRefViewBase | undefined>)}
      */
     protected getWizardNewViewRef(appUILogic: IAppUINewDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase | undefined>;
-    protected calcOpenViewRef(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase>;
+    /**
+     * 拿选中的数据做批添加新建
+     * @author lxm
+     * @date 2023-09-15 05:20:02
+     * @protected
+     * @param {IAppUIOpenDataLogic} appUILogic
+     * @param {IData[]} selections
+     * @param {IContext} context
+     * @param {IAppUILogicRefViewBase} newViewRef
+     * @return {*}  {Promise<void>}
+     */
+    protected doBatchAdd(appUILogic: IAppUIOpenDataLogic, selections: IData[], context: IContext, newViewRef: IAppUILogicRefViewBase): Promise<void>;
 }
 //# sourceMappingURL=app-ui-logic-executor.d.ts.map

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;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAqDtB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA8DtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;cAmC9B,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;CA0BnC"}
+{"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;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;cAqDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA2BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAiFtB;;;;;;;;;;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"}

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

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
-import { getFormTypeFieldName } from '../../model';
+import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 /**
@@ -82,6 +82,27 @@ export class AppUILogicExecutor extends LogicExecutor {
         // 打开视图
         return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
     }
+    async calcOpenViewRef(appUILogic, parameters) {
+        const appDataEntityId = parameters.view.model.appDataEntityId;
+        // 表单类型属性
+        const formTypeName = await getFormTypeFieldName(appDataEntityId);
+        if (!formTypeName) {
+            throw new RuntimeModelError(appUILogic, `${appDataEntityId}实体缺少表单类型应用实体属性`);
+        }
+        const { data } = parameters;
+        // 表单类型值
+        const formTypeValue = data[0][formTypeName];
+        if (!formTypeValue) {
+            throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
+        }
+        const openViewRefs = appUILogic.openDataAppViews;
+        // 根据表单类型值找到实际打开的视图
+        const findView = openViewRefs === null || openViewRefs === void 0 ? void 0 : openViewRefs.find(item => item.refMode === formTypeValue);
+        if (!findView) {
+            throw new RuntimeError(`没有找到与表单类型${formTypeValue}相关的实体的编辑视图`);
+        }
+        return findView;
+    }
     /**
      * 执行应用预置界面逻辑newdata
      *
@@ -96,7 +117,7 @@ export class AppUILogicExecutor extends LogicExecutor {
      */
     async executeNewDataAppUILogic(appUILogic, parameters) {
         const { context, params } = parameters, rest = __rest(parameters, ["context", "params"]);
-        const { data } = parameters;
+        const { data, view } = parameters;
         const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } = appUILogic;
         let newViewRef;
         if (enableWizardAdd) {
@@ -107,8 +128,15 @@ export class AppUILogicExecutor extends LogicExecutor {
             }
         }
         else if (enableBatchAdd) {
-            // todo 批添加
-            throw new ModelError(appUILogic, 'enableBatchAdd暂未支持');
+            // 查找批添加打开视图
+            const parentDeName = calcDeCodeNameById(view.parentView.model.appDataEntityId);
+            const batchViews = appUILogic.batchAddAppViews;
+            newViewRef = batchViews === null || batchViews === void 0 ? void 0 : batchViews.find(viewRef => {
+                return viewRef.refMode.toLowerCase() !== parentDeName;
+            });
+            if (!newViewRef) {
+                throw new RuntimeModelError(appUILogic, '没有找到批添加需要打开的选择视图');
+            }
         }
         else if (batchAddOnly) {
             // todo 只支持批添加
@@ -141,7 +169,12 @@ export class AppUILogicExecutor extends LogicExecutor {
             tempParams = Object.assign(tempParams, _data.$origin);
         }
         // 打开视图
-        return ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
+        const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
+        // 执行批添加新建逻辑
+        if (enableBatchAdd && result.data) {
+            await this.doBatchAdd(appUILogic, result.data, context, newViewRef);
+        }
+        return result;
     }
     /**
      * 获取向导新建视图引用
@@ -179,25 +212,74 @@ export class AppUILogicExecutor extends LogicExecutor {
         }
         return findView;
     }
-    async calcOpenViewRef(appUILogic, parameters) {
-        const appDataEntityId = parameters.view.model.appDataEntityId;
-        // 表单类型属性
-        const formTypeName = await getFormTypeFieldName(appDataEntityId);
-        if (!formTypeName) {
-            throw new RuntimeModelError(appUILogic, `${appDataEntityId}实体缺少表单类型应用实体属性`);
-        }
-        const { data } = parameters;
-        // 表单类型值
-        const formTypeValue = data[0][formTypeName];
-        if (!formTypeValue) {
-            throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
-        }
-        const openViewRefs = appUILogic.openDataAppViews;
-        // 根据表单类型值找到实际打开的视图
-        const findView = openViewRefs === null || openViewRefs === void 0 ? void 0 : openViewRefs.find(item => item.refMode === formTypeValue);
-        if (!findView) {
-            throw new RuntimeError(`没有找到与表单类型${formTypeValue}相关的实体的编辑视图`);
+    /**
+     * 拿选中的数据做批添加新建
+     * @author lxm
+     * @date 2023-09-15 05:20:02
+     * @protected
+     * @param {IAppUIOpenDataLogic} appUILogic
+     * @param {IData[]} selections
+     * @param {IContext} context
+     * @param {IAppUILogicRefViewBase} newViewRef
+     * @return {*}  {Promise<void>}
+     */
+    async doBatchAdd(appUILogic, selections, context, newViewRef) {
+        var _a;
+        // 批添加新建选中数据后
+        if (selections === null || selections === void 0 ? void 0 : selections.length) {
+            const selfDe = await ibiz.hub.getAppDataEntity(appUILogic.appDataEntityId, context.srfappid);
+            const minorDERs = selfDe.minorAppDERSs;
+            const pickParentDeName = newViewRef.refMode.toLowerCase();
+            if (!minorDERs) {
+                throw new RuntimeModelError(selfDe, '实体没有从关系集合！');
+            }
+            // 获取选择视图对应父实体在当前实体里的外键属性名称。
+            let pickParentFieldName;
+            minorDERs === null || minorDERs === void 0 ? void 0 : minorDERs.forEach(item => {
+                const majorDeName = calcDeCodeNameById(item.majorAppDataEntityId);
+                if (pickParentDeName === majorDeName) {
+                    pickParentFieldName = item.parentAppDEFieldId;
+                }
+            });
+            // 获取key为keymapping的特殊视图参数
+            const openViewKeyParam = (_a = newViewRef.navigateParams) === null || _a === void 0 ? void 0 : _a.find(navParam => {
+                return navParam.key === 'keymapping';
+            });
+            let addData = [];
+            if (openViewKeyParam) {
+                const keyValuePairs = openViewKeyParam.value.split(';');
+                const keyMapping = {};
+                // 遍历键值对数组并添加到 keyMapping 映射对象中
+                for (const pair of keyValuePairs) {
+                    const [sourceKey, targetKey] = pair.split(':');
+                    if (sourceKey && targetKey) {
+                        keyMapping[sourceKey] = targetKey;
+                    }
+                }
+                addData = selections.map(item => {
+                    const tempData = {
+                        [pickParentFieldName]: item.srfkey,
+                    };
+                    // 遍历映射对象，将属性从 item 复制到 tempData
+                    for (const key in keyMapping) {
+                        if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
+                            const targetKey = keyMapping[key];
+                            if (Object.prototype.hasOwnProperty.call(item, key)) {
+                                tempData[targetKey] = item[key];
+                            }
+                        }
+                    }
+                    return tempData;
+                });
+            }
+            else {
+                addData = selections.map(item => ({
+                    [pickParentFieldName]: item.srfkey,
+                }));
+            }
+            // 获取实体服务并调用创建接口
+            const service = ibiz.hub.getApp(context.srfappid).deService;
+            await service.exec(selfDe.id, 'Create', context, addData);
         }
-        return findView;
     }
 }

package/out/service/service/control/control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}
+{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}

package/out/service/service/control/control.service.js

@@ -46,7 +46,7 @@ export class ControlService {
      * @param {IParams} [params={}] 视图参数或数据
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    async exec(methodName, context, data = {}, params = {}) {
+    async exec(methodName, context, data, params) {
         const res = await this.app.deService.exec(this.model.appDataEntityId, methodName, context, data, params);
         return res;
     }

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IA6CjC,SAAS,CAAC,KAAK,EAAE,cAAc;IA5C3C;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAK3C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAwBvC;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,KAAU,EAClB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;CAO1B"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IA6CjC,SAAS,CAAC,KAAK,EAAE,cAAc;IA5C3C;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAK3C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAwBvC;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAO1B"}

package/out/service/service/entity/de.service.js

@@ -83,7 +83,7 @@ export class DEService {
      * @param {IParams} [params2={}] 查询参数
      * @return {*}  {Promise<IHttpResponse>}
      */
-    exec(id, context, params = {}, params2 = {}) {
+    exec(id, context, params, params2) {
         const method = this.getMethod(id);
         if (method) {
             return method.exec(context, params, params2);

package/out/service/service/entity/method/de-action.d.ts

@@ -23,7 +23,7 @@ export declare class DEActionMethod extends Method {
      * @type {boolean}
      */
     protected get isLocalMode(): boolean;
-    exec(context: IParams, data: IData, params: IParams): Promise<HttpResponse<IData>>;
+    exec(context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<IData>>;
     /**
      * 创建数据
      *

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAwE/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IA8E/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -32,19 +32,19 @@ export class DEActionMethod extends Method {
             if (!deLogic) {
                 throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
             }
-            return execDELogicAction(deLogic, context, data, params);
+            return execDELogicAction(deLogic, context, data || {}, params || {});
         }
-        if (!this.isLocalMode) {
+        if (data && !this.isLocalMode) {
             data = await this.input.handle(context, data);
         }
         // 执行变更属性逻辑
-        if (!['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
-            await execFieldLogics(this.entity, 'change', context, data, params);
+        if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
+            await execFieldLogics(this.entity, 'change', context, data, params || {});
         }
         let result;
         switch (this.method.codeName) {
             case 'Create':
-                result = await this.create(context, data, params);
+                result = await this.create(context, data, params || {});
                 break;
             case 'Get':
                 result = await this.get(context, params);
@@ -77,7 +77,7 @@ export class DEActionMethod extends Method {
                 let path = this.calcPath(context);
                 if (this.method.needResourceKey) {
                     path = `${path}/${context[this.entity.codeName.toLowerCase()] ||
-                        data[this.entity.keyAppDEFieldId]}`;
+                        (data === null || data === void 0 ? void 0 : data[this.entity.keyAppDEFieldId])}`;
                 }
                 const res = await this.request(path, context, data, params);
                 res.data = await this.result.handle(context, res.data);
@@ -85,7 +85,7 @@ export class DEActionMethod extends Method {
             }
         }
         // 计算属性逻辑
-        await execFieldLogics(this.entity, 'compute', context, result.data, params);
+        await execFieldLogics(this.entity, 'compute', context, result.data, params || {});
         return result;
     }
     /**

package/out/service/service/entity/method/method.d.ts

@@ -63,7 +63,7 @@ export declare abstract class Method {
      * @param {IParams} [params2={}]
      * @return {*}  {Promise<HttpResponse>}
      */
-    abstract exec(context: IParams, params: IData, params2: IParams): Promise<HttpResponse>;
+    abstract exec(context: IParams, params?: IData, params2?: IParams): Promise<HttpResponse>;
     /**
      * 发送请求
      *
@@ -76,7 +76,7 @@ export declare abstract class Method {
      * @param {IParams} params
      * @return {*}  {Promise<HttpResponse<any>>}
      */
-    protected request(path: string, context: IParams, data: IData, params: IParams): Promise<HttpResponse<any>>;
+    protected request(path: string, context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<any>>;
     /**
      * 根据上下文计算当前请求路径
      *

package/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAwC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GAEf,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAwC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}

package/out/types.d.ts

@@ -138,5 +138,16 @@ declare module '@ibiz-template/core' {
          */
         scheduler: LogicSchedulerCenter;
     }
+    interface IEnvironment {
+        /**
+         * 全局提供的功能性配置
+         *
+         * @description 默认无值使用默认配置，可以使用 environment.js 中的 globalConfig 覆盖默认配置
+         * @author chitanda
+         * @date 2023-09-15 14:09:14
+         * @type {IGlobalConfig}
+         */
+        globalConfig?: IGlobalConfig;
+    }
 }
 //# sourceMappingURL=types.d.ts.map

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}

package/out/ui-logic/ui-logic-node/end-node/end-node.js

@@ -21,7 +21,7 @@ export class EndNode extends UILogicNode {
                 ctx.result = null;
                 break;
             case 'SRCVALUE': // 直接值
-                ctx.result = rawValue;
+                ctx.result = ibiz.util.rawValue.format(rawValue);
                 break;
             case 'LOGICPARAM': // 逻辑参数对象
                 ctx.result = ctx.params[returnParamId];

package/out/ui-logic/utils/handle-src-val.js

@@ -27,7 +27,7 @@ export function handleSrcVal(ctx, srcValParams) {
             return undefined;
         // 直接值
         case 'SRCVALUE':
-            return srcValue;
+            return ibiz.util.rawValue.format(srcValue);
         case 'WEBCONTEXT': // 网页请求上下文
         case 'VIEWPARAM': // 视图参数
             value = ctx.viewParams;

package/out/utils/index.d.ts

@@ -9,4 +9,5 @@ export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
+export { RawValueUtil } from './raw-value-util/raw-value-util';
 //# 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,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC"}

package/out/utils/index.js

@@ -9,3 +9,4 @@ export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
+export { RawValueUtil } from './raw-value-util/raw-value-util';

package/out/utils/raw-value-util/raw-value-util.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 直接值工具类
+ *
+ * @export
+ * @class RawValueUtil
+ */
+export declare class RawValueUtil {
+    /**
+     *  字符串是否完全由整数/浮点数组成
+     *
+     * @param {string} str
+     * @return {*}
+     */
+    isNumber(str: string): boolean;
+    /**
+     * 转换直接值
+     *
+     * @param {string} val
+     * @return {*}
+     */
+    format(val: string | undefined): number | boolean | string | undefined;
+}
+//# sourceMappingURL=raw-value-util.d.ts.map

package/out/utils/raw-value-util/raw-value-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"raw-value-util.d.ts","sourceRoot":"","sources":["../../../src/utils/raw-value-util/raw-value-util.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI9B;;;;;OAKG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;CAavE"}

package/out/utils/raw-value-util/raw-value-util.js

@@ -0,0 +1,37 @@
+/**
+ * 直接值工具类
+ *
+ * @export
+ * @class RawValueUtil
+ */
+export class RawValueUtil {
+    /**
+     *  字符串是否完全由整数/浮点数组成
+     *
+     * @param {string} str
+     * @return {*}
+     */
+    isNumber(str) {
+        return /^-?\d+(\.\d+)?$/.test(str);
+    }
+    /**
+     * 转换直接值
+     *
+     * @param {string} val
+     * @return {*}
+     */
+    format(val) {
+        let tempVal = val;
+        if (val !== undefined) {
+            if (val === 'true' || val === 'false') {
+                // 布尔值处理
+                tempVal = val === 'true';
+            }
+            else if (this.isNumber(val)) {
+                // 数值处理
+                tempVal = parseFloat(val);
+            }
+        }
+        return tempVal;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.1.24",
-    "@ibiz/model-core": "^0.0.16",
+    "@ibiz/model-core": "^0.0.17",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.2",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.16",
+    "@ibiz/model-core": "^0.0.17",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "bfc52e088d9eb1548c4c22cd783ec22d76499ee1"
+  "gitHead": "47de26dd6360166d072d61af88da5bc1b3732b22"
 }

package/src/de-logic/de-logic-node/end-node/end-node.ts

@@ -26,7 +26,7 @@ export class EndNode extends DELogicNode {
         ctx.result = null;
         break;
       case 'SRCVALUE': // 直接值
-        ctx.result = rawValue;
+        ctx.result = ibiz.util.rawValue.format(rawValue);
         break;
       case 'LOGICPARAM': // 逻辑参数对象
         ctx.result = ctx.params[returnParamId!];

package/src/de-logic/utils/handle-src-val.ts

@@ -55,7 +55,7 @@ export function handleSrcVal(
       return undefined;
     // 直接值
     case 'SRCVALUE':
-      return srcValue;
+      return ibiz.util.rawValue.format(srcValue);
     case 'WEBCONTEXT': // 网页请求上下文
     case 'VIEWPARAM': // 视图参数
       value = ctx.viewParams;

package/src/global/global-util/global-util.ts

@@ -1,5 +1,10 @@
 import { IExportExcelUtil } from '../../interface';
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
+import {
+  TextUtil,
+  LayoutPanelUtil,
+  HandlebarsUtil,
+  RawValueUtil,
+} from '../../utils';
 
 /**
  * 全局工具方法或对象
@@ -34,6 +39,14 @@ export class GlobalUtil {
    */
   readonly hbs = new HandlebarsUtil();
 
+  /**
+   * 直接值工具
+   *
+   * @author zhujiamin
+   * @date 2023-08-24 11:08:28
+   */
+  readonly rawValue = new RawValueUtil();
+
   /**
    * 获取导出Excel工具类对象
    * @author lxm