common-utils-kit 1.1.4 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common-utils-kit",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/files.js

@@ -107,3 +107,131 @@ export function downloadFiles(url, filename) {
     xhr.send();
   });
 }
+/**
+ * File转Base64
+ * @param {File} file - File对象格式文件数据
+ * @example
+ * fileToBase64(file).then((base64) => {
+ *   console.log(base64); // base64格式的文件
+ * }).catch((error) => {
+ *   console.error(error); // 转换失败或其他错误信息
+ * });
+ */
+export function fileToBase64(file) {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    this.aa = reader.result;
+    reader.onload = () => resolve(reader.result);
+    reader.onerror = (error) => reject(error);
+  });
+}
+/**
+ * Base64转File
+ * @param {String} base64 - base64格式文件数据
+ * @example
+ * base64ToFile(base64).then((file) => {
+ *   console.log(file); // File格式的文件
+ * }).catch((error) => {
+ *   console.error(error); // 转换失败或其他错误信息
+ * });
+ */
+export function base64ToFile(base64, filename = "file") { //将base64转换为文件
+  return new Promise((resolve, reject) => {
+    const arr = base64.split(',')
+    const mime = arr[0].match(/:(.*?);/)[1]
+    const suffix = mime.split('/')[1]
+    const bstr = atob(arr[1])
+    let n = bstr.length
+    const u8arr = new Uint8Array(n)
+    while (n--) {
+      u8arr[n] = bstr.charCodeAt(n)
+    }
+    const fileData = new File([u8arr], `${filename}.${suffix}`, { type: mime })
+    resolve(fileData)
+  })
+}
+/**
+ * Base64转Blob
+ * @param {String} base64 - base64格式文件数据
+ * @example
+ * base64ToFile(base64).then((blob) => {
+ *   console.log(blob); // blob格式的文件
+ * }).catch((error) => {
+ *   console.error(error); // 转换失败或其他错误信息
+ * });
+ */
+export function base64ToFileBlob(dataurl) {
+  return new Promise((resolve, reject) => {
+    var arr = dataurl.split(','),
+      mime = arr[0].match(/:(.*?);/)[1],
+      bstr = atob(arr[1]),
+      n = bstr.length,
+      u8arr = new Uint8Array(n)
+    while (n--) {
+      u8arr[n] = bstr.charCodeAt(n)
+    }
+    const blobData = new Blob([u8arr], { type: mime })
+    resolve(blobData)
+  })
+}
+// 使用canvas压缩图片
+export function uploadCompress(file, config) {
+  return new Promise((resolve, reject) => {
+    const image = new Image();
+    image.src = URL.createObjectURL(file);
+    image.onload = () => {
+      let resultBlob = "";
+      // 压缩图片
+      resultBlob = compressUpload(image, file, config);
+      resolve(resultBlob);
+    };
+    image.onerror = (err) => { reject(err) };
+    /* 图片压缩-canvas压缩 */
+    function compressUpload(image, file, compressConfig={}) {
+      const canvas = document.createElement("canvas");
+      const ctx = canvas.getContext("2d");
+      let width = compressConfig.width || image.width;
+      let height = compressConfig.height || image.height;
+
+      // 只设置宽度时，等比计算高度
+      if (compressConfig.width && !compressConfig.height) {
+        height = (compressConfig.width / image.width) * image.height;
+      }
+      // 只设置高度时，等比计算宽度
+      if (compressConfig.height && !compressConfig.width) {
+        width = (compressConfig.height / image.height) * image.width;
+      }
+
+      canvas.width = width;
+      canvas.height = height;
+      ctx.fillRect(0, 0, canvas.width, canvas.height);
+      ctx.drawImage(image, 0, 0, width, height);
+
+      // 进行最小压缩0.1
+      const compressData = canvas.toDataURL(
+        file.type || "image/jpeg",
+        compressConfig.rate || 0.5
+      );
+      // base64转Blob
+      const blobImg = dataURItoBlob(compressData);
+      console.log(" ", (blobImg.size / 1024 / 1024).toFixed(2));
+      return blobImg;
+    }
+    /* 图片格式转换——base64转Blob对象 */
+    function dataURItoBlob(data) {
+      let byteString;
+      if (data.split(",")[0].indexOf("base64") >= 0) {
+        byteString = data.split(",")[1];
+      } else {
+        byteString = unescape(data.split(",")[1]);
+      }
+      const mimeString = data.split(",")[0].split(":")[1].split(";")[0];
+      const ia = new Uint8Array(byteString.length);
+      for (let i = 0; i < byteString.length; i += 1) {
+        ia[i] = byteString.charCodeAt(i);
+      }
+      return new Blob([ia], { type: mimeString });
+    }
+  });
+}

package/src/format.js

@@ -126,9 +126,7 @@ export function flatToTree(flatArray, rootValue = null, bind = "pid") {
   flatArray.forEach(item => {
     if (item[bind] === rootValue) {
       const children = flatToTree(flatArray, item.id);
-      if (children.length) {
-        item.children = children;
-      }
+      item.children = children && children.length ? children : []
       tree.push(item);
     }
   });

package/src/tool.js

@@ -19,26 +19,55 @@ export function debounce(time = 500) {
   })
 }
 
-
-let wait = null
 /**
 * @description 节流
 * @param {number} time 每time秒调用一次 默认0.5秒
+* @param {boolean} immediately 是否立即执行一次 默认true
 * @example
-* throttle(time).then(res => {
+* throttle(time,immediately).then(res => {
 *  执行方法
 * })
 */
-export function throttle(time = 500) { //防抖  // 默认0.2秒后执行事件
+
+let wait = null;
+export function throttle(time = 500, immediately=true) {
   return new Promise((resolve) => {
-    if (wait) { return }
-    wait = setTimeout(() => {
-      resolve(true)
-      wait = null
-    }, time)
-  })
+    if (immediately && (!wait || Date.now() - wait >= time)) {
+      resolve(true);
+      wait = Date.now();
+      setTimeout(() => {
+        wait = null;
+      }, time);
+    }
+    if (!immediately && !wait) {
+      wait = setTimeout(() => {
+        resolve(true);
+        wait = null;
+      }, time);
+    }
+  });
 }
 
+
+// /**
+// * @description 节流
+// * @param {number} time 每time秒调用一次 默认0.5秒
+// * @example
+// * throttle(time).then(res => {
+// *  执行方法
+// * })
+// */
+// let wait = null
+// export function throttle(time = 500) { //防抖  // 默认0.2秒后执行事件
+//   return new Promise((resolve) => {
+//     if (wait) { return }
+//     wait = setTimeout(() => {
+//       resolve(true)
+//       wait = null
+//     }, time)
+//   })
+// }
+
 /**
  * @description 进行阻塞延时，以达到可以简写代码的目的
  * @param {number} value 堵塞时间 单位ms 毫秒