@ibiz-template/runtime 0.5.3-beta.0 → 0.5.3-beta.10

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

@@ -1,5 +1,5 @@
 import { where, equals, clone, isNil, isEmpty } from 'ramda';
-import { ascSort, createUUID } from 'qx-util';
+import { createUUID } from 'qx-util';
 import { RuntimeError } from '@ibiz-template/core';
 import { isExistSessionId, isExistSrfKey, } from '../service-exist-util/service-exist-util';
 import { findModelChild } from '../../../model';
@@ -103,8 +103,20 @@ export class DECache {
                 entity.srfkey = createUUID();
             }
             entity.srftempdate = new Date().getTime();
-            this.cacheMap.set(entity.srfkey, clone(entity));
-            ibiz.log.warn('add', entity.srfkey, entity);
+            // 提交回调
+            const commit = () => {
+                this.cacheMap.set(entity.srfkey, clone(entity));
+                ibiz.log.warn('add', entity.srfkey, entity);
+            };
+            const t = this.getTransaction(context);
+            if (t) {
+                t.change(entity.srfkey, () => {
+                    commit();
+                });
+            }
+            else {
+                commit();
+            }
             return entity;
         }
         catch (err) {
@@ -156,10 +168,27 @@ export class DECache {
             entity.srftempdate = new Date().getTime();
             const data = this.cacheMap.get(oldKey);
             if (data) {
-                data.assign(entity);
-                this.cacheMap.set(oldKey, data);
-                ibiz.log.warn('update', oldKey, entity);
-                return clone(data);
+                const _data = clone(data);
+                _data.assign(entity);
+                // 提交回调
+                const commit = () => {
+                    data.assign(entity);
+                    if (oldKey !== entity.srfkey) {
+                        this.cacheMap.delete(oldKey);
+                    }
+                    this.cacheMap.set(entity.srfkey, data);
+                    ibiz.log.warn('update', entity.srfkey, entity);
+                };
+                const t = this.getTransaction(context);
+                if (t) {
+                    t.change(entity.srfkey, () => {
+                        commit();
+                    });
+                }
+                else {
+                    commit();
+                }
+                return _data;
             }
             throw new Error('数据不存在，无法更新!');
         }
@@ -182,9 +211,19 @@ export class DECache {
             const key = srfKey;
             if (this.cacheMap.has(key)) {
                 const data = this.cacheMap.get(key);
-                data.srftempdate = new Date().getTime();
-                this.cacheMap.delete(key);
-                ibiz.log.warn('delete', key);
+                const commit = () => {
+                    this.cacheMap.delete(key);
+                    ibiz.log.warn('delete', key);
+                };
+                const t = this.getTransaction(context);
+                if (t) {
+                    t.change(key, () => {
+                        commit();
+                    });
+                }
+                else {
+                    commit();
+                }
                 return data;
             }
             return null;
@@ -206,6 +245,11 @@ export class DECache {
     createBatch(context, entities) {
         try {
             isExistSessionId('add', context);
+            const commit = (entity) => {
+                this.cacheMap.set(entity.srfkey, entity);
+                ibiz.log.warn('add', entity.srfkey, entity);
+            };
+            const t = this.getTransaction(context);
             for (let i = 0; i < entities.length; i++) {
                 const entity = entities[i];
                 if (isNil(entity.srfkey) || isEmpty(entity.srfkey)) {
@@ -213,9 +257,14 @@ export class DECache {
                 }
                 entity.srftempdate = new Date().getTime();
                 const data = clone(entity);
-                this.cacheMap.set(entity.srfkey, data);
-                entities[i] = data;
-                ibiz.log.warn('add', entity.srfkey, entity);
+                if (t) {
+                    t.change(data.srfkey, () => {
+                        commit(data);
+                    });
+                }
+                else {
+                    commit(data);
+                }
             }
             return entities;
         }
@@ -236,16 +285,44 @@ export class DECache {
     updateBatch(context, entities) {
         try {
             isExistSessionId('update', context);
+            const commit = (entity, oldKey) => {
+                // 如果主键改变，删除旧的数据再设置新数据
+                if (oldKey !== entity.srfkey) {
+                    this.cacheMap.delete(oldKey);
+                }
+                this.cacheMap.set(entity.srfkey, entity);
+                ibiz.log.warn('update', entity.srfkey, entity);
+            };
+            const t = this.getTransaction(context);
             for (let i = 0; i < entities.length; i++) {
                 const entity = entities[i];
                 isExistSrfKey('update', entity);
+                const oldKey = entity.srfkey;
+                // 联合主键相关数据处理
+                if (this.isUnionKey) {
+                    this.calcUnionKey(entity);
+                    // 主键改变的时候，检测变更之后的主键是否已经存在
+                    if (oldKey !== entity.srfkey &&
+                        this.checkData(context, entity.srfkey)) {
+                        throw new RuntimeError(`更新联合主键数据失败，已有主键为${entity.srfkey}的数据`);
+                    }
+                }
                 entity.srftempdate = new Date().getTime();
                 const data = this.cacheMap.get(entity.srfkey);
                 if (data) {
-                    data.assign(entity);
-                    this.cacheMap.set(entity.srfkey, data);
-                    ibiz.log.warn('update', entity.srfkey, entity);
-                    entities[i] = clone(data);
+                    const _data = clone(data);
+                    _data.assign(entity);
+                    entities[i] = _data;
+                    if (t) {
+                        t.change(entity.srfkey, () => {
+                            data.assign(entity);
+                            commit(data, oldKey);
+                        });
+                    }
+                    else {
+                        data.assign(entity);
+                        commit(data, oldKey);
+                    }
                 }
                 else {
                     throw new Error(`数据[${entity.srfdename}-${entity.srfmajortext}(${entity.srfkey})]不存在，无法更新!`);
@@ -285,10 +362,21 @@ export class DECache {
         if (notRemoveKeys.length > 0) {
             throw new Error(`未找到以下数据「${notRemoveKeys.join('、')}」，无法删除!`);
         }
-        for (let i = 0; i < srfKeys.length; i++) {
-            const key = srfKeys[i];
+        const commit = (key) => {
             this.cacheMap.delete(key);
             ibiz.log.warn('delete', key);
+        };
+        const t = this.getTransaction(context);
+        for (let i = 0; i < srfKeys.length; i++) {
+            const key = srfKeys[i];
+            if (t) {
+                t.change(key, () => {
+                    commit(key);
+                });
+            }
+            else {
+                commit(key);
+            }
         }
         return [];
     }
@@ -315,83 +403,6 @@ export class DECache {
         const values = this.cacheMap.values();
         return Array.from(values);
     }
-    /**
-     * 根据条件查找数据，未设置条件默认返回全部
-     *
-     * @author chitanda
-     * @date 2023-12-22 13:12:28
-     * @param {IContext} context
-     * @param {IParams} [params={}]
-     * @return {*}  {IDataEntity[]}
-     */
-    select(context, params = {}) {
-        try {
-            isExistSessionId('getList', context);
-            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;
-            }
-            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);
-            return [];
-        }
-    }
     /**
      * 根据条件生成查询
      *
@@ -446,4 +457,20 @@ export class DECache {
         });
         data.srfkey = unionValues.join('||');
     }
+    /**
+     * 根据上下文，获取已经开启的事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:28
+     * @protected
+     * @param {IContext} context
+     * @return {*}  {(ITransaction | null)}
+     */
+    getTransaction(context) {
+        const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+        if (uiDomain && uiDomain.transaction.state.isOpen === true) {
+            return uiDomain.transaction;
+        }
+        return null;
+    }
 }

package/out/service/utils/de-dq-cond/ps-model-cond-engine-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ps-model-cond-engine-base.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond/ps-model-cond-engine-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;GAMG;AACH,8BAAsB,qBAAqB;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB,CAAqC;IAEjE;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI;IAS3B;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,YAAY,EAAE,MAAM,GAAG,MAAM,GAC5B,OAAO;IA+EV;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,oBAAoB;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,uBAAuB,IAAI,qBAAqB;IAEnE;;;;;OAKG;IACH,uBAAuB,IAAI,oBAAoB;CAGhD"}
+{"version":3,"file":"ps-model-cond-engine-base.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond/ps-model-cond-engine-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;GAMG;AACH,8BAAsB,qBAAqB;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB,CAAqC;IAEjE;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI;IAS3B;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,YAAY,EAAE,MAAM,GAAG,MAAM,GAC5B,OAAO;IAmFV;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,oBAAoB;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,uBAAuB,IAAI,qBAAqB;IAEnE;;;;;OAKG;IACH,uBAAuB,IAAI,oBAAoB;CAGhD"}

package/out/service/utils/de-dq-cond/ps-model-cond-engine-base.js

@@ -54,6 +54,10 @@ export class PSModelCondEngineBase {
                 "LT" /* CondType.CONDOP_LT */ === strCondOp ||
                 "LTANDEQ" /* CondType.CONDOP_LTANDEQ */ === strCondOp ||
                 "NOTEQ" /* CondType.CONDOP_NOTEQ */ === strCondOp) {
+                // 特殊处理，如果值为空，直接返回false
+                if (objValue == null || objCondValue == null) {
+                    return false;
+                }
                 // 大小比较
                 let nRet = -1;
                 // eslint-disable-next-line eqeqeq

package/out/service/utils/de-dq-cond-util/de-dq-cond-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-dq-cond-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond-util/de-dq-cond-util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAC9C;IAEhB;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,gBAAgB,GAAG,IAAI;IAc/D;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE;CAyC9D"}
+{"version":3,"file":"de-dq-cond-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond-util/de-dq-cond-util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAC9C;IAEhB;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,gBAAgB,GAAG,IAAI;IAkB/D;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE;CA0C9D"}

package/out/service/utils/de-dq-cond-util/de-dq-cond-util.js

@@ -25,7 +25,12 @@ export class DEDQCondUtil {
         const groups = dataSet.dedqgroupConditions;
         if (groups) {
             const cond = new PSDEDQCondEngine();
-            cond.parse(['OR', this.calcCond(groups)]);
+            if (groups.length === 1) {
+                cond.parse(this.calcCond(groups)[0]);
+            }
+            else if (groups.length > 1) {
+                cond.parse(['AND', this.calcCond(groups)][0]);
+            }
             this.map.set(dataSet, cond);
             return cond;
         }
@@ -62,16 +67,18 @@ export class DEDQCondUtil {
             }
             else if (item.condType === 'SINGLE') {
                 const cond = item;
+                condArr.push(cond.condOp);
                 condArr.push(cond.fieldName);
                 if (cond.condValue) {
-                    // if (cond.getPSVARTypeId()) {
-                    //   condArr.push({
-                    //     type: cond.getPSVARTypeId(),
-                    //     value: cond.getPSVARTypeId(),
-                    //   });
-                    // } else {
-                    //   condArr.push(cond.condValue);
-                    // }
+                    if (cond.vartypeId) {
+                        condArr.push({
+                            type: cond.vartypeId,
+                            value: cond.condValue,
+                        });
+                    }
+                    else {
+                        condArr.push(cond.condValue);
+                    }
                 }
                 else {
                     // 无条件值为空字符串

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

@@ -112,7 +112,7 @@ export declare class DynamicCodeListCache {
      *
      * @return {codeListItem[] | undefined}
      */
-    protected prepareTreeData(items: IData[], pValue?: string | number): CodeListItem[] | undefined;
+    protected prepareTreeData(items: IData[]): CodeListItem[] | undefined;
     /**
      * 获取动态的代码项
      *

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,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"}
+{"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,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;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

@@ -154,17 +154,17 @@ export class DynamicCodeListCache {
         const res = await app.deService.exec(appDataEntityId, appDEDataSetId, context, undefined, tempParams);
         let resultItems = [];
         if (res.data.length) {
-            res.data.forEach((item) => {
-                if (pvalueAppDEFieldId) {
-                    const tempItems = this.prepareTreeData(res.data);
-                    if (tempItems) {
-                        resultItems = tempItems;
-                    }
+            if (pvalueAppDEFieldId) {
+                const tempItems = this.prepareTreeData(res.data);
+                if (tempItems) {
+                    resultItems = tempItems;
                 }
-                else {
+            }
+            else {
+                res.data.forEach((item) => {
                     resultItems.push(this.convertData(item));
-                }
-            });
+                });
+            }
         }
         return Object.freeze(resultItems);
     }
@@ -173,25 +173,24 @@ export class DynamicCodeListCache {
      *
      * @return {codeListItem[] | undefined}
      */
-    prepareTreeData(items, pValue) {
-        const { pvalueAppDEFieldId } = this.codeList;
-        let filteredData = [];
-        filteredData = items.filter(item => {
-            if (pValue) {
-                // 有传父value去后台数据里找出来子项pValue等于父value的
-                return item[pvalueAppDEFieldId] === pValue;
-            }
-            // 没有传父value，只需要找出来没有父值属性的
-            return !item[pvalueAppDEFieldId];
+    prepareTreeData(items) {
+        const { valueAppDEFieldId, pvalueAppDEFieldId } = this.codeList;
+        const map = {};
+        const nestedList = [];
+        items.forEach((data) => {
+            map[data[valueAppDEFieldId]] = this.convertData(data);
         });
-        if (filteredData.length === 0) {
-            return;
-        }
-        return filteredData.map(data => {
-            const tempCodeListItem = this.convertData(data);
-            tempCodeListItem.children = this.prepareTreeData(items, tempCodeListItem.value);
-            return tempCodeListItem;
+        items.forEach((data) => {
+            const parent = map[data[pvalueAppDEFieldId]];
+            if (parent) {
+                parent.children = parent.children || [];
+                parent.children.push(map[data[valueAppDEFieldId]]);
+            }
+            else {
+                nestedList.push(map[data[valueAppDEFieldId]]);
+            }
         });
+        return nestedList;
     }
     /**
      * 获取动态的代码项

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 {IContext} context
+ * @param {IParams} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
-export declare function getMatchResPath(context: IContext, entity: IAppDataEntity): {
+export declare function getMatchResPath(context: IParams, entity: IAppDataEntity): {
     path: string;
     keys: string[];
 } | undefined;

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,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"}
+{"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,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 {IContext} context
+ * @param {IParams} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */

package/out/service/utils/search-filter/search-filter.d.ts

@@ -13,20 +13,6 @@ export declare class SearchFilter {
      * @type {IParams}
      */
     readonly context: IContext;
-    /**
-     * 父关系实体
-     *
-     * @type {string}
-     * @memberof SearchFilter
-     */
-    readonly srfparentdename?: string;
-    /**
-     * 指定父数据主键
-     *
-     * @type {string}
-     * @memberof SearchFilter
-     */
-    readonly srfparentkey?: string;
     /**
      * 分页
      *

package/out/service/utils/search-filter/search-filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-filter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/search-filter/search-filter.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAElC;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,KAAK;IAElB;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,QAAQ;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAG,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,mBAAmB;IAErC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAS;IAE1C;;;;;;OAMG;gBACS,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK;IAqC3C;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;CAM/B"}
+{"version":3,"file":"search-filter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/search-filter/search-filter.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,KAAK;IAElB;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,QAAQ;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAG,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,mBAAmB;IAErC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAS;IAE1C;;;;;;OAMG;gBACS,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK;IA6B3C;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;CAM/B"}

package/out/service/utils/search-filter/search-filter.js

@@ -70,19 +70,11 @@ export class SearchFilter {
                     this.sortMode = arr[1].toUpperCase();
                 }
             }
-            if (!isNil(data.srfparentkey) && !isEmpty(data.srfparentkey)) {
-                this.srfparentkey = data.srfparentkey;
-            }
-            if (!isNil(data.srfparentdename) && !isEmpty(data.srfparentdename)) {
-                this.srfparentdename = data.srfparentdename;
-            }
             this.data = Object.assign({}, data);
             delete this.data.page;
             delete this.data.size;
             delete this.data.query;
             delete this.data.sort;
-            delete this.data.srfparentkey;
-            delete this.data.srfparentdename;
         }
     }
     /**

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts

@@ -14,6 +14,12 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
     _id: string;
     _value: string;
     _deData: IData;
+    /**
+     * 克隆方法
+     * @author lxm
+     * @date 2024-01-12 02:37:46
+     */
+    clone: () => TreeDataSetNodeData;
     constructor(model: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: {
         data: IData;
         leaf: boolean;

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAqHH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA4KH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}