jmash-core-mp 0.1.21 → 0.1.22

package/src/utils/common.ts

@@ -1,179 +1,179 @@
-import mpx from "@mpxjs/core";
-
-// 获取不同手机的顶部/底部高度
-export const getHeight = () => {
-  // 手机顶部电量等信息的高度+7 状态栏的高度+7
-  let navigationPaddingHeight = 0;
-  // 顶部整体高度(包括胶囊球高度)
-  let topHeight = 0;
-  // 手机底部的安全距离
-  let bottomHeight = 0;
-  // 胶囊球右边界到手机左侧的坐标-坐标信息以屏幕左上角为原点
-  let MenuButtonRight = 0;
-  // 胶囊球左边界到手机左侧的坐标-坐标信息以屏幕左上角为原点
-  let MenuButtonLeft = 0;
-  // 胶囊球上边界到手机顶部的坐标-坐标信息以屏幕左上角为原点
-  let MenuButtonTop = 0;
-  // 胶囊球下边界到手机顶部的坐标-坐标信息以屏幕左上角为原点
-  let MenuButtonBottom = 0;
-  // 胶囊球宽度
-  let MenuButtonWidth = 0;
-  // 胶囊球高度
-  let MenuButtonHeight = 0;
-  // 状态栏的高度
-  let MenuButtonBounding = 0;
-  // 屏幕宽度
-  let screenWidth = 0;
-  // 屏幕高度
-  let screenHeight = 0;
-  try {
-    MenuButtonHeight = mpx.getMenuButtonBoundingClientRect().height
-      ? mpx.getMenuButtonBoundingClientRect().height
-      : 0;
-    navigationPaddingHeight =
-      mpx.getWindowInfo().statusBarHeight + 7
-        ? mpx.getWindowInfo().statusBarHeight + 7
-        : 0;
-    topHeight = MenuButtonHeight + navigationPaddingHeight;
-    bottomHeight =
-      mpx.getWindowInfo().screenHeight - mpx.getWindowInfo().safeArea.bottom
-        ? mpx.getWindowInfo().screenHeight - mpx.getWindowInfo().safeArea.bottom
-        : 0;
-    MenuButtonRight = mpx.getMenuButtonBoundingClientRect().right;
-    MenuButtonLeft = mpx.getMenuButtonBoundingClientRect().left;
-    MenuButtonTop = mpx.getMenuButtonBoundingClientRect().top;
-    MenuButtonBottom = mpx.getMenuButtonBoundingClientRect().bottom;
-    MenuButtonWidth = mpx.getMenuButtonBoundingClientRect().width;
-    MenuButtonBounding = mpx.getWindowInfo().statusBarHeight;
-    screenWidth = mpx.getWindowInfo().screenWidth;
-    screenHeight = mpx.getWindowInfo().screenHeight;
-  } catch (error) {
-    console.log("getHeight", error);
-  }
-
-  /**
-   * 判断手机型号如果没有底部横线的时候,添加的默认高度
-   * @param height 本身计算的高度
-   * @param stackingHeight 需要叠加的高度
-   */
-  function computeHeightFn(height: number, stackingHeight: number) {
-    return height !== 0 ? height : height + stackingHeight;
-  }
-  /**
-   * 原有基础上添加高度
-   * @param height 本身计算的高度
-   * @param addHeight 相加的高度
-   */
-  function addition(height: number, addHeight: number) {
-    return height + addHeight;
-  }
-  return {
-    navigationPaddingHeight,
-    topHeight,
-    bottomHeight,
-    MenuButtonRight,
-    MenuButtonLeft,
-    MenuButtonTop,
-    MenuButtonBottom,
-    MenuButtonWidth,
-    MenuButtonHeight,
-    MenuButtonBounding,
-    screenWidth,
-    screenHeight,
-    computeHeightFn,
-    addition,
-  };
-};
-
-/**
- * 格式化日期时间字符串
- * @param dateTimeString 日期时间字符串
- * @returns 格式化后的日期时间字符串
- */
-export const formatDateTime = (dateTimeString: string, format?: any) => {
-  const date = new Date(dateTimeString);
-  // 如果日期无效（即日期为Invalid Date），则返回一个空字符串或默认值
-  if (isNaN(date.getTime())) {
-    return "";
-  }
-  const year = date.getFullYear();
-  const month = ("0" + (date.getMonth() + 1)).slice(-2);
-  const day = ("0" + date.getDate()).slice(-2);
-  const hours = ("0" + date.getHours()).slice(-2);
-  const minutes = ("0" + date.getMinutes()).slice(-2);
-  const seconds = ("0" + date.getSeconds()).slice(-2);
-  if (format === "YYYY-MM-DD HH:mm:ss") {
-    return (
-      year +
-      "-" +
-      month +
-      "-" +
-      day +
-      " " +
-      hours +
-      ":" +
-      minutes +
-      ":" +
-      seconds
-    );
-  }
-  if (format === "YYYY-MM-DD HH:mm") {
-    return year + "-" + month + "-" + day + " " + hours + ":" + minutes;
-  }
-  if (format === "YYYY-MM-DD") {
-    return year + "-" + month + "-" + day;
-  }
-  if (format === "HH:mm:ss") {
-    return hours + ":" + minutes + ":" + seconds;
-  }
-  if (format === "HH:mm") {
-    return hours + ":" + minutes;
-  }
-  return "";
-};
-
-/**
- * 正则校验规则
- * @param {string} value 需要校验的值
- * @param {string} message 错误提示信息
- * @param {string} rules 正则校验规则
- */
-export const validateRules = (
-  value: string,
-  message: string,
-  rules: any
-): boolean => {
-  if (value && !rules.test(value)) {
-    // 显示错误提示
-    mpx.showToast({
-      title: message,
-      icon: "none",
-      duration: 2000,
-    });
-    return false;
-  }
-  return true;
-};
-
-/**
- * 校验必填项
- * @param {string} value 需要校验的值
- * @param {string} message 错误提示信息
- */
-export const validateRequired = (
-  value: string | number,
-  message: string
-): boolean => {
-  console.log(value, message);
-  const valueStr = typeof value === "number" ? String(value) : value;
-  if (!valueStr || valueStr.trim() === "") {
-    // 显示错误提示
-    mpx.showToast({
-      title: message,
-      icon: "none",
-      duration: 2000,
-    });
-    return false;
-  }
-  return true;
-};
+import mpx from "@mpxjs/core";
+
+// 获取不同手机的顶部/底部高度
+export const getHeight = () => {
+  // 手机顶部电量等信息的高度+7 状态栏的高度+7
+  let navigationPaddingHeight = 0;
+  // 顶部整体高度(包括胶囊球高度)
+  let topHeight = 0;
+  // 手机底部的安全距离
+  let bottomHeight = 0;
+  // 胶囊球右边界到手机左侧的坐标-坐标信息以屏幕左上角为原点
+  let MenuButtonRight = 0;
+  // 胶囊球左边界到手机左侧的坐标-坐标信息以屏幕左上角为原点
+  let MenuButtonLeft = 0;
+  // 胶囊球上边界到手机顶部的坐标-坐标信息以屏幕左上角为原点
+  let MenuButtonTop = 0;
+  // 胶囊球下边界到手机顶部的坐标-坐标信息以屏幕左上角为原点
+  let MenuButtonBottom = 0;
+  // 胶囊球宽度
+  let MenuButtonWidth = 0;
+  // 胶囊球高度
+  let MenuButtonHeight = 0;
+  // 状态栏的高度
+  let MenuButtonBounding = 0;
+  // 屏幕宽度
+  let screenWidth = 0;
+  // 屏幕高度
+  let screenHeight = 0;
+  try {
+    MenuButtonHeight = mpx.getMenuButtonBoundingClientRect().height
+      ? mpx.getMenuButtonBoundingClientRect().height
+      : 0;
+    navigationPaddingHeight =
+      mpx.getWindowInfo().statusBarHeight + 7
+        ? mpx.getWindowInfo().statusBarHeight + 7
+        : 0;
+    topHeight = MenuButtonHeight + navigationPaddingHeight;
+    bottomHeight =
+      mpx.getWindowInfo().screenHeight - mpx.getWindowInfo().safeArea.bottom
+        ? mpx.getWindowInfo().screenHeight - mpx.getWindowInfo().safeArea.bottom
+        : 0;
+    MenuButtonRight = mpx.getMenuButtonBoundingClientRect().right;
+    MenuButtonLeft = mpx.getMenuButtonBoundingClientRect().left;
+    MenuButtonTop = mpx.getMenuButtonBoundingClientRect().top;
+    MenuButtonBottom = mpx.getMenuButtonBoundingClientRect().bottom;
+    MenuButtonWidth = mpx.getMenuButtonBoundingClientRect().width;
+    MenuButtonBounding = mpx.getWindowInfo().statusBarHeight;
+    screenWidth = mpx.getWindowInfo().screenWidth;
+    screenHeight = mpx.getWindowInfo().screenHeight;
+  } catch (error) {
+    console.log("getHeight", error);
+  }
+
+  /**
+   * 判断手机型号如果没有底部横线的时候,添加的默认高度
+   * @param height 本身计算的高度
+   * @param stackingHeight 需要叠加的高度
+   */
+  function computeHeightFn(height: number, stackingHeight: number) {
+    return height !== 0 ? height : height + stackingHeight;
+  }
+  /**
+   * 原有基础上添加高度
+   * @param height 本身计算的高度
+   * @param addHeight 相加的高度
+   */
+  function addition(height: number, addHeight: number) {
+    return height + addHeight;
+  }
+  return {
+    navigationPaddingHeight,
+    topHeight,
+    bottomHeight,
+    MenuButtonRight,
+    MenuButtonLeft,
+    MenuButtonTop,
+    MenuButtonBottom,
+    MenuButtonWidth,
+    MenuButtonHeight,
+    MenuButtonBounding,
+    screenWidth,
+    screenHeight,
+    computeHeightFn,
+    addition,
+  };
+};
+
+/**
+ * 格式化日期时间字符串
+ * @param dateTimeString 日期时间字符串
+ * @returns 格式化后的日期时间字符串
+ */
+export const formatDateTime = (dateTimeString: string, format?: any) => {
+  const date = new Date(dateTimeString);
+  // 如果日期无效（即日期为Invalid Date），则返回一个空字符串或默认值
+  if (isNaN(date.getTime())) {
+    return "";
+  }
+  const year = date.getFullYear();
+  const month = ("0" + (date.getMonth() + 1)).slice(-2);
+  const day = ("0" + date.getDate()).slice(-2);
+  const hours = ("0" + date.getHours()).slice(-2);
+  const minutes = ("0" + date.getMinutes()).slice(-2);
+  const seconds = ("0" + date.getSeconds()).slice(-2);
+  if (format === "YYYY-MM-DD HH:mm:ss") {
+    return (
+      year +
+      "-" +
+      month +
+      "-" +
+      day +
+      " " +
+      hours +
+      ":" +
+      minutes +
+      ":" +
+      seconds
+    );
+  }
+  if (format === "YYYY-MM-DD HH:mm") {
+    return year + "-" + month + "-" + day + " " + hours + ":" + minutes;
+  }
+  if (format === "YYYY-MM-DD") {
+    return year + "-" + month + "-" + day;
+  }
+  if (format === "HH:mm:ss") {
+    return hours + ":" + minutes + ":" + seconds;
+  }
+  if (format === "HH:mm") {
+    return hours + ":" + minutes;
+  }
+  return "";
+};
+
+/**
+ * 正则校验规则
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ * @param {string} rules 正则校验规则
+ */
+export const validateRules = (
+  value: string,
+  message: string,
+  rules: any
+): boolean => {
+  if (value && !rules.test(value)) {
+    // 显示错误提示
+    mpx.showToast({
+      title: message,
+      icon: "none",
+      duration: 2000,
+    });
+    return false;
+  }
+  return true;
+};
+
+/**
+ * 校验必填项
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ */
+export const validateRequired = (
+  value: string | number,
+  message: string
+): boolean => {
+  console.log(value, message);
+  const valueStr = typeof value === "number" ? String(value) : value;
+  if (!valueStr || valueStr.trim() === "") {
+    // 显示错误提示
+    mpx.showToast({
+      title: message,
+      icon: "none",
+      duration: 2000,
+    });
+    return false;
+  }
+  return true;
+};

