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

package/out/service/service/work-flow/work-flow.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-flow.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/work-flow/work-flow.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAe,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,gBAAgB;IAmB1C,SAAS,CAAC,KAAK,EAAE,cAAc;IAlB3C,OAAO,CAAC,GAAG,CAAe;IAE1B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa,CAAc;IAEnC;;;;;OAKG;gBACmB,KAAK,EAAE,cAAc;IAQ3C;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IAIlB;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;;;;;;OASG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;;;;;;OAOG;IACG,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAOjE;;;;;;;;OAQG;IACG,SAAS,CACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;IASlC;;;;;;;OAOG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IASpE;;;;;;;OAOG;IACG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAc3E;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAInD;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,eAAe,CACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;;OAUG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAqBjC"}
+{"version":3,"file":"work-flow.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/work-flow/work-flow.service.ts"],"names":[],"mappings":"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"}

package/out/service/service/work-flow/work-flow.service.js

@@ -129,8 +129,8 @@ export class WorkFlowService {
      * @date 2022-09-29 14:09:45
      * @returns {*}  {Promise<IHttpResponse<IData>>}
      */
-    async getWFVersion() {
-        return this.app.net.get(`${this.getBaseUrl()}/process-definitions2`);
+    async getWFVersion(srfWFTag) {
+        return this.app.net.get(`/wfcore/${ibiz.appData.context.srfsystemid}-app-${this.app.model.codeName.toLowerCase()}/${this.model.name.toLowerCase()}${srfWFTag ? `-${srfWFTag}` : ''}/process-definitions2`);
     }
     /**
      * 启动工作流

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

@@ -146,16 +146,6 @@ export declare class DECache {
      * @return {*}  {IDataEntity[]}
      */
     getList(): IDataEntity[];
-    /**
-     * 根据条件查找数据，未设置条件默认返回全部
-     *
-     * @author chitanda
-     * @date 2023-12-22 13:12:28
-     * @param {IContext} context
-     * @param {IParams} [params={}]
-     * @return {*}  {IDataEntity[]}
-     */
-    select(context: IContext, params?: IParams): IDataEntity[];
     /**
      * 根据条件生成查询
      *

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;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;IAOb;;;;;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;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;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 { 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';
@@ -315,83 +315,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 [];
-        }
-    }
     /**
      * 根据条件生成查询
      *

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/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/utils/ui-domain/ui-domain.d.ts

@@ -1,4 +1,4 @@
-import { IParentConfig } from '../../interface';
+import { IAppDERS } from '@ibiz/model-core';
 /**
  * 界面域
  *
@@ -22,9 +22,9 @@ export declare class UIDomain {
      * @author chitanda
      * @date 2023-12-26 15:12:13
      * @protected
-     * @type {Map<string, IParentConfig[]>}
+     * @type {Map<string, IAppDERS[]>}
      */
-    protected rsMap: Map<string, IParentConfig[]>;
+    protected rsMap: Map<string, IAppDERS[]>;
     /**
      * Creates an instance of UIDomain.
      *
@@ -40,18 +40,18 @@ export declare class UIDomain {
      * @author chitanda
      * @date 2023-12-26 15:12:31
      * @param {string} entity
-     * @param {IParentConfig} config
+     * @param {IAppDERS} configs
      */
-    setDERConfig(deCodeName: string, config: IParentConfig): void;
+    setDERConfig(deCodeName: string, configs: IAppDERS[]): void;
     /**
      * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
      *
      * @author chitanda
      * @date 2023-12-26 16:12:07
      * @param {string} deCodeName
-     * @return {*}  {IParentConfig[]}
+     * @return {*}  {IAppDERS[]}
      */
-    getDERConfig(deCodeName: string): IParentConfig[];
+    getDERConfig(deCodeName: string): IAppDERS[];
     /**
      * 界面域销毁
      *

package/out/utils/ui-domain/ui-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAa;IAE1D;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAQ7D;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,EAAE;IAOjD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}
+{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAErD;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI;IAI3D;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE;IAO5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}

package/out/utils/ui-domain/ui-domain.js

@@ -23,7 +23,7 @@ export class UIDomain {
          * @author chitanda
          * @date 2023-12-26 15:12:13
          * @protected
-         * @type {Map<string, IParentConfig[]>}
+         * @type {Map<string, IAppDERS[]>}
          */
         this.rsMap = new Map();
         if (id) {
@@ -39,14 +39,10 @@ export class UIDomain {
      * @author chitanda
      * @date 2023-12-26 15:12:31
      * @param {string} entity
-     * @param {IParentConfig} config
+     * @param {IAppDERS} configs
      */
-    setDERConfig(deCodeName, config) {
-        if (!this.rsMap.has(deCodeName)) {
-            this.rsMap.set(deCodeName, []);
-        }
-        const arr = this.rsMap.get(deCodeName);
-        arr.push(config);
+    setDERConfig(deCodeName, configs) {
+        this.rsMap.set(deCodeName, configs);
     }
     /**
      * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
@@ -54,7 +50,7 @@ export class UIDomain {
      * @author chitanda
      * @date 2023-12-26 16:12:07
      * @param {string} deCodeName
-     * @return {*}  {IParentConfig[]}
+     * @return {*}  {IAppDERS[]}
      */
     getDERConfig(deCodeName) {
         if (this.rsMap.has(deCodeName)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.3-beta.0",
+  "version": "0.5.3-beta.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "5eb401038895adf73adda7baf784193ef0f40ce5"
+  "gitHead": "abce1a3f4ba865163181e1e3f33e688726fcddc9"
 }

package/src/app-hub.ts

@@ -1,7 +1,12 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
-import { IAppHubService, IAppService, ModelLoaderProvider } from './interface';
+import {
+  IAppDEService,
+  IAppHubService,
+  IAppService,
+  ModelLoaderProvider,
+} from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
 import { ConfigService } from './service';
@@ -372,6 +377,25 @@ export class AppHub implements IAppHubService {
     return [];
   }
 
+  /**
+   * 获取应用实体服务
+   *
+   * @author chitanda
+   * @date 2024-01-10 13:01:01
+   * @param {string} appId
+   * @param {string} entityId
+   * @param {IContext} context
+   * @return {*}  {Promise<IAppDEService>}
+   */
+  async getAppDEService(
+    appId: string,
+    entityId: string,
+    context: IContext,
+  ): Promise<IAppDEService> {
+    const app = await this.getAppAsync(appId);
+    return app.deService.getService(context, entityId);
+  }
+
   reset(): void {
     this.appMap.clear();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/constant/control-type.ts

@@ -213,4 +213,9 @@ export enum ControlType {
    * 标题栏
    */
   CAPTIONBAR = 'CAPTIONBAR',
+
+  /**
+   * 上下文菜单
+   */
+  CONTEXT_MENU = 'CONTEXTMENU',
 }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -724,7 +724,7 @@ export class GridController<
             this.state.columnStates.push({
               key: column.codeName!,
               caption: column.caption!,
-              hidden: !!column.hideDefault,
+              hidden: !!column.hideDefault || !!column.hiddenDataItem,
               uaColumn: column.columnType === 'UAGRIDCOLUMN',
             });
           }

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -3,7 +3,7 @@ import { Convert } from '../../../hub';
 import { ModelLoaderProvider } from '../../provider';
 import { IAppConfigService } from '../i-app-config-service/i-app-config-service';
 import { IHubController } from '../../controller';
-import { IConfigService } from '../../service';
+import { IAppDEService, IConfigService } from '../../service';
 import { IAppService } from '../i-app-service/i-app-service';
 
 /**
@@ -182,6 +182,22 @@ export interface IAppHubService {
    */
   getAllApps(): IAppService[];
 
+  /**
+   * 获取应用实体服务
+   *
+   * @author chitanda
+   * @date 2024-01-10 13:01:40
+   * @param {string} appId
+   * @param {string} entityId
+   * @param {IContext} context
+   * @return {*}  {IAppDEService}
+   */
+  getAppDEService(
+    appId: string,
+    entityId: string,
+    context: IContext,
+  ): Promise<IAppDEService>;
+
   /**
    * 重置清空基座
    * @author lxm

package/src/interface/service/index.ts

@@ -1,4 +1,3 @@
 export type { CodeListItem } from './code-list-item/code-list-item';
 export type { IDataEntity } from './i-data-entity/i-data-entity';
-export type { IParentConfig } from './i-parent-config/i-parent-config';
 export type * from './service';

package/src/interface/service/service/i-app-de.service.ts

@@ -1,9 +1,11 @@
 import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
+import { IAppDEMethodDTO } from '@ibiz/model-core';
 import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
 import { IConfigService } from './i-config.service';
 import { IDataEntity } from '../i-data-entity/i-data-entity';
+import { MethodDto } from '../../../service';
 
 /**
  * 实体服务
@@ -342,4 +344,23 @@ export interface IAppDEService {
    * @return {*}  {void}
    */
   destroy(): void;
+
+  /**
+   * 创建DTO实例
+   * @author lxm
+   * @date 2024-01-10 09:48:34
+   * @param {IAppDEMethodDTO} [dto] dto模型对象
+   * @param {{
+   *       isLocalMode?: boolean; 是否是临时模式
+   *       inSelfLoop?: boolean; 是否是自关系递归
+   *     }} [opts]
+   * @return {*}  {MethodDto}
+   */
+  createMethodDto(
+    dto?: IAppDEMethodDTO,
+    opts?: {
+      isLocalMode?: boolean;
+      inSelfLoop?: boolean;
+    },
+  ): MethodDto;
 }

package/src/interface/service/service/i-wf.service.ts

@@ -45,11 +45,12 @@ export interface IWorkFlowService {
   /**
    * 获取标准工作流版本信息
    *
-   * @author lxm
-   * @date 2022-09-29 14:09:45
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @author chitanda
+   * @date 2024-01-10 16:01:30
+   * @param {string} srfWFTag
+   * @return {*}  {Promise<IHttpResponse<IData>>}
    */
-  getWFVersion(): Promise<IHttpResponse<IData>>;
+  getWFVersion(srfWFTag: string): Promise<IHttpResponse<IData>>;
 
   /**
    * 工作流撤销

package/src/service/dto/method.dto.ts

@@ -4,7 +4,8 @@ import {
   IAppDEMethodDTO,
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
-import { ModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { clone } from 'ramda';
 import { findModelChild } from '../../model';
 import { IAppDEService, IAppService, IDataEntity } from '../../interface';
 
@@ -62,19 +63,6 @@ export class MethodDto {
     }
   }
 
-  /**
-   * 查找本地 DTO 存储数据
-   *
-   * @author chitanda
-   * @date 2023-12-22 14:12:19
-   * @param {IContext} context
-   * @param {IParams} [params]
-   * @return {*}  {IDataEntity[]}
-   */
-  select(context: IContext, params?: IParams): IDataEntity[] {
-    return this.service.local.select(context, params);
-  }
-
   /**
    * 转换数组成ListMap
    *
@@ -148,27 +136,45 @@ export class MethodDto {
             }
 
             // 获取当前需要打包子数据的关系配置
-            let configs = uiDomain.getDERConfig(field.refAppDataEntityId!);
-            // 找到当前层级所在下标
-            const index = configs.findIndex(
-              config => config.majorDECodeName === this.entity.codeName,
-            );
-            // 过滤出当前层级之后的关系配置
-            configs = configs.slice(index + 1);
+            const configs = uiDomain.getDERConfig(field.refAppDataEntityId!);
 
+            // 获取指定子关系的 dto
             const dto = await this.getFieldDto(context, field);
-            // 子数据过滤参数
-            const filterParams: IParams = {};
-            if (field.refPickupAppDEFieldId) {
-              filterParams[field.refPickupAppDEFieldId!] = data.srfkey;
-            }
-            // 子层级数据过滤参数对象必须为空
-            configs.forEach(config => {
-              filterParams[config.pickupDEFName.toLowerCase()] = null;
-            });
 
-            const items = await dto.select(context, filterParams);
-            if (items) {
+            // 获取 dto 实体对应的服务
+            const service = await ibiz.hub.getAppDEService(
+              dto.entity.appId,
+              field.refAppDataEntityId!,
+              context,
+            );
+            // 查找当前 dto 实体在关系配置中和本实体的关系配置
+            const deRs = configs.find(rs => {
+              return rs.majorAppDataEntityId === this.entity.id;
+            });
+            // 根据关系配置中的嵌套数据集获取数据，如果没有嵌套数据集则使用默认数据集
+            let res;
+            if (deRs && deRs.nestedAppDEDataSetId) {
+              const _context = clone(context);
+              _context[this.entity.codeName!.toLowerCase()] = data.srfkey;
+              const _params: IParams = {};
+              if (deRs.parentAppDEFieldId) {
+                _params[deRs.parentAppDEFieldId] = data.srfkey;
+              }
+              res = await service.exec(
+                deRs.nestedAppDEDataSetId,
+                _context,
+                _params,
+              );
+            } else if (dto.entity.id !== this.entity.id) {
+              res = await service.exec('FetchDefault', context);
+            } else {
+              throw new RuntimeModelError(
+                field,
+                `子关系未配置嵌套关系数据集, 会导致递归查询死循环，请配置!`,
+              );
+            }
+            if (res.ok) {
+              const items = res.data as IData[];
               const arr = [];
               for (let j = 0; j < items.length; j++) {
                 arr.push(await dto.get(context, items[j], true));
@@ -272,20 +278,14 @@ export class MethodDto {
         continue;
       }
       const configs = uiDomain.getDERConfig(field.refAppDataEntityId!);
-      const index = configs.findIndex(
-        config => config.pickupDEFName === field.refPickupAppDEFieldId!,
-      );
-      if (index === -1) {
+      if (configs.length === 0) {
         const dto = await this.getFieldDto(context, field);
-        uiDomain.setDERConfig(field.refAppDataEntityId!, {
-          majorDEName: this.entity.name!,
-          majorDECodeName: this.entity.codeName!,
-          majorDECodeName2: this.entity.codeName2!,
-          minorDEName: dto.entity.name!,
-          minorDECodeName: dto.entity.codeName!,
-          minorDECodeName2: dto.entity.codeName2!,
-          pickupDEFName: field.refPickupAppDEFieldId!,
-        });
+        if (dto.entity.minorAppDERSs) {
+          uiDomain.setDERConfig(
+            field.refAppDataEntityId!,
+            dto.entity.minorAppDERSs.filter(rs => rs.rsmode === 1),
+          );
+        }
         await dto.calcRs(context, depth);
       }
     }
@@ -319,7 +319,10 @@ export class MethodDto {
     const inSelfLoop = this.entity.codeName === entity.codeName;
     const service = await this.app!.deService.getService(context, entity.id!);
     service.isLocalMode = true;
-    const dto = new MethodDto(service, entity, true, methodDto, inSelfLoop);
+    const dto = service.createMethodDto(methodDto, {
+      isLocalMode: true,
+      inSelfLoop,
+    });
     this.dtoMap.set(field.codeName!, dto);
     return dto;
   }