@ibiz-template/runtime 0.5.7-alpha.8 → 0.5.7-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.7-alpha.8",
+  "version": "0.5.7-alpha.9",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.7-alpha.6",
+    "@ibiz-template/core": "^0.5.7-alpha.9",
     "@ibiz/model-core": "^0.1.9",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
@@ -64,5 +64,5 @@
   "dependencies": {
     "animejs": "^3.2.2"
   },
-  "gitHead": "1661f519db56ba73217e0500d0eeaae67830c95b"
+  "gitHead": "733e1918e2e640661bb99dd1c79cf19e0a25ada9"
 }

package/src/application.ts

@@ -264,8 +264,6 @@ export class Application implements IAppService {
         this.model.appId!,
       );
       this.mqtt.evt.on('message', message => {
-        console.log('message', message);
-
         ibiz.mc.command.next(message);
       });
       await this.mqtt.connect();

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

@@ -95,7 +95,7 @@ export class OpenAppViewCommand {
       case 'POPUPAPP':
         throw new ModelError(appView, '未支持的视图打开模式: POPUPAPP');
       case 'POPOVER':
-        return this.openPopover(appView, opts.event!, context, params);
+        return this.openPopover(appView, context, params, opts);
       case 'DRAWER_LEFT':
       case 'DRAWER_RIGHT':
       case 'DRAWER_TOP':
@@ -177,14 +177,17 @@ export class OpenAppViewCommand {
    */
   protected async openPopover(
     appView: IViewConfig,
-    event: MouseEvent | undefined,
     context: IContext,
     params: IParams = {},
+    opts: IOpenViewOptions = {},
   ): Promise<IModalData> {
+    const { event, modalOption } = opts;
     if (!event) {
       throw new RuntimeError('气泡打开缺少event');
     }
-    return ibiz.openView.popover(appView.id, event, context, params);
+    return ibiz.openView.popover(appView.id, event, context, params, {
+      ...modalOption,
+    });
   }
 
   /**

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

@@ -1137,10 +1137,10 @@ export class GridController<
     const getExportData = async (): Promise<IData[]> => {
       const type = _args.params?.type;
       let data: IData[] = [];
-      if (type === 'activatedPage') {
+      // 未指定类型时，默认导出当前页
+      if (!type || type === 'activatedPage') {
         data = this.state.rows.map(row => row.data);
-      }
-      if (type === 'maxRowCount' || type === 'customPage') {
+      } else if (type === 'maxRowCount' || type === 'customPage') {
         const { size } = this.state;
         const { startPage, endPage } = _args.params;
         const params =
@@ -1152,8 +1152,7 @@ export class GridController<
               }
             : { size: 1000, page: 0 };
         data = await this.loadData({ viewParam: params });
-      }
-      if (type === 'selectedRows') {
+      } else if (type === 'selectedRows') {
         data = this.getData();
       }
       if (data.length === 0) {

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

@@ -1,12 +1,14 @@
-import { mergeInLeft } from '@ibiz-template/core';
+import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
 import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
-import { clone } from 'ramda';
+import { clone, isNil } from 'ramda';
+import { isString } from 'lodash-es';
 import {
   ISearchBarState,
   ISearchBarEvent,
   ISearchBarController,
   IBackendSearchBarGroup,
   IGridController,
+  IFilterNode,
 } from '../../../interface';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
@@ -20,6 +22,8 @@ import {
   parseFilters,
 } from './use-searchcond';
 
+const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
+
 /**
  * 搜索栏控制器
  *
@@ -115,7 +119,8 @@ export class SearchBarController
    * @Date: 2023-12-22 13:50:16
    */
   get grid(): IGridController | undefined {
-    return this.ctx.getController('grid') as IGridController;
+    return (this.ctx.getController('grid') ||
+      this.ctx.getController('treegrid')) as IGridController;
   }
 
   /**
@@ -347,6 +352,27 @@ export class SearchBarController
       return;
     }
     const searchconds = calcSearchConds(this.state.filterNodes);
+
+    if (searchconds) {
+      // 给多数据加载之前进行脚本值转换
+
+      recursiveIterate(
+        searchconds[0],
+        (node: IData) => {
+          if (
+            node.condtype === 'DEFIELD' &&
+            !isNil(node.value) &&
+            ScriptValueRegex.test(node.value)
+          ) {
+            node.value = ScriptFactory.execSingleLine(`\`${node.value}\``, {
+              ...this.getEventArgs(),
+            });
+          }
+        },
+        { childrenFields: ['searchconds'] },
+      );
+    }
+
     return searchconds;
   }
 
@@ -543,6 +569,21 @@ export class SearchBarController
     } else {
       this.state.filterNodes = getOriginFilterNodes();
     }
+
+    // 把带有${}的条件禁用，不能修改
+    recursiveIterate(this.state.filterNodes[0], (node: IFilterNode) => {
+      if (node.leaf) {
+        if (
+          node.field &&
+          node.valueOP &&
+          isString(node.value) &&
+          ScriptValueRegex.test(node.value)
+        ) {
+          node.disabled = true;
+        }
+      }
+    });
+
     if (this.grid && groupItem && groupItem.searchGroupData) {
       this.grid.setGroupParams(groupItem.searchGroupData);
       await this.grid.load({ isInitialLoad: true });

package/src/hub/config/app-view-config-service.ts

@@ -1,4 +1,5 @@
 import { RuntimeError } from '@ibiz-template/core';
+import { IAppView } from '@ibiz/model-core';
 import { IAppViewConfigService, IViewConfig } from '../../interface';
 
 /**
@@ -38,6 +39,33 @@ export class AppViewConfigService implements IAppViewConfigService {
     return id;
   }
 
+  /**
+   * 获取视图自定义Option
+   *
+   * @author zk
+   * @date 2024-01-31 11:01:20
+   * @protected
+   * @param {IAppView} model
+   * @return {*}  {IData}
+   * @memberof AppViewConfigService
+   */
+  protected getCustomOption(model: IAppView): { modalOption: IData } {
+    const { appViewParams } = model;
+    // 解析ModalOption参数
+    const optionProperty = appViewParams?.find(
+      item => item.id === 'modaloption',
+    )?.value;
+    let modalOption = {};
+    if (optionProperty) {
+      try {
+        modalOption = JSON.parse(optionProperty);
+      } catch (error) {
+        ibiz.log.error(`视图参数modalOption 解析失败：${error}`);
+      }
+    }
+    return { modalOption };
+  }
+
   has(key: string): boolean {
     const id = this.calcAppViewId(key);
     return this.viewConfigs.has(id);
@@ -66,6 +94,7 @@ export class AppViewConfigService implements IAppViewConfigService {
         height: model.height,
         appDataEntityId: model.appDataEntityId,
         redirectView: model.redirectView,
+        ...this.getCustomOption(model),
       });
     }
     return this.viewConfigs.get(id)!;

package/src/interface/common/i-app-view-config-service/i-app-view-config-service.ts

@@ -46,6 +46,10 @@ export interface IViewConfig {
    * 是否是重定向视图
    */
   redirectView?: boolean;
+  /**
+   * modal参数
+   */
+  modalOption?: IData;
 }
 
 export interface IAppViewConfigService {

package/src/interface/common/i-open-view-options/i-open-view-options.ts

@@ -37,4 +37,14 @@ export interface IOpenViewOptions {
    * @type {MouseEvent}
    */
   event?: MouseEvent;
+
+  /**
+   * 模态参数
+   *
+   * @author zk
+   * @date 2024-02-01 02:02:21
+   * @type {IData}
+   * @memberof IOpenViewOptions
+   */
+  modalOption?: IData;
 }

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

@@ -76,6 +76,14 @@ export interface IFilterLeafNode {
    * @type {string}
    */
   valueOP: string | null;
+
+  /**
+   * 禁用，禁止修改
+   * @author lxm
+   * @date 2024-02-01 02:51:40
+   * @type {boolean}
+   */
+  disabled?: boolean;
 }
 
 export type IFilterNode = IFilterBranchNode | IFilterLeafNode;

package/src/interface/service/service/i-mark-open-data.service.ts

@@ -1,7 +1,9 @@
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, IMarkOpenData } from '@ibiz-template/core';
 
 export type MarkOpenDataActionType = 'VIEW' | 'EDIT' | 'UPDATE' | 'CLOSE';
 
+export type MarkOpenDataCallbackFun = (data: IMarkOpenData) => void;
+
 export interface IMarkOpenDataService {
   /**
    * 获取站内信的集合
@@ -15,4 +17,32 @@ export interface IMarkOpenDataService {
     key: string,
     action: MarkOpenDataActionType,
   ): Promise<IHttpResponse>;
+
+  /**
+   * 监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:45:31
+   * @param {string} deName
+   * @param {string} key
+   * @param {CallbackFun} callback
+   */
+  subscribe(
+    deName: string,
+    key: string,
+    callback: MarkOpenDataCallbackFun,
+  ): void;
+
+  /**
+   * 取消监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:48:19
+   * @param {string} deName
+   * @param {string} key
+   * @param {MarkOpenDataCallbackFun} callback
+   */
+  unsubscribe(
+    deName: string,
+    key: string,
+    callback: MarkOpenDataCallbackFun,
+  ): void;
 }

package/src/interface/service/service/index.ts

@@ -9,4 +9,5 @@ export type { IInternalMessageService } from './i-internal-message.service';
 export type {
   MarkOpenDataActionType,
   IMarkOpenDataService,
+  MarkOpenDataCallbackFun,
 } from './i-mark-open-data.service';

package/src/service/service/mark-open-data/mark-open-data.service.ts

@@ -1,10 +1,29 @@
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, IMarkOpenData } from '@ibiz-template/core';
 import {
   IMarkOpenDataService,
   MarkOpenDataActionType,
+  MarkOpenDataCallbackFun,
 } from '../../../interface';
 
 export class MarkOpenDataService implements IMarkOpenDataService {
+  /**
+   * 回调集合
+   * @author lxm
+   * @date 2024-02-01 04:41:45
+   */
+  callbackMap = new Map<string, Array<MarkOpenDataCallbackFun>>();
+
+  constructor() {
+    ibiz.mc.command.markOpenData.on(msg => {
+      const data = msg.data as IMarkOpenData;
+      const { entity, key } = data;
+      const tag = `${entity}_${key}`;
+      if (this.callbackMap.has(tag)) {
+        this.callbackMap.get(tag)!.forEach(cb => cb(data));
+      }
+    });
+  }
+
   /**
    * 基础路径
    * @author lxm
@@ -22,4 +41,45 @@ export class MarkOpenDataService implements IMarkOpenDataService {
     );
     return res;
   }
+
+  /**
+   * 监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:45:31
+   * @param {string} deName
+   * @param {string} key
+   * @param {MarkOpenDataCallbackFun} callback
+   */
+  subscribe(
+    deName: string,
+    key: string,
+    callback: MarkOpenDataCallbackFun,
+  ): void {
+    const tag = `${deName}_${key}`;
+    const callbacks = this.callbackMap.get(tag) || [];
+    callbacks.push(callback);
+    this.callbackMap.set(tag, callbacks);
+  }
+
+  /**
+   * 取消监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:48:19
+   * @param {string} deName
+   * @param {string} key
+   * @param {MarkOpenDataCallbackFun} callback
+   */
+  unsubscribe(
+    deName: string,
+    key: string,
+    callback: MarkOpenDataCallbackFun,
+  ): void {
+    const tag = `${deName}_${key}`;
+    const callbacks = this.callbackMap.get(tag) || [];
+    const index = callbacks.indexOf(callback);
+    if (index > -1) {
+      callbacks.splice(index, 1);
+      this.callbackMap.set(tag, callbacks);
+    }
+  }
 }

