@ibiz-template/runtime 0.1.13 → 0.1.15

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,
+    });
   }
 
   /**
@@ -277,6 +274,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

@@ -316,11 +316,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;
 }

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

@@ -1,3 +1,4 @@
+import { ISearchBarGroup } from '@ibiz/model-core';
 import { IControlState } from './i-control.state';
 
 export interface ISearchBarState extends IControlState {
@@ -16,4 +17,12 @@ export interface ISearchBarState extends IControlState {
    * @type {boolean}
    */
   visible: boolean;
+
+  /**
+   * 选中的分组项
+   * @author lxm
+   * @date 2023-08-25 05:32:59
+   * @type {boolean}
+   */
+  selectedGroupItem: ISearchBarGroup | null;
 }

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

@@ -74,7 +74,9 @@ export class MethodDto {
             for (let j = 0; j < items.length; j++) {
               arr.push(await dto.get(context, items[j]));
             }
-            params[key] = arr;
+            if (arr.length > 0) {
+              params[key] = arr;
+            }
           }
           break;
         }

package/src/service/service/entity/method/method.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { HttpResponse, RuntimeModelError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
+import { notNilEmpty } from 'qx-util';
 import { Application } from '../../../../application';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
@@ -121,16 +122,22 @@ export abstract class Method {
       let res: HttpResponse | null = null;
       switch (requestMethod) {
         case 'POST':
-          res = await this.app.net.post(`${path}/${methodName}`, data);
+          res = await this.app.net.post(
+            `${path}/${methodName}`,
+            notNilEmpty(data) ? data : params,
+          );
           break;
         case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, params);
+          res = await this.app.net.get(`${path}/${methodName}`, data);
           break;
         case 'PUT':
-          res = await this.app.net.put(`${path}/${methodName}`, data);
+          res = await this.app.net.put(
+            `${path}/${methodName}`,
+            notNilEmpty(data) ? data : params,
+          );
           break;
         case 'DELETE':
-          res = await this.app.net.delete(`${path}/${methodName}`, params);
+          res = await this.app.net.delete(`${path}/${methodName}`, data);
           break;
         default:
           if (requestMethod) {

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

@@ -33,6 +33,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       data,
       params,
     );
+    const tempParams = { ...resultParams };
 
     // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
     const frontPSAppView = action.frontAppViewId;
@@ -60,7 +61,9 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     }
 
     const app = ibiz.hub.getApp(context?.srfappid);
-    const _data = resultData.map(item => item.getOrigin?.() || item || {});
+    const _data = resultData
+      .map(item => item.getOrigin?.() || item || {})
+      .map(item => Object.assign(item, tempParams)); // 界面行为视图参数和data合并一起传给后台
     const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(
       action.actionTarget!,
     );
@@ -70,7 +73,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       methodName,
       resultContext,
       isMultiData ? _data : _data[0],
-      resultParams,
+      tempParams,
     );
 
     // 适配界面行为成功提示信息
@@ -80,7 +83,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     Object.assign(actionResult, {
       data: isArray(res.data) ? res.data : [res.data],
       nextContext: resultContext,
-      nextParams: resultParams,
+      nextParams: tempParams,
     });
 
     return actionResult;

package/src/ui-action/uiaction-util.ts

@@ -49,6 +49,7 @@ export class UIActionUtil {
   ): Promise<void> {
     const result = await this.exec(actionId, params);
     if (result.closeView) {
+      params.view.modal.ignoreDismissCheck = true;
       params.view.closeView({ ok: true });
     } else if (result.refresh) {
       switch (result.refreshMode) {

package/src/utils/handlebars/handlebars.ts

@@ -1,3 +1,5 @@
+import { installHelpers } from './helpers';
+
 /**
  * handlebars 渲染工具类
  *
@@ -10,6 +12,16 @@ export class HandlebarsUtil {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   protected hsb: any;
 
+  /**
+   * 如果已经在请求中，则不再重复请求
+   *
+   * @author chitanda
+   * @date 2023-08-30 11:08:58
+   * @protected
+   * @type {(Promise<unknown> | null)}
+   */
+  protected p: Promise<unknown> | null = null;
+
   /**
    * handlebars 是否已经初始化
    *
@@ -27,10 +39,20 @@ export class HandlebarsUtil {
    *
    * @author chitanda
    * @date 2023-08-28 17:08:24
-   * @return {*}  {Promise<void>}
+   * @return {*}  {Promise<unknown>}
    */
-  async init(): Promise<void> {
-    this.hsb = await import('handlebars');
+  async init(): Promise<unknown> {
+    if (this.isInit) {
+      return;
+    }
+    if (this.p) {
+      return this.p;
+    }
+    this.p = import('handlebars');
+    this.hsb = await this.p;
+    this.p = null;
+    installHelpers(this.hsb);
+    return this.hsb;
   }
 
   /**

package/src/utils/handlebars/helpers/and/and.ts

@@ -0,0 +1,26 @@
+import { HelperUtil } from '../../utils';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 并且条件模式
+ *
+ * @description 判断: word wor2 word3 必须在判断中必须全部为 true, 用法: {{#and word word2 word3}}xxx{{else}}yyy{{/and}}、{{and word word2 word3}} 返回值为 boolean 类型
+ * @author chitanda
+ * @date 2021-12-29 14:12:10
+ * @export
+ * @class HelperAnd
+ * @extends {HelperBase}
+ */
+export class HelperAnd extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'and');
+  }
+
+  onExecute(...args: unknown[] | Handlebars.HelperOptions[]): string | boolean {
+    const options = args[args.length - 1] as Handlebars.HelperOptions;
+    args.pop();
+    const arr = (args as unknown[]).filter(item => !!item);
+    const bol = arr.length === args.length;
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+}

package/src/utils/handlebars/helpers/camel-case/camel-case.ts

@@ -0,0 +1,25 @@
+import { camelCase } from 'lodash-es';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 转驼峰
+ *
+ * @description 用法 {{camelCase xxx}}，效果: this-is-my-name => thisIsMyName
+ * @author chitanda
+ * @date 2021-12-24 15:12:59
+ * @export
+ * @class HelperCamelCase
+ * @extends {HelperBase}
+ */
+export class HelperCamelCase extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'camelCase');
+  }
+
+  onExecute(param: string): string {
+    if (!param) {
+      return '';
+    }
+    return camelCase(param);
+  }
+}

