@ibiz-template/runtime 0.5.0-beta.3 → 0.5.0-beta.5

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

@@ -1,5 +1,9 @@
-import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
-import { IAppDataEntity, ISearchBar } from '@ibiz/model-core';
+import {
+  RuntimeError,
+  mergeInLeft,
+  recursiveIterate,
+} from '@ibiz-template/core';
+import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
 import { isNil } from 'ramda';
 import {
   ISearchBarState,
@@ -13,6 +17,8 @@ import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
 import { SearchBarService } from './search-bar.service';
+import { getEntitySchema } from '../../utils';
+import { calcFilterModelBySchema } from './entity-schema';
 
 /**
  * 搜索栏控制器
@@ -67,6 +73,22 @@ export class SearchBarController
    */
   isBackendSearchGroup = this.model.searchBarStyle === 'SEARCHBAR2';
 
+  /**
+   * 启用自定义过滤项
+   * @author lxm
+   * @date 2023-12-29 04:15:34
+   * @type {boolean}
+   */
+  enableFilter: boolean = this.model.enableFilter === true;
+
+  /**
+   * 最终使用的searchBarFilters
+   * @author lxm
+   * @date 2023-12-29 06:55:13
+   * @type {ISearchBarFilter[]}
+   */
+  searchBarFilters!: ISearchBarFilter[];
+
   /**
    * 表格控制器
    * @return {*}
@@ -89,16 +111,24 @@ export class SearchBarController
     super.initState();
     this.state.query = '';
     this.state.selectedGroupItem = null;
+    this.state.searchBarGroups = [];
+    this.state.selectedSearchGroupItem = null;
+    this.initFilterState();
+  }
+
+  /**
+   * 初始化Filter相关的属性
+   * @author lxm
+   * @date 2023-12-29 04:18:02
+   * @protected
+   */
+  protected initFilterState(): void {
+    this.resetFilter();
     this.state.visible = !!(
       this.model.enableQuickSearch ||
       this.model.enableGroup ||
-      this.model.enableFilter
+      this.enableFilter
     );
-    if (this.model.enableFilter) {
-      this.resetFilter();
-    }
-    this.state.searchBarGroups = [];
-    this.state.selectedSearchGroupItem = null;
   }
 
   protected async onCreated(): Promise<void> {
@@ -119,10 +149,44 @@ export class SearchBarController
       await this.service.init(this.context);
     }
 
+    await this.initByEntitySchema();
     await this.initSearchBarFilters();
     await this.initSearBarGroups();
   }
 
