@ibiz-template/runtime 0.7.39 → 0.7.40

package/out/service/de-service-util.js

@@ -1,4 +1,4 @@
-import { HttpError, RuntimeError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import { DEService } from './service';
 /**
  * 应用服务工具类
@@ -36,6 +36,15 @@ export class DEServiceUtil {
          * @type {Map<string, Promise<IAppDEService>>}
          */
         this.creatingCache = new Map();
+        /**
+         * @description 执行中方法数量缓存
+         * @protected
+         * @type {Map<string, Method>} Map<域标识，{执行中数量,是否销毁}>
+         * @memberof DEServiceUtil
+         */
+        this.processingCache = new Map();
+        this.handleMethodProcessStateChange =
+            this.handleMethodProcessStateChange.bind(this);
     }
     /**
      * 注册服务工厂方法
@@ -48,6 +57,35 @@ export class DEServiceUtil {
     static register(id, constructor) {
         this.constructorCache.set(id.toUpperCase(), constructor);
     }
+    /**
+     * @description 处理方法处理状态变更
+     * @param {IMethodProcessState} data
+     * @memberof DEServiceUtil
+     */
+    handleMethodProcessStateChange(data) {
+        const { type, srfsessionid } = data;
+        if (type === 'BEFORE') {
+            // 方法执行前
+            if (!this.processingCache.has(srfsessionid)) {
+                this.processingCache.set(srfsessionid, {
+                    isDestoryed: false,
+                    count: 0,
+                });
+            }
+            const processingState = this.processingCache.get(srfsessionid);
+            processingState.count += 1;
+        }
+        else {
+            // 方法执行后
+            const processingState = this.processingCache.get(srfsessionid);
+            if (processingState) {
+                processingState.count -= 1;
+                if (processingState.isDestoryed && processingState.count === 0) {
+                    this.cleaUIDomainCache(srfsessionid);
+                }
+            }
+        }
+    }
     /**
      * 根据实体标识获取实体服务
      *
@@ -62,6 +100,8 @@ export class DEServiceUtil {
         const { targetApp, targetAppDataEntityId } = await this.computeAppDEMappingParam(context, id);
         if (targetApp && targetAppDataEntityId) {
             const targetService = await targetApp.deService.getService(context, targetAppDataEntityId);
+            // 订阅服务方法处理状态
+            targetService.methodProcesser.on(this.handleMethodProcessStateChange);
             return targetService;
         }
         // 标准逻辑
@@ -80,6 +120,8 @@ export class DEServiceUtil {
                 const service = this.createServiceInstance(sandboxId, id, context.srfappid);
                 this.creatingCache.set(cacheKey, service);
                 result = await service;
+                // 订阅服务方法处理状态
+                result.methodProcesser.on(this.handleMethodProcessStateChange);
                 this.creatingCache.delete(cacheKey);
             }
             map.set(id, result);
@@ -120,6 +162,25 @@ export class DEServiceUtil {
      */
     reset(context) {
         const sandboxId = context.srfsessionid;
+        if (!this.cache.has(sandboxId)) {
+            return;
+        }
+        const processingState = this.processingCache.get(sandboxId);
+        // 无正在执行的方法，则直接清除当前界面域所有类型，反之，执行中的方法都执行完毕再清除
+        if (!processingState || processingState.count === 0) {
+            this.cleaUIDomainCache(sandboxId);
+        }
+        else {
+            processingState.isDestoryed = true;
+        }
+    }
+    /**
+     * @description 清除当前界面域下所有缓存，包含当前服务缓存、当前执行状态缓存、服务数据缓存
+     * @param {string} sandboxId 界面域标识
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    cleaUIDomainCache(sandboxId) {
         if (!this.cache.has(sandboxId)) {
             return;
         }
@@ -128,6 +189,7 @@ export class DEServiceUtil {
             service.destroy();
         });
         this.cache.delete(sandboxId);
+        this.processingCache.delete(sandboxId);
     }
     /**
      * 清理所有服务, 当前临时域下的所有临时数据缓存
@@ -201,16 +263,8 @@ export class DEServiceUtil {
         }
         // 标准逻辑
         const service = await this.getService(context, appDataEntityId);
-        try {
-            const result = await service.exec(methodName, context, params, params2, header);
-            return result;
-        }
-        catch (error) {
-            if (error instanceof HttpError) {
-                error.tag = context.srfviewid;
-            }
-            throw error;
-        }
+        const result = await service.exec(methodName, context, params, params2, header);
+        return result;
     }
     /**
      * 计算应用实体服务映射参数

package/out/service/service/auth/v7-auth.service.d.ts

@@ -50,11 +50,11 @@ export declare class V7AuthService implements IAuthService {
     /**
      * 页面未关闭情况下，自动延长登录时间
      *
-     * @author tony001
-     * @date 2024-05-14 17:05:38
+     * @param {IParams} [context]
      * @return {*}  {Promise<void>}
+     * @memberof V7AuthService
      */
