@ibiz-template/runtime 0.1.14 → 0.1.16

package/src/interface/controller/state/control/i-grid.state.ts

@@ -148,4 +148,20 @@ export interface IColumnState {
    * @type {boolean}
    */
   hidden: boolean;
+
+  /**
+   * 是否是操作列
+   * @author lxm
+   * @date 2023-08-31 04:54:58
+   * @type {boolean}
+   */
+  uaColumn: boolean;
+
+  /**
+   * 是否是固定列，固定在左侧还是右侧
+   * @author lxm
+   * @date 2023-08-31 04:55:24
+   * @type {('left' | 'right')}
+   */
+  fixed?: 'left' | 'right';
 }

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/interface/service/code-list-item/code-list-item.ts

@@ -36,4 +36,10 @@ export interface CodeListItem {
    * @type {CodeListItem[]}
    */
   children?: CodeListItem[];
+
+  /**
+   * 文本样式
+   * @type {string}
+   */
+  textCls?: string;
 }

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/code-list/code-list.service.ts

@@ -108,6 +108,7 @@ export class CodeListService {
         value: isValueNumber ? Number(codeItem.value) : codeItem.value!,
         color: codeItem.color,
         id: codeItem.codeName!,
+        textCls: codeItem.textCls,
       };
       if (codeItem.codeItems?.length) {
         _codeItem.children = this.formatStaticItems(

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,13 +122,19 @@ export abstract class Method {
       let res: HttpResponse | null = null;
       switch (requestMethod) {
         case 'POST':
-          res = await this.app.net.post(`${path}/${methodName}`, data, params);
+          res = await this.app.net.post(
+            `${path}/${methodName}`,
+            notNilEmpty(data) ? data : params,
+          );
           break;
         case 'GET':
           res = await this.app.net.get(`${path}/${methodName}`, data);
           break;
         case 'PUT':
-          res = await this.app.net.put(`${path}/${methodName}`, data, params);
+          res = await this.app.net.put(
+            `${path}/${methodName}`,
+            notNilEmpty(data) ? data : params,
+          );
           break;
         case 'DELETE':
           res = await this.app.net.delete(`${path}/${methodName}`, data);

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

@@ -33,7 +33,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       data,
       params,
     );
-    const tempParams = { ...params, ...resultParams };
+    const tempParams = { ...resultParams };
 
     // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
     const frontPSAppView = action.frontAppViewId;
@@ -61,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!,
     );

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;
+}

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

@@ -0,0 +1,46 @@
+import { HelperAnd } from './and/and';
+import { HelperCamelCase } from './camel-case/camel-case';
+import { HelperConcat } from './concat/concat';
+import { HelperEq } from './eq/eq';
+import { HelperGt } from './gt/gt';
+import { HelperGte } from './gte/gte';
+import { HelperEqPropertyValue } from './eq-property-value/eq-property-value';
+import { HelperJson } from './json/json';
+import { HelperLowerCase } from './lower-case/lower-case';
+import { HelperLt } from './lt/lt';
+import { HelperLte } from './lte/lte';
+import { HelperNeq } from './neq/neq';
+import { HelperNot } from './not/not';
+import { HelperOr } from './or/or';
+import { HelperPascalCase } from './pascal-case/pascal-case';
+import { HelperSnakeCase } from './snake-case/snake-case';
+import { HelperSpinalCase } from './spinal-case/spinal-case';
+import { HelperUpperCase } from './upper-case/upper-case';
+
+/**
+ * 安装自定义助手
+ *
+ * @author chitanda
+ * @date 2021-12-24 14:12:05
+ * @export
+ */
+export function installHelpers(hsb: IData): void {
+  new HelperAnd(hsb);
+  new HelperCamelCase(hsb);
+  new HelperConcat(hsb);
+  new HelperEq(hsb);
+  new HelperGt(hsb);
+  new HelperGte(hsb);
+  new HelperJson(hsb);
+  new HelperLowerCase(hsb);
+  new HelperLt(hsb);
+  new HelperLte(hsb);
+  new HelperNeq(hsb);
+  new HelperNot(hsb);
+  new HelperOr(hsb);
+  new HelperPascalCase(hsb);
+  new HelperSnakeCase(hsb);
+  new HelperSpinalCase(hsb);
+  new HelperUpperCase(hsb);
+  new HelperEqPropertyValue(hsb);
+}

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

@@ -0,0 +1,25 @@
+import { HelperBase } from '../helper-base';
+
+/**
+ * json 转 string
+ *
+ * @description 用法 {{json xxx 2}}，支持第二个参数传递格式化。效果: 将 json 对象转为 json 字符串
+ * @author chitanda
+ * @date 2021-12-24 15:12:59
+ * @export
+ * @class HelperJson
+ * @extends {HelperBase}
+ */
+export class HelperJson extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'jsonStringify');
+  }
+
+  onExecute(obj: Record<string, unknown> | unknown[], space: number): string {
+    return JSON.stringify(
+      obj,
+      null,
+      typeof space === 'number' ? space : undefined,
+    );
+  }
+}

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

