uni-oaview 1.1.7 → 1.1.9

package/dist/index.d.ts

@@ -7,12 +7,24 @@ import { App } from 'vue';
 declare function sendLaunchAppParamsLog(params: any): void;
 
 /**
- * 防抖函数
- * @param callback
- * @param time
+ * 获取当前app版本
  * @returns
  */
-declare function createDebounceFn(callback: (...params: any[]) => void, time: number): (...params: any[]) => void;
+declare function getAppVersion(): string;
+/**
+ * 比较两个版本号
+ * @param versionA
+ * @param versionB
+ * @returns
+ */
+declare function compareVersions(versionA: string, versionB: string): number;
+/**
+ * 判断当前版本是否高于或等于传入版本
+ * @param version
+ * @returns
+ */
+declare function isCurrentVersionHigher(appVersion: string, warningText?: string): boolean;
+
 /**
  * 展示消息提醒，或者是确认弹窗等
  * @param title
@@ -44,6 +56,14 @@ declare const Message: {
     confirm(content: string, title?: string, confirmText?: string, cancelText?: string): Promise<unknown>;
 };
 
+/**
+ * 防抖函数
+ * @param callback
+ * @param time
+ * @returns
+ */
+declare function createDebounceFn(callback: (...params: any[]) => void, time: number): (...params: any[]) => void;
+
 declare const _default: {
     install: (app: App<Element>) => void;
 };
