@ibiz-template/runtime 0.1.15 → 0.1.17

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.js

@@ -0,0 +1,79 @@
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 消息弹窗节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class MsgBoxNode
+ * @extends {UILogicNode}
+ */
+export class MsgBoxNode extends UILogicNode {
+    constructor() {
+        super(...arguments);
+        this.typeMap = {
+            INFO: 'info',
+            QUESTION: 'success',
+            WARNING: 'warning',
+            ERROR: 'error',
+        };
+    }
+    async exec(ctx) {
+        const { msgBoxType, buttonsType, msgBoxParamId } = this.model;
+        if (!msgBoxType) {
+            throw new RuntimeModelError(this.model, '缺少消息类型的配置');
+        }
+        if (!buttonsType) {
+            throw new RuntimeModelError(this.model, '缺少按钮类型的配置');
+        }
+        // 处理标题和内容
+        let { title } = this.model;
+        let { message } = this.model;
+        if (msgBoxParamId) {
+            const param = ctx.params[msgBoxParamId];
+            if (param.title) {
+                title = param.title;
+            }
+            if (param.message) {
+                message = param.message;
+            }
+        }
+        // 处理消息类型
+        const type = this.typeMap[msgBoxType];
+        const modalParams = {
+            type,
+            title: title || '消息',
+            desc: message,
+        };
+        let resultTags = [];
+        // 处理按钮类型
+        switch (buttonsType) {
+            case 'YESNO':
+                modalParams.confirmButtonText = '是';
+                modalParams.cancelButtonText = '否';
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = true;
+                resultTags = ['yes', 'no'];
+                break;
+            case 'OK':
+                modalParams.confirmButtonText = '确定';
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = false;
+                resultTags = ['ok'];
+                break;
+            case 'OKCANCEL':
+                modalParams.confirmButtonText = '确定';
+                modalParams.cancelButtonText = '取消';
+                modalParams.showConfirmButton = true;
+                modalParams.showCancelButton = true;
+                resultTags = ['ok', 'cancel'];
+                break;
+            default:
+                throw new ModelError(this.model, `${buttonsType}暂未支持`);
+        }
+        console.log(this.model, modalParams);
+        const result = await ibiz.modal.confirm(modalParams);
+        ctx.setLastReturn(resultTags[result ? 0 : 1]);
+    }
+}

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;IAgE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
+{"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;IAiE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

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

@@ -75,7 +75,8 @@ export class UILogicParam {
             ctx.params[tag] = {};
         }
         else if (m.lastReturnParam) {
-            throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+            // 上一次调用返回变量
+            ctx.initLastReturnParam(tag);
         }
         else if (m.navContextParam) {
             // 应用上下文

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAOL,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IA4DvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EASL,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAgEvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

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

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { BindParamNode, DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { BindParamNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, MsgBoxNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -67,6 +67,12 @@ export class UILogic {
                 case 'VIEWCTRLINVOKE': // 视图部件调用
                     logicNode = new ViewCtrlInvokeNode(node);
                     break;
+                case 'MSGBOX': // 消息弹窗
+                    logicNode = new MsgBoxNode(node);
+                    break;
+                case 'DEBUGPARAM': // 调试逻辑参数
+                    logicNode = new DebugParamNode(node);
+                    break;
                 case 'RESETPARAM': // 重置参数
                 case 'COPYPARAM': // 拷贝参数
                 case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
@@ -74,11 +80,9 @@ export class UILogic {
                 case 'SORTPARAM': // 排序数组参数
                 case 'RENEWPARAM': // 重新建立参数
                 case 'PFPLUGIN': // 前端插件调用
-                case 'MSGBOX': // 消息弹窗
                 case 'DEDATASET': // 实体数据集
                 case 'DELOGIC': // 实体逻辑
                 case 'THROWEXCEPTION': // 抛出异常
-                case 'DEBUGPARAM': // 调试逻辑参数
                 default:
                     throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
             }

package/out/utils/text-util/text-util.d.ts

@@ -7,6 +7,15 @@
  * @class TextUtil
  */
 export declare class TextUtil {
+    /**
+     * input元素，用于存储拷贝的文本
+     *
+     * @author zhanghengfeng
+     * @date 2023-08-31 20:08:06
+     * @private
+     * @type {(HTMLInputElement | null)}
+     */
+    private inputElement;
     /**
      * 值格式化
      *
@@ -21,10 +30,10 @@ export declare class TextUtil {
      * 拷贝文本
      *
      * @author zhanghengfeng
-     * @date 2023-08-28 14:08:57
+     * @date 2023-08-31 11:08:51
      * @param {string} value
-     * @return {*}  {Promise<void>}
+     * @return {*}  {boolean}
      */
-    copy(value: string): Promise<void>;
+    copy(value: string): boolean;
 }
 //# sourceMappingURL=text-util.d.ts.map

package/out/utils/text-util/text-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text-util.d.ts","sourceRoot":"","sources":["../../../src/utils/text-util/text-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAI5C;;;;;;;OAOG;IACG,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzC"}
+{"version":3,"file":"text-util.d.ts","sourceRoot":"","sources":["../../../src/utils/text-util/text-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY,CAAiC;IAErD;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAI5C;;;;;;;OAOG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAW7B"}

package/out/utils/text-util/text-util.js

@@ -7,6 +7,17 @@
  * @class TextUtil
  */
 export class TextUtil {
+    constructor() {
+        /**
+         * input元素，用于存储拷贝的文本
+         *
+         * @author zhanghengfeng
+         * @date 2023-08-31 20:08:06
+         * @private
+         * @type {(HTMLInputElement | null)}
+         */
+        this.inputElement = null;
+    }
     /**
      * 值格式化
      *
@@ -23,11 +34,19 @@ export class TextUtil {
      * 拷贝文本
      *
      * @author zhanghengfeng
-     * @date 2023-08-28 14:08:57
+     * @date 2023-08-31 11:08:51
      * @param {string} value
-     * @return {*}  {Promise<void>}
+     * @return {*}  {boolean}
      */
-    async copy(value) {
-        return navigator.clipboard.writeText(value);
+    copy(value) {
+        if (!this.inputElement) {
+            this.inputElement = document.createElement('input');
+            this.inputElement.style.position = 'absolute';
+            this.inputElement.style.left = '-9999px';
+            document.body.appendChild(this.inputElement);
+        }
+        this.inputElement.value = value;
+        this.inputElement.select();
+        return document.execCommand('copy');
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "7410b8ff7fb415b221b9eab24fd0e4f2ce1f16c6"
+  "gitHead": "7f956bdd62e436209f34b16d69a78a73b35842ae"
 }

package/src/command/app/open-app-view/open-app-view.ts

@@ -62,7 +62,7 @@ export class OpenAppViewCommand {
       case 'INDEXVIEWTAB':
         if (opts.noWaitRoute) {
           this.openIndexViewTab(appView, context, params);
-          return;
+          return { ok: true };
         }
         return this.openIndexViewTab(appView, context, params);
       case 'POPUP':

package/src/controller/common/view/view.controller.ts

@@ -2,7 +2,7 @@
 import { createUUID, notNilEmpty } from 'qx-util';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { IAppView } from '@ibiz/model-core';
-import { isEmpty, isNil } from 'ramda';
+import { isEmpty, isNil, isNotNil } from 'ramda';
 import { LoadingState } from '../../utils/loading/loading.state';
 import {
   IViewController,
@@ -217,6 +217,10 @@ export class ViewController<
 
     // 给modal的关闭前回调注入视图关闭事件
     this.modal.hooks.beforeDismiss.tapPromise(async modalData => {
+      // 如果视图设置了关闭状态，根据关闭状态返回
+      if (isNotNil(this.state.closeOK)) {
+        modalData.ok = this.state.closeOK;
+      }
       await this._evt.emit('onCloseView', { ...modalData });
     });
 

package/src/controller/control/exp-bar/exp-bar.controller.ts

@@ -209,12 +209,8 @@ export class ExpBarControlController<
       this.xDataController.evt.on('onLoadSuccess', event => {
         this.xDataLoadSuccess(event);
       });
-      this.xDataController.evt.on('onBeforeLoad', () => {
-        const searchParams: IParams = {};
-        if (this.state.query) {
-          searchParams.query = this.state.query;
-        }
-        this.xDataController.state.searchParams = searchParams;
+      this.xDataController.evt.on('onRemoveSuccess', () => {
+        this.defaultNavByFirstItem();
       });
     }
 

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -7,7 +7,6 @@ import {
   IDEEditForm,
   IDEEditFormItem,
   IDEFormDetail,
-  IDEFormMDCtrl,
   IDEWizardEditForm,
   IWFEditForm,
 } from '@ibiz/model-core';
@@ -94,10 +93,12 @@ export class EditFormService<
     context: IParams,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
+    const _data = data instanceof ControlVO ? data.getOrigin() : data;
+    const tempData = this.getFilteredData(_data);
     let res = await this.exec(
       this.model.createControlAction?.appDEMethodId || 'create',
       context,
-      data instanceof ControlVO ? data.getOrigin() : data,
+      tempData,
     );
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
@@ -116,10 +117,12 @@ export class EditFormService<
     context: IParams,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
+    const _data = data instanceof ControlVO ? data.getOrigin() : data;
+    const tempData = this.getFilteredData(_data);
     let res = await this.exec(
       this.model.updateControlAction?.appDEMethodId || 'update',
       context,
-      data instanceof ControlVO ? data.getOrigin() : data,
+      tempData,
     );
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
@@ -261,7 +264,7 @@ export class EditFormService<
     recursiveIterate(
       this.model,
       (item: IDEFormDetail) => {
-        if (item.detailType === 'FORMITEM') {
+        if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
           const formItem = item as IDEEditFormItem;
           const uiKey = formItem.fieldName || formItem.id!.toLowerCase();
           const deField =
@@ -279,24 +282,6 @@ export class EditFormService<
           }
           this.dataUIMap.set(uiKey, mapField);
         }
-        if (item.detailType === 'MDCTRL') {
-          const formItem = item as IDEFormMDCtrl;
-          const uiKey = formItem.fieldName || formItem.id!.toLowerCase();
-          const deField =
-            formItem.fieldName || (item as IDEEditFormItem).appDEFieldId!;
-          let mapField: UIMapField;
-          if (deField) {
-            mapField = new UIMapField(uiKey, deField, {
-              isOriginField: true,
-            });
-          } else {
-            // 前台属性和没属性的表单项，或预置属性
-            mapField = new UIMapField(uiKey, uiKey, {
-              isOriginField: true,
-            });
-          }
-          this.dataUIMap.set(uiKey, mapField);
-        }
       },
       {
         childrenFields: ['deformPages', 'deformDetails'],
@@ -319,4 +304,21 @@ export class EditFormService<
     }
     return res as IHttpResponse<ControlVO>;
   }
+
+  /**
+   * 保存时根据表单项过滤出传给后台的数据
+   *
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-01 10:04:25
+   */
+  getFilteredData(data: IData): IData {
+    const tempData: IData = {};
+    this.dataUIMap.forEach(dataUI => {
+      if (data[dataUI.dataKey] !== undefined) {
+        tempData[dataUI.dataKey] = data[dataUI.dataKey];
+      }
+    });
+    return tempData;
+  }
 }

package/src/controller/control/form/form-detail/form-item/form-item.controller.ts

@@ -162,6 +162,18 @@ export class FormItemController
     return this.model.valueFormat;
   }
 
+  /**
+   * 数据类型
+   *
+   * @author zhanghengfeng
+   * @date 2023-09-01 11:09:00
+   * @readonly
+   * @type {(number | undefined)}
+   */
+  get dataType(): number | undefined {
+    return this.model.dataType;
+  }
+
   /**
    * 初始化
    *

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.controller.ts

@@ -67,7 +67,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
   public initColumns(details: IDEFormDetail[]): void {
     details.forEach(async detail => {
       if (detail.detailType === 'FORMITEM') {
-        const { editor } = detail as IDEFormItem;
+        const { editor, dataType } = detail as IDEFormItem;
         const editorProvider = await getEditorProvider(editor!);
         if (editorProvider) {
           const c = await editorProvider.createController(editor!, {
@@ -75,6 +75,7 @@ export class FormMDCtrlRepeaterGridController extends FormMDCtrlContentTypeContr
             valueFormat: (editor as IDEFormItem).valueFormat,
             context: this.parent.form.context,
             params: this.parent.form.params,
+            dataType,
           });
           this.editorMap[detail.codeName!] = {
             provider: editorProvider,

package/src/controller/control/grid/grid/grid.controller.ts

@@ -31,6 +31,7 @@ import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
 import { isValueChange } from '../../../utils';
+import { ScriptFactory } from '../../../../utils';
 
 /**
  * 表格控制器
@@ -567,11 +568,36 @@ export class GridController
             key: column.codeName!,
             caption: column.caption!,
             hidden: !!column.hideDefault,
+            uaColumn: column.columnType === 'UAGRIDCOLUMN',
           });
         }
       },
       { childrenFields: ['degridColumns'] },
     );
+    this.calcColumnFixed();
+  }
+
+  /**
+   * 计算列的固定状态
+   * @author lxm
+   * @date 2023-08-31 05:12:27
+   * @protected
+   */
+  protected calcColumnFixed(): void {
+    const showColumns = this.state.columnStates.filter(
+      column => !column.hidden,
+    );
+    const allNum = showColumns.length;
+    const { frozenFirstColumn, frozenLastColumn } = this.model;
+    showColumns.forEach((column, index) => {
+      if (column.uaColumn) {
+        column.fixed = index + 1 <= Math.floor(allNum / 2) ? 'left' : 'right';
+      } else if (frozenFirstColumn && index < frozenFirstColumn) {
+        column.fixed = 'left';
+      } else if (frozenLastColumn && index >= allNum - frozenLastColumn) {
+        column.fixed = 'right';
+      }
+    });
   }
 
   /**
@@ -778,22 +804,28 @@ export class GridController
       throw new RuntimeError(`没找到${updateId}编辑列更新`);
     }
 
-    const { appDEMethodId, degeiupdateDetails } = findUpdate;
+    const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } =
+      findUpdate;
     const updateItems = degeiupdateDetails!.map(item => item.id!);
-
-    const params = { ...this.params, ...row.data.getOrigin() };
-    const res = await this.service.updateGridEditItem(
-      appDEMethodId!,
-      this.context,
-      params,
-    );
-    const result = res.data;
-    if (result && updateItems?.length) {
-      await Promise.all(
-        updateItems.map(itemName => {
-          return this.setRowValue(row, itemName, result[itemName]);
-        }),
+    if (customCode && scriptCode) {
+      ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
+        isAsync: false,
+      });
+    } else {
+      const params = { ...this.params, ...row.data.getOrigin() };
+      const res = await this.service.updateGridEditItem(
+        appDEMethodId!,
+        this.context,
+        params,
       );
+      const result = res.data;
+      if (result && updateItems?.length) {
+        await Promise.all(
+          updateItems.map(itemName => {
+            return this.setRowValue(row, itemName, result![itemName]);
+          }),
+        );
+      }
     }
   }
 

package/src/controller/control/grid/grid/grid.service.ts

@@ -64,7 +64,10 @@ export class GridService extends MDControlService<IDEGrid> {
     context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
-    let res = await this.entityService.exec(methodName, context, params);
+    const entityService = await this.app.deService.getService(
+      this.model.appDataEntityId!,
+    );
+    let res = await entityService.exec(methodName, context, params);
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
   }

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -206,7 +206,7 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
    * @return {*}  {(string | undefined)}
    */
   calcFieldAgg(items: IData[]): string | undefined {
-    const { aggField, aggMode, aggValueFormat } = this.model;
+    const { aggField, aggMode, aggValueFormat, unitName } = this.model;
     // 无聚合配置的列，返回undefined
     if (aggMode === 'NONE') {
       return;
@@ -250,20 +250,24 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
         `暂未支持聚合模式${this.grid.model.aggMode}`,
       );
     }
-    if (!aggValueFormat) {
-      return `${aggValue}`;
-    }
+
+    let value = `${aggValue}`;
 
     // 聚合值格式化
-    const formatValue: string = '';
-    switch (aggValueFormat) {
-      default:
-        throw new ModelError(
-          this.model,
-          `暂未支持${aggValueFormat}的聚合值格式化`,
-        );
+    if (aggValueFormat) {
+      try {
+        value = ibiz.util.text.format(`${aggValue}`, aggValueFormat);
+      } catch (error) {
+        ibiz.log.error(`${aggValue} 值格式化错误`);
+      }
     }
-    return formatValue;
+
+    // 添加单位
+    if (value && unitName) {
+      value += unitName;
+    }
+
+    return value;
   }
 
   /**

package/src/de-logic/de-logic-context.ts

@@ -9,6 +9,14 @@ import { DELogicParam } from './de-logic-param/de-logic-param';
  * @class DELogicContext
  */
 export class DELogicContext {
+  /**
+   * 上一次返回值
+   * @author lxm
+   * @date 2023-09-04 09:22:52
+   * @type {unknown}
+   */
+  lastReturn: unknown;
+
   /**
    * Creates an instance of DELogicContext.
    * @author lxm
@@ -82,4 +90,28 @@ export class DELogicContext {
    * @type {string}
    */
   defaultParamName: string = 'Default';
+
+  /**
+   * 设置上一次返回值
+   * @author lxm
+   * @date 2023-09-04 09:23:52
+   * @param {unknown} value
+   */
+  setLastReturn(value: unknown): void {
+    this.lastReturn = value;
+  }
+
+  /**
+   * 初始化上一次返回参数类型的逻辑参数
+   * @author lxm
+   * @date 2023-09-04 09:52:00
+   * @param {string} tag
+   */
+  initLastReturnParam(tag: string): void {
+    Object.defineProperty(this.params, tag, {
+      enumerable: true,
+      configurable: true,
+      get: () => this.lastReturn,
+    });
+  }
 }

package/src/de-logic/de-logic-param/de-logic-param.ts

@@ -48,7 +48,8 @@ export class DELogicParam {
       // 数据对象变量
       ctx.params[tag] = {};
     } else if (m.lastReturnParam) {
-      throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+      // 上一次调用返回
+      ctx.initLastReturnParam(tag);
     } else if (m.appContextParam) {
       // 应用上下文
       ctx.params[tag] = ctx.context;

package/src/engine/md-view.engine.ts

@@ -10,6 +10,7 @@ import {
   MDCtrlRemoveParams,
   ISearchBarController,
   MDCtrlLoadParams,
+  EventBase,
 } from '../interface';
 import { calcDeCodeNameById } from '../model';
 import { ViewEngineBase } from './view-base.engine';
@@ -82,9 +83,7 @@ export class MDViewEngine extends ViewEngineBase {
   async onMounted(): Promise<void> {
     await super.onMounted();
     const { model } = this.view;
-    this.xdataControl.evt.on('onActive', async event => {
-      await this.openData(event);
-    });
+    this.xdataControl.evt.on('onActive', this.onXDataActive.bind(this));
     this.xdataControl.evt.on('onSelectionChange', async event => {
       // 更新工具栏状态
       this.toolbar?.calcButtonState(
@@ -135,6 +134,18 @@ export class MDViewEngine extends ViewEngineBase {
     }
   }
 
+  /**
+   * 多数据部件激活事件处理
+   * @author lxm
+   * @date 2023-08-31 02:53:37
+   * @protected
+   * @param {EventBase} event
+   * @return {*}  {Promise<void>}
+   */
+  protected async onXDataActive(event: EventBase): Promise<void> {
+    await this.openData(event);
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key: string, args: any): Promise<IData | null | undefined> {
     if (key === SysUIActionTag.TOGGLE_FILTER) {

package/src/interface/controller/controller/editor/i-editor-container.controller.ts

@@ -37,4 +37,13 @@ export interface IEditorContainerController {
    * @type {IParams}
    */
   params: IParams;
+
+  /**
+   * 数据类型
+   *
+   * @author zhanghengfeng
+   * @date 2023-09-01 11:09:38
+   * @type {(number | undefined)}
+   */
+  dataType: number | undefined;
 }