-    extendLogin(): Promise<void>;
+    extendLogin(context?: IParams): Promise<void>;
     /**
      * 通过refreshToken换算token
      *
@@ -74,11 +74,12 @@ export declare class V7AuthService implements IAuthService {
     /**
      * 加载应用数据
      *
-     * @author chitanda
-     * @date 2022-07-20 20:07:50
+     * @protected
+     * @param {IParams} [context]
      * @return {*}  {Promise<void>}
+     * @memberof V7AuthService
      */
-    protected loadAppData(): Promise<void>;
+    protected loadAppData(context?: IParams): Promise<void>;
     /**
      * 清空权限数据
      *

package/out/service/service/auth/v7-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAsCxC;;;;;;;;;;OAUG;IACG,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,EAClB,OAAO,CAAC,EAAE,KAAK,GACd,OAAO,CAAC,OAAO,CAAC;IA6CnB;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAchC;;;;;;;;OAQG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA2BrE;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAoDlC;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BnC;;;;;;OAMG;IACH,WAAW,IAAI,SAAS,GAAG,SAAS;IAWpC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAStB"}
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAsCxC;;;;;;;;;;OAUG;IACG,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,EAClB,OAAO,CAAC,EAAE,KAAK,GACd,OAAO,CAAC,OAAO,CAAC;IA6CnB;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAchC;;;;;;;;OAQG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA2BrE;;;;;;OAMG;IACG,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwDnD;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BnC;;;;;;OAMG;IACH,WAAW,IAAI,SAAS,GAAG,SAAS;IAWpC;;;;;;;OAOG;cACa,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAStB"}

package/out/service/service/auth/v7-auth.service.js

@@ -146,11 +146,11 @@ export class V7AuthService {
     /**
      * 页面未关闭情况下，自动延长登录时间
      *
-     * @author tony001
-     * @date 2024-05-14 17:05:38
+     * @param {IParams} [context]
      * @return {*}  {Promise<void>}
+     * @memberof V7AuthService
      */