package/src/utils/handlebars/helpers/concat/concat.ts

@@ -0,0 +1,22 @@
+import { HelperBase } from '../helper-base';
+
+/**
+ * 字符串拼接
+ *
+ * @description 用法：{{concat string1 string2 string3}} 返回值为 string 类型
+ * @author mosher
+ * @date 2022-10-12 10:59:10
+ * @export
+ * @class HelperConcat
+ * @extends {HelperBase}
+ */
+export class HelperConcat extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'concat');
+  }
+
+  onExecute(...args: string[]): string {
+    args.pop();
+    return args.join('');
+  }
+}

package/src/utils/handlebars/helpers/eq/eq.ts

@@ -0,0 +1,28 @@
+import { eq } from 'lodash-es';
+import { HelperUtil } from '../../utils';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 等于
+ *
+ * @description 判断: word === word2, 用法: {{#eq word word2}}xxx{{else}}yyy{{/eq}}、{{eq word 'xxx'}} 返回值为 boolean 类型
+ * @author chitanda
+ * @date 2021-12-24 14:12:25
+ * @export
+ * @class HelperEq
+ * @extends {HelperBase}
+ */
+export class HelperEq extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'eq');
+  }
+
+  onExecute(
+    param: unknown,
+    param2: unknown,
+    options: Handlebars.HelperOptions,
+  ): string | boolean {
+    const bol = eq(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+}

package/src/utils/handlebars/helpers/eq-property-value/eq-property-value.ts

@@ -0,0 +1,41 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { eq, findIndex, isArray } from 'lodash-es';
+import { HelperUtil } from '../../utils';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 比较数组或对象是否存在某个属性的值
+ *
+ * @author zk
+ * @date 2023-06-15 09:06:37
+ * @export
+ * @class HelperHaCtrl
+ * @extends {HelperBase}
+ */
+export class HelperEqPropertyValue extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'eqPropertyValue');
+  }
+
+  onExecute(
+    obj: unknown[] | unknown,
+    key: string,
+    val: unknown,
+    options: Handlebars.HelperOptions,
+  ): string | boolean {
+    // 数组
+    let bol = false;
+    if (isArray(obj)) {
+      bol = !eq(
+        findIndex(obj, o => eq((o as any)[key], val)),
+        -1,
+      );
+    } else {
+      bol =
+        // eslint-disable-next-line no-prototype-builtins
+        (obj as object).hasOwnProperty(key) &&
+        (bol = eq((obj as any)[key], val));
+    }
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+}

package/src/utils/handlebars/helpers/gt/gt.ts

@@ -0,0 +1,28 @@
+import { gt } from 'lodash-es';
+import { HelperUtil } from '../../utils';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 大于
+ *
+ * @description 判断: word > word2, 用法: {{#gt word word2}}xxx{{else}}yyy{{/gt}}、{{gt word word2}} 返回值为 boolean 类型
+ * @author chitanda
+ * @date 2021-12-24 15:12:56
+ * @export
+ * @class HelperGt
+ * @extends {HelperBase}
+ */
+export class HelperGt extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'gt');
+  }
+
+  onExecute(
+    param: unknown,
+    param2: unknown,
+    options: Handlebars.HelperOptions,
+  ): string | boolean {
+    const bol = gt(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+}

package/src/utils/handlebars/helpers/gte/gte.ts

@@ -0,0 +1,28 @@
+import { gte } from 'lodash-es';
+import { HelperUtil } from '../../utils';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 大于等于
+ *
+ * @description 判断: word >= word2, 用法 {{#gte word word2}}xxx{{else}}yyy{{/gte}}、{{gte word word2}} 返回值为 boolean 类型
+ * @author chitanda
+ * @date 2021-12-24 15:12:35
+ * @export
+ * @class HelperGte
+ * @extends {HelperBase}
+ */
+export class HelperGte extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'gte');
+  }
+
+  onExecute(
+    param: unknown,
+    param2: unknown,
+    options: Handlebars.HelperOptions,
+  ): string | boolean {
+    const bol = gte(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+}

package/src/utils/handlebars/helpers/helper-base.ts

@@ -0,0 +1,31 @@
+/**
+ * helper 基类
+ *
+ * @author chitanda
+ * @date 2021-12-29 14:12:34
+ * @export
+ * @class HelperBase
+ */
+export abstract class HelperBase {
+  /**
+   * Creates an instance of HelperBase.
+   *
+   * @author chitanda
+   * @date 2021-12-29 14:12:47
+   * @param {string} tag 助手标识
+   */
+  constructor(Handlebars: IData, tag: string) {
+    Handlebars.registerHelper(tag, this.onExecute);
+  }
+
+  /**
+   * 助手执行
+   *
+   * @author chitanda
+   * @date 2022-08-05 18:08:03
+   * @abstract
+   * @param {...unknown[]} args
+   * @return {*}  {(string | boolean)}
+   */
+  abstract onExecute(...args: unknown[]): string | boolean;
+}