jmash-core-mp 0.1.21 → 0.1.22

package/lib/store/user.js

@@ -1,227 +1,227 @@
-import { defineStore } from "@mpxjs/pinia";
-import { authApi } from "../api/auth/index";
-import { db } from "../utils/db";
-import { net } from "../utils/net";
-import mpx from "@mpxjs/core";
-export const useUserStore = defineStore("user", {
-    state: () => ({
-        userInfo: db.getUserInfo() || {},
-        roleCodes: db.getRoleCodes() || [],
-        permCodes: db.getPermCodes() || [],
-        accessToken: db.getToken() || "",
-        expiresDate: db.getTokenExpiresDate() || 0,
-    }),
-    actions: {
-        /** 登录检查 */
-        loginOnlyAC() {
-            // 1. 已登录 → 直接返回成功
-            if (this.checkLogin()) {
-                return Promise.resolve(true);
-            }
-            const config = getApp().globalData.config;
-            // 2. 测试环境特殊配置 → 直接返回失败
-            if (config.dev && config.testNewUser) {
-                return Promise.reject("测试环境，要求用户登录！");
-            }
-            // 3. 执行静默登录
-            return this.silentLogin().then((res) => {
-                return res.status;
-            });
-        },
-        /** 登录检查并跳转登录 */
-        loginAC(backurl, tabbar, loginurl = "/jmash/pages/auth/login") {
-            // 1. 已登录 → 直接 resolve
-            if (this.checkLogin()) {
-                return Promise.resolve(true);
-            }
-            // 2. 拼接登录跳转地址（抽离公共逻辑）
-            const toUrl = `${loginurl}?tabbar=${tabbar}&backurl=${encodeURIComponent(backurl)}`;
-            const config = getApp().globalData.config;
-            // 3. 测试环境特殊处理
-            if (config.dev && config.testNewUser) {
-                mpx.navigateTo({ url: toUrl });
-                return Promise.resolve(false);
-            }
-            // 4. 生产环境：执行静默登录
-            return this.silentLogin()
-                .then((res) => {
-                // 静默登录成功
-                return Promise.resolve(res.status);
-            })
-                .catch(() => {
-                mpx.navigateTo({ url: toUrl });
-                return Promise.resolve(false);
-            });
-        },
-        /** 静默登录 */
-        silentLogin() {
-            const obj = __mpx_mode__ === "ali" ? { scopes: "auth_base" } : {};
-            const config = getApp().globalData.config;
-            return mpx
-                .login(obj)
-                .then((res) => {
-                console.log("silentLogin-res", res);
-                if (res.code) {
-                    return authApi
-                        .mpLogin({
-                        loginCode: res.code,
-                        appId: config.appId,
-                        componentAppid: config.componentAppid,
-                    })
-                        .then(this.loginProcess);
-                }
-                throw new Error("接口登录失败!");
-            })
-                .catch((error) => {
-                console.log("小程序登录失败!", error);
-                return Promise.reject(error);
-            });
-        },
-        // 手机号code 注册登录
-        mpRegister(phoneCode, nickName = "", avatar = "") {
-            const obj = __mpx_mode__ === "ali" ? { scopes: "auth_user" } : {};
-            const config = getApp().globalData.config;
-            return mpx
-                .login(obj)
-                .then((res) => {
-                if (res.code) {
-                    return authApi
-                        .mpPhoneRegister({
-                        phoneCode: phoneCode,
-                        loginCode: res.code,
-                        appId: config.appId,
-                        nickName: nickName,
-                        avatar: avatar,
-                        componentAppid: config.componentAppid,
-                    })
-                        .then(this.loginProcess);
-                }
-                throw new Error("小程序登录失败!");
-            });
-        },
-        //web登录.
-        webLogin(userName, pwd) {
-            // 编码密码
-            const encodePwd = net.encrypt(pwd);
-            return authApi
-                .webLogin({ userName, encodePwd: encodePwd })
-                .then((res) => {
-                return {
-                    status: true,
-                    token: this.loginSuccess(res.data),
-                    message: "登录成功!",
-                };
-            });
-        },
-        // 登录处理
-        loginProcess(resp) {
-            //console.log("miniappLogin", resp);
-            if (resp.statusCode === 200 && resp.data.status === true) {
-                console.log("login success");
-                this.loginSuccess(resp.data.token);
-            }
-            else if (resp.statusCode !== 200) {
-                throw new Error(resp.errMsg);
-            }
-            else if (resp.data.status === false) {
-                throw new Error("用户未注册!");
-            }
-            return resp.data;
-        },
-        loginSuccess(token) {
-            this.accessToken = token.accessToken;
-            this.expiresDate = token.expiresIn * 1000 + new Date().getTime();
-            db.setToken(token);
-            this.getUserInfo(false);
-            this.getRolePerm(false);
-            return token;
-        },
-        // 退出登录，清空状态
-        logout() {
-            db.clearStorage();
-            this.userInfo = {};
-            this.roleCodes = [];
-            this.permCodes = [];
-            this.accessToken = "";
-            this.expiresDate = 0;
-        },
-        /** 检查登录是否有效？ */
-        checkLogin() {
-            if (this.accessToken && !this.isTokenExpires()) {
-                return true;
-            }
-            return false;
-        },
-        //是否Token过期.
-        isTokenExpires() {
-            const expiresDate = this.expiresDate;
-            //无token/无过期时间直接视为过期
-            if (!this.accessToken || !expiresDate)
-                return true;
-            const now = new Date().getTime();
-            return now + 30000 > expiresDate;
-        },
-        // 检查角色
-        checkRole(role) {
-            // 获取roleCodes
-            const roleCodes = this.roleCodes;
-            return roleCodes.length > 0 && roleCodes.indexOf(role) !== -1;
-        },
-        // 获取用户信息
-        getUserInfo(cache = true) {
-            const userInfo = this.userInfo;
-            // 有缓存直接返回
-            if (cache && Object.keys(userInfo).length > 0) {
-                return Promise.resolve(userInfo);
-            }
-            // 无缓存请求接口
-            return authApi
-                .userInfo()
-                .then((resp) => {
-                this.userInfo = resp.data;
-                db.setUserInfo(resp.data);
-                return resp.data;
-            })
-                .catch(() => Promise.reject("获取用户信息错误！"));
-        },
-        setUserInfo(userInfo) {
-            this.userInfo = userInfo;
-            db.setUserInfo(userInfo);
-        },
-        // 获取角色权限
-        getRolePerm(cache = true) {
-            const rolesPerms = {
-                roleCodes: this.roleCodes,
-                permCodes: this.permCodes,
-            };
-            // 有缓存直接返回
-            if (cache &&
-                (rolesPerms.roleCodes.length > 0 || rolesPerms.permCodes.length > 0)) {
-                return Promise.resolve(rolesPerms);
-            }
-            // 无缓存请求接口
-            return authApi
-                .userRolesPerms()
-                .then((response) => {
-                this.roleCodes = response.data.roleCodes;
-                this.permCodes = response.data.permCodes;
-                db.setRoleCodes(response.data.roleCodes);
-                db.setPermCodes(response.data.permCodes);
-                return response.data;
-            })
-                .catch(() => Promise.reject("获取角色权限错误！"));
-        },
-        // 刷新Token.
-        refreshToken() {
-            return authApi
-                .refreshToken()
-                .then((response) => {
-                this.accessToken = response.data.accessToken;
-                this.expiresDate =
-                    response.data.expiresIn * 1000 + new Date().getTime();
-                db.setToken(response.data);
-                return true;
-            });
-        },
-    },
-});
+import { defineStore } from "@mpxjs/pinia";
+import { authApi } from "../api/auth/index";
+import { db } from "../utils/db";
+import { net } from "../utils/net";
+import mpx from "@mpxjs/core";
+export const useUserStore = defineStore("user", {
+    state: () => ({
+        userInfo: db.getUserInfo() || {},
+        roleCodes: db.getRoleCodes() || [],
+        permCodes: db.getPermCodes() || [],
+        accessToken: db.getToken() || "",
+        expiresDate: db.getTokenExpiresDate() || 0,
+    }),
+    actions: {
+        /** 登录检查 */
+        loginOnlyAC() {
+            // 1. 已登录 → 直接返回成功
+            if (this.checkLogin()) {
+                return Promise.resolve(true);
+            }
+            const config = getApp().globalData.config;
+            // 2. 测试环境特殊配置 → 直接返回失败
+            if (config.dev && config.testNewUser) {
+                return Promise.reject("测试环境，要求用户登录！");
+            }
+            // 3. 执行静默登录
+            return this.silentLogin().then((res) => {
+                return res.status;
+            });
+        },
+        /** 登录检查并跳转登录 */
+        loginAC(backurl, tabbar, loginurl = "/jmash/pages/auth/login") {
+            // 1. 已登录 → 直接 resolve
+            if (this.checkLogin()) {
+                return Promise.resolve(true);
+            }
+            // 2. 拼接登录跳转地址（抽离公共逻辑）
+            const toUrl = `${loginurl}?tabbar=${tabbar}&backurl=${encodeURIComponent(backurl)}`;
+            const config = getApp().globalData.config;
+            // 3. 测试环境特殊处理
+            if (config.dev && config.testNewUser) {
+                mpx.navigateTo({ url: toUrl });
+                return Promise.resolve(false);
+            }
+            // 4. 生产环境：执行静默登录
+            return this.silentLogin()
+                .then((res) => {
+                // 静默登录成功
+                return Promise.resolve(res.status);
+            })
+                .catch(() => {
+                mpx.navigateTo({ url: toUrl });
+                return Promise.resolve(false);
+            });
+        },
+        /** 静默登录 */
+        silentLogin() {
+            const obj = __mpx_mode__ === "ali" ? { scopes: "auth_base" } : {};
+            const config = getApp().globalData.config;
+            return mpx
+                .login(obj)
+                .then((res) => {
+                console.log("silentLogin-res", res);
+                if (res.code) {
+                    return authApi
+                        .mpLogin({
+                        loginCode: res.code,
+                        appId: config.appId,
+                        componentAppid: config.componentAppid,
+                    })
+                        .then(this.loginProcess);
+                }
+                throw new Error("接口登录失败!");
+            })
+                .catch((error) => {
+                console.log("小程序登录失败!", error);
+                return Promise.reject(error);
+            });
+        },
+        // 手机号code 注册登录
+        mpRegister(phoneCode, nickName = "", avatar = "") {
+            const obj = __mpx_mode__ === "ali" ? { scopes: "auth_user" } : {};
+            const config = getApp().globalData.config;
+            return mpx
+                .login(obj)
+                .then((res) => {
+                if (res.code) {
+                    return authApi
+                        .mpPhoneRegister({
+                        phoneCode: phoneCode,
+                        loginCode: res.code,
+                        appId: config.appId,
+                        nickName: nickName,
+                        avatar: avatar,
+                        componentAppid: config.componentAppid,
+                    })
+                        .then(this.loginProcess);
+                }
+                throw new Error("小程序登录失败!");
+            });
+        },
+        //web登录.
+        webLogin(userName, pwd) {
+            // 编码密码
+            const encodePwd = net.encrypt(pwd);
+            return authApi
+                .webLogin({ userName, encodePwd: encodePwd })
+                .then((res) => {
+                return {
+                    status: true,
+                    token: this.loginSuccess(res.data),
+                    message: "登录成功!",
+                };
+            });
+        },
+        // 登录处理
+        loginProcess(resp) {
+            //console.log("miniappLogin", resp);
+            if (resp.statusCode === 200 && resp.data.status === true) {
+                console.log("login success");
+                this.loginSuccess(resp.data.token);
+            }
+            else if (resp.statusCode !== 200) {
+                throw new Error(resp.errMsg);
+            }
+            else if (resp.data.status === false) {
+                throw new Error("用户未注册!");
+            }
+            return resp.data;
+        },
+        loginSuccess(token) {
+            this.accessToken = token.accessToken;
+            this.expiresDate = token.expiresIn * 1000 + new Date().getTime();
+            db.setToken(token);
+            this.getUserInfo(false);
+            this.getRolePerm(false);
+            return token;
+        },
+        // 退出登录，清空状态
+        logout() {
+            db.clearStorage();
+            this.userInfo = {};
+            this.roleCodes = [];
+            this.permCodes = [];
+            this.accessToken = "";
+            this.expiresDate = 0;
+        },
+        /** 检查登录是否有效？ */
+        checkLogin() {
+            if (this.accessToken && !this.isTokenExpires()) {
+                return true;
+            }
+            return false;
+        },
+        //是否Token过期.
+        isTokenExpires() {
+            const expiresDate = this.expiresDate;
+            //无token/无过期时间直接视为过期
+            if (!this.accessToken || !expiresDate)
+                return true;
+            const now = new Date().getTime();
+            return now + 30000 > expiresDate;
+        },
+        // 检查角色
+        checkRole(role) {
+            // 获取roleCodes
+            const roleCodes = this.roleCodes;
+            return roleCodes.length > 0 && roleCodes.indexOf(role) !== -1;
+        },
+        // 获取用户信息
+        getUserInfo(cache = true) {
+            const userInfo = this.userInfo;
+            // 有缓存直接返回
+            if (cache && Object.keys(userInfo).length > 0) {
+                return Promise.resolve(userInfo);
+            }
+            // 无缓存请求接口
+            return authApi
+                .userInfo()
+                .then((resp) => {
+                this.userInfo = resp.data;
+                db.setUserInfo(resp.data);
+                return resp.data;
+            })
+                .catch(() => Promise.reject("获取用户信息错误！"));
+        },
+        setUserInfo(userInfo) {
+            this.userInfo = userInfo;
+            db.setUserInfo(userInfo);
+        },
+        // 获取角色权限
+        getRolePerm(cache = true) {
+            const rolesPerms = {
+                roleCodes: this.roleCodes,
+                permCodes: this.permCodes,
+            };
+            // 有缓存直接返回
+            if (cache &&
+                (rolesPerms.roleCodes.length > 0 || rolesPerms.permCodes.length > 0)) {
+                return Promise.resolve(rolesPerms);
+            }
+            // 无缓存请求接口
+            return authApi
+                .userRolesPerms()
+                .then((response) => {
+                this.roleCodes = response.data.roleCodes;
+                this.permCodes = response.data.permCodes;
+                db.setRoleCodes(response.data.roleCodes);
+                db.setPermCodes(response.data.permCodes);
+                return response.data;
+            })
+                .catch(() => Promise.reject("获取角色权限错误！"));
+        },
+        // 刷新Token.
+        refreshToken() {
+            return authApi
+                .refreshToken()
+                .then((response) => {
+                this.accessToken = response.data.accessToken;
+                this.expiresDate =
+                    response.data.expiresIn * 1000 + new Date().getTime();
+                db.setToken(response.data);
+                return true;
+            });
+        },
+    },
+});