+  /**
+   * 根据实体jsonschema初始化
+   * @author lxm
+   * @date 2023-12-29 04:21:31
+   * @return {*}  {Promise<void>}
+   */
+  async initByEntitySchema(): Promise<void> {
+    this.enableFilter = true;
+    const json = await getEntitySchema(this.appDataEntity.id!, this.context);
+    if (!json) {
+      return;
+    }
+    const addSearchBarFilters = calcFilterModelBySchema(json, this);
+
+    const mergeFilters: ISearchBarFilter[] = [];
+    this.model.searchBarFilters?.forEach(filter => {
+      const findindex = addSearchBarFilters.findIndex(
+        item =>
+          item.appDEFieldId === filter.appDEFieldId &&
+          (filter.defsearchMode?.valueOP
+            ? item.defsearchMode!.valueOP === filter.defsearchMode.valueOP
+            : true),
+      );
+      if (findindex === -1) {
+        mergeFilters.push(filter);
+      }
+    });
+
+    addSearchBarFilters.push(...mergeFilters);
+
+    this.searchBarFilters = addSearchBarFilters;
+  }
+
   /**
    * 计算快速搜索的占位
    * @author lxm
@@ -229,8 +293,8 @@ export class SearchBarController
    * @return {*}  {Promise<void>}
    */
   protected async initSearchBarFilters(): Promise<void> {
-    if (this.model.searchBarFilters?.length) {
-      this.model.searchBarFilters.forEach(item => {
+    if (this.searchBarFilters?.length) {
+      this.searchBarFilters.forEach(item => {
         const filterController = new SearchBarFilterController(item, this);
         this.filterControllers.push(filterController);
       });
@@ -269,7 +333,7 @@ export class SearchBarController
   }
 
   /**
-   * 格式化过滤项
+   * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
    * @author lxm
    * @date 2023-10-16 03:45:41
    * @param {IFilterNode} node
@@ -293,6 +357,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 +432,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 +441,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 +499,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 +545,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/control/tree-grid-ex/tree-grid-ex.controller.ts

@@ -9,7 +9,6 @@ import {
   ITreeNodeData,
 } from '../../../interface';
 import { getTreeGridExColumnProvider } from '../../../register';
-
 import { TreeGridExService } from './tree-grid-ex.service';
 import { TreeController } from '../tree/tree.controller';
 import {
@@ -103,14 +102,15 @@ export class TreeGridExController<
   protected initState(): void {
     super.initState();
     this.state.columnStates = [];
+    this.state.rootNodes = [];
     this.state.rows = {};
   }
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
 
-    this.initColumnStates();
     await this.initGridColumns();
+    this.initColumnStates();
   }
 
   protected async initService(): Promise<void> {

package/src/controller/utils/index.ts

@@ -8,3 +8,4 @@ export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';
 export * from './value-default/value-default';
 export * from './data-file-util/data-file-util';
+export * from './jsonschema/index';

package/src/controller/utils/jsonschema/entity.ts

@@ -0,0 +1,19 @@
+/**
+ * 获取实体的jsonschema
+ * @author lxm
+ * @date 2023-12-29 04:03:58
+ * @export
+ * @param {string} entityId
+ * @param {IContext} context
+ * @return {*}  {Promise<IData>}
+ */
+export async function getEntitySchema(
+  entityId: string,
+  context: IContext,
+): Promise<IData> {
+  const app = ibiz.hub.getApp(context.srfappid);
+  const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
+  const url = `/jsonschema/${entity.name}`;
+  const res = await app.net.get(url);
+  return res.data;
+}

package/src/controller/utils/jsonschema/index.ts

@@ -0,0 +1 @@
+export * from './entity';

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/provider/i-app-menu-item.provider.ts

@@ -0,0 +1,40 @@
+import { IAppMenuItem } from '@ibiz/model-core';
+import { IAppMenuController } from '../controller';
+
+/**
+ * 应用菜单项适配器的接口
+ *
+ * @author lxm
+ * @date 2022-10-25 13:10:45
+ * @export
+ * @interface IAppMenuItemProvider
+ */
+export interface IAppMenuItemProvider {
+  /**
+   * 执行界面行为
+   * @author lxm
+   * @date 2023-05-08 09:55:06
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} params
+   * @return {*}  {Promise<IUIActionResult>}
+   */
+  onClick?(
+    menuItem: IAppMenuItem,
+    event: MouseEvent,
+    AppMenuController: IAppMenuController,
+  ): Promise<void>;
+
+  /**
+   * 绘制菜单项文本
+   * @author lxm
+   * @date 2023-12-29 03:05:22
+   * @param {IAppMenuItem} menuItem
+   * @param {IAppMenuController} AppMenuController
+   * @return {*}  {*}
+   */
+  renderText?(
+    menuItem: IAppMenuItem,
+    AppMenuController: IAppMenuController,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ): any;
+}

package/src/interface/provider/index.ts

@@ -17,3 +17,4 @@ export type {
   IDEMethodCreateOptions,
 } from './i-de-method.provider';
 export type { ITreeGridExColumnProvider } from './i-tree-grid-ex-column.provider';
+export type { IAppMenuItemProvider } from './i-app-menu-item.provider';

package/src/register/helper/app-menu-item-register.ts

@@ -0,0 +1,65 @@
+import { IAppMenuItem } from '@ibiz/model-core';
+import { getPluginRegisterKey } from './common-register';
+import { IAppMenuItemProvider } from '../../interface';
+
+/** 应用菜单项适配器前缀 */
+export const APPMENUITEM_PROVIDER_PREFIX = 'APPMENUITEM';
+
+/**
+ * 注册应用菜单项适配器
+ *
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IAppMenuItemProvider} callback 生成界面行为适配器的回调
+ */
+export function registerAppMenuItemProvider(
+  key: string,
+  callback: () => IAppMenuItemProvider,
+): void {
+  ibiz.register.register(`${APPMENUITEM_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+function getProvider(key: string): IAppMenuItemProvider | undefined {
+  return ibiz.register.get(
+    `${APPMENUITEM_PROVIDER_PREFIX}_${key}`,
+  ) as IAppMenuItemProvider;
+}
+
+/**
+ * 获取应用菜单项适配器
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:43
+ * @export
+ * @param {IAppMenuItem} model
+ * @return {*}  {Promise<IAppMenuItemProvider>}
+ */
+export async function getAppMenuItemProvider(
+  model: IAppMenuItem,
+): Promise<IAppMenuItemProvider | undefined> {
+  let provider: IAppMenuItemProvider | undefined;
+  const { sysPFPluginId, appId, itemType } = model as Required<IAppMenuItem>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到应用菜单项插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
+  // 找应用菜单项类型
+  provider = getProvider(itemType);
+  if (!provider) {
+    ibiz.log.error(`找不到应用菜单项类型${itemType}对应的适配器`);
+  } else {
+    return provider;
+  }
+}

package/src/register/helper/index.ts

@@ -12,3 +12,4 @@ export * from './async-action-register';
 export * from './platform-register';
 export * from './de-method-register';
 export * from './tree-grid-ex-column-register';
+export * from './app-menu-item-register';

package/src/service/de-service-util.ts

@@ -71,7 +71,7 @@ export class DEServiceUtil {
    * @return {*}  {Promise<IAppDEService>}
    */
   async getService(context: IContext, id: string): Promise<IAppDEService> {
-    const sandboxId = context.srfsessionid;
+    const sandboxId = context.srfsessionid || 'applocation';
     if (!this.cache.has(sandboxId)) {
       this.cache.set(sandboxId, new Map());
     }

package/src/service/service/entity/method/de-action.ts

@@ -279,10 +279,16 @@ export class DEActionMethod extends Method {
       let resultData: IDataEntity | IDataEntity[];
       if (isArray(addData)) {
         resultData = await Promise.all(
-          addData.map(item => this.service.local.add(context, item)!),
+          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);
     } catch (err) {
@@ -364,10 +370,16 @@ export class DEActionMethod extends Method {
       let resultData: IDataEntity | IDataEntity[];
       if (isArray(updateData)) {
         resultData = await Promise.all(
-          updateData.map(item => this.service.local.update(context, item)!),
+          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);
@@ -434,4 +446,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}
+   */
+  protected attach(context: IContext, data: IDataEntity): IDataEntity {
+    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) {
+          data[pickupLowerDEFName] = majorkey;
+        }
+      });
+    }
+    return data;
+  }
 }

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();
   }
 

package/src/utils/index.ts

@@ -1,3 +1,4 @@
+export * from './error-handler';
 export { HandlebarsUtil } from './handlebars/handlebars';
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';