jmash-core-mp 0.1.19 → 0.1.20

package/lib/api/auth/index.d.ts

@@ -1,8 +1,6 @@
-import { ResponseData, AppConfig } from "../../api/types";
+import { ResponseData } from "../../api/types";
 import type { LoginReq, LoginRes, RolesPerms, WebLoginReq, TokenModel, PhoneRegisterReq, PhoneReplaceReq, UpdateUserReq, UserInfoReq, UserInfo } from "./types";
 declare class AuthApi {
-    config: AppConfig;
-    constructor();
     mpLogin(data: LoginReq): Promise<ResponseData<LoginRes>>;
     mpPhoneRegister(data: PhoneRegisterReq): Promise<ResponseData<LoginRes>>;
     replaceBindphone(data: PhoneReplaceReq): Promise<ResponseData<string>>;

package/lib/api/auth/index.js

@@ -3,10 +3,6 @@ import { db } from "../../utils/db";
 import { grpc } from "../../utils/grpc";
 import mpx from "@mpxjs/core";
 class AuthApi {
-    config;
-    constructor() {
-        this.config = getApp().globalData.config;
-    }
     // 小程序静默登录
     mpLogin(data) {
         if (__mpx_mode__ === "wx") {
@@ -15,8 +11,9 @@ class AuthApi {
         if (__mpx_mode__ === "ali") {
             data.opensType = OpensType.ali_pay;
         }
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/front/rbac/miniapp_login/" + this.config.tenant,
+            url: "/v1/front/rbac/miniapp_login/" + config.tenant,
             method: "POST",
             data,
             header: {
@@ -33,8 +30,9 @@ class AuthApi {
         if (__mpx_mode__ === "ali") {
             data.opensType = OpensType.ali_pay;
         }
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/front/rbac/miniapp_phonenumber/" + this.config.tenant,
+            url: "/v1/front/rbac/miniapp_phonenumber/" + config.tenant,
             method: "POST",
             data: data,
             header: {
@@ -44,7 +42,8 @@ class AuthApi {
     }
     // 已登陆状态小程序更换绑定手机号
     replaceBindphone(data) {
-        data.tenant = this.config.tenant;
+        const config = getApp().globalData.config;
+        data.tenant = config.tenant;
         if (__mpx_mode__ === "wx") {
             data.opensType = OpensType.wechat;
         }
@@ -60,9 +59,10 @@ class AuthApi {
     }
     //web登录.
     webLogin(data) {
-        data.tenant = this.config.tenant;
+        const config = getApp().globalData.config;
+        data.tenant = config.tenant;
         data.directoryId = "user";
-        data.clientId = this.config.appId ? this.config.appId : "h5";
+        data.clientId = config.appId ? config.appId : "h5";
         data.captchaId = "1";
         data.captchaCode = "1";
         return mpx.xfetch.fetch({
@@ -76,42 +76,47 @@ class AuthApi {
     }
     // 刷新token
     refreshToken() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
             url: "/v1/front/rbac/auth/refresh_token",
             method: "POST",
             data: {
                 refreshToken: db.getRefreshToken(),
-                tenant: this.config.tenant,
-                clientId: this.config.appId,
+                tenant: config.tenant,
+                clientId: config.appId,
             },
             header: { "content-type": "application/json" },
         });
     }
     // 获取当前会话用户
     userInfo() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/rbac/auth/user?tenant=" + this.config.tenant,
+            url: "/v1/rbac/auth/user?tenant=" + config.tenant,
             method: "GET",
         });
     }
     // 当前用户角色权限
     userRolesPerms() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/rbac/auth/roles_perms?tenant=" + this.config.tenant,
+            url: "/v1/rbac/auth/roles_perms?tenant=" + config.tenant,
             method: "GET",
         });
     }
     // 允许切换身份的用户列表
     allowRunAsUser() {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/rbac/auth/allow_run_as_user?tenant=" + this.config.tenant,
+            url: "/v1/rbac/auth/allow_run_as_user?tenant=" + config.tenant,
             method: "GET",
         });
     }
     // 运行某种身份
     runAsUser(userId) {
+        const config = getApp().globalData.config;
         const data = {
-            tenant: this.config.tenant,
+            tenant: config.tenant,
             userId: userId,
         };
         return mpx.xfetch.fetch({
@@ -143,8 +148,9 @@ class AuthApi {
     }
     // 部门Tree
     deptTree(deptId, tenant) {
+        const config = getApp().globalData.config;
         const query = {
-            tenant: tenant ? tenant : this.config.tenant,
+            tenant: tenant ? tenant : config.tenant,
             excludeId: deptId,
         };
         return mpx.xfetch.fetch({
@@ -155,8 +161,9 @@ class AuthApi {
     }
     // 职务Tree
     jobTree(jobId, tenant) {
+        const config = getApp().globalData.config;
         const query = {
-            tenant: tenant ? tenant : this.config.tenant,
+            tenant: tenant ? tenant : config.tenant,
             roleType: "job",
             hasRoleType: true,
             excludeId: jobId,
@@ -169,7 +176,8 @@ class AuthApi {
     }
     // 修改个人信息
     updateUserInfo(data) {
-        data.tenant = this.config.tenant;
+        const config = getApp().globalData.config;
+        data.tenant = config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({
             url: "/v1/rbac/auth/user",
@@ -179,7 +187,8 @@ class AuthApi {
     }
     // 获取当前会话用户的信息
     findUserInfo(data) {
-        data.tenant = this.config.tenant;
+        const config = getApp().globalData.config;
+        data.tenant = config.tenant;
         return mpx.xfetch.fetch({
             url: "/v1/front/rbac/auth/user",
             method: "GET",

package/lib/api/cms/index.d.ts

@@ -1,8 +1,6 @@
 import { CmsSiteKey, CmsSiteList, CmsSiteModel, CmsChannelReq, CmsChannelList, CmsInfoReq, CmsInfoPage, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoFileReq, CmsInfoFileList, FrontInteractKey, FrontInteractModel, FrontLikeKey, FrontLikeModel, FrontLikeCreateReq, FrontBrowseRecordCreateReq, FrontBrowseRecordModel, CmsChannelKey, CmsChannelModel } from "./types";
-import { ResponseData, AppConfig } from "../../api/types";
+import { ResponseData } from "../../api/types";
 declare class CmsApiImpl {
-    config: AppConfig;
-    constructor();
     findCmsSiteList(tenant: string): Promise<ResponseData<CmsSiteList>>;
     findCmsSite(data: CmsSiteKey): Promise<ResponseData<CmsSiteModel>>;
     findCmsChannelList(data: CmsChannelReq): Promise<ResponseData<CmsChannelList>>;

package/lib/api/cms/index.js

@@ -2,10 +2,6 @@ import { grpc } from "../../utils/grpc";
 import mpx from "@mpxjs/core";
 // 获取网站内容信息
 class CmsApiImpl {
-    config;
-    constructor() {
-        this.config = getApp().globalData.config;
-    }
     // 查询企业官网、微网站列表
     findCmsSiteList(tenant) {
         return mpx.xfetch.fetch({
@@ -49,7 +45,8 @@ class CmsApiImpl {
     }
     // 根据栏目别名查询翻页信息信息主表-单页栏目内容
     findCmsContentInfo(data) {
-        data.tenant = data.tenant || this.config.tenant;
+        const config = getApp().globalData.config;
+        data.tenant = data.tenant || config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({
             url: `/v1/front/cms/cms_info/alias/${data.tenant}/${data.siteId}/${data.channelAlias}`,

package/lib/api/dict/index.d.ts

@@ -1,8 +1,6 @@
-import { ResponseData, AppConfig } from "../../api/types";
+import { ResponseData } from "../../api/types";
 import { EnumRes, DictEntryReq, DictEntryList } from "./types";
 declare class DictApiImpl {
-    config: AppConfig;
-    constructor();
     /**
      * 枚举
      * @param data 查询条件

package/lib/api/dict/index.js

@@ -1,9 +1,5 @@
 import mpx from "@mpxjs/core";
 class DictApiImpl {
-    config;
-    constructor() {
-        this.config = getApp().globalData.config;
-    }
     /**
      * 枚举
      * @param data 查询条件
@@ -26,8 +22,9 @@ class DictApiImpl {
         if (data) {
             data.hasEnable = data.enable !== undefined;
         }
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/dict/dict_entry/list/" + this.config.tenant,
+            url: "/v1/dict/dict_entry/list/" + config.tenant,
             method: "GET",
             data,
         });

package/lib/api/files/index.d.ts

@@ -1,8 +1,6 @@
 import { FileInfo, FileBase64Req, FileDownInfo, FileWebReq } from "./types";
-import { ResponseData, AppConfig } from "../../api/types";
+import { ResponseData } from "../../api/types";
 declare class FileApi {
-    config: AppConfig;
-    constructor();
     baseApiUrl(): string;
     uploadUrl(): string;
     /**

package/lib/api/files/index.js

@@ -2,12 +2,9 @@ import { db } from "../../utils/db";
 import { grpc } from "../../utils/grpc";
 import mpx from "@mpxjs/core";
 class FileApi {
-    config;
-    constructor() {
-        this.config = getApp().globalData.config;
-    }
     baseApiUrl() {
-        let currentBaseURL = this.config.baseUrl;
+        const config = getApp().globalData.config;
+        let currentBaseURL = config.baseUrl;
         // 使用 slice() 方法
         if (currentBaseURL.slice(-1) === "/") {
             currentBaseURL = currentBaseURL.slice(0, -1);
@@ -16,7 +13,8 @@ class FileApi {
     }
     // 上传Url
     uploadUrl() {
-        return this.baseApiUrl() + "/v1/file/upload?tenant=" + this.config.tenant;
+        const config = getApp().globalData.config;
+        return this.baseApiUrl() + "/v1/file/upload?tenant=" + config.tenant;
     }
     /**
      * url 获取图片Full路径
@@ -40,9 +38,10 @@ class FileApi {
      * @param type resize	等比例缩放,white	补白,trans	补透明,clip	裁剪
      */
     imageIdUrl(imageId, width = 0, height = 0, type = "clip") {
+        const config = getApp().globalData.config;
         return (this.baseApiUrl() +
             "/v1/file/image_id/" +
-            this.config.tenant +
+            config.tenant +
             `/${type}/${width}/${height}/` +
             imageId);
     }
@@ -52,11 +51,13 @@ class FileApi {
     }
     // Id 获取文件Full路径
     fileIdUrl(fileId) {
-        return this.baseApiUrl() + "/v1/file/id/" + this.config.tenant + fileId;
+        const config = getApp().globalData.config;
+        return this.baseApiUrl() + "/v1/file/id/" + config.tenant + fileId;
     }
     // 上传文件
     uploadBase64File(base64) {
-        base64.tenant = this.config.tenant;
+        const config = getApp().globalData.config;
+        base64.tenant = config.tenant;
         grpc.clearEmpty(base64);
         return mpx.xfetch.fetch({
             url: "/v1/file/base64upload",

package/lib/api/region/index.d.ts

@@ -1,8 +1,6 @@
 import { DictRegionList, DictRegionReq } from "./types";
-import { ResponseData, AppConfig } from "../../api/types";
+import { ResponseData } from "../../api/types";
 declare class RegionApiImpl {
-    config: AppConfig;
-    constructor();
     findList(query?: DictRegionReq): Promise<ResponseData<DictRegionList>>;
 }
 declare const regionApi: RegionApiImpl;

package/lib/api/region/index.js

@@ -1,18 +1,15 @@
 import { grpc } from "../../utils/grpc";
 import mpx from "@mpxjs/core";
 class RegionApiImpl {
-    config;
-    constructor() {
-        this.config = getApp().globalData.config;
-    }
     // 查询列表信息地区信息
     findList(query) {
         if (query) {
             query.hasEnable = query.enable !== undefined;
         }
         grpc.clearEmpty(query);
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: "/v1/region/dict_region/list/" + this.config.tenant,
+            url: "/v1/region/dict_region/list/" + config.tenant,
             method: "GET",
             data: query,
         });

package/lib/api/storage/index.d.ts

@@ -1,8 +1,6 @@
-import { ResponseData, AppConfig } from "../../api/types";
+import { ResponseData } from "../../api/types";
 import { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel } from "./types";
 declare class StorageApiImpl {
-    config: AppConfig;
-    constructor();
     findMyOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
     findStorageBrowserOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
     findStorageOrganInfoList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;

package/lib/api/storage/index.js

@@ -1,36 +1,36 @@
 import mpx from "@mpxjs/core";
 import { grpc } from "../../utils/grpc";
 class StorageApiImpl {
-    config;
-    constructor() {
-        this.config = getApp().globalData.config;
-    }
     // 查询我的组织列表
     findMyOrganList(data) {
         grpc.clearEmpty(data);
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: `/v1/storage/storage_organ/my_list/${this.config.tenant}?&serviceType[]=${data.serviceType}`,
+            url: `/v1/storage/storage_organ/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
             method: "GET",
         });
     }
     // 查询列表信息店铺用户浏览信息
     findStorageBrowserOrganList(data) {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: `/v1/front/storage/storage_organ_browser/my_list/${this.config.tenant}?&serviceType[]=${data.serviceType}`,
+            url: `/v1/front/storage/storage_organ_browser/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
             method: "GET",
         });
     }
     // 查询列表信息店铺用户浏览信息
     findStorageOrganInfoList(data) {
+        const config = getApp().globalData.config;
         return mpx.xfetch.fetch({
-            url: `/v1/storage/storage_organ_info/list/${this.config.tenant}?&serviceType[]=${data.serviceType}`,
+            url: `/v1/storage/storage_organ_info/list/${config.tenant}?&serviceType[]=${data.serviceType}`,
             method: "GET",
             data: data,
         });
     }
     // 修改组织浏览信息
     updateStorageOrganBrowser(data) {
-        data.tenant = this.config.tenant;
+        const config = getApp().globalData.config;
+        data.tenant = config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({
             url: "/v1/front/storage/storage_organ_browser/browse",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/auth/index.ts

@@ -17,10 +17,6 @@ import { grpc } from "../../utils/grpc";
 import mpx from "@mpxjs/core";
 
 class AuthApi {
-  config: AppConfig;
-  constructor() {
-    this.config = getApp().globalData.config;
-  }
   // 小程序静默登录
   mpLogin(data: LoginReq): Promise<ResponseData<LoginRes>> {
     if (__mpx_mode__ === "wx") {
@@ -29,8 +25,9 @@ class AuthApi {
     if (__mpx_mode__ === "ali") {
       data.opensType = OpensType.ali_pay;
     }
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/front/rbac/miniapp_login/" + this.config.tenant,
+      url: "/v1/front/rbac/miniapp_login/" + config.tenant,
       method: "POST",
       data,
       header: {
@@ -48,8 +45,9 @@ class AuthApi {
     if (__mpx_mode__ === "ali") {
       data.opensType = OpensType.ali_pay;
     }
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/front/rbac/miniapp_phonenumber/" + this.config.tenant,
+      url: "/v1/front/rbac/miniapp_phonenumber/" + config.tenant,
       method: "POST",
       data: data,
       header: {
@@ -60,7 +58,8 @@ class AuthApi {
 
   // 已登陆状态小程序更换绑定手机号
   replaceBindphone(data: PhoneReplaceReq): Promise<ResponseData<string>> {
-    data.tenant = this.config.tenant;
+    const config = getApp().globalData.config;
+    data.tenant = config.tenant;
     if (__mpx_mode__ === "wx") {
       data.opensType = OpensType.wechat;
     }
@@ -77,9 +76,10 @@ class AuthApi {
 
   //web登录.
   webLogin(data: WebLoginReq): Promise<ResponseData<TokenModel>> {
-    data.tenant = this.config.tenant;
+    const config = getApp().globalData.config;
+    data.tenant = config.tenant;
     data.directoryId = "user";
-    data.clientId = this.config.appId ? this.config.appId : "h5";
+    data.clientId = config.appId ? config.appId : "h5";
     data.captchaId = "1";
     data.captchaCode = "1";
     return mpx.xfetch.fetch({
@@ -94,13 +94,14 @@ class AuthApi {
 
   // 刷新token
   refreshToken(): Promise<ResponseData<TokenModel>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
       url: "/v1/front/rbac/auth/refresh_token",
       method: "POST",
       data: {
         refreshToken: db.getRefreshToken(),
-        tenant: this.config.tenant,
-        clientId: this.config.appId,
+        tenant: config.tenant,
+        clientId: config.appId,
       },
       header: { "content-type": "application/json" },
     });
@@ -108,31 +109,35 @@ class AuthApi {
 
   // 获取当前会话用户
   userInfo(): Promise<ResponseData<UserInfo>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/rbac/auth/user?tenant=" + this.config.tenant,
+      url: "/v1/rbac/auth/user?tenant=" + config.tenant,
       method: "GET",
     });
   }
 
   // 当前用户角色权限
   userRolesPerms(): Promise<ResponseData<RolesPerms>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/rbac/auth/roles_perms?tenant=" + this.config.tenant,
+      url: "/v1/rbac/auth/roles_perms?tenant=" + config.tenant,
       method: "GET",
     });
   }
   // 允许切换身份的用户列表
   allowRunAsUser(): Promise<ResponseData<any[]>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/rbac/auth/allow_run_as_user?tenant=" + this.config.tenant,
+      url: "/v1/rbac/auth/allow_run_as_user?tenant=" + config.tenant,
       method: "GET",
     });
   }
 
   // 运行某种身份
   runAsUser(userId: string): Promise<ResponseData<any>> {
+    const config = getApp().globalData.config;
     const data = {
-      tenant: this.config.tenant,
+      tenant: config.tenant,
       userId: userId,
     };
     return mpx.xfetch.fetch({
@@ -168,8 +173,9 @@ class AuthApi {
   }
   // 部门Tree
   deptTree(deptId?: string, tenant?: string): Promise<ResponseData<any[]>> {
+    const config = getApp().globalData.config;
     const query = {
-      tenant: tenant ? tenant : this.config.tenant,
+      tenant: tenant ? tenant : config.tenant,
       excludeId: deptId,
     };
     return mpx.xfetch.fetch({
@@ -181,8 +187,9 @@ class AuthApi {
 
   // 职务Tree
   jobTree(jobId?: string, tenant?: string): Promise<ResponseData<any[]>> {
+    const config = getApp().globalData.config;
     const query = {
-      tenant: tenant ? tenant : this.config.tenant,
+      tenant: tenant ? tenant : config.tenant,
       roleType: "job",
       hasRoleType: true,
       excludeId: jobId,
@@ -195,7 +202,8 @@ class AuthApi {
   }
   // 修改个人信息
   updateUserInfo(data: UpdateUserReq): Promise<ResponseData<UserInfo>> {
-    data.tenant = this.config.tenant;
+    const config = getApp().globalData.config;
+    data.tenant = config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({
       url: "/v1/rbac/auth/user",
@@ -206,7 +214,8 @@ class AuthApi {
 
   // 获取当前会话用户的信息
   findUserInfo(data: UserInfoReq): Promise<ResponseData<UserInfo>> {
-    data.tenant = this.config.tenant;
+    const config = getApp().globalData.config;
+    data.tenant = config.tenant;
     return mpx.xfetch.fetch({
       url: "/v1/front/rbac/auth/user",
       method: "GET",

package/src/api/cms/index.ts

@@ -30,10 +30,6 @@ import mpx from "@mpxjs/core";
 
 // 获取网站内容信息
 class CmsApiImpl {
-  config: AppConfig;
-  constructor() {
-    this.config = getApp().globalData.config;
-  }
   // 查询企业官网、微网站列表
   findCmsSiteList(tenant: string): Promise<ResponseData<CmsSiteList>> {
     return mpx.xfetch.fetch({
@@ -87,7 +83,8 @@ class CmsApiImpl {
   findCmsContentInfo(
     data: CmsContentInfoReq
   ): Promise<ResponseData<CmsContentInfoModel>> {
-    data.tenant = data.tenant || this.config.tenant;
+    const config = getApp().globalData.config;
+    data.tenant = data.tenant || config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({
       url: `/v1/front/cms/cms_info/alias/${data.tenant}/${data.siteId}/${data.channelAlias}`,

package/src/api/dict/index.ts

@@ -3,10 +3,6 @@ import { EnumEntryReq, EnumRes, DictEntryReq, DictEntryList } from "./types";
 import mpx from "@mpxjs/core";
 
 class DictApiImpl {
-  config: AppConfig;
-  constructor() {
-    this.config = getApp().globalData.config;
-  }
   /**
    * 枚举
    * @param data 查询条件
@@ -34,8 +30,9 @@ class DictApiImpl {
     if (data) {
       data.hasEnable = data.enable !== undefined;
     }
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/dict/dict_entry/list/" + this.config.tenant,
+      url: "/v1/dict/dict_entry/list/" + config.tenant,
       method: "GET",
       data,
     });

package/src/api/files/index.ts

@@ -5,12 +5,9 @@ import { grpc } from "../../utils/grpc";
 import mpx from "@mpxjs/core";
 
 class FileApi {
-  config: AppConfig;
-  constructor() {
-    this.config = getApp().globalData.config;
-  }
   baseApiUrl(): string {
-    let currentBaseURL = this.config.baseUrl as string;
+    const config = getApp().globalData.config;
+    let currentBaseURL = config.baseUrl as string;
     // 使用 slice() 方法
     if (currentBaseURL.slice(-1) === "/") {
       currentBaseURL = currentBaseURL.slice(0, -1);
@@ -20,7 +17,8 @@ class FileApi {
 
   // 上传Url
   uploadUrl(): string {
-    return this.baseApiUrl() + "/v1/file/upload?tenant=" + this.config.tenant;
+    const config = getApp().globalData.config;
+    return this.baseApiUrl() + "/v1/file/upload?tenant=" + config.tenant;
   }
 
   /**
@@ -59,10 +57,11 @@ class FileApi {
     height: number = 0,
     type: string = "clip"
   ): string {
+    const config = getApp().globalData.config;
     return (
       this.baseApiUrl() +
       "/v1/file/image_id/" +
-      this.config.tenant +
+      config.tenant +
       `/${type}/${width}/${height}/` +
       imageId
     );
@@ -75,12 +74,14 @@ class FileApi {
 
   // Id 获取文件Full路径
   fileIdUrl(fileId?: string): string {
-    return this.baseApiUrl() + "/v1/file/id/" + this.config.tenant + fileId;
+    const config = getApp().globalData.config;
+    return this.baseApiUrl() + "/v1/file/id/" + config.tenant + fileId;
   }
 
   // 上传文件
   uploadBase64File(base64: FileBase64Req): Promise<ResponseData<FileInfo>> {
-    base64.tenant = this.config.tenant;
+    const config = getApp().globalData.config;
+    base64.tenant = config.tenant;
     grpc.clearEmpty(base64);
     return mpx.xfetch.fetch({
       url: "/v1/file/base64upload",

package/src/api/region/index.ts

@@ -4,18 +4,15 @@ import { grpc } from "../../utils/grpc";
 import mpx from "@mpxjs/core";
 
 class RegionApiImpl {
-  config: AppConfig;
-  constructor() {
-    this.config = getApp().globalData.config;
-  }
   // 查询列表信息地区信息
   findList(query?: DictRegionReq): Promise<ResponseData<DictRegionList>> {
     if (query) {
       query.hasEnable = query.enable !== undefined;
     }
     grpc.clearEmpty(query);
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: "/v1/region/dict_region/list/" + this.config.tenant,
+      url: "/v1/region/dict_region/list/" + config.tenant,
       method: "GET",
       data: query,
     });

package/src/api/storage/index.ts

@@ -9,17 +9,14 @@ import {
 } from "./types";
 
 class StorageApiImpl {
-  config: AppConfig;
-  constructor() {
-    this.config = getApp().globalData.config;
-  }
   // 查询我的组织列表
   findMyOrganList(
     data: StorageOrganInfoReq
   ): Promise<ResponseData<StorageOrganInfoList>> {
     grpc.clearEmpty(data);
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: `/v1/storage/storage_organ/my_list/${this.config.tenant}?&serviceType[]=${data.serviceType}`,
+      url: `/v1/storage/storage_organ/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
       method: "GET",
     });
   }
@@ -28,8 +25,9 @@ class StorageApiImpl {
   findStorageBrowserOrganList(
     data: StorageOrganInfoReq
   ): Promise<ResponseData<StorageOrganInfoList>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: `/v1/front/storage/storage_organ_browser/my_list/${this.config.tenant}?&serviceType[]=${data.serviceType}`,
+      url: `/v1/front/storage/storage_organ_browser/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
       method: "GET",
     });
   }
@@ -38,8 +36,9 @@ class StorageApiImpl {
   findStorageOrganInfoList(
     data: StorageOrganInfoReq
   ): Promise<ResponseData<StorageOrganInfoList>> {
+    const config = getApp().globalData.config;
     return mpx.xfetch.fetch({
-      url: `/v1/storage/storage_organ_info/list/${this.config.tenant}?&serviceType[]=${data.serviceType}`,
+      url: `/v1/storage/storage_organ_info/list/${config.tenant}?&serviceType[]=${data.serviceType}`,
       method: "GET",
       data: data,
     });
@@ -49,7 +48,8 @@ class StorageApiImpl {
   updateStorageOrganBrowser(
     data: StorageOrganBrowserUpdateReq
   ): Promise<ResponseData<StorageOrganBrowserModel>> {
-    data.tenant = this.config.tenant;
+    const config = getApp().globalData.config;
+    data.tenant = config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({
       url: "/v1/front/storage/storage_organ_browser/browse",

package/src/app.mpx

@@ -7,8 +7,7 @@ mpx.use(apiProxy, { usePromise: true })
 import { createPinia } from '@mpxjs/pinia';
 createPinia();
 //网络请求和App配置
-import { mpxFetch } from "./utils/request";
-import { config, initConfig } from "./utils/config";
+import { mpxFetch, config, initConfig } from "./index";
 mpx.use(mpxFetch);
 
 createApp({

package/lib/components/auth-user/jmash-user.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/cms/jmash-cms-article-view.mpx.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/core/jmash-login.mpx.d.ts

@@ -1 +0,0 @@
-export {};