package/src/utils/config.ts

@@ -1,35 +1,35 @@
-import { AppConfig } from "../api/types";
-import mpx from "@mpxjs/core";
-
-const defaultConfig: AppConfig = {
-  name: "Jmash Core MPX",
-  dev: true,
-  testNewUser: false,
-  tenant: "xyvcard",
-  baseUrl: "https://mm.sooyie.cn",
-  resourceUrl: "https://mm.sooyie.cn/v1/file/path/wxapp",
-  appId: "",
-  componentAppid: "wxe1b784ea80c01f40",
-  wechatComponentAppId: "",
-  wechatAppId: "",
-  wechatBiz: "",
-  siteId: "c0a28f0f-023a-420b-b4e8-0ce138ac8269",
-};
-
-const config: AppConfig = { ...defaultConfig };
-
-function setConfig(cfg: Partial<AppConfig>) {
-  Object.assign(config, cfg);
-}
-
-function initConfig(config: Partial<AppConfig>, mode: string) {
-  if (__mpx_mode__ !== "web") {
-    // 只有运行时才能调用
-    const accountInfo = mpx.getAccountInfoSync();
-    // 微信
-    config.appId = accountInfo.miniProgram.appId;
-  }
-  return config;
-}
-
-export { config, setConfig, initConfig };
+import { AppConfig } from "../api/types";
+import mpx from "@mpxjs/core";
+
+const defaultConfig: AppConfig = {
+  name: "Jmash Core MPX",
+  dev: true,
+  testNewUser: false,
+  tenant: "xyvcard",
+  baseUrl: "https://mm.sooyie.cn",
+  resourceUrl: "https://mm.sooyie.cn/v1/file/path/wxapp",
+  appId: "",
+  componentAppid: "wxe1b784ea80c01f40",
+  wechatComponentAppId: "",
+  wechatAppId: "",
+  wechatBiz: "",
+  siteId: "c0a28f0f-023a-420b-b4e8-0ce138ac8269",
+};
+
+const config: AppConfig = { ...defaultConfig };
+
+function setConfig(cfg: Partial<AppConfig>) {
+  Object.assign(config, cfg);
+}
+
+function initConfig(config: Partial<AppConfig>, mode: string) {
+  if (__mpx_mode__ !== "web") {
+    // 只有运行时才能调用
+    const accountInfo = mpx.getAccountInfoSync();
+    // 微信
+    config.appId = accountInfo.miniProgram.appId;
+  }
+  return config;
+}
+
+export { config, setConfig, initConfig };