-    async extendLogin() {
+    async extendLogin(context) {
         if (this.isAnonymous) {
             // 匿名登录不需要延长都是会话级的
             return;
@@ -162,6 +162,10 @@ export class V7AuthService {
             let wait = Number(expirein) - new Date().getTime();
             const early = 5 * 60 * 1000;
             wait = wait > early ? wait - early : 0;
+            // 修复setTimeout函数delay参数将转换为带符号的32位整数，当 delay 大于2147483647时，将会被设置为 1导致的异常
+            if (wait > 2147483647) {
+                wait = 2147483647;
+            }
             setTimeout(async () => {
                 const remember = getAppCookie(CoreConst.TOKEN_REMEMBER);
                 const refreshToken = getAppCookie(CoreConst.REFRESH_TOKEN);
@@ -184,7 +188,7 @@ export class V7AuthService {
                         setAppCookie(CoreConst.REFRESH_TOKEN, res.data.refresh_token, cacheDay);
                     }
                     // token刷新后，更新 appData
-                    await this.loadAppData();
+                    await this.loadAppData(context);
                     // 刷新token之后用新的token重连mqtt
                     ibiz.hub.initMqtt();
                 }
@@ -251,12 +255,19 @@ export class V7AuthService {
     /**
      * 加载应用数据
      *
-     * @author chitanda
-     * @date 2022-07-20 20:07:50
+     * @protected
+     * @param {IParams} [context]
      * @return {*}  {Promise<void>}
+     * @memberof V7AuthService
      */
-    async loadAppData() {
-        const res = await ibiz.net.get('/appdata');
+    async loadAppData(context) {
+        let res;
+        if (context && Object.keys(context).length > 0) {
+            res = await ibiz.net.get('/appdata', context);
+        }
+        else {
+            res = await ibiz.net.get('/appdata');
+        }
         if (res.ok) {
             ibiz.appData = res.data;
         }

package/out/service/service/authority/authority.service.d.ts

@@ -75,7 +75,7 @@ export declare class AuthorityService {
      * @param {*} [appData=ibiz.appData]
      * @returns {*}  {Promise<void>}
      */
-    init(appData?: IData | undefined): Promise<void>;
+    init(appData?: import("@ibiz-template/core").IApiData | undefined): Promise<void>;
     /**
      * 通过统一资源标识计算权限
      * @author lxm

package/out/service/service/authority/authority.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAI5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;;;OAUG;IACG,wBAAwB,CAC5B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;IAmCnB;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;CA+BpB"}
+{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAI5D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IA2Cf,SAAS,CAAC,QAAQ,EAAE,YAAY;IA1C5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAa;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,sBAAsB,CAAC,CACjE,CAAa;IAEd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;;;OASG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CACX,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,sBAAsB,CAAC,GACnC,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsB7D;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,qDAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;;;OAUG;IACG,wBAAwB,CAC5B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;IAmCnB;;;;;;;;;OASG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;CA+BpB"}

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

@@ -1,5 +1,5 @@
 import { IAppCodeList, IApplication, ICodeItem } from '@ibiz/model-core';
-import { CodeListItem } from '../../../interface';
+import { CodeListItem, IApiCodeListService } from '../../../interface';
 import { DynamicCodeListCache } from '../../utils';
 /**
  * 全局代码表服务
@@ -9,7 +9,7 @@ import { DynamicCodeListCache } from '../../utils';
  * @export
  * @class CodeListService
  */
-export declare class CodeListService {
+export declare class CodeListService implements IApiCodeListService {
     protected appModel: IApplication;
     /**
      * 所有代码表缓存

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

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA2C3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAiBnC;;;;;;;OAOG;IACH,gBAAgB,CACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,EAC9C,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,YAAY,GAAG,SAAS;IA2B3B;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAWpC;;;;;OAKG;IACG,mBAAmB,CACvB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAqB5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAQhB"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IAoB7C,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA2C3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAiBnC;;;;;;;OAOG;IACH,gBAAgB,CACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,EAC9C,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,YAAY,GAAG,SAAS;IA2B3B;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAWpC;;;;;OAKG;IACG,mBAAmB,CACvB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAqB5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAQhB"}

package/out/service/service/control/md-control.service.d.ts

@@ -83,7 +83,7 @@ export declare class MDControlService<T extends IMDAjaxControl = IMDAjaxControl>
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    exportData(_dataExport: IDEDataExport, _context: IParams, _params?: IParams): Promise<IHttpResponse<Blob>>;
+    exportData(dataExport: IDEDataExport, context: IContext, params?: IParams): Promise<IHttpResponse<Blob>>;
     /**
      * 处理响应
      *

package/out/service/service/control/md-control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,OAAO,EACjB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAU/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}
+{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAa/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}

package/out/service/service/control/md-control.service.js

@@ -1,4 +1,3 @@
-import { RuntimeError } from '@ibiz-template/core';
 import { isArray } from 'qx-util';
 import { ControlService } from './control.service';
 export class MDControlService extends ControlService {
@@ -123,14 +122,9 @@ export class MDControlService extends ControlService {
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    async exportData(_dataExport, _context, _params = {}) {
-        // return this.entityService.file.exportData(
-        //   dataExport,
-        //   this.model.fetchControlAction!.appDEMethodId!,
-        //   context,
-        //   params,
-        // );
-        throw new RuntimeError('未实现');
+    async exportData(dataExport, context, params = {}) {
+        const entityService = await this.app.deService.getService(context, this.model.appDataEntityId);
+        return entityService.file.exportData(dataExport, this.model.fetchControlAction.appDEMethodId, context, params);
     }
     /**
      * 处理响应

package/out/service/service/counter/counter.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAoBtB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CAUvB"}
+{"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAuBtB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CAUvB"}

package/out/service/service/counter/counter.service.js

@@ -23,6 +23,9 @@ export class CounterService {
         // 可由外部传入自定义标识，应用同时存在子关系的A\B单数据页面，计数器对象应该不一样
         if (params && params.srfcustomtag) {
             id = params.srfcustomtag;
+            if (context) {
+                id = `${context.srfsessionid}@${id}`;
+            }
         }
         if (this.counterMap.has(id)) {
             const counter = this.counterMap.get(id);

package/out/service/service/entity/de.service.d.ts

@@ -4,7 +4,7 @@ import { DECache } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
 import { FileService } from '../file/file.service';
-import { IAppDEService, IDataEntity } from '../../../interface';
+import { IAppDEService, IDataEntity, IDeMethodProcesser } from '../../../interface';
 import { ConfigService } from '../config/config.service';
 import { MethodDto } from '../../dto/method.dto';
 /**
@@ -59,6 +59,12 @@ export declare class DEService implements IAppDEService {
      * @type {DECache}
      */
     readonly local: DECache;
+    /**
+     * @description 方法处理器
+     * @type {IDeMethodProcesser}
+     * @memberof DEService
+     */
+    readonly methodProcesser: IDeMethodProcesser;
     /**
      * 是否为本地模式(临时数据模式)服务
      *

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}

package/out/service/service/entity/de.service.js

@@ -1,5 +1,6 @@
-import { IBizContext, ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
-import { DECache, calcResPath } from '../../utils';
+import { HttpError, IBizContext, ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { createUUID } from 'qx-util';
+import { DECache, DeMethodProcesser, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { FileService } from '../file/file.service';
 import { findAppDEMethod } from '../../../model';
@@ -48,6 +49,7 @@ export class DEService {
         this.configCache = new ConfigService(model.appId, 'PSAppDataEntity', model.codeName);
         this.wf = new WorkFlowService(model);
         this.file = new FileService(model);
+        this.methodProcesser = new DeMethodProcesser(srfSessionId);
     }
     /**
      * 获取实体服务方法实例
@@ -102,7 +104,20 @@ export class DEService {
         const tempContext = IBizContext.create(result);
         const method = await this.getMethod(id);
         if (method) {
-            return method.exec(tempContext, params, params2, header);
+            const processTag = createUUID();
+            this.methodProcesser.increment(processTag, method);
+            try {
+                const response = await method.exec(tempContext, params, params2, header);
+                this.methodProcesser.decrement(processTag);
+                return response;
+            }
+            catch (error) {
+                this.methodProcesser.decrement(processTag);
+                if (error instanceof HttpError) {
+                    error.tag = context.srfviewid;
+                }
+                throw error;
+            }
         }
         throw new RuntimeError(ibiz.i18n.t('runtime.service.noSupportedMethod', {
             codeName: this.model.codeName,
@@ -281,6 +296,7 @@ export class DEService {
      */
     async destroy() {
         this.local.clear();
+        this.methodProcesser.destroy();
     }
     createMethodDto(dto, opts) {
         return new MethodDto(this, this.model, opts === null || opts === void 0 ? void 0 : opts.isLocalMode, dto);

package/out/service/service/entity/method/de-action.d.ts

@@ -176,5 +176,13 @@ export declare class DEActionMethod extends Method {
      * @return {*}  {IDataEntity}
      */
     protected attach(context: IContext, data: IDataEntity): IDataEntity;
+    /**
+     * @description 移动位置
+     * @param {IContext} context
+     * @param {IParams} params
+     * @returns {*}  {Promise<IHttpResponse<IDataEntity>>}
+     * @memberof DEActionMethod
+     */
+    moveOrder(context: IContext, params: IParams): Promise<IHttpResponse<IDataEntity[]>>;
 }
 //# sourceMappingURL=de-action.d.ts.map

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"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"}

package/out/service/service/entity/method/de-action.js

@@ -62,6 +62,14 @@ export class DEActionMethod extends Method {
         if (!context.srfappid) {
             return new HttpResponse({});
         }
+        // 前端临时模式
+        if (this.isLocalMode) {
+            // 操作类型为移动位置
+            if (this.method.actionMode === 'MOVEORDER') {
+                result = await this.moveOrder(context, data);
+                return result;
+            }
+        }
         // 执行变更属性逻辑
         if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
             await execFieldLogics(this.entity, 'change', context, data, params);
@@ -616,4 +624,77 @@ export class DEActionMethod extends Method {
         }
         return data;
     }
+    /**
+     * @description 移动位置
+     * @param {IContext} context
+     * @param {IParams} params
+     * @returns {*}  {Promise<IHttpResponse<IDataEntity>>}
+     * @memberof DEActionMethod
+     */
+    async moveOrder(context, params) {
+        var _a;
+        let result = [];
+        // 校验数据合法性
+        const orderField = (_a = this.entity.appDEFields) === null || _a === void 0 ? void 0 : _a.find(appDEField => {
+            return appDEField.predefinedType === 'ORDERVALUE';
+        });
+        if (!orderField) {
+            throw new Error(ibiz.i18n.t('runtime.service.noSortField'));
+        }
+        const orderFieldCodeName = orderField.codeName.toLowerCase();
+        const srfdraggingkey = context[this.entity.codeName.toLowerCase()];
+        if (!srfdraggingkey) {
+            throw new Error(ibiz.i18n.t('runtime.service.noDragElementId'));
+        }
+        const { srftargetkey, srfmovetype } = params;
+        if (!srftargetkey) {
+            throw new Error(ibiz.i18n.t('runtime.service.noTargetElementId'));
+        }
+        if (!srfmovetype) {
+            throw new Error(ibiz.i18n.t('runtime.service.noMoveTypeField'));
+        }
+        // 获取原始数据
+        const res = await this.service.fetchDefault(context, {
+            sort: `${orderFieldCodeName},ASC`,
+        });
+        const sourceItems = res.ok ? res.data : [];
+        if (sourceItems.length === 0) {
+            return new HttpResponse(result);
+        }
+        // 排序
+        const cloneMap = new Map();
+        const cloneItems = sourceItems.map((item) => {
+            cloneMap.set(item[this.entity.keyAppDEFieldId], item);
+            return item.clone();
+        });
+        const draggingEleIndex = cloneItems.findIndex((item) => {
+            return item[this.entity.keyAppDEFieldId] === srfdraggingkey;
+        });
+        const targetEleIndex = cloneItems.findIndex((item) => {
+            return item[this.entity.keyAppDEFieldId] === srftargetkey;
+        });
+        const [draggingEle] = cloneItems.splice(draggingEleIndex, 1);
+        if (srfmovetype === 'MOVEBEFORE') {
+            // 拖拽元素拖动至目标元素之前
+            cloneItems.splice(targetEleIndex, 0, draggingEle);
+        }
+        else {
+            // 拖拽元素拖动至目标元素之后
+            cloneItems.splice(targetEleIndex + 1, 0, draggingEle);
+        }
+        const updateItems = [];
+        cloneItems.forEach((item, index) => {
+            item[orderFieldCodeName] = index + 1;
+            const sourceItem = cloneMap.get(item[this.entity.keyAppDEFieldId]);
+            if (sourceItem &&
+                item[orderFieldCodeName] !== sourceItem[orderFieldCodeName]) {
+                updateItems.push(item);
+            }
+        });
+        if (updateItems.length > 0) {
+            const updateRes = await this.updateTemp(context, updateItems);
+            result = updateRes.ok ? updateRes.data : [];
+        }
+        return new HttpResponse(result);
+    }
 }

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA6DvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAsDzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAqBlC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAmEvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAsDzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAqBlC"}

package/out/service/service/entity/method/fetch.js

@@ -16,6 +16,7 @@ import { execFieldLogics } from '../../../../de-logic';
  */
 export class FetchMethod extends Method {
     async exec(context, params, params2, header) {
+        var _a;
         // 若无srfappid，表示上下文已经销毁，则不执行后续逻辑直接返回
         if (!context.srfappid) {
             return new HttpResponse([]);
@@ -25,6 +26,13 @@ export class FetchMethod extends Method {
         // 根据数据集合来源查询数据
         let res;
         if (this.isLocalMode) {
+            // 界面没传排序字段且当前应用实体存在预置排序字段时，则默认以预置排序字段升序排列
+            const orderField = (_a = this.entity.appDEFields) === null || _a === void 0 ? void 0 : _a.find(appDEField => {
+                return appDEField.predefinedType === 'ORDERVALUE';
+            });
+            if (!searchParams.sort && orderField) {
+                searchParams.sort = `${orderField.codeName.toLowerCase()},ASC`;
+            }
             const cond = DEDQCondUtil.getCond(this.method);
             const filter = new SearchFilter(context, searchParams);
             const items = await this.searchLocal(cond, filter);

package/out/service/service/file/file.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/file/file.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,WAAY,YAAW,YAAY;IAOlC,SAAS,CAAC,KAAK,EAAE,cAAc;IAN3C;;;;;OAKG;gBACmB,KAAK,EAAE,cAAc;IAE3C;;;;;;;;;;OAUG;IACH,UAAU,CACR,UAAU,EAAE,aAAa,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;CAWhC"}
+{"version":3,"file":"file.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/file/file.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,WAAY,YAAW,YAAY;IAOlC,SAAS,CAAC,KAAK,EAAE,cAAc;IAN3C;;;;;OAKG;gBACmB,KAAK,EAAE,cAAc;IAE3C;;;;;;;;;;OAUG;IACH,UAAU,CACR,UAAU,EAAE,aAAa,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;CAehC"}

package/out/service/service/file/file.service.js

@@ -22,9 +22,15 @@ export class FileService {
      */
     exportData(dataExport, fetchAction, context, params) {
         const resPath = calcResPath(context, this.model);
-        const exportUrl = `${resPath}/${this.model.deapicodeName2}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
+        const exportUrl = `${resPath}/${this.model.deapicodeName2}/exportdata/${fetchAction.toLowerCase()}`;
+        //  查询参数
+        const queryParam = { srfexporttag: dataExport.codeName };
+        if (context === null || context === void 0 ? void 0 : context.srfdatatype) {
+            Object.assign(queryParam, { srfdatatype: context.srfdatatype });
+        }
         return ibiz.net.request(exportUrl, {
             method: 'post',
+            params: queryParam,
             data: params,
             responseType: 'blob',
         });

package/out/service/service/util/util.service.d.ts

@@ -79,6 +79,21 @@ export declare class UtilService {
      * @return {*}  {{ context: IContext; params: IParams; data: IData }}
      */
     private handleRequestData;
+    /**
+     * @description 处理自定义类型请求数据
+     * @private
+     * @param {(IData | IData[])} data
+     * @returns {*}  IData | IData[]
+     * @memberof UtilService
+     */
+    private handleUserRequestData;
+    /**
+     * @description 解析用户自定义功能参数(getAppDEActionId|saveAppDEActionId|modelMapping),分别表示获取行为|保存行为|数据映射关系
+     * @private
+     * @returns {*}  {IParams}
+     * @memberof UtilService
+     */
+    private parseUserUtilParams;
     /**
      * 处理响应数据
      *
@@ -89,5 +104,13 @@ export declare class UtilService {
      * @return {*}  {IData}
      */
     private handleResponse;
+    /**
+     * @description 处理自定义类型响应数据
+     * @private
+     * @param {IData[]} response
+     * @returns {*}  {IData | IData[]}
+     * @memberof UtilService
+     */
+    private handleUserResponse;
 }
 //# sourceMappingURL=util.service.d.ts.map