package/lib/utils/common.d.ts

@@ -1,35 +1,35 @@
-export declare const getHeight: () => {
-    navigationPaddingHeight: number;
-    topHeight: number;
-    bottomHeight: number;
-    MenuButtonRight: number;
-    MenuButtonLeft: number;
-    MenuButtonTop: number;
-    MenuButtonBottom: number;
-    MenuButtonWidth: number;
-    MenuButtonHeight: number;
-    MenuButtonBounding: number;
-    screenWidth: number;
-    screenHeight: number;
-    computeHeightFn: (height: number, stackingHeight: number) => number;
-    addition: (height: number, addHeight: number) => number;
-};
-/**
- * 格式化日期时间字符串
- * @param dateTimeString 日期时间字符串
- * @returns 格式化后的日期时间字符串
- */
-export declare const formatDateTime: (dateTimeString: string, format?: any) => string;
-/**
- * 正则校验规则
- * @param {string} value 需要校验的值
- * @param {string} message 错误提示信息
- * @param {string} rules 正则校验规则
- */
-export declare const validateRules: (value: string, message: string, rules: any) => boolean;
-/**
- * 校验必填项
- * @param {string} value 需要校验的值
- * @param {string} message 错误提示信息
- */
-export declare const validateRequired: (value: string | number, message: string) => boolean;
+export declare const getHeight: () => {
+    navigationPaddingHeight: number;
+    topHeight: number;
+    bottomHeight: number;
+    MenuButtonRight: number;
+    MenuButtonLeft: number;
+    MenuButtonTop: number;
+    MenuButtonBottom: number;
+    MenuButtonWidth: number;
+    MenuButtonHeight: number;
+    MenuButtonBounding: number;
+    screenWidth: number;
+    screenHeight: number;
+    computeHeightFn: (height: number, stackingHeight: number) => number;
+    addition: (height: number, addHeight: number) => number;
+};
+/**
+ * 格式化日期时间字符串
+ * @param dateTimeString 日期时间字符串
+ * @returns 格式化后的日期时间字符串
+ */
+export declare const formatDateTime: (dateTimeString: string, format?: any) => string;
+/**
+ * 正则校验规则
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ * @param {string} rules 正则校验规则
+ */
+export declare const validateRules: (value: string, message: string, rules: any) => boolean;
+/**
+ * 校验必填项
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ */
+export declare const validateRequired: (value: string | number, message: string) => boolean;