package/src/utils/db.ts

@@ -1,100 +1,100 @@
-import mpx from "@mpxjs/core";
-import type { TokenModel, UserInfo } from "../api/auth/types";
-
-// 本地存储
-class LocalStorage {
-  // 获取token
-  getToken(): string {
-    return mpx.getStorageSync("token");
-  }
-  // 用户租户
-  getUserTenant(): string {
-    return this.getUserInfo().storage as string;
-  }
-  //获取组织租户
-  getOrganTenant(tenant: string): string {
-    return mpx.getStorageSync("OrganTenant:" + tenant);
-  }
-
-  //是否Token过期.
-  isTokenExpires(): boolean {
-    const expiresDate = this.getTokenExpiresDate();
-    if (this.getToken() && expiresDate) {
-      const now = new Date().getTime();
-      //提前30秒过期.
-      return now + 30000 > expiresDate;
-    }
-    return true;
-  }
-
-  // 获取刷新token
-  getRefreshToken(): string {
-    return mpx.getStorageSync("refreshToken");
-  }
-
-  // 删除刷新token
-  removeRefreshToken() {
-    mpx.removeStorageSync("refreshToken");
-  }
-
-  // 获取Token 过期时间
-  getTokenExpiresDate(): number {
-    return mpx.getStorageSync("expiresDate");
-  }
-
-  // 设置token
-  setToken(data: TokenModel) {
-    mpx.setStorageSync("token", data.accessToken);
-    mpx.setStorageSync("expiresIn", data.expiresIn);
-    mpx.setStorageSync("refreshToken", data.refreshToken);
-    const expiresDate = new Date().getTime() + data.expiresIn * 1000;
-    mpx.setStorageSync("expiresDate", expiresDate);
-  }
-
-  // 清理本地缓存
-  clearStorage(): void {
-    mpx.clearStorage();
-  }
-
-  // 获取Bearer 格式请求Token
-  getBearerToken(): string {
-    const token = this.getToken();
-    if (token) {
-      return "Bearer " + token;
-    }
-    return "";
-  }
-
-  // 获取用户信息
-  getUserInfo() {
-    return mpx.getStorageSync("userInfo") || {};
-  }
-
-  // 设置用户信息
-  setUserInfo(data: UserInfo) {
-    mpx.setStorageSync("userInfo", data);
-  }
-
-  // 获取角色列表
-  getRoleCodes() {
-    return mpx.getStorageSync("roleCodes") || [];
-  }
-
-  // 设置角色列表
-  setRoleCodes(codes: string[]) {
-    mpx.setStorageSync("roleCodes", codes);
-  }
-
-  // 获取权限列表
-  getPermCodes() {
-    return mpx.getStorageSync("permCodes") || [];
-  }
-
-  // 设置权限列表
-  setPermCodes(codes: string[]) {
-    mpx.setStorageSync("permCodes", codes);
-  }
-}
-
-const db = new LocalStorage();
-export { db };
+import mpx from "@mpxjs/core";
+import type { TokenModel, UserInfo } from "../api/auth/types";
+
+// 本地存储
+class LocalStorage {
+  // 获取token
+  getToken(): string {
+    return mpx.getStorageSync("token");
+  }
+  // 用户租户
+  getUserTenant(): string {
+    return this.getUserInfo().storage as string;
+  }
+  //获取组织租户
+  getOrganTenant(tenant: string): string {
+    return mpx.getStorageSync("OrganTenant:" + tenant);
+  }
+
+  //是否Token过期.
+  isTokenExpires(): boolean {
+    const expiresDate = this.getTokenExpiresDate();
+    if (this.getToken() && expiresDate) {
+      const now = new Date().getTime();
+      //提前30秒过期.
+      return now + 30000 > expiresDate;
+    }
+    return true;
+  }
+
+  // 获取刷新token
+  getRefreshToken(): string {
+    return mpx.getStorageSync("refreshToken");
+  }
+
+  // 删除刷新token
+  removeRefreshToken() {
+    mpx.removeStorageSync("refreshToken");
+  }
+
+  // 获取Token 过期时间
+  getTokenExpiresDate(): number {
+    return mpx.getStorageSync("expiresDate");
+  }
+
+  // 设置token
+  setToken(data: TokenModel) {
+    mpx.setStorageSync("token", data.accessToken);
+    mpx.setStorageSync("expiresIn", data.expiresIn);
+    mpx.setStorageSync("refreshToken", data.refreshToken);
+    const expiresDate = new Date().getTime() + data.expiresIn * 1000;
+    mpx.setStorageSync("expiresDate", expiresDate);
+  }
+
+  // 清理本地缓存
+  clearStorage(): void {
+    mpx.clearStorage();
+  }
+
+  // 获取Bearer 格式请求Token
+  getBearerToken(): string {
+    const token = this.getToken();
+    if (token) {
+      return "Bearer " + token;
+    }
+    return "";
+  }
+
+  // 获取用户信息
+  getUserInfo() {
+    return mpx.getStorageSync("userInfo") || {};
+  }
+
+  // 设置用户信息
+  setUserInfo(data: UserInfo) {
+    mpx.setStorageSync("userInfo", data);
+  }
+
+  // 获取角色列表
+  getRoleCodes() {
+    return mpx.getStorageSync("roleCodes") || [];
+  }
+
+  // 设置角色列表
+  setRoleCodes(codes: string[]) {
+    mpx.setStorageSync("roleCodes", codes);
+  }
+
+  // 获取权限列表
+  getPermCodes() {
+    return mpx.getStorageSync("permCodes") || [];
+  }
+
+  // 设置权限列表
+  setPermCodes(codes: string[]) {
+    mpx.setStorageSync("permCodes", codes);
+  }
+}
+
+const db = new LocalStorage();
+export { db };

package/src/utils/grpc.ts

@@ -1,21 +1,21 @@
-// grpc工具类
-class GrpcUtil {
-  //清理空参数.
-  clearEmpty(params: any): void {
-    for (const key in params) {
-      if (params[key] !== null && typeof params[key] === "object") {
-        this.clearEmpty(params[key]);
-        if (Object.keys(params[key]).length === 0) {
-          delete params[key];
-        }
-      }
-
-      if ([undefined, null, ""].includes(params[key])) {
-        delete params[key];
-      }
-    }
-    return params;
-  }
-}
-const grpc = new GrpcUtil();
-export { grpc };
+// grpc工具类
+class GrpcUtil {
+  //清理空参数.
+  clearEmpty(params: any): void {
+    for (const key in params) {
+      if (params[key] !== null && typeof params[key] === "object") {
+        this.clearEmpty(params[key]);
+        if (Object.keys(params[key]).length === 0) {
+          delete params[key];
+        }
+      }
+
+      if ([undefined, null, ""].includes(params[key])) {
+        delete params[key];
+      }
+    }
+    return params;
+  }
+}
+const grpc = new GrpcUtil();
+export { grpc };