@ibiz-template/runtime 0.7.41-alpha.8 → 0.7.41-alpha.80

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

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-this-alias */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { HttpError, HttpResponse, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
-import { isArray, isNil } from 'lodash-es';
+import { isArray, isNil, isUndefined } from 'lodash-es';
 import { ascSort } from 'qx-util';
 import { clone } from 'ramda';
 import { Method } from './method';
@@ -145,7 +145,7 @@ export class DEActionMethod extends Method {
                         path = `${path}/${srfkey}`;
                     }
                     const res = await this.request(path, context, data, params, header);
-                    if (!res.data) {
+                    if (isNil(res.data) || isUndefined(res.data)) {
                         ibiz.log.error(ibiz.i18n.t('runtime.deAction.responseDataError'), res);
                     }
                     if (!(params && params.srfupdateitem)) {
@@ -155,6 +155,11 @@ export class DEActionMethod extends Method {
                 }
             }
         }
+        // 非临时操作需重置缓存变更记录
+        if (this.isLocalMode === false) {
+            const app = ibiz.hub.getApp(context.srfappid);
+            app.deService.recordUIDomainChanges(context.srfsessionid, 'RESET');
+        }
         if (this.method.afterCode) {
             await ScriptFactory.asyncExecScriptFn({
                 context,

package/out/service/service/entity/method/method-renturn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;IA2BlE;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAM7D"}
+{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;IAiClE;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAM7D"}

package/out/service/service/entity/method/method-renturn.js

@@ -58,11 +58,17 @@ export class MethodReturn {
             app.deService.clearTempCacheByRs({
                 srfappid: app.appId,
                 srfsessionid: context.srfsessionid,
+                srfskipcleartmpres: context.srfskipcleartmpres,
             }, this.entity.id);
             const items = await this.dto.sets(context, [data]);
             return items[0];
         }
-        if (isNilOrEmpty(data)) {
+        // 返回类型为简单类型时，返回数据key为srfresult，值为响应数据
+        const output = this.method.appDEMethodReturn;
+        if (output && output.type === 'SIMPLE') {
+            data = { srfresult: data };
+        }
+        else if (isNilOrEmpty(data)) {
             data = {};
         }
         return new AppDataEntity(this.entity, data);

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

@@ -11,16 +11,25 @@ export declare class FileService implements IFileService {
      */
     constructor(model: IAppDataEntity);
     /**
-     * 后台导出数据，返回文件流
-     *
-     * @author lxm
-     * @date 2022-11-25 14:11:53
+     * @description 后台导出数据，返回文件流
      * @param {IDEDataExport} dataExport 导出模型
      * @param {string} fetchAction 查询方法
      * @param {IContext} context 上下文
      * @param {IParams} params 请求参数
+     * @deprecated 已弃用，请使用 export 方法，参数一致
      * @returns {*}  {Promise<IHttpResponse<Blob>>}
+     * @memberof FileService
      */
     exportData(dataExport: IDEDataExport, fetchAction: string, context: IContext, params: IParams): Promise<IHttpResponse<Blob>>;
+    /**
+     * @description 导出
+     * @param {IDEDataExport} dataExport 导出模型
+     * @param {string} fetchAction 查询方法
+     * @param {IContext} context 上下文
+     * @param {IParams} params 请求参数
+     * @returns {*}  {Promise<boolean>}
+     * @memberof FileService
+     */
+    export(dataExport: IDEDataExport, fetchAction: string, context: IContext, params: IParams): Promise<boolean>;
 }
 //# sourceMappingURL=file.service.d.ts.map

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;CAehC"}
+{"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;;;;;;;;;OASG;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;IAgB/B;;;;;;;;OAQG;IACH,MAAM,CACJ,UAAU,EAAE,aAAa,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;CAepB"}

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

@@ -10,15 +10,14 @@ export class FileService {
         this.model = model;
     }
     /**
-     * 后台导出数据，返回文件流
-     *
-     * @author lxm
-     * @date 2022-11-25 14:11:53
+     * @description 后台导出数据，返回文件流
      * @param {IDEDataExport} dataExport 导出模型
      * @param {string} fetchAction 查询方法
      * @param {IContext} context 上下文
      * @param {IParams} params 请求参数
+     * @deprecated 已弃用，请使用 export 方法，参数一致
      * @returns {*}  {Promise<IHttpResponse<Blob>>}
+     * @memberof FileService
      */
     exportData(dataExport, fetchAction, context, params) {
         const resPath = calcResPath(context, this.model);
@@ -35,4 +34,28 @@ export class FileService {
             responseType: 'blob',
         });
     }
+    /**
+     * @description 导出
+     * @param {IDEDataExport} dataExport 导出模型
+     * @param {string} fetchAction 查询方法
+     * @param {IContext} context 上下文
+     * @param {IParams} params 请求参数
+     * @returns {*}  {Promise<boolean>}
+     * @memberof FileService
+     */
+    export(dataExport, fetchAction, context, params) {
+        const resPath = calcResPath(context, this.model);
+        const url = `${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.platform.backendExport({
+            url,
+            data: params,
+            method: 'post',
+            params: queryParam,
+        });
+    }
 }

package/out/service/service/index.d.ts

@@ -12,4 +12,6 @@ export { InternalMessageService } from './internal-message/internal-message.serv
 export { MarkOpenDataService } from './mark-open-data/mark-open-data.service';
 export { UtilService } from './util/util.service';
 export { ThirdAuthService } from './third-auth/third-auth.service';
+export { FileService } from './file/file.service';
+export { AIUtilService } from './util/ai-util.service';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC"}

package/out/service/service/index.js

@@ -12,3 +12,5 @@ export { InternalMessageService } from './internal-message/internal-message.serv
 export { MarkOpenDataService } from './mark-open-data/mark-open-data.service';
 export { UtilService } from './util/util.service';
 export { ThirdAuthService } from './third-auth/third-auth.service';
+export { FileService } from './file/file.service';
+export { AIUtilService } from './util/ai-util.service';

package/out/service/service/internal-message/internal-message.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-message.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/internal-message/internal-message.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,qBAAa,sBAAuB,YAAW,uBAAuB;IACpE;;;;OAIG;IACH,SAAS,CAAC,OAAO,SAAkC;IAEnD;;;;;;OAMG;IACG,KAAK,CACT,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;IA8B7C;;;;;;OAMG;IACG,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAKtE;;;;;;OAMG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;OAKG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;CA0BtC"}
+{"version":3,"file":"internal-message.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/internal-message/internal-message.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,qBAAa,sBAAuB,YAAW,uBAAuB;IACpE;;;;OAIG;IACH,SAAS,CAAC,OAAO,SAAkC;IAEnD;;;;;;OAMG;IACG,KAAK,CACT,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;IA8B7C;;;;;;OAMG;IACG,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAKtE;;;;;;OAMG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC;;;;;OAKG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;CAuCtC"}

package/out/service/service/internal-message/internal-message.service.js

@@ -78,7 +78,8 @@ export class InternalMessageService {
      * @return {*}  {Promise<number>}
      */
     async getUnreadNum() {
-        const res = await ibiz.net.post(`${this.baseUrl}/fetch_cur_receiver`, {
+        var _a;
+        const fetchParams = {
             page: 0,
             size: 1,
             sort: 'timestamp,desc',
@@ -97,7 +98,17 @@ export class InternalMessageService {
                     ],
                 },
             ],
-        });
+        };
+        // 不是门户应用只查询当前系统数据
+        if (!ibiz.env.isPortalApp) {
+            fetchParams.searchconds[0].searchconds.push({
+                condop: 'EQ',
+                condtype: 'DEFIELD',
+                fieldname: 'system_tag',
+                value: (_a = ibiz.appData) === null || _a === void 0 ? void 0 : _a.context.srfdcsystemid,
+            });
+        }
+        const res = await ibiz.net.post(`${this.baseUrl}/fetch_cur_receiver`, fetchParams);
         if (res.headers['x-total']) {
             return Number(res.headers['x-total']);
         }

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

@@ -7,9 +7,10 @@ export declare class ThirdAuthService implements IThirdAuthService {
      * @date 2024-11-18 14:11:58
      * @param {('DINGTALK' | 'WXWORK' | 'OAUTH'  |string)} type 授权类型：钉钉 | 企业微信 | OAUTH | 自定义
      * @param {('EMBED' | 'THIRD')} mode
+     * @param {IData} [params]
      * @return {*}  {Promise<IThirdAuthResult>}
      */
-    auth(type: 'DINGTALK' | 'WXWORK' | 'OAUTH' | string, mode: 'EMBED' | 'THIRD'): Promise<IThirdAuthResult>;
+    auth(type: 'DINGTALK' | 'WXWORK' | 'OAUTH' | string, mode: 'EMBED' | 'THIRD', params?: IData): Promise<IThirdAuthResult>;
     /**
      * 清空权限数据
      *
@@ -64,8 +65,9 @@ export declare class ThirdAuthService implements IThirdAuthService {
      *
      * @author tony001
      * @date 2024-12-22 11:12:56
+     * @param {IData} [params={}]
      * @return {*}  {Promise<IThirdAuthResult>}
      */
-    oauthThirdAuth(): Promise<IThirdAuthResult>;
+    oauthThirdAuth(params?: IData): Promise<IThirdAuthResult>;
 }
 //# sourceMappingURL=third-auth.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"third-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/third-auth/third-auth.service.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD;;;;;;;;OAQG;IACG,IAAI,CACR,IAAI,EAAE,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,EAC9C,IAAI,EAAE,OAAO,GAAG,OAAO,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAmB5B;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAUrB;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAavB;;;;;;OAMG;IACG,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA6CpD;;;;;;OAMG;IACG,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAuCrD;;;;;;OAMG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAmDlD;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA+BnD;;;;;;OAMG;IACG,cAAc,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAwClD"}
+{"version":3,"file":"third-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/third-auth/third-auth.service.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD;;;;;;;;;OASG;IACG,IAAI,CACR,IAAI,EAAE,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,EAC9C,IAAI,EAAE,OAAO,GAAG,OAAO,EACvB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,gBAAgB,CAAC;IAmB5B;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAUrB;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAavB;;;;;;OAMG;IACG,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA6CpD;;;;;;OAMG;IACG,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAuCrD;;;;;;OAMG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAmDlD;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA+BnD;;;;;;;OAOG;IACG,cAAc,CAAC,MAAM,GAAE,KAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA0CpE"}

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

@@ -10,9 +10,10 @@ export class ThirdAuthService {
      * @date 2024-11-18 14:11:58
      * @param {('DINGTALK' | 'WXWORK' | 'OAUTH'  |string)} type 授权类型：钉钉 | 企业微信 | OAUTH | 自定义
      * @param {('EMBED' | 'THIRD')} mode
+     * @param {IData} [params]
      * @return {*}  {Promise<IThirdAuthResult>}
      */
-    async auth(type, mode) {
+    async auth(type, mode, params) {
         switch (type) {
             case 'DINGTALK':
                 return mode === 'EMBED'
@@ -23,7 +24,7 @@ export class ThirdAuthService {
                     ? this.wxWorkEmbedAuth()
                     : this.wxWorkThirddAuth();
             case 'OAUTH':
-                return this.oauthThirdAuth();
+                return this.oauthThirdAuth(params);
             default:
                 throw new RuntimeError(ibiz.i18n.t('runtime.service.thirdAuth.noSupported', { type }));
         }
@@ -228,23 +229,25 @@ export class ThirdAuthService {
      *
      * @author tony001
      * @date 2024-12-22 11:12:56
+     * @param {IData} [params={}]
      * @return {*}  {Promise<IThirdAuthResult>}
      */
-    async oauthThirdAuth() {
-        if (!ibiz.env.oauthOpenAccessId) {
+    async oauthThirdAuth(params = {}) {
+        const oauthOpenAccessId = params.oauthopenaccessid || ibiz.env.oauthOpenAccessId;
+        if (!oauthOpenAccessId) {
             throw new RuntimeError(ibiz.i18n.t('runtime.service.thirdAuth.oauthOpenAccessIdError'));
         }
         // 截取地址，拼接需要部分组成新地址
         const baseUrl = this.getNeedLocation();
         // 拼接重定向地址
         const redirectUri = `${baseUrl}oauth.html`;
-        const res = await ibiz.net.get(`/uaa/open/oauth2-${ibiz.env.oauthOpenAccessId}/authorize`, { redirect_uri: redirectUri });
+        const res = await ibiz.net.get(`/uaa/open/oauth2-${oauthOpenAccessId}/authorize`, { redirect_uri: redirectUri });
         if (res.ok && res.data) {
             const targetUri = res.data;
             const lastAccessParams = {
                 srfdcsystem: ibiz.env.dcSystem,
                 baseurl: `${ibiz.env.baseUrl}/${ibiz.env.appId}`,
-                oauthopenaccessid: ibiz.env.oauthOpenAccessId,
+                oauthopenaccessid: oauthOpenAccessId,
                 srfredirect_uri: encodeURIComponent(window.location.href),
             };
             if (ibiz.env.cookieDomain &&

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

@@ -0,0 +1,157 @@
+import { IAppUtil } from '@ibiz/model-core';
+/**
+ * 应用功能扩展参数
+ */
+export type IUtilParam = {
+    getSessionAppDEActionId: string | undefined;
+    deleteSessionAppDEActionId: string | undefined;
+    updateSessionAppDEActionId: string | undefined;
+    getMessageAppDEActionId: string | undefined;
+    deleteMessageAppDEActionId: string | undefined;
+    likeMessageAppDEActionId: string | undefined;
+    dislikeMessageAppDEActionId: string | undefined;
+    cancelFeedbackMessageAppDEActionId: string | undefined;
+    clearAllSessionAppDEActionId: string | undefined;
+    clearAllMessageSessionAppDEActionId: string | undefined;
+    sessionmodelMapping: IData | undefined;
+    messagemodelMapping: IData | undefined;
+};
+/**
+ * 应用功能组件服务
+ */
+export declare class AIUtilService {
+    protected appUtil: IAppUtil;
+    /**
+     * 会话应用实体名称
+     */
+    private sessionAppEntityName;
+    /**
+     * 会话应用实体服务
+     */
+    private sessionService;
+    /**
+     * 消息应用实体名称
+     */
+    private messageAppEntityName;
+    /**
+     * 消息应用实体服务
+     */
+    private messageService;
+    /**
+     * 应用功能参数
+     */
+    private utilParams;
+    /**
+     *  构造函数
+     * @param appUtil
+     */
+    constructor(appUtil: IAppUtil);
+    /**
+     * 解析用户自定义功能参数
+     * @returns
+     */
+    private parseUserUtilParams;
+    /**
+     * 获取会话服务
+     * @param context
+     * @returns
+     */
+    private getSessionService;
+    /**
+     * 获取消息服务
+     * @param context
+     * @returns
+     */
+    private getMessageService;
+    /**
+     * 处理请求数据
+     * @param data
+     * @returns
+     */
+    private handleUserRequestData;
+    /**
+     * 处理响应数据
+     * @param response
+     * @param key
+     * @returns
+     */
+    private handleUserResponse;
+    /**
+     * 获取会话列表
+     * @param context
+     * @param params
+     * @returns
+     */
+    getSessionList(context: IContext, params: IParams): Promise<IData[]>;
+    /**
+     * 更新会话
+     * @param context
+     * @param params
+     * @param data
+     * @returns
+     */
+    updateSession(context: IContext, params: IParams, realID: string, data: IData): Promise<IData>;
+    /**
+     * 删除会话(多个以逗号分割)
+     * @param context
+     * @param params
+     * @returns
+     */
+    deleteSession(context: IContext, params: IParams, realID: string): Promise<boolean>;
+    /**
+     * 获取消息列表
+     * @param context
+     * @param params
+     * @param sessionID
+     * @returns
+     */
+    getMessageList(context: IContext, params: IParams): Promise<IData[]>;
+    /**
+     * 删除消息(多个以逗号分割)
+     * @param context
+     * @param params
+     * @param messageID
+     */
+    deleteMessage(context: IContext, params: IParams, messageID: string): Promise<boolean>;
+    /**
+     * 点赞
+     * @param context
+     * @param params
+     * @param messageID
+     * @returns
+     */
+    likeMessage(context: IContext, params: IParams, messageID: string): Promise<boolean>;
+    /**
+     * 点踩
+     * @param context
+     * @param params
+     * @param messageID
+     * @returns
+     */
+    dislikeMessage(context: IContext, params: IParams, messageID: string, feedbackContent: string): Promise<boolean>;
+    /**
+     * 取消点赞或者点踩
+     * @param context
+     * @param params
+     * @param messageID
+     * @returns
+     */
+    cancelFeedback(context: IContext, params: IParams, messageID: string): Promise<boolean>;
+    /**
+     * 清空所有会话
+     * @param context
+     * @param params
+     * @param excludeSessionID 排除的sessionid
+     * @returns
+     */
+    clearAllSession(context: IContext, params: IParams, excludeSessionID: string): Promise<boolean>;
+    /**
+     * 删除指定会话的所有的消息
+     * @param context
+     * @param params
+     * @param sessionid 会话真实id
+     * @returns
+     */
+    clearAllMessageBySessionId(context: IContext, params: IParams, realID: string): Promise<boolean>;
+}
+//# sourceMappingURL=ai-util.service.d.ts.map

package/out/service/service/util/ai-util.service.d.ts.map

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