package/src/service/utils/dyna-sys-params/dyna-sys-params.ts

@@ -22,14 +22,14 @@ export async function calcDynaSysParams(
 ): Promise<{
   srfkey?: string | undefined;
   srfparentkey?: string | undefined;
-  srfparentdeanme?: string | undefined;
+  srfparentdename?: string | undefined;
 }> {
   const appId = opts.appId || context.srfappid;
   const viewParams = opts.viewParams || {};
   const loadModelParams: {
     srfkey?: string;
     srfparentkey?: string;
-    srfparentdeanme?: string;
+    srfparentdename?: string;
   } = {};
 
   const appDe = await ibiz.hub.getAppDataEntity(appDataEntityId, appId);
@@ -47,9 +47,9 @@ export async function calcDynaSysParams(
   }
 
   // *计算上层父实体主键和name
-  if (viewParams.srfparentkey && viewParams.srfparentdeanme) {
+  if (viewParams.srfparentkey && viewParams.srfparentdename) {
     loadModelParams.srfparentkey = viewParams.srfparentkey;
-    loadModelParams.srfparentdeanme = viewParams.srfparentdeanme;
+    loadModelParams.srfparentdename = viewParams.srfparentdename;
   } else {
     // 上层资源路径主实体名称和主键
     const match = getMatchResPath(context, appDe);
@@ -57,8 +57,8 @@ export async function calcDynaSysParams(
       const parentDeKey = match.keys[match.keys.length - 2];
       loadModelParams.srfparentkey =
         viewParams.srfparentkey || context[parentDeKey];
-      loadModelParams.srfparentdeanme =
-        viewParams.srfparentdeanme || parentDeKey;
+      loadModelParams.srfparentdename =
+        viewParams.srfparentdename || parentDeKey;
     }
   }
 

package/src/ui-action/provider/front-ui-action-provider.ts

@@ -45,12 +45,14 @@ export class FrontUIActionProvider extends UIActionProviderBase {
           data,
           params,
         );
+        //  解析自定义 视图 option 参数
+        const options = this.handleViewOptionParams(resultParams);
         const res: IModalData | undefined = await ibiz.commands.execute(
           OpenAppViewCommand.TAG,
           frontPSAppView,
           resultContext,
           resultParams,
-          { event, noWaitRoute },
+          { event, noWaitRoute, ...options },
         );
         // 打开视图取消操作
         if (!res?.ok) {
@@ -86,6 +88,28 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     return actionResult;
   }
 
+  /**
+   * 处理打开视图配置自定义参数 modalOption
+   *
+   * @author zk
+   * @date 2024-02-01 01:02:28
+   * @param {IData} param
+   * @return {*}  {IData}
+   * @memberof FrontUIActionProvider
+   */
+  handleViewOptionParams(param: IData): IData {
+    if (param.modaloption) {
+      try {
+        const modalOption = JSON.parse(param.modaloption);
+        delete param.modaloption;
+        return { modalOption };
+      } catch (error) {
+        ibiz.log.error(`视图参数modalOption 解析失败：${error}`);
+      }
+    }
+    return {};
+  }
+
   /**
    * 处理模式：用户自定义
    * @author lxm

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -215,10 +215,19 @@ export async function getDERedirectToView(
   const entity = await ibiz.hub.getAppDataEntity(entityId, appView.appId);
   const rdTag = await calcDERdTag(entity, appView, params, curData);
   let viewId = '';
-  // view://协议开头处理,值示例: view://{app}/{viewcodename}?srfwftag={wftag}
+  // view://协议开头处理,值示例: view://{app}/{viewcodename}?srfnavctx={"work_item":"6c797b6a6dfbd8f38652fe3ea3220fc1","project":"ee11e5a96002f4f3937ddba025ec7d44"}&srfwftag={wftag}
   if (rdTag.startsWith('view://')) {
     const url = new URL(rdTag);
     if (url.searchParams.size > 0) {
+      const navCtx = url.searchParams.get('srfnavctx');
+      if (navCtx) {
+        try {
+          Object.assign(context, JSON.parse(navCtx));
+        } catch (error) {
+          ibiz.log.error(`重定向[${rdTag}] 中 srfnavctx 参数解析失败`, error);
+        }
+        url.searchParams.delete('srfnavctx');
+      }
       url.searchParams.forEach((value, _key) => {
         params[_key] = value;
       });