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

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

@@ -54,6 +54,17 @@ export class EditFormController
     >;
   }
 
+  /**
+   * 表单旧数据
+   *
+   * @author zk
+   * @date 2023-12-20 11:12:43
+   * @protected
+   * @type {IData}
+   * @memberof FormController
+   */
+  protected oldData: IData = new ControlVO();
+
   /**
    * 初始化方法
    *
@@ -212,6 +223,8 @@ export class EditFormController
 
     this.state.modified = false;
     this.state.data = res.data;
+    // 缓存旧数据
+    this.oldData = this.data.clone();
     this.formStateNotify(FormNotifyState.LOAD);
 
     await this.evt.emit('onLoadSuccess', undefined);
@@ -276,6 +289,8 @@ export class EditFormController
       } else {
         mergeInLeft(this.data, res.data);
       }
+      // 保存结束后更新旧数据
+      this.oldData = this.data.clone();
       this.data.tempsrfkey = this.data.srfkey;
     }
     this.state.modified = false;
@@ -510,16 +525,45 @@ export class EditFormController
    * @return {*}  {Promise<void>}
    */
   async autoSave(): Promise<void> {
-    if (this.model.enableAutoSave) {
-      // 自动保存静默，报错直接控制台输出
-      try {
-        await this.save({ silent: true, noFillBack: true });
-      } catch (error) {
-        ibiz.log.error(error);
-      }
+    if (!this.model.enableAutoSave) {
+      return;
+    }
+    // todo 临时模型数据 节流保存
+    const { demand } = this.model as IData;
+    // 自动保存静默，报错直接控制台输出
+    const saveParam: FormSaveParams = { silent: true, noFillBack: true };
+    if (demand) {
+      saveParam.data = this.getDiffData();
+    }
+    try {
+      await this.save(saveParam);
+    } catch (error) {
+      ibiz.log.error(error);
     }
   }
 
+  /**
+   * 比较旧数据跟当前数据的差异返回差异数据
+   *
+   * @author zk
+   * @date 2023-12-20 10:12:06
+   * @protected
+   * @return {*}  {IData}
+   * @memberof EditFormController
+   */
+  protected getDiffData(): IData {
+    const { data } = this.state;
+    const diffData: IData = {};
+    Object.keys(data).forEach(key => {
+      // 值不一致 || 属性为主键
+      if (data[key] !== this.oldData[key] || key === data.srfkeyfield) {
+        diffData[key] = data[key];
+      }
+    });
+    diffData.srfuf = data.srfuf;
+    return new ControlVO(diffData, (this.oldData as ControlVO).$dataUIMap);
+  }
+
   /**
    * 设置simple模式的数据
    * @author lxm

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

@@ -844,6 +844,22 @@ export class GridController
     this.evt.emit('onRowEditChange', { row });
   }
 
+  /**
+   * 获取部件默认排序模型
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-28 18:43:27
+   */
+  getSortModel(): {
+    minorSortAppDEFieldId: string | undefined;
+    minorSortDir: string | undefined;
+  } {
+    return {
+      minorSortAppDEFieldId: this.model.minorSortAppDEFieldId,
+      minorSortDir: this.model.minorSortDir,
+    };
+  }
+
   /**
    * 设置排序
    *
@@ -853,19 +869,11 @@ export class GridController
    * @param {string} order 排序顺序
    */
   setSort(fieldId?: string, order?: 'asc' | 'desc'): void {
-    if (fieldId && order) {
-      const fieldName = this.fieldIdNameMap.get(fieldId)!.toLowerCase();
-      super.setSort(fieldName, order);
-    } else {
-      // 设置默认排序或者置空
-      const { minorSortAppDEFieldId, minorSortDir } = this.model;
-      if (minorSortAppDEFieldId && minorSortDir) {
-        const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId)!;
-        this.state.sortQuery = `${fieldName.toLowerCase()},${minorSortDir.toLowerCase()}`;
-      } else {
-        this.state.sortQuery = '';
-      }
+    let fieldName;
+    if (fieldId) {
+      fieldName = this.fieldIdNameMap.get(fieldId)!.toLowerCase();
     }
+    super.setSort(fieldName, order);
   }
 
   /**

package/src/controller/control/list/list.controller.ts

@@ -29,26 +29,19 @@ export class ListController
   }
 
   /**
-   * 设置排序
-   *
-   * @author lxm
-   * @date 2022-09-28 13:09:44
-   * @param {string} key 排序字段
-   * @param {string} order 排序顺序
+   * 获取部件默认排序模型
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-28 18:43:27
    */
-  setSort(key?: string, order?: 'asc' | 'desc'): void {
-    if (key && order) {
-      super.setSort(key, order);
-    } else {
-      // 设置默认排序或者置空
-      const { minorSortAppDEFieldId, minorSortDir } = this.model;
-      if (minorSortAppDEFieldId && minorSortDir) {
-        const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId)!;
-        this.state.sortQuery = `${fieldName.toLowerCase()},${minorSortDir.toLowerCase()}`;
-      } else {
-        this.state.sortQuery = '';
-      }
-    }
+  getSortModel(): {
+    minorSortAppDEFieldId: string | undefined;
+    minorSortDir: string | undefined;
+  } {
+    return {
+      minorSortAppDEFieldId: this.model.minorSortAppDEFieldId,
+      minorSortDir: this.model.minorSortDir,
+    };
   }
 
   /**

package/src/controller/control/md-ctrl/md-ctrl.controller.ts

@@ -53,28 +53,6 @@ export class MDCtrlController
     this.setSort();
   }
 
-  /**
-   * 设置排序
-   *
-   * @author lxm
-   * @date 2022-09-28 13:09:44
-   * @param {string} key 排序字段
-   * @param {string} order 排序顺序
-   */
-  setSort(key?: string, order?: 'asc' | 'desc'): void {
-    if (key && order) {
-      super.setSort(key, order);
-    } else {
-      // 设置默认排序或者置空
-      const { minorSortAppDEFieldId, minorSortDir } = this.model;
-      if (minorSortAppDEFieldId && minorSortDir) {
-        this.state.sortQuery = `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`;
-      } else {
-        this.state.sortQuery = '';
-      }
-    }
-  }
-
   /**
    * 加载更多
    * @author lxm

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

@@ -1,4 +1,8 @@
-import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
+import {
+  RuntimeError,
+  mergeInLeft,
+  recursiveIterate,
+} from '@ibiz-template/core';
 import { IAppDataEntity, ISearchBar } from '@ibiz/model-core';
 import { isNil } from 'ramda';
 import {
@@ -269,7 +273,7 @@ export class SearchBarController
   }
 
   /**
-   * 格式化过滤项
+   * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
    * @author lxm
    * @date 2023-10-16 03:45:41
    * @param {IFilterNode} node
@@ -293,6 +297,34 @@ export class SearchBarController
     };
   }
 
+  /**
+   * 根据格式化后的过滤项反推出过滤项树节点数据集合
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-28 09:47:45
+   */
+  parseFilters(data: IData): IFilterNode {
+    if (data.condtype === 'GROUP') {
+      return {
+        leaf: false,
+        logicType: data.condop === 'AND' ? 'AND' : 'OR',
+        children: (data.searchconds || []).map((item: IData) =>
+          this.parseFilters(item),
+        ),
+      };
+    }
+    if (data.condtype === 'DEFIELD') {
+      return {
+        leaf: true,
+        field: data.fieldname || null,
+        valueOP: data.condop || null,
+        value: data.value || null,
+      };
+    }
+    throw new RuntimeError(`无效的condtype:${data.condtype}`);
+  }
+
   /**
    * 获取初始过滤项树节点数据集合
    * @return {*}
@@ -340,10 +372,6 @@ export class SearchBarController
                     tempGroup.searchGroupData.columnstates =
                       tempData.theme_model.columnstates;
                   }
-                  if (tempData.theme_model.filternodes) {
-                    tempGroup.searchGroupData.filternodes =
-                      tempData.theme_model.filternodes;
-                  }
                   if (tempData.theme_model.searchconds) {
                     tempGroup.searchGroupData.searchconds =
                       tempData.theme_model.searchconds;
@@ -353,7 +381,7 @@ export class SearchBarController
                   tempGroup.show = tempData.valid_flag === '1';
                 }
               } catch (error) {
-                ibiz.log.error(error);
+                ibiz.log.error(`${item.data}非标准JSON格式:`, error);
               }
             }
             return tempGroup;
@@ -411,11 +439,9 @@ export class SearchBarController
     if (this.grid && this.state.selectedSearchGroupItem) {
       const filters = this.calcFilters();
       const saveParams = {
-        filternodes: this.state.filterNodes,
         searchconds: filters,
         sort: this.grid.state.sortQuery,
         columnstates: this.grid.state.columnStates,
-        show: this.state.selectedSearchGroupItem.show,
       };
       // 根据是否保存过决定是更新还是新建
       if (this.state.selectedSearchGroupItem.saved) {
@@ -459,8 +485,16 @@ export class SearchBarController
         groupItem.show = true;
       }
     }
-    if (groupItem.searchGroupData && groupItem.searchGroupData.filternodes) {
-      this.state.filterNodes = groupItem.searchGroupData.filternodes;
+    if (
+      groupItem.searchGroupData &&
+      groupItem.searchGroupData.searchconds &&
+      groupItem.searchGroupData.searchconds.length > 0
+    ) {
+      // 根据后台标准的searchconds计算出 前端回显的树形结构FilterNodes
+      const filterNodes = groupItem.searchGroupData.searchconds.map(item =>
+        this.parseFilters(item),
+      );
+      this.state.filterNodes = filterNodes;
     } else {
       this.state.filterNodes = this.getOriginFilterNodes();
     }

package/src/controller/control/tree/tree.controller.ts

@@ -6,6 +6,7 @@ import {
 } from '@ibiz-template/core';
 import {
   IDETBUIActionItem,
+  IDEToolbarItem,
   IDETree,
   IDETreeDataSetNode,
   IDETreeNode,
@@ -21,11 +22,7 @@ import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
 import { ContextMenuController } from '../context-menu';
 import { TreeService } from './tree.service';
-import {
-  calcDeCodeNameById,
-  getChildNodeRSs,
-  getUIActionItemsByActionLevel,
-} from '../../../model';
+import { calcDeCodeNameById, getChildNodeRSs } from '../../../model';
 import { ControllerEvent } from '../../utils';
 
 export type DropNodeRS = {
@@ -81,11 +78,19 @@ export class TreeController<
   dropNodeRss = new Map<string, DropNodeRS[]>();
 
   /**
-   * 节点对应的上下文菜单里第一个行为级别为常用操作的项
+   * 节点上下文解析后信息`
    * @author lxm
-   * @date 2023-12-19 03:14:03
+   * @date 2023-12-29 10:38:37
    */
-  nodeClickTBUIActionItem = new Map<string, IDETBUIActionItem>();
+  contextMenuInfos: {
+    [p: string]: {
+      /**
+       * 上下文菜单里第一个行为级别为常用操作的项
+       */
+      clickTBUIActionItem?: IDETBUIActionItem;
+      onlyOneActionItem: boolean;
+    };
+  } = {};
 
   protected initState(): void {
     super.initState();
@@ -208,11 +213,29 @@ export class TreeController<
    */
   protected initNodeClickTBUIActionItem(): void {
     this.model.detreeNodes?.forEach(node => {
-      if (node.decontextMenu?.detoolbarItems?.length) {
-        const items = getUIActionItemsByActionLevel(node.decontextMenu, 200);
-        if (items.length > 0) {
-          this.nodeClickTBUIActionItem.set(node.id!, items[0]);
-        }
+      const contextMenu = node.decontextMenu;
+      if (contextMenu?.detoolbarItems?.length) {
+        let itemNum = 0;
+        const items: IDETBUIActionItem[] = [];
+
+        recursiveIterate(
+          contextMenu,
+          (item: IDEToolbarItem) => {
+            if (item.itemType === 'DEUIACTION') {
+              itemNum += 1;
+              const uiItem = item as IDETBUIActionItem;
+              if (uiItem.actionLevel === 200) {
+                items.push(uiItem);
+              }
+            }
+          },
+          { childrenFields: ['detoolbarItems'] },
+        );
+
+        this.contextMenuInfos[node.id!] = {
+          onlyOneActionItem: itemNum === 1,
+          clickTBUIActionItem: items[0],
+        };
       }
     });
   }
@@ -325,9 +348,15 @@ export class TreeController<
     event: MouseEvent,
   ): Promise<void> {
     // 节点有配置常用操作的上下文菜单时，触发界面行为，后续逻辑都不走
-    if (this.nodeClickTBUIActionItem.has(nodeData.nodeId)) {
-      const item = this.nodeClickTBUIActionItem.get(nodeData.nodeId)!;
-      return this.doUIAction(item.uiactionId!, nodeData, event, item.appId);
+    const clickActionItem =
+      this.contextMenuInfos[nodeData.nodeId]?.clickTBUIActionItem;
+    if (clickActionItem) {
+      return this.doUIAction(
+        clickActionItem.uiactionId!,
+        nodeData,
+        event,
+        clickActionItem.appId,
+      );
     }
 
     // 导航的时候，没有导航视图的时候，节点后续点击逻辑都不走，也不选中
@@ -632,16 +661,23 @@ export class TreeController<
       );
     }
     // * 前后的情况
-    if (draggingNode.parent?.id !== dropNode.parent?.id) {
-      // 父不一样的时候需要判断能否移入到对方的父节点内
-      return !!this.findDropNodeRS(
-        dropNode.parent!.nodeId!,
-        draggingNodeModel.appDataEntityId!,
-      );
+
+    // 父相同的情况下,就是排序，看当前节点是否能排序
+    if (draggingNode.parent?.id === dropNode.parent?.id) {
+      const currentNodeModel = this.getNodeModel(dropNode.nodeId)!;
+      return currentNodeModel?.allowOrder === true;
     }
-    // 父相同的情况下,就是排序，看是否能排序
-    const parentNodeModel = this.getNodeModel(dropNode.nodeId)!;
-    return parentNodeModel?.allowOrder === true;
+
+    // 没有父就是根节点，根节点没有上层关系，无法换父
+    if (!dropNode.parent) {
+      return false;
+    }
+
+    // 父不一样的时候需要判断能否移入到对方的父节点内
+    return !!this.findDropNodeRS(
+      dropNode.parent!.nodeId!,
+      draggingNodeModel.appDataEntityId!,
+    );
   }
 
   /**
@@ -688,7 +724,7 @@ export class TreeController<
     const modifiedNodeDatas: ITreeNodeData[] = [];
     const draggingNodeModel = this.getNodeModel(draggingNode.nodeId)!;
     const dropInNode = dropType === 'inner' ? dropNode : dropNode.parent!;
-    const isChangedParent = dropNode.parent?.id !== draggingNode.parent?.id;
+    const isChangedParent = dropNode?.id !== draggingNode.parent?.id;
     let orderNodeModel = this.getNodeModel(dropNode.nodeId)!;
 
     // * 处理切换父节点

package/src/controller/hub.controller.ts

@@ -16,7 +16,16 @@ export class HubController implements IHubController {
     return ibiz.auth.login(loginName, password);
   }
 
-  logout(): Promise<boolean> {
-    return ibiz.auth.logout();
+  async logout(): Promise<boolean> {
+    const bol = await ibiz.auth.logout();
+    if (bol) {
+      // todo: 匿名登录临时处理退出，后续需要优化
+      const l = window.location;
+      if (l.search.indexOf('isAnonymous=true') !== -1) {
+        const href = `${l.origin}${l.pathname}${l.hash}`;
+        window.history.replaceState({}, '', href);
+      }
+    }
+    return bol;
   }
 }

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

@@ -6,11 +6,9 @@ import {
   HandlebarsUtil,
   RawValueUtil,
   ThemeUtil,
-} from '../../utils';
-import {
   DefaultErrorHandler,
   ErrorHandlerCenter,
-} from '../../utils/error-handler';
+} from '../../utils';
 
 /**
  * 全局工具方法或对象

package/src/interface/controller/state/control/i-search-bar.state.ts

@@ -140,15 +140,10 @@ export interface ISearchGroupData {
    */
   columnstates?: Array<IColumnState>;
 
-  /**
-   * 过滤项树节点数据集合
-   */
-  filternodes?: Array<IFilterNode>;
-
   /**
    * 自定义搜索条件
    */
-  searchconds?: IData;
+  searchconds?: IData[];
 
   /**
    * 表格排序查询条件

package/src/interface/service/i-data-entity/i-data-entity.ts

@@ -1,3 +1,4 @@
+import { HistoryList } from '@ibiz-template/core';
 import { Srfuf } from '../../../service';
 
 /**
@@ -93,6 +94,15 @@ export interface IDataEntity {
    */
   srfuf: Srfuf;
 
+  /**
+   * 数据历史记录，可用于撤销操作
+   *
+   * @author chitanda
+   * @date 2023-12-28 21:12:08
+   * @type {HistoryList<IData>}
+   */
+  readonly history: HistoryList<IData>;
+
   /**
    * 提供当前数据克隆操作，返回克隆后的当前实例
    *
@@ -105,10 +115,19 @@ export interface IDataEntity {
   /**
    * 将指定的数据对象或者实体数据对象的属性值赋值到当前实体
    *
+   * @description 该方法会先创建一次历史记录，销毁此对象时必须调用 history.destroy() 方法
    * @author chitanda
    * @date 2023-05-16 17:05:26
    * @param {(IData | IDataEntity)} data
    * @return {*}  {IDataEntity}
    */
   assign(data: IData | IDataEntity): IDataEntity;
+
+  /**
+   * 销毁当前实体对象
+   *
+   * @author chitanda
+   * @date 2023-12-28 21:12:40
+   */
+  destroy(): void;
 }

package/src/service/app-data-entity/app-data-entity.ts

@@ -3,7 +3,7 @@
 /* eslint-disable max-classes-per-file */
 import { IAppDataEntity } from '@ibiz/model-core';
 import { clone, isNil } from 'ramda';
-import { DataTypes } from '@ibiz-template/core';
+import { DataTypes, HistoryList } from '@ibiz-template/core';
 import { createUUID } from 'qx-util';
 import { Srfuf } from '../constant';
 import { findModelChild } from '../../model';
@@ -24,6 +24,8 @@ export class AppDataEntity implements IDataEntity {
 
   protected declare _entity: IAppDataEntity;
 
+  declare history: HistoryList<IData>;
+
   declare srfdeid: string;
 
   declare srfdecodename: string;
@@ -51,6 +53,9 @@ export class AppDataEntity implements IDataEntity {
    * @param {(IData | AppDataEntity)} [data={}]
    */
   constructor(entity: IAppDataEntity, data: IData | AppDataEntity = {}) {
+    let history = new HistoryList<IData>(
+      data instanceof AppDataEntity ? clone(data._data) : clone(data),
+    );
     Object.defineProperty(this, '_entity', {
       enumerable: false,
       configurable: true,
@@ -59,7 +64,19 @@ export class AppDataEntity implements IDataEntity {
     Object.defineProperty(this, '_data', {
       enumerable: false,
       configurable: true,
-      value: data instanceof AppDataEntity ? clone(data._data) : clone(data),
+      get() {
+        return history.data;
+      },
+    });
+    Object.defineProperty(this, 'history', {
+      enumerable: false,
+      configurable: true,
+      set(v) {
+        history = v;
+      },
+      get() {
+        return history;
+      },
     });
     Object.defineProperty(this, 'srfdeid', {
       get() {
@@ -139,17 +156,19 @@ export class AppDataEntity implements IDataEntity {
    * @protected
    */
   protected defineProperties(): void {
-    const { _data, convertVal } = this;
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const self = this; // _data 不可以解构，或重新声明变量会断掉引用
+    const { convertVal } = this;
     const properties: { [key: string]: PropertyDescriptor } = {};
-    const keys = Object.keys(_data);
+    const keys = Object.keys(this._data);
     keys.forEach(key => {
       properties[key] = {
         enumerable: true,
         set(val: unknown): void {
-          _data[key] = val;
+          self._data[key] = val;
         },
         get(): any {
-          return _data[key];
+          return self._data[key];
         },
       };
     });
@@ -158,14 +177,14 @@ export class AppDataEntity implements IDataEntity {
       properties[key] = {
         enumerable: true,
         set(val: unknown): void {
-          _data[key] = convertVal(val, field.stdDataType);
+          self._data[key] = convertVal(val, field.stdDataType);
         },
         get(): any {
-          return _data[key];
+          return self._data[key];
         },
       };
       // 初始值转换
-      _data[key] = convertVal(_data[key], field.stdDataType);
+      self._data[key] = convertVal(self._data[key], field.stdDataType);
     });
     Object.defineProperties(this, properties);
   }
@@ -178,8 +197,9 @@ export class AppDataEntity implements IDataEntity {
    * @return {*}  {AppDataEntity}
    */
   clone(): AppDataEntity {
-    const entity = new AppDataEntity(this._entity, this._data);
+    const entity = new AppDataEntity(this._entity);
     entity.srfkey = this.srfkey;
+    entity.history = clone(this.history);
     return entity;
   }
 
@@ -203,10 +223,25 @@ export class AppDataEntity implements IDataEntity {
         delete _data[key];
       }
     });
-    Object.assign(this._data, _data);
+    this.history.assign(_data);
     return this;
   }
 
+  /**
+   * 实体对象销毁
+   *
+   * @author chitanda
+   * @date 2023-12-28 21:12:24
+   */
+  destroy(): void {
+    this.history.destroy();
+    Object.defineProperty(this, '_entity', {
+      enumerable: false,
+      configurable: true,
+      value: null,
+    });
+  }
+
   /**
    * 根据属性的数据类型转换值
    * @author lxm

package/src/service/dto/method.dto.ts

@@ -215,7 +215,7 @@ export class MethodDto {
                 });
                 await dto.sets(context, items);
                 // 删除下边一行代码，DTO 的属性也不能直接删除。界面上表单类似重复器的地方会用到，保存时也需要由界面提供
-                delete datum[key];
+                // delete datum[key];
               } else {
                 await dto.sets(context, []);
               }

package/src/service/utils/de-cache/de-cache.ts

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