@ibiz-template/runtime 0.1.38 → 0.2.1

package/src/controller/control/data-view/data-view.controller.ts

@@ -12,6 +12,7 @@ import {
   MDCtrlLoadParams,
   IMDControlGroupState,
   CodeListItem,
+  ISortItem,
 } from '../../../interface';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
@@ -65,6 +66,7 @@ export class DataViewControlController<
     this.state.noSort = this.model.noSort === true;
     this.state.size = this.model.pagingSize || 20;
     this.state.singleSelect = this.model.singleSelect === true;
+    this.state.sortItems = [];
   }
 
   /**
@@ -77,6 +79,7 @@ export class DataViewControlController<
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     await this.initControlService();
+    this.initSortItems();
   }
 
   /**
@@ -454,4 +457,47 @@ export class DataViewControlController<
       event,
     });
   }
+
+  /**
+   * 初始化排序项集合
+   * @author lxm
+   * @date 2023-10-24 06:11:02
+   * @return {*}  {void}
+   */
+  initSortItems(): void {
+    if (!this.model.dedataViewItems?.length) {
+      return;
+    }
+    const sortItems: ISortItem[] = [];
+    const { minorSortAppDEFieldId, minorSortDir } = this.model;
+    const hasDefaultSort = minorSortAppDEFieldId && minorSortDir;
+    this.model.dedataViewItems.forEach(item => {
+      if (!item.enableSort) {
+        return;
+      }
+
+      let { caption } = item;
+      if (item.capLanguageRes) {
+        caption = ibiz.i18n.t(item.capLanguageRes.lanResTag!, item.caption);
+      }
+      if (!item.appDEFieldId) {
+        throw new RuntimeModelError(item, '启用排序的项必须关联实体属性');
+      }
+
+      const tempItem: ISortItem = {
+        caption: caption!,
+        key: item.appDEFieldId,
+      };
+
+      // 默认排序
+      if (hasDefaultSort && minorSortAppDEFieldId === item.appDEFieldId) {
+        tempItem.order = minorSortDir.toLowerCase() as 'asc' | 'desc';
+      }
+
+      sortItems.push(tempItem);
+    });
+    if (sortItems.length > 0) {
+      this.state.sortItems = sortItems;
+    }
+  }
 }

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

@@ -64,10 +64,10 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
     await super.onInit();
 
     // 加载代码表防抖
-    this.loadCodeList = debounce(
-      this.loadCodeList,
-      300,
-    ) as typeof this.loadCodeList;
+    this.loadCodeList = debounce(this.loadCodeList, 300, {
+      leading: true,
+      trailing: false,
+    }) as typeof this.loadCodeList;
 
     // 默认加载一次代码表
     this.loadCodeList();

package/src/de-logic/utils/handle-src-val.ts