@@ -56,4 +76,4 @@ declare const _default: {
  */
 declare function getDataByApp(eventName: string, params: Record<string, any>, immediate?: boolean): Promise<any>;
 
-export { Message, createDebounceFn, _default as default, getDataByApp, sendLaunchAppParamsLog };
+export { Message, compareVersions, createDebounceFn, _default as default, getAppVersion, getDataByApp, isCurrentVersionHigher, sendLaunchAppParamsLog };

package/dist/index.esm.js

@@ -40,24 +40,6 @@ var OPEN_TOAST = "".concat(prefix, "open-toast");
  */
 var OPEN_CONFIRM_BOX = "".concat(prefix, "open-confirm-box");
 
-/**
- * 防抖函数
- * @param callback
- * @param time
- * @returns
- */
-function createDebounceFn(callback, time) {
-  var timer = null;
-  return function () {
-    for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-      params[_key] = arguments[_key];
-    }
-    clearTimeout(timer);
-    timer = setTimeout(function () {
-      callback.apply(void 0, params);
-    }, time);
-  };
-}
 /**
  * 展示消息提醒，或者是确认弹窗等
  * @param title
@@ -126,6 +108,78 @@ var Message = {
   }
 };
 
+/**
+ * 获取当前app版本
+ * @returns
+ */
+function getAppVersion() {
+  var systemInfo = uni.getSystemInfoSync();
+  return systemInfo.hostVersion;
+}
+function isValidVersion(version) {
+  // 检查版本号是否只包含数字和点，并且至少有一个点
+  return /^(\d+\.)*\d+$/.test(version);
+}
+/**
+ * 比较两个版本号
+ * @param versionA
+ * @param versionB
+ * @returns
+ */
+function compareVersions(versionA, versionB) {
+  if (!isValidVersion(versionA) || !isValidVersion(versionB)) {
+    console.log('【error】：无效的版本格式，请提供格式为"x.y.z"的版本号');
+    return -2;
+  }
+  var partsA = versionA.split('.').map(Number);
+  var partsB = versionB.split('.').map(Number);
+  var maxLength = Math.max(partsA.length, partsB.length);
+  for (var i = 0; i < maxLength; i++) {
+    var numA = partsA[i] || 0;
+    var numB = partsB[i] || 0;
+    if (numA > numB) {
+      return 1; // versionA > versionB
+    } else if (numA < numB) {
+      return -1; // versionA < versionB
+    }
+  }
+
+  return 0; // versionA == versionB
+}
+/**
+ * 判断当前版本是否高于或等于传入版本
+ * @param version
+ * @returns
+ */
+function isCurrentVersionHigher(appVersion, warningText) {
+  var currentVersion = getAppVersion();
+  var result = compareVersions(appVersion, currentVersion);
+  if (result < 0) {
+    Message.warning('版本更新', warningText || '您的App版本过低，请升级App后体验小程序新功能。');
+    return false;
+  }
+  return true;
+}
+
+/**
+ * 防抖函数
+ * @param callback
+ * @param time
+ * @returns
+ */
+function createDebounceFn(callback, time) {
+  var timer = null;
+  return function () {
+    for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+      params[_key] = arguments[_key];
+    }
+    clearTimeout(timer);
+    timer = setTimeout(function () {
+      callback.apply(void 0, params);
+    }, time);
+  };
+}
+
 var install = function install(app) {
   app.mixin({
     onLaunch: function onLaunch(params) {
@@ -166,4 +220,4 @@ function getDataByApp(eventName, params) {
   });
 }
 
-export { Message, createDebounceFn, index as default, getDataByApp, sendLaunchAppParamsLog };
+export { Message, compareVersions, createDebounceFn, index as default, getAppVersion, getDataByApp, isCurrentVersionHigher, sendLaunchAppParamsLog };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-oaview",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "uniapp小程序组件库",
   "main": "dist/index.esm.js",
   "typings": "dist/index.d.ts",

package/src/utils/app-version.ts

@@ -0,0 +1,56 @@
+import { Message } from './message';
+
+/**
+ * 获取当前app版本
+ * @returns
+ */
+export function getAppVersion() {
+  const systemInfo = uni.getSystemInfoSync() as any;
+  return systemInfo.hostVersion as string;
+}
+
+function isValidVersion(version: string): boolean {
+  // 检查版本号是否只包含数字和点，并且至少有一个点
+  return /^(\d+\.)*\d+$/.test(version);
+}
+
+/**
+ * 比较两个版本号
+ * @param versionA
+ * @param versionB
+ * @returns
+ */
+export function compareVersions(versionA: string, versionB: string): number {
+  if (!isValidVersion(versionA) || !isValidVersion(versionB)) {
+    console.log('【error】：无效的版本格式，请提供格式为"x.y.z"的版本号');
+    return -2;
+  }
+  const partsA = versionA.split('.').map(Number);
+  const partsB = versionB.split('.').map(Number);
+  const maxLength = Math.max(partsA.length, partsB.length);
+  for (let i = 0; i < maxLength; i++) {
+    const numA = partsA[i] || 0;
+    const numB = partsB[i] || 0;
+    if (numA > numB) {
+      return 1; // versionA > versionB
+    } else if (numA < numB) {
+      return -1; // versionA < versionB
+    }
+  }
+  return 0; // versionA == versionB
+}
+
+/**
+ * 判断当前版本是否高于或等于传入版本
+ * @param version
+ * @returns
+ */
+export function isCurrentVersionHigher(appVersion: string, warningText?: string): boolean {
+  const currentVersion = getAppVersion();
+  const result = compareVersions(appVersion, currentVersion);
+  if (result < 0) {
+    Message.warning('版本更新', warningText || '您的App版本过低，请升级App后体验小程序新功能。');
+    return false;
+  }
+  return true;
+}

package/src/utils/core.ts

@@ -0,0 +1,15 @@
+/**
+ * 防抖函数
+ * @param callback
+ * @param time
+ * @returns
+ */
+export function createDebounceFn(callback: (...params: any[]) => void, time: number) {
+  let timer: any = null;
+  return (...params: any[]) => {
+    clearTimeout(timer);
+    timer = setTimeout(() => {
+      callback(...params);
+    }, time);
+  };
+}

package/src/utils/index.ts

@@ -1,85 +1,4 @@
 export * from './send-log';
-import { OPEN_CONFIRM_BOX, OPEN_TOAST } from '../../constants';
-/**
- * 防抖函数
- * @param callback
- * @param time
- * @returns
- */
-export function createDebounceFn(callback: (...params: any[]) => void, time: number) {
-  let timer: any = null;
-  return (...params: any[]) => {
-    clearTimeout(timer);
-    timer = setTimeout(() => {
-      callback(...params);
-    }, time);
-  };
-}
-
-/**
- * 展示消息提醒，或者是确认弹窗等
- * @param title
- * @param duration
- */
-export const Message = {
-  /**
-   * 成功弹出框提醒
-   * @param title  标题
-   * @param content  内容
-   * @param confirmText  确认按钮文本
-   */
-  success(title: string, content: string, confirmText?: string) {
-    return new Promise((res) => {
-      uni.$emit(OPEN_TOAST, {
-        type: 'success',
-        title,
-        content,
-        confirmText,
-        callback: res,
-      });
-    });
-  },
-  /**
-   * 警告弹框提醒
-   * @param title 警告标题
-   * @param content 警告内容
-   * @param confirmText 警告按钮文本
-   */
-  warning(title: string, content: string, confirmText?: string) {
-    return new Promise((res) => {
-      uni.$emit(OPEN_TOAST, {
-        type: 'warning',
-        title,
-        content,
-        confirmText,
-        callback: res,
-      });
-    });
-  },
-  /**
-   * 确认弹窗
-   * @param content 确认内容
-   * @param title 标题
-   * @param confirmText 确定按钮文本
-   * @param cancelText 取消按钮文本
-   * @returns
-   */
-  confirm(content: string, title?: string, confirmText?: string, cancelText?: string) {
-    return new Promise((res, rej) => {
-      const callback = (type: 'confirm' | 'cancel') => {
-        if (type === 'confirm') {
-          res('');
-        } else {
-          rej();
-        }
-      };
-      uni.$emit(OPEN_CONFIRM_BOX, {
-        title,
-        content,
-        confirmText,
-        cancelText,
-        callback,
-      });
-    });
-  },
-};
+export * from './app-version';
+export * from './message';
+export * from './core';

package/src/utils/message.ts

@@ -0,0 +1,69 @@
+import { OPEN_CONFIRM_BOX, OPEN_TOAST } from '../../constants';
+
+/**
+ * 展示消息提醒，或者是确认弹窗等
+ * @param title
+ * @param duration
+ */
+export const Message = {
+  /**
+   * 成功弹出框提醒
+   * @param title  标题
+   * @param content  内容
+   * @param confirmText  确认按钮文本
+   */
+  success(title: string, content: string, confirmText?: string) {
+    return new Promise((res) => {
+      uni.$emit(OPEN_TOAST, {
+        type: 'success',
+        title,
+        content,
+        confirmText,
+        callback: res,
+      });
+    });
+  },
+  /**
+   * 警告弹框提醒
+   * @param title 警告标题
+   * @param content 警告内容
+   * @param confirmText 警告按钮文本
+   */
+  warning(title: string, content: string, confirmText?: string) {
+    return new Promise((res) => {
+      uni.$emit(OPEN_TOAST, {
+        type: 'warning',
+        title,
+        content,
+        confirmText,
+        callback: res,
+      });
+    });
+  },
+  /**
+   * 确认弹窗
+   * @param content 确认内容
+   * @param title 标题
+   * @param confirmText 确定按钮文本
+   * @param cancelText 取消按钮文本
+   * @returns
+   */
+  confirm(content: string, title?: string, confirmText?: string, cancelText?: string) {
+    return new Promise((res, rej) => {
+      const callback = (type: 'confirm' | 'cancel') => {
+        if (type === 'confirm') {
+          res('');
+        } else {
+          rej();
+        }
+      };
+      uni.$emit(OPEN_CONFIRM_BOX, {
+        title,
+        content,
+        confirmText,
+        cancelText,
+        callback,
+      });
+    });
+  },
+};