@ibiz-template/runtime 0.4.16 → 0.4.17-dev.0

package/out/service/utils/de-cache/de-cache.d.ts

@@ -19,42 +19,49 @@ export declare class DECache {
      * @type {boolean}
      */
     protected get isUnionKey(): boolean;
+    /**
+     * Creates an instance of DECache.
+     *
+     * @author chitanda
+     * @date 2023-12-22 13:12:40
+     * @param {IAppDataEntity} entity 应用实体模型
+     */
     constructor(entity: IAppDataEntity);
     /**
      * 数据缓存
      *
      * @author chitanda
      * @date 2022-08-17 23:08:08
-     * @type {Map<string, Map<string, IDataEntity>>}
+     * @type {Map<string, IDataEntity>}
      */
-    readonly cacheMap: Map<string, Map<string, IDataEntity>>;
+    readonly cacheMap: Map<string, IDataEntity>;
     /**
      * 强制设置数据，忽略其他逻辑
      *
      * @author chitanda
      * @date 2022-05-10 17:05:45
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity} entity
      */
-    forceAdd(context: IParams, entity: IDataEntity): void;
+    forceAdd(_context: IContext, entity: IDataEntity): void;
     /**
      * 强制更新数据，非合并，忽略其他逻辑
      *
      * @author chitanda
      * @date 2022-05-10 17:05:27
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity} entity
      */
-    forceUpdate(context: IParams, entity: IDataEntity): void;
+    forceUpdate(_context: IContext, entity: IDataEntity): void;
     /**
      * 强制删除数据，忽略其他逻辑
      *
      * @author chitanda
      * @date 2022-05-10 17:05:08
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {string} srfKey
      */
-    forceDelete(context: IParams, srfKey: string): void;
+    forceDelete(_context: IContext, srfKey: string): void;
     /**
      * 新增数据
      *
@@ -63,7 +70,7 @@ export declare class DECache {
      * @return {*}  {boolean}
      * @memberof EntityCache
      */
-    add(context: IParams, entity: IDataEntity): IDataEntity | null;
+    add(context: IContext, entity: IDataEntity): IDataEntity | null;
     /**
      * 查找数据
      *
@@ -72,74 +79,83 @@ export declare class DECache {
      * @return {*}  {IDataEntity}
      * @memberof EntityCache
      */
-    get(context: IParams, srfKey: string): IDataEntity | null;
+    get(context: IContext, srfKey: string): IDataEntity | null;
     /**
      * 更新数据
      *
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity} entity
      * @return {*}  {IDataEntity}
      * @memberof EntityCache
      */
-    update(context: IParams, entity: IDataEntity): IDataEntity | null;
+    update(context: IContext, entity: IDataEntity): IDataEntity | null;
     /**
      * 删除数据
      *
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {string} srfKey
      * @return {*}  {(IDataEntity | null)}
      * @memberof EntityCache
      */
-    delete(context: IParams, srfKey: string): IDataEntity | null;
+    delete(context: IContext, srfKey: string): IDataEntity | null;
     /**
      * 批量创建临时数据
      *
      * @author chitanda
      * @date 2022-03-23 11:03:52
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity[]} entities
      * @return {*}  {IDataEntity[]}
      */
-    createBatch(context: IParams, entities: IDataEntity[]): IDataEntity[];
+    createBatch(context: IContext, entities: IDataEntity[]): IDataEntity[];
     /**
      * 批量更新数据
      *
      * @author chitanda
      * @date 2022-03-23 10:03:17
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity[]} entities
      * @return {*}  {IDataEntity[]}
      */
-    updateBatch(context: IParams, entities: IDataEntity[]): IDataEntity[];
+    updateBatch(context: IContext, entities: IDataEntity[]): IDataEntity[];
     /**
      * 批量删除数据
      *
      * @author chitanda
      * @date 2022-03-23 10:03:40
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {string[]} srfKeys 需要删除的数据主键
      * @return {*}  {string[]} 未能删除的数据主键
      */
-    deleteBatch(context: IParams, srfKeys: string[]): string[];
+    deleteBatch(context: IContext, srfKeys: string[]): string[];
     /**
      * 检查数据是否已经存在
      *
      * @author chitanda
      * @date 2022-08-17 23:08:06
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {string} srfkey
      * @return {*}  {boolean}
      */
-    checkData(context: IParams, srfkey: string): boolean;
+    checkData(_context: IContext, srfkey: string): boolean;
+    /**
+     * 获取当前已经缓存的数据
+     *
+     * @author chitanda
+     * @date 2023-12-22 14:12:57
+     * @return {*}  {IDataEntity[]}
+     */
+    getList(): IDataEntity[];
     /**
      * 根据条件查找数据，未设置条件默认返回全部
      *
      * @author chitanda
-     * @date 2022-08-17 23:08:56
-     * @param {IParams} context
+     * @date 2023-12-22 13:12:28
+     * @param {IContext} context
+     * @param {IParams} [params={}]
      * @return {*}  {IDataEntity[]}
      */
-    getList(context: IParams): IDataEntity[];
+    select(context: IContext, params?: IParams): IDataEntity[];
     /**
      * 根据条件生成查询
      *
@@ -150,23 +166,12 @@ export declare class DECache {
      */
     generatePred(params?: IParams): <U>(testObj: U) => boolean;
     /**
-     * 清除缓存
-     *
-     * @author chitanda
-     * @date 2022-08-17 23:08:54
-     * @param {IParams} context
-     */
-    clear(context: IParams): void;
-    /**
-     * 根据标识获取map组
+     * 清空缓存
      *
      * @author chitanda
-     * @date 2022-08-17 23:08:47
-     * @private
-     * @param {IParams} context
-     * @return {*}  {Map<string, IDataEntity>}
+     * @date 2023-12-22 13:12:17
      */
-    private getCacheByTag;
+    clear(): void;
     /**
      * 根据联合键值计算主键并赋值
      * @author lxm

package/out/service/utils/de-cache/de-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,OAAO;IAaN,SAAS,CAAC,MAAM,EAAE,cAAc;IAZ5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;gBAEqB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IASrD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAMxD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMnD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA2B9D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAazD;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAgCjE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAmB5D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAsBrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA2BrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA4B1D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAMpD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,EAAE;IAexC;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO7B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAQrB;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;CAehD"}
+{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAyB/D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA+BlE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAkB7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAqBtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA0BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA2B3D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,WAAW,EAAE;IAoE9D;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAIb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;CAehD"}

package/out/service/utils/de-cache/de-cache.js

@@ -1,5 +1,5 @@
 import { where, equals, clone, isNil, isEmpty } from 'ramda';
-import { createUUID } from 'qx-util';
+import { ascSort, createUUID } from 'qx-util';
 import { RuntimeError } from '@ibiz-template/core';
 import { isExistSessionId, isExistSrfKey, } from '../service-exist-util/service-exist-util';
 import { findModelChild } from '../../../model';
@@ -24,6 +24,13 @@ export class DECache {
         var _a;
         return !!((_a = this.entity.unionKeyValueAppDEFieldIds) === null || _a === void 0 ? void 0 : _a.length);
     }
+    /**
+     * Creates an instance of DECache.
+     *
+     * @author chitanda
+     * @date 2023-12-22 13:12:40
+     * @param {IAppDataEntity} entity 应用实体模型
+     */
     constructor(entity) {
         this.entity = entity;
         /**
@@ -31,7 +38,7 @@ export class DECache {
          *
          * @author chitanda
          * @date 2022-08-17 23:08:08
-         * @type {Map<string, Map<string, IDataEntity>>}
+         * @type {Map<string, IDataEntity>}
          */
         this.cacheMap = new Map();
     }
@@ -40,12 +47,11 @@ export class DECache {
      *
      * @author chitanda
      * @date 2022-05-10 17:05:45
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity} entity
      */
-    forceAdd(context, entity) {
-        const map = this.getCacheByTag(context);
-        const data = map.get(entity.srfkey);
+    forceAdd(_context, entity) {
+        const data = this.cacheMap.get(entity.srfkey);
         if (data) {
             data.assign(entity);
             ibiz.log.warn('forceAdd', entity.srfkey, entity);
@@ -56,12 +62,11 @@ export class DECache {
      *
      * @author chitanda
      * @date 2022-05-10 17:05:27
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity} entity
      */
-    forceUpdate(context, entity) {
-        const map = this.getCacheByTag(context);
-        map.set(entity.srfkey, clone(entity));
+    forceUpdate(_context, entity) {
+        this.cacheMap.set(entity.srfkey, clone(entity));
         ibiz.log.warn('forceUpdate', entity.srfkey, entity);
     }
     /**
@@ -69,12 +74,11 @@ export class DECache {
      *
      * @author chitanda
      * @date 2022-05-10 17:05:08
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {string} srfKey
      */
-    forceDelete(context, srfKey) {
-        const map = this.getCacheByTag(context);
-        map.delete(srfKey);
+    forceDelete(_context, srfKey) {
+        this.cacheMap.delete(srfKey);
         ibiz.log.warn('forceDelete', srfKey);
     }
     /**
@@ -99,8 +103,7 @@ export class DECache {
                 entity.srfkey = createUUID();
             }
             entity.srftempdate = new Date().getTime();
-            const map = this.getCacheByTag(context);
-            map.set(entity.srfkey, clone(entity));
+            this.cacheMap.set(entity.srfkey, clone(entity));
             ibiz.log.warn('add', entity.srfkey, entity);
             return entity;
         }
@@ -120,8 +123,7 @@ export class DECache {
     get(context, srfKey) {
         try {
             isExistSessionId('get', context);
-            const map = this.getCacheByTag(context);
-            const data = map.get(srfKey);
+            const data = this.cacheMap.get(srfKey);
             ibiz.log.warn('get', srfKey, data);
             return clone(data);
         }
@@ -133,7 +135,7 @@ export class DECache {
     /**
      * 更新数据
      *
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity} entity
      * @return {*}  {IDataEntity}
      * @memberof EntityCache
@@ -152,11 +154,10 @@ export class DECache {
             isExistSessionId('update', context);
             isExistSrfKey('update', entity);
             entity.srftempdate = new Date().getTime();
-            const map = this.getCacheByTag(context);
-            const data = map.get(oldKey);
+            const data = this.cacheMap.get(oldKey);
             if (data) {
                 data.assign(entity);
-                map.set(oldKey, data);
+                this.cacheMap.set(oldKey, data);
                 ibiz.log.warn('update', oldKey, entity);
                 return clone(data);
             }
@@ -170,7 +171,7 @@ export class DECache {
     /**
      * 删除数据
      *
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {string} srfKey
      * @return {*}  {(IDataEntity | null)}
      * @memberof EntityCache
@@ -178,12 +179,11 @@ export class DECache {
     delete(context, srfKey) {
         try {
             isExistSessionId('delete', context);
-            const map = this.getCacheByTag(context);
             const key = srfKey;
-            if (map.has(key)) {
-                const data = map.get(key);
+            if (this.cacheMap.has(key)) {
+                const data = this.cacheMap.get(key);
                 data.srftempdate = new Date().getTime();
-                map.delete(key);
+                this.cacheMap.delete(key);
                 ibiz.log.warn('delete', key);
                 return data;
             }
@@ -199,14 +199,13 @@ export class DECache {
      *
      * @author chitanda
      * @date 2022-03-23 11:03:52
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity[]} entities
      * @return {*}  {IDataEntity[]}
      */
     createBatch(context, entities) {
         try {
             isExistSessionId('add', context);
-            const map = this.getCacheByTag(context);
             for (let i = 0; i < entities.length; i++) {
                 const entity = entities[i];
                 if (isNil(entity.srfkey) || isEmpty(entity.srfkey)) {
@@ -214,7 +213,7 @@ export class DECache {
                 }
                 entity.srftempdate = new Date().getTime();
                 const data = clone(entity);
-                map.set(entity.srfkey, data);
+                this.cacheMap.set(entity.srfkey, data);
                 entities[i] = data;
                 ibiz.log.warn('add', entity.srfkey, entity);
             }
@@ -230,22 +229,21 @@ export class DECache {
      *
      * @author chitanda
      * @date 2022-03-23 10:03:17
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IDataEntity[]} entities
      * @return {*}  {IDataEntity[]}
      */
     updateBatch(context, entities) {
         try {
             isExistSessionId('update', context);
-            const map = this.getCacheByTag(context);
             for (let i = 0; i < entities.length; i++) {
                 const entity = entities[i];
                 isExistSrfKey('update', entity);
                 entity.srftempdate = new Date().getTime();
-                const data = map.get(entity.srfkey);
+                const data = this.cacheMap.get(entity.srfkey);
                 if (data) {
                     data.assign(entity);
-                    map.set(entity.srfkey, data);
+                    this.cacheMap.set(entity.srfkey, data);
                     ibiz.log.warn('update', entity.srfkey, entity);
                     entities[i] = clone(data);
                 }
@@ -265,7 +263,7 @@ export class DECache {
      *
      * @author chitanda
      * @date 2022-03-23 10:03:40
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {string[]} srfKeys 需要删除的数据主键
      * @return {*}  {string[]} 未能删除的数据主键
      */
@@ -277,11 +275,10 @@ export class DECache {
             ibiz.log.error(err);
             return srfKeys;
         }
-        const map = this.getCacheByTag(context);
         const notRemoveKeys = [];
         for (let i = 0; i < srfKeys.length; i++) {
             const key = srfKeys[i];
-            if (!map.has(key)) {
+            if (!this.cacheMap.has(key)) {
                 notRemoveKeys.push(key);
             }
         }
@@ -290,7 +287,7 @@ export class DECache {
         }
         for (let i = 0; i < srfKeys.length; i++) {
             const key = srfKeys[i];
-            map.delete(key);
+            this.cacheMap.delete(key);
             ibiz.log.warn('delete', key);
         }
         return [];
@@ -300,32 +297,95 @@ export class DECache {
      *
      * @author chitanda
      * @date 2022-08-17 23:08:06
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {string} srfkey
      * @return {*}  {boolean}
      */
-    checkData(context, srfkey) {
-        const list = this.getList(context);
-        const i = list.findIndex(item => item.srfkey === srfkey);
-        return i !== -1;
+    checkData(_context, srfkey) {
+        return !!this.cacheMap.get(srfkey);
+    }
+    /**
+     * 获取当前已经缓存的数据
+     *
+     * @author chitanda
+     * @date 2023-12-22 14:12:57
+     * @return {*}  {IDataEntity[]}
+     */
+    getList() {
+        const values = this.cacheMap.values();
+        return Array.from(values);
     }
     /**
      * 根据条件查找数据，未设置条件默认返回全部
      *
      * @author chitanda
-     * @date 2022-08-17 23:08:56
-     * @param {IParams} context
+     * @date 2023-12-22 13:12:28
+     * @param {IContext} context
+     * @param {IParams} [params={}]
      * @return {*}  {IDataEntity[]}
      */
-    getList(context) {
+    select(context, params = {}) {
         try {
             isExistSessionId('getList', context);
-            const map = this.getCacheByTag(context);
-            if (!map) {
-                return [];
+            const values = this.cacheMap.values();
+            let items = Array.from(values);
+            items = ascSort(items, 'srfordervalue');
+            // 查询数据条件集
+            const data = {};
+            // if (notNilEmpty(context)) {
+            //   const map = this.entity.majorKeyMap;
+            //   if (map) {
+            //     for (const key in map) {
+            //       if (Object.prototype.hasOwnProperty.call(map, key)) {
+            //         const val = map[key];
+            //         if (notNilEmpty(context[key])) {
+            //           data[val] = equals(context[key]);
+            //         }
+            //       }
+            //     }
+            //   }
+            // }
+            const nullData = {};
+            const undefinedData = {};
+            const emptyData = {};
+            if (params.srfkey) {
+                data.srfkey = equals(params.srfkey);
+                delete params.srfkey;
             }
-            const values = map.values();
-            return Array.from(values);
+            for (const key in params) {
+                if (Object.prototype.hasOwnProperty.call(params, key)) {
+                    const val = params[key];
+                    if (val == null) {
+                        nullData[key] = equals(null);
+                        undefinedData[key] = equals(undefined);
+                        emptyData[key] = equals('');
+                    }
+                    else {
+                        data[key] = equals(val);
+                    }
+                }
+            }
+            if (!isEmpty(data)) {
+                // 返回柯里化函数，用于判断数据是否满足要求
+                const pred = where(data);
+                const nullPred = where(nullData);
+                const undefinedPred = where(undefinedData);
+                const emptyPred = where(emptyData);
+                items = items.filter(obj => {
+                    if (isEmpty(nullData)) {
+                        if (pred(obj)) {
+                            return true;
+                        }
+                    }
+                    else if (pred(obj) &&
+                        (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))) {
+                        return true;
+                    }
+                    return false;
+                });
+            }
+            const list = items.map(obj => obj.clone());
+            return list;
         }
         catch (err) {
             ibiz.log.error(err);
@@ -356,33 +416,13 @@ export class DECache {
         return where(data);
     }
     /**
-     * 清除缓存
-     *
-     * @author chitanda
-     * @date 2022-08-17 23:08:54
-     * @param {IParams} context
-     */
-    clear(context) {
-        const tag = context.srfsessionid;
-        if (this.cacheMap.size > 0) {
-            this.cacheMap.delete(tag);
-        }
-    }
-    /**
-     * 根据标识获取map组
+     * 清空缓存
      *
      * @author chitanda
-     * @date 2022-08-17 23:08:47
-     * @private
-     * @param {IParams} context
-     * @return {*}  {Map<string, IDataEntity>}
+     * @date 2023-12-22 13:12:17
      */
-    getCacheByTag(context) {
-        const tag = context.srfsessionid;
-        if (!this.cacheMap.has(tag)) {
-            this.cacheMap.set(tag, new Map());
-        }
-        return this.cacheMap.get(tag);
+    clear() {
+        this.cacheMap.clear();
     }
     /**
      * 根据联合键值计算主键并赋值

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -106,7 +106,7 @@ export declare class DynamicCodeListCache {
      * @param {IParams} [params={}]
      * @returns {*}  {Promise<CodeListItem[]>}
      */
-    protected load(context?: IParams, params?: IParams): Promise<CodeListItem[]>;
+    protected load(context: IContext, params?: IParams): Promise<CodeListItem[]>;
     /**
      * 组装树形代码表数据
      *
@@ -122,7 +122,7 @@ export declare class DynamicCodeListCache {
      * @param {IParams} [params={}]
      * @returns {*}  {Promise<IData[]>}
      */
-    get(context?: IParams, params?: IParams): Promise<CodeListItem[]>;
+    get(context: IContext, params?: IParams): Promise<CodeListItem[]>;
 }
 export {};
 //# sourceMappingURL=dynamic-code-list.d.ts.map

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IA6DhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC3B"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IA6DhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -118,7 +118,7 @@ export class DynamicCodeListCache {
      * @param {IParams} [params={}]
      * @returns {*}  {Promise<CodeListItem[]>}
      */
-    async load(context = {}, params = {}) {
+    async load(context, params = {}) {
         const app = ibiz.hub.getApp(context.srfappid);
         const { appDataEntityId, appDEDataSetId, minorSortAppDEFieldId, minorSortDir, pvalueAppDEFieldId, customCond, } = this.codeList;
         // *处理查询参数
@@ -202,7 +202,7 @@ export class DynamicCodeListCache {
      * @param {IParams} [params={}]
      * @returns {*}  {Promise<IData[]>}
      */
-    async get(context = {}, params = {}) {
+    async get(context, params = {}) {
         // 初始化还未完成时被调用
         if (this.initPromise) {
             await this.initPromise;

package/out/service/utils/res-path/res-path.d.ts

@@ -8,11 +8,11 @@ import { IAppDataEntity } from '@ibiz/model-core';
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IParams} context
+ * @param {IContext} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
-export declare function getMatchResPath(context: IParams, entity: IAppDataEntity): {
+export declare function getMatchResPath(context: IContext, entity: IAppDataEntity): {
     path: string;
     keys: string[];
 } | undefined;
@@ -22,9 +22,9 @@ export declare function getMatchResPath(context: IParams, entity: IAppDataEntity
  * @author lxm
  * @date 2022-11-25 13:11:53
  * @export
- * @param {IParams} context 上下文对象
+ * @param {IContext} context 上下文对象
  * @param {ServicePathItem[][]} pathItems 计算出的资源关系路径
  * @return {*}  {string}
  */
-export declare function calcResPath(context: IParams, entity: IAppDataEntity): string;
+export declare function calcResPath(context: IContext, entity: IAppDataEntity): string;
 //# sourceMappingURL=res-path.d.ts.map

package/out/service/utils/res-path/res-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"res-path.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/res-path/res-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,cAAc,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAkC9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,GAAG,MAAM,CAkB5E"}
+{"version":3,"file":"res-path.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/res-path/res-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,cAAc,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAkC9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAG,MAAM,CAkB7E"}

package/out/service/utils/res-path/res-path.js

@@ -9,7 +9,7 @@ const reg = /\$\{(.*?)\}/g;
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IParams} context
+ * @param {IContext} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
@@ -54,7 +54,7 @@ export function getMatchResPath(context, entity) {
  * @author lxm
  * @date 2022-11-25 13:11:53
  * @export
- * @param {IParams} context 上下文对象
+ * @param {IContext} context 上下文对象
  * @param {ServicePathItem[][]} pathItems 计算出的资源关系路径
  * @return {*}  {string}
  */