szld-libs 0.2.26 → 0.2.27

package/es/components/Upload/index.js

@@ -36,7 +36,7 @@ const UploadFile = (props) => {
     ] });
   };
   const beforeUpload = (file) => {
-    const result = new Promise((resolve, reject) => {
+    const result = new Promise(async (resolve, reject) => {
       const acceptList = accept.split(",");
       const suffix = getFileSuffix(file.name) || "";
       if (accept && !acceptList.includes(suffix)) {
@@ -44,18 +44,33 @@ const UploadFile = (props) => {
         reject(false);
       }
       const isLess = file.size / 1024 / 1024 < maxSize;
-      if (!isLess) {
+      if (!isLess && !compression) {
         message.error(`文件必须小于${maxSize}MB`);
         reject(false);
       }
       if (compression) {
-        resolve(
-          compressionImage(
-            file,
+        let s = 0;
+        async function compress(f) {
+          if (!compression) {
+            return;
+          }
+          const result3 = await compressionImage(
+            f,
             compression.quality,
             compression.limit
-          )
-        );
+          );
+          s++;
+          if (s >= 5) {
+            return result3;
+          }
+          if (result3.size / 1024 / 1024 > maxSize) {
+            await compress(result3);
+          } else {
+            return result3;
+          }
+        }
+        const result2 = await compress(file);
+        resolve(result2);
       }
       resolve(file);
     }).catch((err) => {

package/es/index.js

@@ -23,7 +23,7 @@ const Demo = () => {
   };
   return /* @__PURE__ */ jsxs("div", { style: { height: "100vh" }, children: [
     "测试页面",
-    /* @__PURE__ */ jsx(UploadFile, { compression: { quality: 0.8, limit: 5 * 1024 }, accept: ".heic,.jpg,.png,.jpeg", maxSize: 100 })
+    /* @__PURE__ */ jsx(UploadFile, { compression: { quality: 0.9, limit: 5 }, accept: ".heic,.jpg,.png,.jpeg", maxSize: 5 })
   ] });
 };
 ReactDOM.createRoot(document.getElementById("root")).render(

package/es/utils/image-compression/index.d.ts

@@ -2,7 +2,7 @@
  * 图片压缩方法
  * @param {Object}  file 图片文件
  * @param {Nubmber} quality 压缩质量参数 0-1
- * @param {limit} limit 最小限制大小，小于该值时不进行压缩
+ * @param {limit} limit 最小限制大小，小于该值时不进行压缩, MB
  * @returns 压缩后的新图片
  */
 declare const compressionImage: (file: File, quality?: number, limit?: number) => Promise<File>;

package/es/utils/image-compression/index.js

@@ -1,8 +1,8 @@
 import UPNG from "./UPNG";
 import { fileToDataURL, dataURLToImage, scaleWidthHeight, canvastoFile, convertQualityToBit } from "./image";
-const compressionImage = async (file, quality = 0.5, limit = 300) => {
+const compressionImage = async (file, quality = 0.5, limit = 5) => {
   const fileName = file.name;
-  if (file.size / 1024 < limit) {
+  if (file.size / 1024 / 1024 < limit) {
     return file;
   }
   try {

package/es/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/lib/components/Upload/index.js

@@ -37,7 +37,7 @@ const UploadFile = (props) => {
     ] });
   };
   const beforeUpload = (file) => {
-    const result = new Promise((resolve, reject) => {
+    const result = new Promise(async (resolve, reject) => {
       const acceptList = accept.split(",");
       const suffix = utils.getFileSuffix(file.name) || "";
       if (accept && !acceptList.includes(suffix)) {
@@ -45,18 +45,33 @@ const UploadFile = (props) => {
         reject(false);
       }
       const isLess = file.size / 1024 / 1024 < maxSize;
-      if (!isLess) {
+      if (!isLess && !compression) {
         antd.message.error(`文件必须小于${maxSize}MB`);
         reject(false);
       }
       if (compression) {
-        resolve(
-          compressionImage(
-            file,
+        let s = 0;
+        async function compress(f) {
+          if (!compression) {
+            return;
+          }
+          const result3 = await compressionImage(
+            f,
             compression.quality,
             compression.limit
-          )
-        );
+          );
+          s++;
+          if (s >= 5) {
+            return result3;
+          }
+          if (result3.size / 1024 / 1024 > maxSize) {
+            await compress(result3);
+          } else {
+            return result3;
+          }
+        }
+        const result2 = await compress(file);
+        resolve(result2);
       }
       resolve(file);
     }).catch((err) => {

package/lib/index.js

@@ -24,7 +24,7 @@ const Demo = () => {
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { height: "100vh" }, children: [
     "测试页面",
-    /* @__PURE__ */ jsxRuntime.jsx(main.UploadFile, { compression: { quality: 0.8, limit: 5 * 1024 }, accept: ".heic,.jpg,.png,.jpeg", maxSize: 100 })
+    /* @__PURE__ */ jsxRuntime.jsx(main.UploadFile, { compression: { quality: 0.9, limit: 5 }, accept: ".heic,.jpg,.png,.jpeg", maxSize: 5 })
   ] });
 };
 ReactDOM.createRoot(document.getElementById("root")).render(

package/lib/utils/image-compression/index.d.ts

@@ -2,7 +2,7 @@
  * 图片压缩方法
  * @param {Object}  file 图片文件
  * @param {Nubmber} quality 压缩质量参数 0-1
- * @param {limit} limit 最小限制大小，小于该值时不进行压缩
+ * @param {limit} limit 最小限制大小，小于该值时不进行压缩, MB
  * @returns 压缩后的新图片
  */
 declare const compressionImage: (file: File, quality?: number, limit?: number) => Promise<File>;

package/lib/utils/image-compression/index.js

@@ -1,9 +1,9 @@
 "use strict";
 const UPNG = require("./UPNG");
 const image = require("./image");
-const compressionImage = async (file, quality = 0.5, limit = 300) => {
+const compressionImage = async (file, quality = 0.5, limit = 5) => {
   const fileName = file.name;
-  if (file.size / 1024 < limit) {
+  if (file.size / 1024 / 1024 < limit) {
     return file;
   }
   try {

package/lib/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "szld-libs",
   "private": false,
-  "version": "0.2.26",
+  "version": "0.2.27",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -31,7 +31,7 @@
     "rimraf": "^4.1.2",
     "typescript": "^4.9.3",
     "vite": "^4.0.0",
-    "vite-plugin-build": "^0.7.0"
+    "vite-plugin-build": "^0.10.0"
   },
   "main": "lib/main.js",
   "module": "es/main.js",

package/es/components/Echarts/index.css

@@ -1,5 +0,0 @@
-.echarts-module_main_3e0bc {
-  width: 100%;
-  height: 100%;
-  position: relative;
-}

package/es/components/Echarts/index.d.ts

@@ -1,13 +0,0 @@
-import * as echarts from 'echarts/core';
-import { BarSeriesOption, LineSeriesOption } from 'echarts/charts';
-import { TitleComponentOption, TooltipComponentOption, GridComponentOption, DatasetComponentOption } from 'echarts/components';
-type ECOption = echarts.ComposeOption<BarSeriesOption | LineSeriesOption | TitleComponentOption | TooltipComponentOption | GridComponentOption | DatasetComponentOption>;
-export interface EchartsProps {
-    option: ECOption;
-}
-/**
- * @param props : EchartsProps 传入图标配置项
- * 外部包裹一层dom元素定义width和height，内部自动占满
- */
-declare const Echarts: (props: EchartsProps) => import("react/jsx-runtime").JSX.Element;
-export default Echarts;

package/es/components/Echarts/index.js

@@ -1,65 +0,0 @@
-import { jsx } from "react/jsx-runtime";
-import * as echarts from "echarts/core";
-import { BarChart } from "echarts/charts";
-import { TitleComponent, TooltipComponent, GridComponent, DatasetComponent, TransformComponent } from "echarts/components";
-import { LabelLayout, UniversalTransition } from "echarts/features";
-import { CanvasRenderer } from "echarts/renderers";
-import { useRef, useEffect } from "react";
-import { useDebounceFn } from "ahooks";
-const main = "echarts-module_main_3e0bc";
-const classes = {
-  main
-};
-echarts.use([
-  TitleComponent,
-  TooltipComponent,
-  GridComponent,
-  DatasetComponent,
-  TransformComponent,
-  BarChart,
-  LabelLayout,
-  UniversalTransition,
-  CanvasRenderer
-]);
-const Echarts = (props) => {
-  const ref = useRef(null);
-  const eRef = useRef(null);
-  const resizeRef = useRef(null);
-  useEffect(() => {
-    if (ref.current && eRef.current) {
-      resizeRef.current = new ResizeObserver((entries) => {
-        for (const entry of entries) {
-          if (entry.target === ref.current) {
-            run();
-          }
-        }
-      });
-      resizeRef.current.observe(ref.current);
-    }
-    return () => {
-      var _a;
-      ref.current && ((_a = resizeRef.current) == null ? void 0 : _a.unobserve(ref.current));
-      resizeRef.current = null;
-    };
-  }, [ref.current, eRef.current]);
-  useEffect(() => {
-    if (ref.current && !eRef.current) {
-      eRef.current = echarts.init(ref.current);
-    }
-  }, [ref.current]);
-  useEffect(() => {
-    if (eRef.current && ref.current) {
-      eRef.current.setOption(props.option);
-    }
-  }, [eRef.current]);
-  const onResize = () => {
-    if (eRef.current) {
-      eRef.current.resize();
-    }
-  };
-  const { run } = useDebounceFn(onResize, { wait: 300 });
-  return /* @__PURE__ */ jsx("div", { ref, className: classes.main });
-};
-export {
-  Echarts as default
-};

package/es/components/Echarts/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

package/lib/components/Echarts/index.css

@@ -1,5 +0,0 @@
-.echarts-module_main_3e0bc {
-  width: 100%;
-  height: 100%;
-  position: relative;
-}

package/lib/components/Echarts/index.d.ts

@@ -1,13 +0,0 @@
-import * as echarts from 'echarts/core';
-import { BarSeriesOption, LineSeriesOption } from 'echarts/charts';
-import { TitleComponentOption, TooltipComponentOption, GridComponentOption, DatasetComponentOption } from 'echarts/components';
-type ECOption = echarts.ComposeOption<BarSeriesOption | LineSeriesOption | TitleComponentOption | TooltipComponentOption | GridComponentOption | DatasetComponentOption>;
-export interface EchartsProps {
-    option: ECOption;
-}
-/**
- * @param props : EchartsProps 传入图标配置项
- * 外部包裹一层dom元素定义width和height，内部自动占满
- */
-declare const Echarts: (props: EchartsProps) => import("react/jsx-runtime").JSX.Element;
-export default Echarts;

package/lib/components/Echarts/index.js

@@ -1,81 +0,0 @@
-"use strict";
-const jsxRuntime = require("react/jsx-runtime");
-const echarts = require("echarts/core");
-const charts = require("echarts/charts");
-const components = require("echarts/components");
-const features = require("echarts/features");
-const renderers = require("echarts/renderers");
-const react = require("react");
-const ahooks = require("ahooks");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const echarts__namespace = /* @__PURE__ */ _interopNamespaceDefault(echarts);
-const main = "echarts-module_main_3e0bc";
-const classes = {
-  main
-};
-echarts__namespace.use([
-  components.TitleComponent,
-  components.TooltipComponent,
-  components.GridComponent,
-  components.DatasetComponent,
-  components.TransformComponent,
-  charts.BarChart,
-  features.LabelLayout,
-  features.UniversalTransition,
-  renderers.CanvasRenderer
-]);
-const Echarts = (props) => {
-  const ref = react.useRef(null);
-  const eRef = react.useRef(null);
-  const resizeRef = react.useRef(null);
-  react.useEffect(() => {
-    if (ref.current && eRef.current) {
-      resizeRef.current = new ResizeObserver((entries) => {
-        for (const entry of entries) {
-          if (entry.target === ref.current) {
-            run();
-          }
-        }
-      });
-      resizeRef.current.observe(ref.current);
-    }
-    return () => {
-      var _a;
-      ref.current && ((_a = resizeRef.current) == null ? void 0 : _a.unobserve(ref.current));
-      resizeRef.current = null;
-    };
-  }, [ref.current, eRef.current]);
-  react.useEffect(() => {
-    if (ref.current && !eRef.current) {
-      eRef.current = echarts__namespace.init(ref.current);
-    }
-  }, [ref.current]);
-  react.useEffect(() => {
-    if (eRef.current && ref.current) {
-      eRef.current.setOption(props.option);
-    }
-  }, [eRef.current]);
-  const onResize = () => {
-    if (eRef.current) {
-      eRef.current.resize();
-    }
-  };
-  const { run } = ahooks.useDebounceFn(onResize, { wait: 300 });
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { ref, className: classes.main });
-};
-module.exports = Echarts;

package/lib/components/Echarts/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>