@gct-paas/api 0.1.4-dev.4 → 0.1.4-dev.5

package/es/apaas/service/apis/audit-log.service.d.ts

@@ -17,7 +17,7 @@ export interface getOperateTypesQuery {
   /**
    * 功能模块
    */
-  module: string;
+  moduleType: string;
 }
 export interface AuditLogService {
   /**

package/es/apaas/service/entities.d.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-empty-object-type */
 export interface AccountConfig {
   /**
-   * 应用类型 枚举(钉钉 DINGDING,企微 QIYEWEIXIN,飞书 FEISHU)
+   * 应用类型 枚举 (钉钉 DINGDING，企微 QIYEWEIXIN，飞书 FEISHU，微软 MICROSOFT)
    *
    * @type string
    */
@@ -4178,6 +4178,12 @@ export interface DataTraceRequest {
    * @type string
    */
   module?: string;
+  /**
+   * 多个模块
+   *
+   * @type string[]
+   */
+  modules?: string[];
   /**
    * 操作类型
    *
@@ -5670,6 +5676,12 @@ export interface DocControlTaskTodoResponse {
   version?: string;
 }
 export interface DocOutlineBase {
+  /**
+   * 基础单据id(DHR ID)
+   *
+   * @type string
+   */
+  baseId?: string;
   /**
    *
    *
@@ -9480,6 +9492,12 @@ export interface FieldMeta {
    * @type string
    */
   bindInfo?: string;
+  /**
+   * 业务字段类型
+   *
+   * @type string
+   */
+  bizType?: string;
   /**
    *
    *
@@ -9702,6 +9720,12 @@ export interface FieldMetaDTO {
    * @type string
    */
   bindInfo?: string;
+  /**
+   * 业务字段类型
+   *
+   * @type string
+   */
+  bizType?: string;
   /**
    *
    *
@@ -10218,6 +10242,12 @@ export interface FieldMetaVO {
    * @type string
    */
   bindInfo?: string;
+  /**
+   * 业务字段类型
+   *
+   * @type string
+   */
+  bizType?: string;
   /**
    * 默认值
    *
@@ -10382,6 +10412,12 @@ export interface FileResourceResponse {
   url?: string;
 }
 export interface FileTaskDTO {
+  /**
+   * 是否包含半成品批次（当type为EDHR时使用，用于判断打印时是否需要打印半成品批次eDHR）
+   *
+   * @type boolean
+   */
+  includeSemi?: boolean;
   /**
    * 模板实例id
    *
@@ -17296,6 +17332,12 @@ export interface OnlineFormFieldMetaVO {
    * @type string
    */
   bindInfo?: string;
+  /**
+   * 业务字段类型
+   *
+   * @type string
+   */
+  bizType?: string;
   /**
    * 默认值
    *
@@ -18318,6 +18360,12 @@ export interface OnlineFormInstanceResponse {
    * @type string
    */
   designerJson?: string;
+  /**
+   *
+   *
+   * @type string
+   */
+  direction?: string;
   /**
    *
    *
@@ -18390,6 +18438,12 @@ export interface OnlineFormInstanceResponse {
    * @type string
    */
   formType?: string;
+  /**
+   *
+   *
+   * @type number
+   */
+  height?: number;
   /**
    * 主键ID
    *
@@ -18492,6 +18546,12 @@ export interface OnlineFormInstanceResponse {
    * @type string
    */
   operatorRange?: string;
+  /**
+   *
+   *
+   * @type string
+   */
+  paperSize?: string;
   /**
    * 实例参数(业务扩展属性)
    *
@@ -18630,6 +18690,12 @@ export interface OnlineFormInstanceResponse {
    * @type string
    */
   viewType?: string;
+  /**
+   *
+   *
+   * @type number
+   */
+  width?: number;
 }
 export interface OnlineFormInstanceTmplRelationResponse {
   /**
@@ -25978,6 +26044,24 @@ export interface ProcessPathResponse {
    * @type string
    */
   tmplId?: string;
+  /**
+   * 事务定义id
+   *
+   * @type string
+   */
+  txnDefinitionId?: string;
+  /**
+   * 事务实例id
+   *
+   * @type string
+   */
+  txnInstId?: string;
+  /**
+   * 事务实例状态
+   *
+   * @type string
+   */
+  txnInstStatus?: string;
 }
 export interface ProcessPathUserRequest {
   /**
@@ -35828,6 +35912,12 @@ export interface UserTenantDTO {
    * @type string
    */
   id?: string;
+  /**
+   * 是否最后登录租户，0：否 1：是
+   *
+   * @type number
+   */
+  latestLogin?: number;
   /**
    * 直属上级id
    *

package/es/platform/service/api-config.mjs

@@ -5608,6 +5608,12 @@ export const apiConfig = [
         path: "login-log/userLoginLogPage",
         hasData: true
       },
+      {
+        mode: "get",
+        method: "getLoginSettingGet",
+        path: "login/setting/get",
+        hasQuery: true
+      },
       {
         mode: "get",
         method: "getLoginSsoOauth2Authorize",

package/es/platform/service/apis/api.service.d.ts

@@ -28,6 +28,7 @@ import type {
   TenantUserSearchRequest,
   UserWithUserExtraDTO,
   UserIdsDTO,
+  ResponseEntity,
   RedirectView,
   DataSourceUpdateRequest,
   DatasourceExtDTO,
@@ -40,6 +41,7 @@ import type {
   AppEffectiveLicense,
   UserLoginLogPageRequest,
   UserLoginLogDTO,
+  ThirdPartyLoginConfig,
   ModelDTO,
   消息设置VO,
   SendEmailMessageRequest,
@@ -510,6 +512,12 @@ export interface getLicenseGetAppEffectiveLicenseQuery {
    */
   env: string;
 }
+export interface getLoginSettingGetQuery {
+  /**
+   * code
+   */
+  code: string;
+}
 export interface getLoginSsoOauth2AuthorizeQuery {
   /**
    * 授权码
@@ -1141,7 +1149,7 @@ export interface ApiService {
   postAppUserSaveList(
     query: postAppUserSaveListQuery,
     config?: Partial<AxiosRequestConfig>,
-  ): Promise<string>;
+  ): Promise<ResponseEntity>;
   /**
    * 修改
    */
@@ -1261,6 +1269,13 @@ export interface ApiService {
     data: UserLoginLogPageRequest,
     config?: Partial<AxiosRequestConfig>,
   ): Promise<IPage<UserLoginLogDTO>>;
+  /**
+   * 重定向到微软登录页
+   */
+  getLoginSettingGet(
+    query: getLoginSettingGetQuery,
+    config?: Partial<AxiosRequestConfig>,
+  ): Promise<ThirdPartyLoginConfig>;
   /**
    * 泛微OA认证地址
    */

package/es/platform/service/entities.d.ts

@@ -7345,6 +7345,12 @@ export interface FileTaskResponse {
    * @type string
    */
   name?: string;
+  /**
+   *
+   *
+   * @type IObject
+   */
+  params?: IObject;
   /**
    * 关联数据id(edhr实模板ID)
    *
@@ -11016,6 +11022,12 @@ export interface OrgAddOrUpdateUserRequest {
   username?: string;
 }
 export interface OrgBaseInfo {
+  /**
+   *
+   *
+   * @type string
+   */
+  createTime?: string;
   /**
    *
    *
@@ -11046,6 +11058,12 @@ export interface OrgBaseInfo {
    * @type string
    */
   parentId?: string;
+  /**
+   *
+   *
+   * @type string
+   */
+  type?: string;
 }
 export interface OrgConfig {
   /**
@@ -14144,6 +14162,12 @@ export interface PnDataset {
    * @type number
    */
   deleted?: number;
+  /**
+   *
+   *
+   * @type string
+   */
+  designSql?: string;
   /**
    *
    *
@@ -14324,6 +14348,12 @@ export interface PnDatasetRequest {
    * @type string
    */
   databaseType?: string;
+  /**
+   * 设计的sql - 可包含注释
+   *
+   * @type string
+   */
+  designSql?: string;
   /**
    * 文件地址
    *
@@ -14422,6 +14452,12 @@ export interface PnDatasetResponse {
    * @type string
    */
   databaseType?: string;
+  /**
+   * 设计的sql - 可包含注释
+   *
+   * @type string
+   */
+  designSql?: string;
   /**
    * 完整的sql
    *
@@ -19866,6 +19902,12 @@ export interface UserBaseReq {
    * @type string
    */
   password?: string;
+  /**
+   *
+   *
+   * @type string
+   */
+  referer?: string;
   /**
    *
    *
@@ -20282,12 +20324,6 @@ export interface UserExtraResponse {
    * @type string
    */
   id?: string;
-  /**
-   * 是否最近登录租户
-   *
-   * @type number
-   */
-  latestLogin?: number;
   /**
    * 直属上级
    *

package/es/service/http.util.d.ts

@@ -6,6 +6,13 @@ import type { AxiosInstance, AxiosRequestConfig } from 'axios';
  * @class HttpUtil
  */
 export declare class HttpUtil {
+    /**
+     * Axios 实例，供外部使用和挂载中间件
+     *
+     * @static
+     * @type {AxiosInstance}
+     */
+    static _instance: AxiosInstance;
     /**
      * 挂载中间件
      *

package/es/service/http.util.mjs

@@ -3,6 +3,13 @@ import { ContentTypeEnum } from "./http.enum.mjs";
 import { BackendError } from "./http.error.mjs";
 const instance = axios.create();
 export class HttpUtil {
+  /**
+   * Axios 实例，供外部使用和挂载中间件
+   *
+   * @static
+   * @type {AxiosInstance}
+   */
+  static _instance = instance;
   /**
    * 挂载中间件
    *
@@ -10,7 +17,7 @@ export class HttpUtil {
    * @param {(_axios: AxiosInstance) => void} fn 中间件函数
    */
   static use(fn) {
-    fn(instance);
+    fn(this._instance);
   }
   /**
    * GET 请求方法

package/es/service/index.mjs

@@ -1,10 +1,12 @@
 import { apiConfig as aPaasConfig } from "../apaas/index.mjs";
 import { apiConfig as platformConfig } from "../platform/index.mjs";
 import { ApiManage } from "./api-manage.mjs";
+import { installHttpUtil } from "./request.client.mjs";
 export const api = {
   apaas: new ApiManage("/gct-apaas/api", aPaasConfig),
   platform: new ApiManage("/gct-platform/api", platformConfig)
 };
+installHttpUtil();
 export {
   ResultEnum,
   RequestEnum,

package/es/service/request.client.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 安装 HTTP 工具类，配置 android 原生适配器和拦截器
+ *
+ * @export
+ */
+export declare function installHttpUtil(): void;

package/es/service/request.client.mjs

@@ -0,0 +1,35 @@
+import { NativeHTTP } from "../utils/index.mjs";
+import { HttpUtil } from "./http.util.mjs";
+export function installHttpUtil() {
+  if (window.location.host !== "appassets.androidplatform.net") {
+    console.debug("\u5F53\u524D\u73AF\u5883\u975E Android\uFF0C\u5DF2\u8DF3\u8FC7 HTTP \u5DE5\u5177\u7C7B\u5B89\u88C5");
+    return;
+  }
+  const nativeAdapter = async (config) => {
+    const response = await NativeHTTP.request(config);
+    return response;
+  };
+  HttpUtil._instance.defaults.adapter = nativeAdapter;
+  const errorHandler = (error) => {
+    if (error?.response?.status === 401) {
+      console.log("\u767B\u5F55\u4FE1\u606F\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55");
+    } else {
+      console.log("\u7F51\u7EDC\u5F02\u5E38\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5");
+    }
+    return Promise.reject(error);
+  };
+  HttpUtil._instance.interceptors.request.use((config) => {
+    config.headers["App-Tag"] = "__platform__";
+    return config;
+  }, errorHandler);
+  HttpUtil._instance.interceptors.response.use((response) => {
+    if (response.data.code === 200) {
+      return response.data.data;
+    }
+    const errorMessageMode = response.config?.errorMessageMode;
+    if (errorMessageMode !== "none") {
+      console.log(response.data.message);
+    }
+    return Promise.reject(response.data);
+  }, errorHandler);
+}

package/es/utils/index.d.ts

@@ -1,3 +1,4 @@
+export { NativeHTTP } from './native-http/native-http';
 /**
  * 拼接 URL 路径片段，处理多余的斜杠
  *

package/es/utils/index.mjs

@@ -1,3 +1,4 @@
+export { NativeHTTP } from "./native-http/native-http.mjs";
 import { cloneDeep, isEqual, mergeWith, unionWith } from "lodash-es";
 export function joinPath(...segments) {
   return segments.map((seg, i) => {

package/es/utils/native-http/native-http.d.ts

@@ -0,0 +1,6 @@
+import type { InternalAxiosRequestConfig } from 'axios';
+export declare const NativeHTTP: {
+    request(querydata: InternalAxiosRequestConfig): Promise<unknown>;
+    urlDecode(arg: string): Promise<string>;
+    urlDecodeSync(arg: string): string;
+};

package/es/utils/native-http/native-http.mjs

@@ -0,0 +1,63 @@
+import dsBridge from "dsbridge";
+import qs from "qs";
+export const NativeHTTP = {
+  request(querydata) {
+    const { method, url, timeout, params, headers, data, baseURL } = querydata;
+    const pathparam = "?" + qs.stringify(params);
+    const allurl = (baseURL + url).replace(/([^:])\/\//g, "$1/") + pathparam;
+    console.info(allurl + ">>HTTP", querydata);
+    const startTime = performance.now();
+    return new Promise((resolve, reject) => {
+      dsBridge.call(
+        "HTTP." + method,
+        {
+          url: allurl,
+          timeout,
+          headers,
+          data: data && typeof data === "string" ? JSON.parse(data) : data
+        },
+        function(res) {
+          const nativeData = JSON.parse(res);
+          console.info(
+            allurl + `>>HTTP.response-\u8017\u65F6\uFF1A${performance.now() - startTime}`,
+            nativeData
+          );
+          if (nativeData.code === 0 && nativeData.http_code === 200) {
+            resolve({ ...nativeData, config: querydata });
+          } else {
+            const response = {
+              message: nativeData.message,
+              status: nativeData.http_code
+            };
+            reject({ response, config: querydata });
+          }
+        }
+      );
+    });
+  },
+  urlDecode(arg) {
+    return new Promise((resolve, reject) => {
+      return dsBridge.call("HTTP.urlDecode", arg, function(res) {
+        if (res) {
+          const data = JSON.parse(res);
+          if (data.code === 0) {
+            resolve(data.data);
+            return;
+          }
+        }
+        reject();
+      });
+    });
+  },
+  urlDecodeSync(arg) {
+    if (!arg) return "";
+    const res = dsBridge.call("HTTP.urlDecodeSync", arg);
+    if (res) {
+      const data = JSON.parse(res);
+      if (data.code === 0) {
+        return data.data;
+      }
+    }
+    return "";
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/api",
-  "version": "0.1.4-dev.4",
+  "version": "0.1.4-dev.5",
   "description": "paas 平台底包",
   "type": "module",
   "keywords": [
@@ -70,6 +70,7 @@
   },
   "dependencies": {
     "axios": "^1.13.2",
+    "dsbridge": "^3.1.4",
     "lodash-es": "^4.17.23",
     "qs": "^6.14.1"
   },