@ibiz-template/runtime 0.5.0-beta.4 → 0.5.0

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

@@ -211,10 +211,10 @@ export class DEActionMethod extends Method {
             const addData = this.createEntity(entity);
             let resultData;
             if (isArray(addData)) {
-                resultData = await Promise.all(addData.map(item => this.service.local.add(context, item)));
+                resultData = await Promise.all(addData.map(item => this.service.local.add(context, this.attach(context, item))));
             }
             else {
-                resultData = await this.service.local.add(context, addData);
+                resultData = await this.service.local.add(context, this.attach(context, addData));
             }
             return new HttpResponse(resultData);
         }
@@ -257,7 +257,7 @@ export class DEActionMethod extends Method {
         try {
             let key = null;
             if (params) {
-                // key = params[this.entity.keyName];
+                key = params[this.entity.keyAppDEFieldId.toLowerCase()];
             }
             if (!key && context) {
                 key = context[this.entity.codeName.toLowerCase()];
@@ -286,10 +286,10 @@ export class DEActionMethod extends Method {
             const updateData = this.createEntity(entity);
             let resultData;
             if (isArray(updateData)) {
-                resultData = await Promise.all(updateData.map(item => this.service.local.update(context, item)));
+                resultData = await Promise.all(updateData.map(item => this.service.local.update(context, this.attach(context, item))));
             }
             else {
-                resultData = await this.service.local.update(context, updateData);
+                resultData = await this.service.local.update(context, this.attach(context, updateData));
             }
             if (resultData) {
                 return new HttpResponse(resultData);
@@ -313,7 +313,7 @@ export class DEActionMethod extends Method {
         try {
             let key = null;
             if (params) {
-                // key = params[this.entity.keyName];
+                key = params[this.entity.keyAppDEFieldId.toLowerCase()];
             }
             if (!key && context) {
                 key = context[this.entity.codeName.toLowerCase()];
@@ -350,4 +350,32 @@ export class DEActionMethod extends Method {
         // }
         return new HttpResponse(true);
     }
+    /**
+     * 在新建、更新时，根据界面域下的关系，自动填充相关父属性
+     *
+     * @author chitanda
+     * @date 2024-01-02 15:01:30
+     * @protected
+     * @param {IContext} context
+     * @param {IDataEntity} data
+     * @return {*}  {IDataEntity}
+     */
+    attach(context, data) {
+        const sandboxId = context.srfsessionid;
+        const uiDomain = ibiz.uiDomainManager.get(sandboxId);
+        const configs = uiDomain.getDERConfig(this.entity.id);
+        if (configs.length > 0) {
+            configs.forEach(config => {
+                const { majorDECodeName, pickupDEFName } = config;
+                const majorLowerCodeName = majorDECodeName.toLowerCase();
+                const pickupLowerDEFName = pickupDEFName.toLowerCase();
+                const majorkey = context[majorLowerCodeName];
+                // 父主键不能是自身，否则自关系的时候就改错了
+                if (majorkey && majorkey !== data.srfkey) {
+                    data[pickupLowerDEFName] = majorkey;
+                }
+            });
+        }
+        return data;
+    }
 }

package/out/service/utils/de-cache/de-cache.js

@@ -422,9 +422,9 @@ export class DECache {
      * @date 2023-12-22 13:12:17
      */
     clear() {
-        this.cacheMap.forEach(item => {
-            item.destroy();
-        });
+        // this.cacheMap.forEach(item => {
+        //   item.destroy();
+        // });
         this.cacheMap.clear();
     }
     /**

package/out/utils/open-redirect-view/open-redirect-view.d.ts

@@ -23,14 +23,27 @@ export declare function openRedirectView(appView: IAppRedirectView, context: ICo
  * 本地打开工作流重定向视图
  *
  * @description 工作流 appredirectview 特殊处理，全局通过 appredirectview 跳转工作流重定向，均使用此方法
- * @author chitanda
- * @date 2023-01-12 11:01:40
+ * @author zk
+ * @date 2024-01-02 11:01:16
+ * @export
+ * @param {IContext} context
+ * @param {string} linkUrl
+ * @param {IOpenViewOptions} [opts={}]
+ * @return {*}  {Promise<void>}
+ */
+export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<void>;
+/**
+ * 获取本地打开工作流重定向视图的相关信息
+ *
+ * @author zk
+ * @date 2024-01-02 11:01:38
  * @export
- * @param {IAppDERedirectView} appView
  * @param {IContext} context
  * @param {string} linkUrl
+ * @param {IOpenViewOptions} [opts={}]
+ * @return {*}  {Promise<ToViewParams>}
  */
-export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<ToViewParams>;
+export declare function getLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<ToViewParams>;
 /**
  * 获取处理后的重定向视图最终要跳转视图的相关信息
  * @author lxm

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAoDvB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,CAAC,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAsG3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CA+BrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA6CjB"}
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAoDvB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,CAAC,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAsG3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CA+BrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA6CjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -23,14 +23,30 @@ export async function openRedirectView(appView, context, params = {}, opts = {})
  * 本地打开工作流重定向视图
  *
  * @description 工作流 appredirectview 特殊处理，全局通过 appredirectview 跳转工作流重定向，均使用此方法
- * @author chitanda
- * @date 2023-01-12 11:01:40
+ * @author zk
+ * @date 2024-01-02 11:01:16
  * @export
- * @param {IAppDERedirectView} appView
  * @param {IContext} context
  * @param {string} linkUrl
+ * @param {IOpenViewOptions} [opts={}]
+ * @return {*}  {Promise<void>}
  */
 export async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
+    const toView = await getLocalOpenWFRedirectView(context, linkUrl, opts);
+    await ibiz.commands.execute(OpenAppViewCommand.TAG, toView.viewId, toView.context, toView.params, toView.opts);
+}
+/**
+ * 获取本地打开工作流重定向视图的相关信息
+ *
+ * @author zk
+ * @date 2024-01-02 11:01:38
+ * @export
+ * @param {IContext} context
+ * @param {string} linkUrl
+ * @param {IOpenViewOptions} [opts={}]
+ * @return {*}  {Promise<ToViewParams>}
+ */
+export async function getLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
     const i = linkUrl.lastIndexOf('?');
     const queryStr = decodeURIComponent(linkUrl.substring(i + 1, linkUrl.length));
     const params = qs.parse(queryStr, { delimiter: ';' });
@@ -123,7 +139,7 @@ export async function getDERedirectToView(appView, context, params = {}, opts =
                     return { type: 'url', url: linkUrl };
                 }
                 if (linkUrl.startsWith('appredirectview?')) {
-                    const toView = await toLocalOpenWFRedirectView(context, linkUrl, opts);
+                    const toView = await getLocalOpenWFRedirectView(context, linkUrl, opts);
                     return Object.assign({ type: 'view' }, toView);
                 }
                 throw new RuntimeError(`未支持的linkUrl格式:${linkUrl}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.0-beta.4",
+  "version": "0.5.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.0-beta.4",
+    "@ibiz-template/core": "^0.5.0",
     "@ibiz/model-core": "^0.1.0",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "5ae4c48f5f1ade5134d8fc90b3fd176fbe102149"
+  "gitHead": "84126d4a93b6641962d688ef6d92fce3bea7c2d1"
 }

package/src/app-hub.ts

@@ -345,4 +345,10 @@ export class AppHub implements IAppHubService {
     }
     return [];
   }
+
+  reset(): void {
+    this.appMap.clear();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (this.configCache as any) = undefined;
+  }
 }

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -10,9 +10,12 @@ import {
   IAppMenuEvent,
   IAppMenuController,
   IAppService,
+  IAppMenuItemProvider,
 } from '../../../interface';
 import { AppCounter } from '../../../service';
 import { ControlController } from '../../common';
+import { getAppMenuItemProvider } from '../../../register';
+import { CTX } from '../../ctx';
 
 /**
  * 应用菜单控制器
@@ -34,6 +37,22 @@ export class AppMenuController
     this.state.menuItemsState = {};
   }
 
+  /**
+   * 所有菜单项，平铺开
+   * @author lxm
+   * @date 2023-12-29 02:43:35
+   * @type {IAppMenuItem[]}
+   */
+  allAppMenuItems!: IAppMenuItem[];
+
+  /**
+   * 菜单项适配器集合
+   * @author lxm
+   * @date 2023-07-19 04:14:50
+   * @type {{ [key: string]: IProvider }}
+   */
+  itemProviders: { [key: string]: IAppMenuItemProvider } = {};
+
   /**
    * 视图层级
    *
@@ -45,10 +64,15 @@ export class AppMenuController
     return this.view.modal.routeDepth;
   }
 
+  constructor(model: IAppMenu, context: IContext, params: IParams, ctx: CTX) {
+    super(model, context, params, ctx);
+    this.flattenAllItems();
+  }
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
-
     this.app = await ibiz.hub.getApp(this.context.srfappid);
+    await this.initAppMenuItemProviders();
 
     // 初始化菜单项状态
     this.model.appMenuItems?.forEach(item => {
@@ -56,6 +80,24 @@ export class AppMenuController
     });
   }
 
+  /**
+   * 初始化菜单项的适配器
+   * @author lxm
+   * @date 2023-12-29 02:50:20
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initAppMenuItemProviders(): Promise<void> {
+    await Promise.all(
+      this.allAppMenuItems.map(async item => {
+        const provider = await getAppMenuItemProvider(item);
+        if (provider) {
+          this.itemProviders[item.id!] = provider;
+        }
+      }),
+    );
+  }
+
   /**
    * 菜单项点击回调，触发对应的应用功能
    *
@@ -82,6 +124,12 @@ export class AppMenuController
       event,
     });
 
+    // 如果有适配器，走适配器的点击处理
+    const provider = this.itemProviders[id];
+    if (provider && provider.onClick) {
+      return provider.onClick(menuItem, event as MouseEvent, this);
+    }
+
     if (!menuItem.appFuncId) {
       throw new RuntimeModelError(menuItem, '没有配置应用功能');
     }
@@ -139,11 +187,11 @@ export class AppMenuController
 
   /**
    * 所有项平铺
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2022-09-09 16:48:21
+   * @author lxm
+   * @date 2023-12-29 02:42:39
+   * @protected
    */
-  getAllItems(): IAppMenuItem[] {
+  protected flattenAllItems(): void {
     const result: IAppMenuItem[] = [];
     const flattenMenus = (menuItems: IAppMenuItem[]): void => {
       menuItems.forEach(item => {
@@ -154,7 +202,17 @@ export class AppMenuController
       });
     };
     flattenMenus(this.model.appMenuItems!);
-    return result;
+    this.allAppMenuItems = result;
+  }
+
+  /**
+   * 所有项平铺
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2022-09-09 16:48:21
+   */
+  getAllItems(): IAppMenuItem[] {
+    return this.allAppMenuItems;
   }
 
   /**

package/src/controller/control/gantt/gantt.controller.ts

@@ -11,6 +11,7 @@ import {
 } from '../../../interface';
 import { GanttService } from './gantt.service';
 import { TreeGridExController } from '../tree-grid-ex';
+import { calcDeCodeNameById } from '../../../model';
 
 /**
  * 甘特图控制器
@@ -37,7 +38,6 @@ export class GanttController
    */
   protected initState(): void {
     super.initState();
-    this.state.rootNodes = [];
     this.state.ganttStyle = {};
   }
 
@@ -123,9 +123,9 @@ export class GanttController
         ? this.transformNodeDataItem(nodeModel, data)
         : data;
       if (Object.keys(newData).length > 0) {
-        const [, entityCodename] = nodeModel.appDataEntityId!.split('.');
+        const deName = calcDeCodeNameById(nodeModel.appDataEntityId!);
         const tempContext = Object.assign(this.context.clone(), {
-          [entityCodename]: currentNode.srfkey,
+          [deName]: currentNode.srfkey,
         });
         const response = await this.service.execDeService(
           nodeModel.appDataEntityId!,

package/src/controller/control/grid/grid/entity-schema.ts

@@ -0,0 +1,105 @@
+import { IDEGridDataItem, IDEGridFieldColumn } from '@ibiz/model-core';
+import { GridController } from './grid.controller';
+
+const TypeToDataType: { [p: string]: number } = {
+  string: 25,
+  number: 6,
+  integer: 9,
+  date: 5,
+} as const;
+
+/**
+ * 根据json模型计算出表格列模型
+ * @author lxm
+ * @date 2024-01-02 10:27:40
+ * @export
+ * @param {IData} json
+ * @param {SearchBarController} c
+ * @return {*}  {ISearchBarFilter[]}
+ */
+export async function calcColumnModelBySchema(
+  json: IData,
+  c: GridController,
+): Promise<
+  | { degridColumns: IDEGridFieldColumn[]; degridDataItems: IDEGridDataItem[] }
+  | undefined
+> {
+  if (!json.properties) {
+    return;
+  }
+  const { properties } = json;
+  if (!(Object.keys(properties).length > 0)) {
+    return;
+  }
+
+  const addFields: {
+    key: string;
+    description: string;
+    type: string;
+  }[] = [];
+  Object.keys(properties).forEach((key: string) => {
+    let type: string;
+
+    switch (properties[key].type) {
+      case 'string':
+        type = 'string';
+        if (properties[key].format === 'date-time') {
+          type = 'date';
+        }
+        break;
+      case 'integer':
+        type = 'integer';
+        break;
+      case 'number':
+        type = 'number';
+        break;
+      default:
+        ibiz.log.error(`未支持的类型${properties[key].type}`);
+        return;
+    }
+
+    addFields.push({
+      key,
+      description: properties[key].description,
+      type,
+    });
+  });
+
+  // 属性codeName对应的属性id
+  const codeNameToId: { [p: string]: string } = {};
+  const dataEntity = await ibiz.hub.getAppDataEntity(
+    c.model.appDataEntityId!,
+    c.model.appId,
+  );
+  dataEntity.appDEFields?.forEach(field => {
+    codeNameToId[field.codeName!.toLowerCase()] = field.id!;
+  });
+
+  const addColumns: IDEGridFieldColumn[] = [];
+  const addDataItems: IDEGridDataItem[] = [];
+
+  addFields.forEach(item => {
+    addColumns.push({
+      appId: c.model.appId,
+      appDEFieldId: codeNameToId[item.key],
+      id: item.key,
+      codeName: item.key,
+      columnType: 'DEFGRIDCOLUMN',
+      width: 150,
+      widthUnit: 'PX',
+      valueType: 'SIMPLE',
+      caption: item.description,
+      dataItemName: item.key,
+    });
+
+    addDataItems.push({
+      appId: c.model.appId,
+      appDEFieldId: codeNameToId[item.key],
+      id: item.key,
+      valueType: 'SIMPLE',
+      dataType: TypeToDataType[item.type],
+    });
+  });
+
+  return { degridColumns: addColumns, degridDataItems: addDataItems };
+}

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

@@ -40,8 +40,15 @@ import { getGridColumnProvider } from '../../../../register';
 import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { exportData, getDefaultValue, isValueChange } from '../../../utils';
+import {
+  ControllerEvent,
+  exportData,
+  getDefaultValue,
+  getEntitySchema,
+  isValueChange,
+} from '../../../utils';
 import { handleAllSettled, ScriptFactory } from '../../../../utils';
+import { calcColumnModelBySchema } from './entity-schema';
 
 /**
  * 表格控制器
@@ -52,9 +59,13 @@ import { handleAllSettled, ScriptFactory } from '../../../../utils';
  * @class GridController
  * @extends {MDControlController<GridModel>}
  */
-export class GridController
-  extends MDControlController<IDEGrid, IGridState, IGridEvent>
-  implements IGridController
+export class GridController<
+    T extends IDEGrid = IDEGrid,
+    S extends IGridState = IGridState,
+    E extends IGridEvent = IGridEvent,
+  >
+  extends MDControlController<T, S, E>
+  implements IGridController<T, S, E>
 {
   /**
    * 表格部件服务
@@ -65,6 +76,10 @@ export class GridController
    */
   declare service: GridService;
 
+  protected get _evt(): ControllerEvent<IGridEvent> {
+    return this.evt;
+  }
+
   /**
    * 是否有配置宽度自适应列
    *
@@ -81,6 +96,14 @@ export class GridController
    */
   isMultistageHeader: boolean = false;
 
+  /**
+   * 是否添加jsonschema里定义的表格列
+   * @author lxm
+   * @date 2024-01-02 05:27:16
+   * @type {boolean}
+   */
+  addSchemaColumn: boolean = false;
+
   /**
    * 所有表格列控制器集合
    *
@@ -221,6 +244,8 @@ export class GridController
    * @returns {*}  {Promise<void>}
    */
   protected async onCreated(): Promise<void> {
+    await this.initByEntitySchema();
+
     await super.onCreated();
 
     this.service = new GridService(this.model);
@@ -241,6 +266,46 @@ export class GridController
     await this.initGroup();
   }
 
+  /**
+   * 根据jsonschema初始化自定义表格列
+   * @author lxm
+   * @date 2024-01-02 04:41:23
+   * @return {*}  {Promise<void>}
+   */
+  async initByEntitySchema(): Promise<void> {
+    if (!this.addSchemaColumn) {
+      return;
+    }
+
+    const json = await getEntitySchema(
+      this.model.appDataEntityId!,
+      this.context,
+    );
+    if (!json) {
+      return;
+    }
+
+    const result = await calcColumnModelBySchema(json, this);
+    if (result && result.degridColumns.length > 0) {
+      const { degridColumns, degridDataItems } = result;
+      // 修改模型之前拷贝一份，避免污染原始数据
+      (this as IData).model = clone(this.model);
+      this.model.degridColumns = [
+        ...(this.model.degridColumns || []).filter(item => {
+          return degridColumns.findIndex(x => x.id === item.id) === -1;
+        }),
+        ...degridColumns,
+      ];
+
+      this.model.degridDataItems = [
+        ...(this.model.degridDataItems || []).filter(item => {
+          return degridDataItems.findIndex(x => x.id === item.id) === -1;
+        }),
+        ...degridDataItems!,
+      ];
+    }
+  }
+
   /**
    * 初始化表格分组
    * @author lxm
@@ -550,7 +615,7 @@ export class GridController
         ? await this.service.create(tempContext, data)
         : await this.service.update(tempContext, data);
     } catch (error) {
-      await this.evt.emit('onSaveError', undefined);
+      await this._evt.emit('onSaveError', undefined);
       this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
         error: error as Error,
         data: rowState.data,
@@ -564,7 +629,7 @@ export class GridController
     rowState.modified = false;
 
     this.gridStateNotify(rowState, GridNotifyState.SAVE);
-    await this.evt.emit('onSaveSuccess', undefined);
+    await this._evt.emit('onSaveSuccess', undefined);
   }
 
   async saveAll(): Promise<void> {
@@ -717,7 +782,7 @@ export class GridController
 
     try {
       await this.dataChangeNotify(row, [name]);
-      await this.evt.emit('onGridDataChange', {
+      await this._evt.emit('onGridDataChange', {
         data: this.state.rows.map(_row => {
           return _row.data;
         }),
@@ -810,7 +875,7 @@ export class GridController
       } else if (row.data.srfuf === Srfuf.CREATE) {
         // 新建的行取消时删除这一行的数据
         row.showRowEdit = false;
-        this.evt.emit('onRowEditChange', { row });
+        this._evt.emit('onRowEditChange', { row });
         return this.remove({ data: [row.data], silent: true });
       } else if (row.cacheData) {
         // 取消的时候，还原编辑前的数据
@@ -841,7 +906,7 @@ export class GridController
       row.editColStates[column.fieldName].editable = toState;
     });
 
-    this.evt.emit('onRowEditChange', { row });
+    this._evt.emit('onRowEditChange', { row });
   }
 
   /**

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

@@ -31,7 +31,7 @@ export class GridService extends MDControlService<IDEGrid> {
         if (deField) {
           const deFieldKey = deField.toLowerCase();
           const dataItem = dataItems.find(
-            item => item.appDEFieldId === deField,
+            item => item.id === column.dataItemName,
           );
           if (dataItem) {
             mapField = new UIMapField(uiKey, deFieldKey, {

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

@@ -261,7 +261,7 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
   calcFieldAgg(items: IData[]): string | undefined {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
     // 无聚合配置的列，返回undefined
-    if (aggMode === 'NONE') {
+    if (isNil(aggMode) || aggMode === 'NONE') {
       return;
     }
     const fieldName = aggField || this.model.id!;