@@ -0,0 +1,24 @@
+import { HelperBase } from '../helper-base';
+
+/**
+ * 字符串转换小写
+ *
+ * @description 用法 {{lowerCase word}}, 效果: MyName => myname
+ * @author chitanda
+ * @date 2021-12-24 15:12:35
+ * @export
+ * @class HelperLowerCase
+ * @extends {HelperBase}
+ */
+export class HelperLowerCase extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'lowerCase');
+  }
+
+  onExecute(param: string): string {
+    if (!param) {
+      return '';
+    }
+    return param.toLowerCase();
+  }
+}

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

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

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

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

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

@@ -0,0 +1,28 @@
+import { eq } from 'lodash-es';
+import { HelperUtil } from '../../utils';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 不等于
+ *
+ * @description 判断: word !== word2, 用法 {{#neq word 'xxx'}}xxx{{else}}yyy{{/neq}}、{{neq word 'xxx'}} 返回值为 boolean 类型
+ * @author chitanda
+ * @date 2021-12-24 15:12:21
+ * @export
+ * @class HelperNeq
+ * @extends {HelperBase}
+ */
+export class HelperNeq extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'neq');
+  }
+
+  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/not/not.ts

@@ -0,0 +1,26 @@
+import { HelperUtil } from '../../utils';
+import { HelperBase } from '../helper-base';
+
+/**
+ * 参数不存在或者为空时返回 true
+ *
+ * @description 判断: 参数为 null、undefined、空字符串、空数组、空对象时返回 true, 用法: {{#not value}}xxx{{else}}yyy{{/not}}、{{not value}} 返回值为 boolean 类型
+ * @author chitanda
+ * @date 2021-12-29 15:12:38
+ * @export
+ * @class HelperNot
+ * @extends {HelperBase}
+ */
+export class HelperNot extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'not');
+  }
+
+  onExecute(
+    param: unknown,
+    options: Handlebars.HelperOptions,
+  ): string | boolean {
+    const bol = Handlebars.Utils.isEmpty(param);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+}

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

@@ -0,0 +1,28 @@
+import { HelperBase } from '../helper-base';
+
+/**
+ * 或者条件
+ *
+ * @description 判断: word word2 word3 其中任意一个值在判断中为 true, 用法 {{#or word word2 word3}}xxx{{else}}yyy{{/or}}、{{or word word2 word3}} 返回值为 boolean 类型
+ * @author chitanda
+ * @date 2021-12-29 10:12:00
+ * @export
+ * @class HelperOr
+ * @extends {HelperBase}
+ */
+export class HelperOr extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'or');
+  }
+
+  onExecute(...args: unknown[] | Handlebars.HelperOptions[]): string {
+    const options = args[args.length - 1] as Handlebars.HelperOptions;
+    args.pop();
+    const item = (args as unknown[]).find(itemArg => !!itemArg);
+    if (options.fn) {
+      const data = options.data?.root || {};
+      return item ? options.fn(data) : options.inverse(data);
+    }
+    return (item as string) || '';
+  }
+}