@guiwzh/small-design 0.1.0 → 0.1.1

package/dist/index.mjs

@@ -492,7 +492,6 @@ var autoComplete_default = AutoComplete;
 
 // src/components/Upload/upload.tsx
 import { useRef as useRef4, useState as useState6 } from "react";
-import axios from "axios";
 
 // src/components/Progress/progress.tsx
 import { jsx as jsx9 } from "react/jsx-runtime";
@@ -615,10 +614,57 @@ var dragger_default = Dragger;
 
 // src/components/Upload/upload.tsx
 import { jsx as jsx12, jsxs as jsxs6 } from "react/jsx-runtime";
+function defaultRequest(options) {
+  const { action, file, filename, headers, data, withCredentials, onProgress, onSuccess, onError } = options;
+  const formData = new FormData();
+  formData.append(filename, file);
+  if (data) {
+    Object.keys(data).forEach((key) => formData.append(key, data[key]));
+  }
+  const xhr = new XMLHttpRequest();
+  xhr.upload.addEventListener("progress", (e) => {
+    if (e.lengthComputable) {
+      const percent = Math.floor(e.loaded * 100 / e.total);
+      onProgress(percent);
+    }
+  });
+  xhr.addEventListener("load", () => {
+    if (xhr.status >= 200 && xhr.status < 300) {
+      let response;
+      try {
+        response = JSON.parse(xhr.responseText);
+      } catch (e) {
+        response = xhr.responseText;
+      }
+      onSuccess(response);
+    } else {
+      onError(new Error(`Upload failed with status ${xhr.status}`));
+    }
+  });
+  xhr.addEventListener("error", () => {
+    onError(new Error("Upload failed due to network error"));
+  });
+  xhr.addEventListener("abort", () => {
+  });
+  xhr.open("POST", action, true);
+  if (headers) {
+    Object.keys(headers).forEach((key) => {
+      xhr.setRequestHeader(key, headers[key]);
+    });
+  }
+  if (withCredentials) {
+    xhr.withCredentials = true;
+  }
+  xhr.send(formData);
+  return {
+    abort: () => xhr.abort()
+  };
+}
 var Upload = (props) => {
   const {
     action,
     beforeUpload,
+    customRequest,
     onprogress,
     onSuccess,
     onError,
@@ -645,6 +691,7 @@ var Upload = (props) => {
   const abortRecord = useRef4({});
   const FileRecord = useRef4(/* @__PURE__ */ new Set());
   const [fileList, setFileList] = useState6([]);
+  const request = customRequest || defaultRequest;
   const handleClick = () => {
     var _a;
     (_a = fileInput.current) == null ? void 0 : _a.click();
@@ -656,21 +703,19 @@ var Upload = (props) => {
     }
     let concurrency = 0;
     const queue = [];
-    function AskTask(task) {
-      return new Promise(() => {
-        const executeRequest = () => {
-          concurrency++;
-          task[0]().then(() => {
-            concurrency--;
-            nextTask();
-          });
-        };
-        if (concurrency < limit) {
-          executeRequest();
-        } else {
-          queue.push([executeRequest, task[1]]);
-        }
-      });
+    function askTask(task) {
+      const executeRequest = () => {
+        concurrency++;
+        task[0]().then(() => {
+          concurrency--;
+          nextTask();
+        });
+      };
+      if (concurrency < limit) {
+        executeRequest();
+      } else {
+        queue.push([executeRequest, task[1]]);
+      }
     }
     function nextTask() {
       if (concurrency < limit && queue.length > 0) {
@@ -685,7 +730,7 @@ var Upload = (props) => {
     }
     let uidCounter = 0;
     function dealFile(file) {
-      let _file = {
+      const _file = {
         uid: `upload-file-${Date.now()}-${uidCounter++}`,
         size: file.size,
         name: file.name,
@@ -701,54 +746,40 @@ var Upload = (props) => {
             isSame = true;
           }
         }
-        if (isSame) return prevList;
+        if (isSame) return [...prevList];
         return [_file, ...prevList];
       });
-      const formData = new FormData();
-      formData.append(name || "file", file);
-      data && Object.keys(data).forEach((key) => formData.append(key, data[key]));
-      const controller = new AbortController();
-      abortRecord.current = { ...abortRecord.current, [_file.uid]: controller };
-      return [_file, formData, controller];
+      return _file;
     }
-    const post = (_file, formData, controller, try_nums) => {
+    const post = (_file, tryNums) => {
       return new Promise((resolve) => {
-        axios.post(action, formData, {
-          headers: {
-            ...headers,
-            "Content-Type": "multipart/form-data"
-          },
+        const requestReturn = request({
+          action,
+          file: _file.raw,
+          filename: name || "file",
+          headers,
+          data,
           withCredentials,
-          signal: controller.signal,
-          onUploadProgress: (e) => {
-            let percentage = Math.floor(e.loaded * 100 / e.total || 0);
-            if (percentage < 100) {
-              updateFileList(_file, {
-                percent: percentage,
-                status: "uploading"
-              });
+          onProgress: (percent) => {
+            if (percent < 100) {
+              updateFileList(_file, { percent, status: "uploading" });
               _file.status = "uploading";
-              _file.percent = percentage;
-              onprogress == null ? void 0 : onprogress(percentage, _file);
+              _file.percent = percent;
+              onprogress == null ? void 0 : onprogress(percent, _file);
             }
-          }
-        }).then((res) => {
-          updateFileList(_file, { status: "success", response: res.data });
-          _file.status = "success";
-          _file.response = res.data;
-          onSuccess == null ? void 0 : onSuccess(res.data, _file);
-          onChange == null ? void 0 : onChange(_file);
-          resolve("success");
-        }).catch((err) => {
-          if (axios.isCancel(err)) {
-            resolve("cancel");
-          } else {
-            if (try_nums < failednums) {
-              const [_file_new, formData2, controller2] = dealFile(_file.raw);
-              AskTask([
-                () => post(_file_new, formData2, controller2, try_nums + 1),
-                _file.name
-              ]);
+          },
+          onSuccess: (response) => {
+            updateFileList(_file, { status: "success", response });
+            _file.status = "success";
+            _file.response = response;
+            onSuccess == null ? void 0 : onSuccess(response, _file);
+            onChange == null ? void 0 : onChange(_file);
+            resolve("success");
+          },
+          onError: (err) => {
+            if (tryNums < failednums) {
+              const newFile = dealFile(_file.raw);
+              askTask([() => post(newFile, tryNums + 1), _file.name]);
             }
             updateFileList(_file, { status: "error", error: err });
             _file.status = "error";
@@ -758,9 +789,10 @@ var Upload = (props) => {
             resolve("failed");
           }
         });
+        abortRecord.current[_file.uid] = requestReturn;
       });
     };
-    let postFiles = Array.from(files);
+    const postFiles = Array.from(files);
     postFiles.forEach((file) => {
       if (maxsize && file.size > maxsize * 1024 * 1024) {
         onExceed == null ? void 0 : onExceed(`\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7${maxsize}Mb`);
@@ -768,18 +800,18 @@ var Upload = (props) => {
       }
       FileRecord.current.add(file.name);
       if (!beforeUpload) {
-        const [_file, formData, source] = dealFile(file);
-        AskTask([() => post(_file, formData, source, 0), file.name]);
+        const _file = dealFile(file);
+        askTask([() => post(_file, 0), file.name]);
       } else {
         const result = beforeUpload(file);
         if (result && result instanceof Promise) {
-          result.then((processedFile) => {
-            const [_file, formData, source] = dealFile(file);
-            AskTask([() => post(_file, formData, source, 0), file.name]);
+          result.then(() => {
+            const _file = dealFile(file);
+            askTask([() => post(_file, 0), file.name]);
           });
         } else if (result) {
-          const [_file, formData, source] = dealFile(file);
-          AskTask([() => post(_file, formData, source, 0), file.name]);
+          const _file = dealFile(file);
+          askTask([() => post(_file, 0), file.name]);
         }
       }
     });
@@ -1060,73 +1092,11 @@ var Lazyload = (props) => {
   return /* @__PURE__ */ jsx15("div", { ref: containerRef, className, style: styles, children: visible ? children : placeholder });
 };
 var lazyLoad_default = Lazyload;
-
-// src/components/Keepalive/Keepalive.tsx
-import { createContext as createContext2, useContext as useContext3, useEffect as useEffect6, useRef as useRef7, useState as useState10 } from "react";
-import { useOutlet, useLocation, matchPath } from "react-router-dom";
-import { Fragment as Fragment2, jsx as jsx16, jsxs as jsxs8 } from "react/jsx-runtime";
-var KeepAliveContext = createContext2({
-  keepPaths: [],
-  keepElements: {},
-  dropByPath() {
-  }
-});
-var isKeepPath = (keepPaths, path) => {
-  for (let i = 0; i < keepPaths.length; i++) {
-    let item = keepPaths[i];
-    if (item === path) return true;
-    if (item instanceof RegExp && item.test(path)) return true;
-    if (typeof item === "string" && item.toLowerCase() === path) return true;
-  }
-  return false;
-};
-function useKeepOutlet() {
-  const location = useLocation();
-  const element = useOutlet();
-  const { keepElements, keepPaths } = useContext3(KeepAliveContext);
-  const isKeep = isKeepPath(keepPaths, location.pathname);
-  const keepElementsRef = useRef7(keepElements);
-  keepElementsRef.current = keepElements;
-  useEffect6(() => {
-    if (isKeep && element) {
-      keepElementsRef.current[location.pathname] = element;
-    }
-  });
-  return /* @__PURE__ */ jsxs8(Fragment2, { children: [
-    Object.entries(keepElements).map(([pathname, el]) => /* @__PURE__ */ jsx16(
-      "div",
-      {
-        style: {
-          height: "100%",
-          width: "100%",
-          position: "relative",
-          overflow: "hidden auto"
-        },
-        className: "keep-alive-page",
-        hidden: !matchPath(location.pathname, pathname),
-        children: el
-      },
-      pathname
-    )),
-    !isKeep && element
-  ] });
-}
-var KeepAliveLayout = (props) => {
-  const { keepPaths, children } = props;
-  const [keepElements] = useState10({});
-  const dropByPath = (path) => {
-    delete keepElements[path];
-  };
-  return /* @__PURE__ */ jsx16(KeepAliveContext.Provider, { value: { keepPaths, keepElements, dropByPath }, children });
-};
-var Keepalive_default = KeepAliveLayout;
 export {
   autoComplete_default as AutoComplete,
   button_default as Button,
   icon_default as Icon,
   input_default as Input,
-  KeepAliveContext,
-  Keepalive_default as KeepAliveLayout,
   lazyLoad_default as LazyLoad,
   Menu_default as Menu,
   menuItem_default as MenuItem,
@@ -1137,7 +1107,6 @@ export {
   upload_default as Upload,
   virtualList_default as VirtualList,
   useClickOutside_default as useClickOutside,
-  useDebounce_default as useDebounce,
-  useKeepOutlet
+  useDebounce_default as useDebounce
 };
 //# sourceMappingURL=index.mjs.map