@ibiz-template/runtime 0.1.14 → 0.1.16

package/out/utils/handlebars/utils/helper/helper.js

@@ -0,0 +1,69 @@
+/**
+ * 助手工具类
+ *
+ * @author chitanda
+ * @date 2021-12-29 17:12:32
+ * @export
+ * @class HelperUtil
+ */
+export class HelperUtil {
+    /**
+     * 判断字符串是否为助手
+     *
+     * @author chitanda
+     * @date 2021-12-30 10:12:26
+     * @static
+     * @param {string} name
+     * @return {*}  {boolean}
+     */
+    static isHelperName(name) {
+        return this.helperNames.includes(name);
+    }
+    /**
+     * 判断类助手统一结果调用处理
+     *
+     * @author chitanda
+     * @date 2021-12-29 17:12:23
+     * @static
+     * @param {unknown} context 执行上下文
+     * @param {boolean} bol 判断结果
+     * @param {Handlebars.HelperOptions} options
+     * @return {*}  {(string | boolean)}
+     */
+    static handleJudgmentExecute(context, bol, options) {
+        if (options.fn) {
+            return bol ? options.fn(context) : options.inverse(context);
+        }
+        // eslint-disable-next-line no-return-assign
+        return bol ? (options.hash.yes = true) : (options.hash.no = false);
+    }
+}
+/**
+ * 当前所有助手 tag 名称
+ *
+ * @author chitanda
+ * @date 2021-12-30 10:12:39
+ * @protected
+ * @type {string[]}
+ */
+HelperUtil.helperNames = [
+    'lookup',
+    'log',
+    'and',
+    'camelCase',
+    'concat',
+    'eq',
+    'gt',
+    'get',
+    'lowerCase',
+    'lt',
+    'lte',
+    'neq',
+    'not',
+    'or',
+    'pascalCase',
+    'pluralize',
+    'snakeCase',
+    'spinalCase',
+    'upperCase',
+];

package/out/utils/handlebars/utils/index.d.ts

@@ -0,0 +1,2 @@
+export { HelperUtil } from './helper/helper';
+//# sourceMappingURL=index.d.ts.map

package/out/utils/handlebars/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/handlebars/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC"}

package/out/utils/handlebars/utils/index.js

@@ -0,0 +1 @@
+export { HelperUtil } from './helper/helper';

package/out/utils/modal/modal.d.ts

