@ibiz-template/runtime 0.1.36 → 0.1.38

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

@@ -6,6 +6,7 @@ import {
 import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
 import { IAppDEDataSet } from '@ibiz/model-core';
+import { isArray } from 'lodash-es';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
@@ -30,14 +31,17 @@ export class FetchMethod extends Method {
 
   async exec(
     context: IParams,
-    data: IData,
-    params: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
   ): Promise<HttpResponse<IDataEntity[]>> {
+    // 过滤参数，必须是对象
+    const searchParams = params && isArray(params) ? params : params2 || {};
+
     if (this.isLocalMode) {
       // 临时数据
       const items = await this.searchLocal(
         null,
-        new SearchFilter(context, data),
+        new SearchFilter(context, searchParams),
       );
       return new HttpResponse<IDataEntity[]>(items, 200);
     }
@@ -48,12 +52,12 @@ export class FetchMethod extends Method {
       case 'INDEXDE':
       case 'CODELIST':
       case 'MULTIFORM':
-        res = await this.fetchCodeListSet(context, params);
+        res = await this.fetchCodeListSet(context, searchParams);
         break;
       case 'REMOTE':
         {
           const path = this.calcPath(context);
-          res = await this.request(path, context, data, params);
+          res = await this.request(path, context, params, params2);
         }
         break;
       default:
@@ -68,13 +72,10 @@ export class FetchMethod extends Method {
     res.data = items.map(item => this.createEntity(item));
 
     // 计算属性逻辑,每条数据走一遍
-    if (res.data.length) {
-      await Promise.all(
-        res.data.map((item: IData) =>
-          execFieldLogics(this.entity, 'compute', context, item, params),
-        ),
-      );
+    if (res.data) {
+      execFieldLogics(this.entity, 'compute', context, res.data, searchParams);
     }
+
     return res as HttpResponse<IDataEntity[]>;
   }
 

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

@@ -1,7 +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 { isArray } from 'lodash-es';
 import { Application } from '../../../../application';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
@@ -71,16 +71,17 @@ export abstract class Method {
   /**
    * 执行行为
    *
-   * @author chitanda
-   * @date 2022-10-10 14:10:42
-   * @param {IParams} context
-   * @param {IData} [params={}]
-   * @param {IParams} [params2={}]
+   * @author lxm
+   * @date 2023-10-19 02:42:49
+   * @abstract
+   * @param {IParams} context 上下文
+   * @param {(IData | IData[])} [params] 请求参数
+   * @param {IParams} [params2] 查询参数
    * @return {*}  {Promise<HttpResponse>}
    */
   abstract exec(
     context: IParams,
-    params?: IData,
+    params?: IData | IData[],
     params2?: IParams,
   ): Promise<HttpResponse>;
 
@@ -99,7 +100,7 @@ export abstract class Method {
   protected async request(
     path: string,
     context: IParams,
-    data?: IData,
+    data?: IData | IData[],
     params?: IParams,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<HttpResponse<any>> {
@@ -111,7 +112,7 @@ export abstract class Method {
         case 'POST':
           res = await this.app.net.post(
             this.mergeRequestPath(path, methodName),
-            notNilEmpty(data) ? data! : params || {},
+            data || params || {},
           );
           break;
         case 'GET':
@@ -123,7 +124,7 @@ export abstract class Method {
         case 'PUT': {
           res = await this.app.net.put(
             this.mergeRequestPath(path, methodName),
-            notNilEmpty(data) ? data! : params || {},
+            data || params || {},
           );
           break;
         }
@@ -184,17 +185,25 @@ export abstract class Method {
 
   /**
    * 创建实体
-   *
-   * @author chitanda
-   * @date 2022-10-11 22:10:05
+   * @author lxm
+   * @date 2023-10-19 03:22:00
    * @protected
-   * @param {(IData | IDataEntity)} data
-   * @return {*}  {IDataEntity}
+   * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+   * @return {*}  {(IDataEntity | IDataEntity[])}
    */
-  protected createEntity(data: IData | IDataEntity): IDataEntity {
-    if (data instanceof AppDataEntity) {
-      return data.clone();
+  protected createEntity(
+    data: IData[] | IDataEntity[] | IData | IDataEntity,
+  ): IDataEntity | IDataEntity[] {
+    const toEntity = (single: IData | IDataEntity): IDataEntity => {
+      if (single instanceof AppDataEntity) {
+        return single.clone();
+      }
+      return new AppDataEntity(this.entity, single);
+    };
+
+    if (isArray(data)) {
+      return data.map(item => toEntity(item));
     }
-    return new AppDataEntity(this.entity, data);
+    return toEntity(data);
   }
 }

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -3,6 +3,7 @@ import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 import { Application } from '../../../application';
 import { CodeListItem } from '../../../interface';
+import { ScriptFactory } from '../../../utils';
 
 /**
  * 实际缓存对象
@@ -129,17 +130,59 @@ export class DynamicCodeListCache {
    * @param {IData} data
    * @returns {*}
    */
-  protected convertData(data: IData): Readonly<IData> {
-    // todo 根据模型转换
-    const result: IData = {};
+  protected convertData(data: IData): CodeListItem {
+    const result = {} as CodeListItem;
+    const {
+      valueAppDEFieldId,
+      textAppDEFieldId,
+      iconClsAppDEFieldId,
+      iconClsXAppDEFieldId,
+      iconPathAppDEFieldId,
+      iconPathXAppDEFieldId,
+      disableAppDEFieldId,
+      dataAppDEFieldId,
+    } = this.codeList;
     // 值属性
-    const { valueAppDEFieldId, textAppDEFieldId } = this.codeList;
     const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
     result.id = value;
     result.value = value;
     // 文本属性
     result.text = textAppDEFieldId ? data[textAppDEFieldId] : data.srfmajortext;
-    return Object.freeze(result);
+    if (
+      iconClsAppDEFieldId ||
+      iconClsXAppDEFieldId ||
+      iconPathAppDEFieldId ||
+      iconPathXAppDEFieldId
+    ) {
+      result.sysImage = {};
+      // 图标样式属性
+      if (iconClsAppDEFieldId) {
+        result.sysImage.cssClass = data[iconClsAppDEFieldId];
+      }
+      // 图标样式(倍数)属性
+      if (iconClsXAppDEFieldId) {
+        result.sysImage.cssClassX = data[iconClsXAppDEFieldId];
+      }
+      // 图标路径属性
+      if (iconPathAppDEFieldId) {
+        result.sysImage.imagePath = data[iconPathAppDEFieldId];
+      }
+      // 图标路径(倍数)属性
+      if (iconPathXAppDEFieldId) {
+        result.sysImage.imagePathX = data[iconPathXAppDEFieldId];
+      }
+    }
+    // 禁止选择属性
+    if (disableAppDEFieldId) {
+      result.disableSelect = data[disableAppDEFieldId];
+    }
+    // 数据属性
+    if (dataAppDEFieldId && data[dataAppDEFieldId]) {
+      result.data = ScriptFactory.execSingleLine(
+        data[dataAppDEFieldId],
+      ) as IData;
+    }
+    return result;
   }
 
   /**
@@ -157,11 +200,24 @@ export class DynamicCodeListCache {
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     const app = ibiz.hub.getApp(context.srfappid);
+    const {
+      appDataEntityId,
+      appDEDataSetId,
+      minorSortAppDEFieldId,
+      minorSortDir,
+      pvalueAppDEFieldId,
+    } = this.codeList;
     // *预定义加载
     // 特殊处理，避免预置代码表加载不全
     if (!params.size) {
       params = { ...params, size: 10000 };
     }
+    // 排序
+    if (minorSortAppDEFieldId && minorSortDir) {
+      Object.assign(params, {
+        sort: `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`,
+      });
+    }
     if (this.isPredefined) {
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,
@@ -171,7 +227,6 @@ export class DynamicCodeListCache {
     }
 
     // *加载实体服务数据
-    const { appDataEntityId, appDEDataSetId } = this.codeList;
     if (!appDataEntityId) {
       throw new RuntimeModelError(this.codeList, '未配置应用实体');
     }
@@ -188,12 +243,50 @@ export class DynamicCodeListCache {
     );
     let resultItems: CodeListItem[] = [];
     if (res.data.length) {
-      resultItems = res.data.map((item: IData) => {
-        return this.convertData(item);
+      res.data.forEach((item: IData) => {
+        if (pvalueAppDEFieldId) {
+          const tempItems = this.prepareTreeData(res.data as IData[]);
+          if (tempItems) {
+            resultItems = tempItems;
+          }
+        } else {
+          resultItems.push(this.convertData(item));
+        }
       });
-      // todo 动态树形代码表
     }
-    return resultItems;
+    return Object.freeze(resultItems) as CodeListItem[];
+  }
+
+  /**
+   * 组装树形代码表数据
+   *
+   * @return {codeListItem[] | undefined}
+   */
+  protected prepareTreeData(
+    items: IData[],
+    pValue?: string | number,
+  ): CodeListItem[] | undefined {
+    const { pvalueAppDEFieldId } = this.codeList;
+    let filteredData: IData[] = [];
+    filteredData = items.filter(item => {
+      if (pValue) {
+        // 有传父value去后台数据里找出来子项pValue等于父value的
+        return item[pvalueAppDEFieldId!] === pValue;
+      }
+      // 没有传父value，只需要找出来没有父值属性的
+      return !item[pvalueAppDEFieldId!];
+    });
+    if (filteredData.length === 0) {
+      return;
+    }
+    return filteredData.map(data => {
+      const tempCodeListItem = this.convertData(data);
+      tempCodeListItem.children = this.prepareTreeData(
+        items,
+        tempCodeListItem.value,
+      );
+      return tempCodeListItem;
+    });
   }
 
   /**

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

@@ -61,13 +61,13 @@ export class UIActionUtil {
     } else if (result.refresh) {
       switch (result.refreshMode) {
         case 1:
-          await params.view.callUIAction(SysUIActionTag.REFRESH);
+          params.view.callUIAction(SysUIActionTag.REFRESH);
           break;
         case 2:
-          await params.view.parentView?.callUIAction(SysUIActionTag.REFRESH);
+          params.view.parentView?.callUIAction(SysUIActionTag.REFRESH);
           break;
         case 3:
-          await params.view.getTopView()?.callUIAction(SysUIActionTag.REFRESH);
+          params.view.getTopView()?.callUIAction(SysUIActionTag.REFRESH);
           break;
         default:
       }

package/src/ui-logic/ui-logic-param/ui-logic-param.ts

@@ -41,7 +41,12 @@ export class UILogicParam {
     }
 
     if (m.default) {
-      ctx.params[tag] = data && data.length > 0 ? data[0] : {};
+      // 配置了数据对象列表的，default给数组格式的数据
+      if (m.entityListParam) {
+        ctx.params[tag] = data || [];
+      } else {
+        ctx.params[tag] = data && data.length > 0 ? data[0] : {};
+      }
     } else if (m.activeContainerParam) {
       ctx.params[tag] = parameters.ctrl || parameters.view;
     } else if (m.activeCtrlParam) {

package/src/utils/script/script-factory.ts

@@ -38,4 +38,20 @@ export class ScriptFactory {
       args,
     );
   }
+
+  /**
+   * 执行单行脚本
+   * @author lxm
+   * @date 2023-10-20 03:20:56
+   * @static
+   * @param {string} scriptCode 脚本字符串
+   * @param {IParams} [args={}] 作用域变量参数对象
+   * @return {*}  {unknown}
+   */
+  static execSingleLine(scriptCode: string, args: IParams = {}): unknown {
+    return this.execScriptFn(args, scriptCode, {
+      singleRowReturn: true,
+      isAsync: false,
+    });
+  }
 }