xyvcard-wechat-auth 0.0.24 → 0.0.27

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

@@ -12,7 +12,7 @@ declare class AuthApiImpl {
     updateUser(data: any): Promise<ResponseData<any>>;
     updatePwd(encodeOldPwd: string, encodeNewPwd: string): Promise<ResponseData<any>>;
     deptTree(deptId?: string): Promise<ResponseData<any>>;
-    jobTree(): Promise<ResponseData<any>>;
+    jobTree(jobId?: string): Promise<ResponseData<any>>;
     updateUserInfo(data: UpdateUserReq): Promise<ResponseData<UserInfo>>;
     replaceBindphone(data: PhoneNumberReq): Promise<ResponseData<boolean>>;
     findUserInfo(data: UserInfoReq): Promise<ResponseData<UserInfo>>;

package/dist/api/auth/index.js

@@ -111,11 +111,12 @@ class AuthApiImpl {
     });
   }
   // 职务Tree
-  jobTree() {
+  jobTree(jobId) {
     const query = {
       tenant: db.getUserTenant(),
       roleType: "job",
-      hasRoleType: true
+      hasRoleType: true,
+      excludeId: jobId
     };
     return request({
       url: "/v1/rbac/role/treelist",

package/dist/api/auth/types.d.ts

@@ -56,3 +56,14 @@ export interface UpdateUserReq {
 export interface UserInfoReq {
     tenant?: string;
 }
+export interface RoleModel {
+    roleId?: string;
+    roleName?: string;
+    roleType?: string;
+}
+export interface DeptModel {
+    deptId?: string;
+    deptName?: string;
+    deptType?: string;
+    parentId?: string;
+}

package/dist/components/common/auth-popup/index.wxss

@@ -1 +1 @@
-.auth-mask-box{position:fixed;left:0;top:0;bottom:0;right:0;width:100%;background-color:rgba(0,0,0,.5);z-index:99999}.auth-mask-popup{position:fixed;bottom:0;left:0;padding:0 30rpx env(safe-area-inset-bottom);box-sizing:border-box;z-index:99999}.auth-mask-popup .popup-title{color:#333;font-size:28rpx;padding:40rpx 20rpx 20rpx;font-weight:bold;display:flex;align-items:center;justify-content:space-between}.auth-mask-popup .popup-title .close-icon{width:40rpx;height:40rpx}
+.auth-mask-box{position:fixed;left:0;top:0;bottom:0;right:0;width:100%;background-color:rgba(0,0,0,.5);z-index:99999}.auth-mask-popup{position:fixed;bottom:0;left:0;width:92%;padding:0 30rpx env(safe-area-inset-bottom);box-sizing:border-box;z-index:99999}.auth-mask-popup .popup-title{color:#333;font-size:28rpx;padding:20px 10px 10px;font-weight:bold;display:flex;align-items:center;justify-content:space-between}.auth-mask-popup .popup-title .close-icon{width:40rpx;height:40rpx}

package/dist/components/jmash-login/index.js

@@ -31,7 +31,7 @@ Component({
     // 登录后跳转方式 "redirectTo switchTab reLaunch navigateTo"
     linkType: {
       type: String,
-      value: ""
+      value: "redirectTo"
     },
     //遮罩层效果
     isShowModel: {
@@ -76,7 +76,6 @@ Component({
       if (event.detail.errMsg === "getPhoneNumber:ok") {
         console.log(event.detail.code);
         auth.phoneCodeLogin(event.detail.code).then((resp) => {
-          console.log(resp);
           if (resp.status == false) {
             wx.showToast({
               title: resp.message ? resp.message : "登录失败联系管理员",
@@ -85,22 +84,15 @@ Component({
             });
             return;
           }
+          const backurl = decodeURIComponent(this.properties.backurl);
           if (this.properties.linkType === "switchTab") {
-            wx.switchTab({
-              url: this.properties.backurl
-            });
+            wx.switchTab({ url: backurl });
           } else if (this.properties.linkType === "navigateTo") {
-            wx.navigateTo({
-              url: this.properties.backurl
-            });
+            wx.navigateTo({ url: backurl });
           } else if (this.properties.linkType === "reLaunch") {
-            wx.reLaunch({
-              url: this.properties.backurl
-            });
+            wx.reLaunch({ url: backurl });
           } else {
-            wx.redirectTo({
-              url: this.properties.backurl
-            });
+            wx.redirectTo({ url: backurl });
           }
         });
       } else {

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export type { RequestData, ResponseData, RequestHeader, CustomEvent } from "./ap
 export { Dict } from "./api/index";
 export { EntryDict, EnumDict } from "./api/dicts";
 export { authApi } from "./api/auth/index";
-export type { LoginReq, LoginRes, PhoneNumberReq, RefreshTokenReq, TokenRes, RolesPerms, UserInfo, UpdateUserReq, UserInfoReq } from "./api/auth/types";
+export type { LoginReq, LoginRes, PhoneNumberReq, RefreshTokenReq, TokenRes, RolesPerms, UserInfo, UpdateUserReq, UserInfoReq, RoleModel, DeptModel } from "./api/auth/types";
 export { dictApi } from "./api/dict/index";
 export type { Entry, DictEntryModel, DictEntryReq } from "./api/dict/types";
 export { fileApi } from "./api/files/index";

package/dist/utils/auth.js

@@ -29,13 +29,11 @@ class Auth {
         resolve(true);
         return;
       }
+      let toUrl = loginurl + "?tabbar=" + (tabbar ? "true" : "false");
+      toUrl += "&backurl=" + encodeURIComponent(backurl);
       if (config.dev && config.testNewUser) {
         reject(false);
-        let toUrl = loginurl + "?tabbar=" + (tabbar ? "true" : "false");
-        toUrl += "&backurl=" + backurl;
-        wx.navigateTo({
-          url: toUrl
-        });
+        wx.navigateTo({ url: toUrl });
         return;
       }
       this.silentLogin().then((res) => {
@@ -43,11 +41,7 @@ class Auth {
           resolve(true);
         } else {
           reject(false);
-          let toUrl = loginurl + "?tabbar=" + (tabbar ? "true" : "false");
-          toUrl += "&backurl=" + backurl;
-          wx.navigateTo({
-            url: toUrl
-          });
+          wx.navigateTo({ url: toUrl });
         }
       });
     });
@@ -131,20 +125,18 @@ class Auth {
               appId: config.appId,
               nickName,
               componentAppid: config.componentAppid
-            }).then(
-              (resp) => {
-                console.log("phoneCodeLogin-res", resp);
-                if (resp.code === 200 && resp.data.status === true) {
-                  db.loginStorage(resp.data);
-                  console.log("login success");
-                  this.getRolePerm().then(() => {
-                    resolve(resp.data);
-                  });
-                } else {
-                  reject(resp.message);
-                }
+            }).then((resp) => {
+              console.log("phoneCodeLogin-res", resp);
+              if (resp.code === 200 && resp.data.status === true) {
+                db.loginStorage(resp.data);
+                console.log("login success");
+                this.getRolePerm().then(() => {
+                  resolve(resp.data);
+                });
+              } else {
+                reject(resp.message);
               }
-            );
+            });
           }
         },
         fail: (fail) => {
@@ -157,7 +149,10 @@ class Auth {
   // 获取角色
   getRolePerm(cache = true) {
     return new Promise((resolve, reject) => {
-      let rolesPerms = { roleCodes: db.getRoleCodes(), permCodes: db.getPermCodes() };
+      let rolesPerms = {
+        roleCodes: db.getRoleCodes(),
+        permCodes: db.getPermCodes()
+      };
       if (cache && (Object.keys(rolesPerms.roleCodes).length > 0 || Object.keys(rolesPerms.permCodes).length > 0)) {
         resolve(rolesPerms);
         return;

package/dist/utils/config.js

@@ -2,8 +2,8 @@ const https = "https://";
 const host = "gh.sooyie.cn";
 const agentUrl = "/v1/file/path/wxapp";
 const config = {
-  dev: true,
-  testNewUser: true,
+  dev: false,
+  testNewUser: false,
   name: "Jmash框架",
   baseUrl: https + host,
   // 接口域名

package/dist/utils/request.d.ts

@@ -1,5 +1,4 @@
 import { RequestData, ResponseData, RequestHeader } from "../api/types";
-declare const request: (options?: RequestData<any>, tenant?: string) => Promise<ResponseData<any>>;
-declare const sendRequest: (options: RequestData<any>, header: RequestHeader) => Promise<ResponseData<any>>;
-declare function clearEmpty(params: any): any;
-export { request, sendRequest, clearEmpty };
+export declare const request: (options?: RequestData<any>, tenant?: string) => Promise<ResponseData<any>>;
+export declare const sendRequest: (options: RequestData<any>, header: RequestHeader) => Promise<ResponseData<any>>;
+export declare function clearEmpty(params: any): any;

package/dist/utils/request.js

@@ -24,7 +24,7 @@ const request = async (options = {}, tenant = "") => {
   try {
     let header = {
       "content-type": "application/json",
-      "Authorization": db.getBearerToken(),
+      Authorization: db.getBearerToken(),
       "Grpc-Metadata-Tenant": tenant
     };
     const response = await sendRequest(options, header);
@@ -67,15 +67,14 @@ const sendRequest = (options, header) => {
 };
 function clearEmpty(params) {
   for (const key in params) {
-    if (typeof params[key] === "object") {
-      clearEmpty(params[key]);
-    }
-    if (typeof params[key] === "object" && Object.keys(params[key]).length === 0) {
-      delete params[key];
-    }
-    if (params[key] === "") {
-      delete params[key];
+    if (params[key] !== null && typeof params[key] === "object") {
+      if (Object.keys(params[key]).length === 0) {
+        delete params[key];
+      } else {
+        clearEmpty(params[key]);
+      }
     }
+    if ([void 0, null, ""].includes(params[key])) delete params[key];
   }
   return params;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-wechat-auth",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",