@@ -16,6 +16,7 @@ export declare class Modal implements IModal {
     mode: ViewMode;
     routeDepth?: number;
     viewUsage: number;
+    ignoreDismissCheck: boolean;
     hooks: {
         shouldDismiss: AsyncSeriesHook<[], {
             allowClose: boolean;

package/out/utils/modal/modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../../src/utils/modal/modal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAErD,KAAK,eAAe,GAAG;IACrB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACtC,CAAC;AACF,qBAAa,KAAM,YAAW,MAAM;IAClC,IAAI,EAAE,QAAQ,CAAkB;IAEhC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,MAAM,CAAK;IAEtB,KAAK;;wBACkD,OAAO;;;MAE5D;gBAEU,IAAI,EAAE,eAAe;IAejC;;;;OAIG;IACH,QAAQ,SAAU,UAAU,KAAG,IAAI,CAEjC;IAEF;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI;IAIlD,OAAO,CAAC,IAAI,GAAE,UAAoC,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB3E;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,IAAI;CAI1B"}
+{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../../src/utils/modal/modal.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAErD,KAAK,eAAe,GAAG;IACrB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACtC,CAAC;AACF,qBAAa,KAAM,YAAW,MAAM;IAClC,IAAI,EAAE,QAAQ,CAAkB;IAEhC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,MAAM,CAAK;IAEtB,kBAAkB,EAAE,OAAO,CAAS;IAEpC,KAAK;;wBACkD,OAAO;;;MAE5D;gBAEU,IAAI,EAAE,eAAe;IAejC;;;;OAIG;IACH,QAAQ,SAAU,UAAU,KAAG,IAAI,CAEjC;IAEF;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI;IAIlD,OAAO,CAAC,IAAI,GAAE,UAAoC,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB3E;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,IAAI;CAI1B"}

package/out/utils/modal/modal.js

@@ -5,6 +5,7 @@ export class Modal {
     constructor(opts) {
         this.mode = ViewMode.EMBED;
         this.viewUsage = 4;
+        this.ignoreDismissCheck = false;
         this.hooks = {
             shouldDismiss: new AsyncSeriesHook(),
             beforeDismiss: new AsyncSeriesHook(),
@@ -41,8 +42,10 @@ export class Modal {
     }
     async dismiss(data = { ok: false, data: [] }) {
         const context = { allowClose: true };
-        // 判断是否执行关闭
-        await this.hooks.shouldDismiss.call(context);
+        if (this.ignoreDismissCheck !== true) {
+            // 判断是否执行关闭
+            await this.hooks.shouldDismiss.call(context);
+        }
         if (!context.allowClose) {
             ibiz.log.debug('shouldDismiss结果为false,关闭中断。');
             return false;

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.14",
+  "version": "0.1.16",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "ea26f98a8968882f3097e022ccbe3b99e21f1ef6"
+  "gitHead": "f81037350c49620b4172e520bc4b156d97e9d718"
 }

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/base.controller.ts

@@ -72,6 +72,7 @@ export class BaseController<
   protected initState(): void {
     this.state.isCreated = false;
     this.state.isMounted = false;
+    this.state.isDestroyed = false;
   }
 
   /**
@@ -199,6 +200,7 @@ export class BaseController<
    */
   async destroyed(): Promise<void> {
     await this.onDestroyed();
+    this.state.isDestroyed = true;
     ibiz.log.debug(`${this.constructor.name}:${this.name} onDestroyed`);
     await this._evt.emit('onDestroyed', undefined);
     this.evt.destroy();

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

@@ -35,7 +35,7 @@ export class CaptionBarController
     await super.onCreated();
 
     this.view.evt.on('onViewInfoChange', ({ caption: _caption, dataInfo }) => {
-      this.state.caption = `${this.state.caption}${
+      this.state.caption = `${this.view.model.caption}${
         dataInfo ? `-${dataInfo}` : ''
       }`;
     });

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/form-detail/form-druipart/form-druipart.controller.ts

@@ -119,8 +119,10 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
     this.isNewData = state === FormNotifyState.DRAFT;
     this.state.showMask = this.isNewData;
 
-    // 表单数据加载变更后，计算关系界面参数
-    this.calcViewParams();
+    if (state === FormNotifyState.LOAD || state === FormNotifyState.DRAFT) {
+      // 表单数据加载变更后，计算关系界面参数
+      this.calcViewParams();
+    }
   }
 
   /**

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

@@ -567,11 +567,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';
+      }
+    });
   }
 
   /**

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

@@ -6,7 +6,9 @@ import { clone } from 'ramda';
 import { OpenAppViewCommand } from '../../../../../command';
 import { CodeListItem, IModalData } from '../../../../../interface';
 import { parseUserParams } from '../../../../../model';
+import { UIActionUtil } from '../../../../../ui-action';
 import { convertNavData, getWFContext } from '../../../../../utils';
+import { ValueExUtil } from '../../../../utils';
 import { GridColumnController } from '../../grid/grid-column.controller';
 import { GridRowState } from '../../grid/grid-row.state';
 
@@ -156,20 +158,15 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
    * @param {MouseEvent} event 鼠标事件
    * @returns {*}  {Promise<void>}
    */
-  async triggerAction(_row: GridRowState, _event: MouseEvent): Promise<void> {
-    // if (this.model.viewLogic) {
-    //   await executeViewLogic(
-    //     this.model.viewLogic,
-    //     this.context,
-    //     [row.data],
-    //     this.params,
-    //     {
-    //       event,
-    //       neuron: this.grid.nerve.self,
-    //       view: this.grid.ctx.view,
-    //     },
-    //   );
-    // }
+  async triggerAction(row: GridRowState, event: MouseEvent): Promise<void> {
+    const actionId = this.model.deuiactionId;
+    await UIActionUtil.execAndResolved(actionId!, {
+      context: this.context,
+      params: this.params,
+      data: [row.data],
+      view: this.grid.view,
+      event,
+    });
   }
 
   /**
@@ -209,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;
@@ -253,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;
   }
 
   /**
@@ -277,6 +278,12 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
    * @return {*}  {string}
    */
   formatValue(value: unknown = ''): string {
+    // 根据数据类型增强转换显示文本
+    if (this.model.valueType) {
+      return ValueExUtil.toText(this.model, value);
+    }
+
+    // 根据格式化配置格式化显示
     const strVal = `${value}`;
     if (!this.valueFormat) {
       return strVal;

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

@@ -30,6 +30,7 @@ export class SearchBarController
   protected initState(): void {
     super.initState();
     this.state.query = '';
+    this.state.selectedGroupItem = null;
     this.state.visible = !!(
       this.model.enableQuickSearch ||
       this.model.enableGroup ||

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

@@ -116,7 +116,6 @@ export class TreeController
 
     // 有父节点绑定到父节点数据上，无父节点替换rootNodes
     if (parentNode) {
-      // nodes.splice(0, 10);
       parentNode.children = nodes;
     } else {
       this.state.rootNodes = nodes;

package/src/controller/utils/event/controller-event.ts

@@ -39,6 +39,14 @@ export type EventTypeObjec<T> = {
  * @template A 能力行为接口
  */
 export class ControllerEvent<E extends IComponentEvent = IComponentEvent> {
+  /**
+   * 是否已经销毁
+   * @author lxm
+   * @date 2023-08-30 02:54:14
+   * @type {boolean}
+   */
+  isDestroyed: boolean = false;
+
   /**
    * 事件对象
    *
@@ -60,6 +68,9 @@ export class ControllerEvent<E extends IComponentEvent = IComponentEvent> {
     name: K,
     args: EventTypeObjec<E>[K]['emitArgs'],
   ): Promise<void> {
+    if (this.isDestroyed) {
+      return;
+    }
     // 自动补全其他事件对象参数
     await this.evt.asyncEmit(name as string, {
       ...this.getBaseArgs(),
@@ -80,6 +91,9 @@ export class ControllerEvent<E extends IComponentEvent = IComponentEvent> {
     name: K,
     fn: (event: EventTypeObjec<E>[K]['event']) => void | Promise<void>,
   ): void {
+    if (this.isDestroyed) {
+      return;
+    }
     this.evt.on(name as string, fn);
   }
 
@@ -92,6 +106,9 @@ export class ControllerEvent<E extends IComponentEvent = IComponentEvent> {
   onAll(
     fn: (eventName: string, event: EventBase) => void | Promise<void>,
   ): void {
+    if (this.isDestroyed) {
+      return;
+    }
     this.evt.onAll(fn as any);
   }
 
@@ -112,5 +129,6 @@ export class ControllerEvent<E extends IComponentEvent = IComponentEvent> {
   destroy(): void {
     this.getBaseArgs = undefined as any;
     this.evt.reset();
+    this.isDestroyed = true;
   }
 }

package/src/controller/utils/index.ts

@@ -4,3 +4,4 @@ export * from './button-state';
 export * from './event';
 export * from './util/util';
 export * from './value-rule/value-rule';
+export * from './value-ex/value-ex';

package/src/controller/utils/value-ex/value-ex.ts

@@ -0,0 +1,83 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { isNil, mergeLeft } from 'ramda';
+
+export type ValueExOptions = {
+  /**
+   * 值类型
+   */
+  valueType?: string | 'SIMPLE' | 'SIMPLES' | 'OBJECT' | 'OBJECTS';
+
+  /**
+   * 对象标识属性
+   */
+  objectIdField?: string;
+
+  /**
+   * 对象名称属性(显示文本)
+   */
+  objectNameField?: string;
+
+  /**
+   * 对象值属性
+   */
+  objectValueField?: string;
+
+  /**
+   * 多项值分隔符
+   */
+  valueSeparator?: string;
+
+  /**
+   * 多项文本分隔符
+   */
+  textSeparator?: string;
+};
+
+export class ValueExUtil {
+  /**
+   * 合并默认值
+   * @author lxm
+   * @date 2023-08-30 02:06:58
+   * @static
+   * @param {ValueExOptions} options
+   * @return {*}  {ValueExOptions}
+   */
+  static mergeDefault(options: ValueExOptions): ValueExOptions {
+    return mergeLeft(options, {
+      textSeparator: ',',
+      valueSeparator: ',',
+    });
+  }
+
+  /**
+   * 转成显示用的文本
+   * @author lxm
+   * @date 2023-08-30 01:55:38
+   * @param {ValueExOptions} options
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  static toText(options: ValueExOptions, value: unknown): string {
+    if (isNil(value) || value === '') {
+      return '';
+    }
+    const { valueType, objectNameField, textSeparator } =
+      this.mergeDefault(options);
+    if (['OBJECTS', 'OBJECT'].includes(valueType!)) {
+      if (!objectNameField) {
+        throw new RuntimeError('缺少objectNameField');
+      }
+      const textKey = objectNameField.toLowerCase();
+      if (valueType === 'OBJECTS') {
+        return (value as IData[])
+          .map(item => item[textKey] || '---')
+          .join(textSeparator);
+      }
+      return (value as IData)[textKey];
+    }
+    if (valueType === 'SIMPLES') {
+      return (value as string[]).join(textSeparator);
+    }
+    return `${value}`;
+  }
+}

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) {
@@ -316,11 +327,23 @@ export class MDViewEngine extends ViewEngineBase {
       Object.assign(params, filteredParams);
     }
     // 有搜索栏的整合相关参数
-    if (this.searchBar && this.searchBar.state.query) {
-      const addParams = {
-        query: this.searchBar.state.query,
-      };
-      Object.assign(params, addParams);
+    if (this.searchBar) {
+      // 快速搜索
+      if (this.searchBar.state.query) {
+        const addParams = {
+          query: this.searchBar.state.query,
+        };
+        Object.assign(params, addParams);
+      }
+      // 快速分组
+      if (this.searchBar.state.selectedGroupItem?.data) {
+        // eslint-disable-next-line no-new-func
+        const func = new Function(
+          `return (${this.searchBar.state.selectedGroupItem.data});`,
+        );
+        const addParams = func() as IData;
+        Object.assign(params, addParams);
+      }
     }
     return params;
   }

package/src/interface/common/i-modal/i-modal.ts

@@ -30,6 +30,15 @@ export interface IModal {
    */
   mode: ViewMode;
 
+  /**
+   * 是否忽略关闭检查，用于强制关闭视图
+   *
+   * @author chitanda
+   * @date 2023-08-30 16:08:45
+   * @type {boolean}
+   */
+  ignoreDismissCheck: boolean;
+
   /**
    * 路由绘制的视图才有，用于表示所在路由层级
    *

package/src/interface/controller/state/common/i-controller.state.ts

@@ -22,4 +22,13 @@ export interface IControllerState {
    * @type {boolean}
    */
   isMounted: boolean;
+
+  /**
+   * 控制器是否走完destroy生命周期
+   *
+   * @author lxm
+   * @date 2022-08-18 22:08:23
+   * @type {boolean}
+   */
+  isDestroyed: boolean;
 }