@@ -80,14 +80,18 @@ export function handleSrcVal(
 
   if (value && srcField) {
     try {
-      value = ScriptFactory.execScriptFn(
-        { srcValue: value },
-        `srcValue.${srcField}`,
-        {
-          singleRowReturn: true,
-          isAsync: false,
-        },
-      );
+      if (Array.isArray(value)) {
+        value = value[Number(srcField)];
+      } else {
+        value = ScriptFactory.execScriptFn(
+          { srcValue: value },
+          `srcValue.${srcField}`,
+          {
+            singleRowReturn: true,
+            isAsync: false,
+          },
+        );
+      }
     } catch (error) {
       ibiz.log.error(`从源参数取属性${srcField}报错，源参数：`, value);
       throw error;

package/src/interface/common/i-sort-item/i-sort-item.ts

@@ -0,0 +1,25 @@
+export interface ISortItem {
+  /**
+   * 唯一标识
+   * @author lxm
+   * @date 2023-10-24 05:55:30
+   * @type {string}
+   */
+  key: string;
+
+  /**
+   * 显示标题
+   * @author lxm
+   * @date 2023-10-24 05:55:36
+   * @type {string}
+   */
+  caption: string;
+
+  /**
+   * 排序顺序
+   * @author lxm
+   * @date 2023-10-24 05:55:45
+   * @type {('asc' | 'desc')}
+   */
+  order?: 'asc' | 'desc';
+}

package/src/interface/common/index.ts

@@ -31,3 +31,4 @@ export type {
 export type { IOpenViewOptions } from './i-open-view-options/i-open-view-options';
 export type { IErrorHandler } from './i-error-handler/i-error-handler';
 export type { IFloatWindowOptions } from './i-float-window-options/i-float-window-options';
+export type { ISortItem } from './i-sort-item/i-sort-item';

package/src/interface/controller/state/control/i-data-view-control.state.ts

@@ -1,3 +1,4 @@
+import { ISortItem } from '../../../common';
 import { IButtonContainerState } from '../../common';
 import { IMDControlState } from './i-md-control.state';
 
@@ -16,4 +17,12 @@ export interface IDataViewControlState extends IMDControlState {
    * @memberof PortletPartState
    */
   groupActionGroupState?: IButtonContainerState;
+
+  /**
+   * 排序栏项集合
+   * @author lxm
+   * @date 2023-10-24 05:57:37
+   * @type {ISortItem[]}
+   */
+  sortItems: ISortItem[];
 }

package/src/service/service/control/control.service.ts

@@ -1,5 +1,6 @@
 import { IHttpResponse } from '@ibiz-template/core';
 import { IControl } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
 import { Application } from '../../../application';
@@ -92,7 +93,7 @@ export class ControlService<T extends IControl = IControl> {
    */
   handleResponse(res: IHttpResponse): IHttpResponse {
     // 公共处理
-    return res;
+    return clone(res);
   }
 
   /**

package/src/service/service/entity/method/de-action.ts

@@ -50,7 +50,8 @@ export class DEActionMethod extends Method {
     data: IData | IData[],
   ): Promise<IData | IData[]> {
     if (isArray(data)) {
-      return Promise.all(data.map(item => this.input.handle(context, item)));
+      // 多项数据不做dto转换
+      return data;
     }
     return this.input.handle(context, data);
   }

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

@@ -3,7 +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';
+import { convertNavData, ScriptFactory } from '../../../utils';
 
 /**
  * 实际缓存对象
@@ -206,22 +206,34 @@ export class DynamicCodeListCache {
       minorSortAppDEFieldId,
       minorSortDir,
       pvalueAppDEFieldId,
+      customCond,
     } = this.codeList;
-    // *预定义加载
-    // 特殊处理，避免预置代码表加载不全
-    if (!params.size) {
-      params = { ...params, size: 10000 };
-    }
+
+    // *处理查询参数
+    const tempParams = { ...params };
+
     // 排序
     if (minorSortAppDEFieldId && minorSortDir) {
-      Object.assign(params, {
+      Object.assign(tempParams, {
         sort: `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`,
       });
     }
+    // 自定义查询
+    if (customCond) {
+      const navParams = ScriptFactory.execSingleLine(customCond) as IData;
+      const addParams = convertNavData(navParams, tempParams, context);
+      Object.assign(tempParams, addParams);
+    }
+    // 特殊处理，避免预置代码表加载不全
+    if (!tempParams.size) {
+      tempParams.size = 10000;
+    }
+
+    // *预定义加载
     if (this.isPredefined) {
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,
-        params,
+        tempParams,
       );
       return Object.freeze(res.data.items);
     }
@@ -238,8 +250,8 @@ export class DynamicCodeListCache {
       appDataEntityId!,
       appDEDataSetId,
       context,
-      {},
-      params,
+      undefined,
+      tempParams,
     );
     let resultItems: CodeListItem[] = [];
     if (res.data.length) {

package/src/service/vo/control.vo.ts

@@ -41,12 +41,7 @@ export class ControlVO {
    * @date 2022-09-06 22:09:24
    * @type {Srfuf}
    */
-  get srfuf(): Srfuf {
-    if (isNil(this.$origin.srfuf)) {
-      return this.srfkey ? Srfuf.UPDATE : Srfuf.CREATE;
-    }
-    return this.$origin.srfuf;
-  }
+  declare srfuf: Srfuf;
 
   /**
    * 主键
@@ -55,9 +50,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  get srfkey(): string {
-    return this.$origin.srfkey;
-  }
+  declare srfkey: string;
 
   /**
    * 主信息
@@ -66,9 +59,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  get srfmajortext(): string {
-    return this.$origin.srfmajortext;
-  }
+  declare srfmajortext: string;
 
   /**
    * 实体模型标识
@@ -77,9 +68,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  get srfdeid(): string {
-    return this.$origin.srfdeid;
-  }
+  declare srfdeid: string;
 
   /**
    * 实体模型代码名称
@@ -88,9 +77,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  get srfdecodename(): string {
-    return this.$origin.srfdecodename;
-  }
+  declare srfdecodename: string;
 
   /**
    * 实体主键属性
@@ -99,9 +86,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  get srfkeyfile(): string {
-    return this.$origin.srfkeyfile;
-  }
+  declare srfkeyfile: string;
 
   /**
    * 实体主信息属性
@@ -110,9 +95,7 @@ export class ControlVO {
    * @date 2022-09-07 19:09:42
    * @type {string}
    */
-  get srfmajorfile(): string {
-    return this.$origin.srfmajorfile;
-  }
+  declare srfmajorfile: string;
 
   /**
    * Creates an instance of ControlVO.
@@ -137,6 +120,65 @@ export class ControlVO {
       value: $dataUIMap || new Map(),
     });
 
+    Object.defineProperty(this, 'srfuf', {
+      get() {
+        if (isNil(this.$origin.srfuf)) {
+          return this.srfkey ? Srfuf.UPDATE : Srfuf.CREATE;
+        }
+        return this.$origin.srfuf;
+      },
+      enumerable: false,
+      configurable: true,
+    });
+
+    Object.defineProperty(this, 'srfkey', {
+      get() {
+        return this.$origin.srfkey;
+      },
+      enumerable: false,
+      configurable: true,
+    });
+
+    Object.defineProperty(this, 'srfmajortext', {
+      get() {
+        return this.$origin.srfmajortext;
+      },
+      enumerable: false,
+      configurable: true,
+    });
+
+    Object.defineProperty(this, 'srfdeid', {
+      get() {
+        return this.$origin.srfdeid;
+      },
+      enumerable: false,
+      configurable: true,
+    });
+
+    Object.defineProperty(this, 'srfdecodename', {
+      get() {
+        return this.$origin.srfdecodename;
+      },
+      enumerable: false,
+      configurable: true,
+    });
+
+    Object.defineProperty(this, 'srfkeyfile', {
+      get() {
+        return this.$origin.srfkeyfile;
+      },
+      enumerable: false,
+      configurable: true,
+    });
+
+    Object.defineProperty(this, 'srfmajorfile', {
+      get() {
+        return this.$origin.srfmajorfile;
+      },
+      enumerable: false,
+      configurable: true,
+    });
+
     // 先转换映射的属性
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;

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

@@ -192,6 +192,11 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
 
     // 准备实体名称
     const deName = calcDeCodeNameById(action.appDataEntityId!);
+    const entity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId!,
+      context.srfappid,
+    );
+    const keyField = entity.keyAppDEFieldId!; // 主键属性名称
 
     // 根据数据目标处理数据集合
     switch (action.actionTarget) {
@@ -211,7 +216,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
       case 'MULTIKEY':
         resultData =
           deName && data.length > 0
-            ? data.map(item => ({ [deName]: item.srfkey || item[deName] }))
+            ? data.map(item => ({ [keyField]: item.srfkey || item[keyField] }))
             : [{}];
         break;
       // 单项数据主键，传递包含一个对象的数组，对象里只含有一个主键
@@ -219,7 +224,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
         {
           const originData = data[0] || {};
           resultData = deName
-            ? [{ [deName]: originData.srfkey || originData[deName] }]
+            ? [{ [keyField]: originData.srfkey || originData[keyField] }]
             : [{}];
         }
         break;

package/src/ui-logic/utils/handle-src-val.ts

@@ -76,14 +76,18 @@ export function handleSrcVal(
 
   if (value && srcField) {
     try {
-      value = ScriptFactory.execScriptFn(
-        { srcValue: value },
-        `srcValue.${srcField}`,
-        {
-          singleRowReturn: true,
-          isAsync: false,
-        },
-      );
+      if (Array.isArray(value)) {
+        value = value[Number(srcField)];
+      } else {
+        value = ScriptFactory.execScriptFn(
+          { srcValue: value },
+          `srcValue.${srcField}`,
+          {
+            singleRowReturn: true,
+            isAsync: false,
+          },
+        );
+      }
     } catch (error) {
       ibiz.log.error(`从源参数取属性${srcField}报错，源参数：`, value);
       throw error;