assui 2.1.9 → 2.1.12

package/es/single-img-upload/index.d.ts

@@ -10,7 +10,7 @@ export interface SingleImgUploadProps extends UploadProps {
     wrapperClassName?: string;
     onDeleteUpload?: () => void;
     /** 格式化接口返回数据 */
-    onFormatResData?: () => string;
+    onFormatResData?: (res: any) => string;
 }
 declare const SingleImgUpload: {
     (props: SingleImgUploadProps): JSX.Element;

package/es/single-img-upload/index.js

@@ -14,6 +14,149 @@ var __assign = this && this.__assign || function () {
   return __assign.apply(this, arguments);
 };
 
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
 
@@ -53,8 +196,17 @@ var __read = this && this.__read || function (o, n) {
 
   return ar;
 };
+
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 /* eslint-disable @typescript-eslint/no-unused-expressions */
-// @ts-nocheck
 
 
 import * as React from 'react';
@@ -64,6 +216,7 @@ import Image from 'antd/lib/image';
 import classNames from 'classnames';
 import useUpdateEffect from 'ahooks/lib/useUpdateEffect';
 import CloseOutlined from 'a-icons/lib/CloseOutlined';
+import isObject from 'lodash/isObject';
 
 var getLocalImgURL = function getLocalImgURL(file) {
   var URL = window.URL || window.webkitURL;
@@ -80,9 +233,10 @@ var SingleImgUpload = function SingleImgUpload(props) {
       onDeleteUpload = props.onDeleteUpload,
       onFormatResData = props.onFormatResData,
       onSuccess = props.onSuccess,
+      beforeUpload = props.beforeUpload,
       onError = props.onError,
       disabled = props.disabled,
-      restProps = __rest(props, ["className", "wrapperClassName", "children", "value", "onStart", "onDeleteUpload", "onFormatResData", "onSuccess", "onError", "disabled"]);
+      restProps = __rest(props, ["className", "wrapperClassName", "children", "value", "onStart", "onDeleteUpload", "onFormatResData", "onSuccess", "beforeUpload", "onError", "disabled"]);
 
   var uploadInstanceRef = React.useRef();
   var fileRef = React.useRef();
@@ -109,10 +263,54 @@ var SingleImgUpload = function SingleImgUpload(props) {
     }
   }, [value]);
 
+  var onBeforeUpload = function onBeforeUpload() {
+    var rest = [];
+
+    for (var _i = 0; _i < arguments.length; _i++) {
+      rest[_i] = arguments[_i];
+    }
+
+    return __awaiter(void 0, void 0, void 0, function () {
+      var resultBefore;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setFileUrl('');
+            if (!beforeUpload) return [3
+            /*break*/
+            , 2];
+            return [4
+            /*yield*/
+            , beforeUpload.apply(void 0, __spreadArray([], __read(rest), false))];
+
+          case 1:
+            resultBefore = _a.sent();
+
+            if (isObject(resultBefore)) {
+              setFileUrl(getLocalImgURL(resultBefore));
+            }
+
+            return [2
+            /*return*/
+            , resultBefore];
+
+          case 2:
+            return [2
+            /*return*/
+            , true];
+        }
+      });
+    });
+  };
+
   var handleStart = function handleStart(file) {
     fileRef.current = file;
     setUploadPercent(0);
-    setFileUrl(getLocalImgURL(file));
+
+    if (!fileUrl) {
+      setFileUrl(getLocalImgURL(file));
+    }
+
     setUploadStatus('uploading');
     onStart && onStart(file);
   };
@@ -190,7 +388,8 @@ var SingleImgUpload = function SingleImgUpload(props) {
     onProgress: handleProgress,
     onError: handleError,
     onSuccess: handleSuccess,
-    disabled: disabled
+    disabled: disabled,
+    beforeUpload: onBeforeUpload
   }, restProps), uploadStatus === 'init' && /*#__PURE__*/React.createElement("div", {
     className: classNames('as-img-upload-button', {
       'init-disable': disabled

package/lib/single-img-upload/index.d.ts

@@ -10,7 +10,7 @@ export interface SingleImgUploadProps extends UploadProps {
     wrapperClassName?: string;
     onDeleteUpload?: () => void;
     /** 格式化接口返回数据 */
-    onFormatResData?: () => string;
+    onFormatResData?: (res: any) => string;
 }
 declare const SingleImgUpload: {
     (props: SingleImgUploadProps): JSX.Element;

package/lib/single-img-upload/index.js

@@ -56,6 +56,149 @@ var __importStar = this && this.__importStar || function (mod) {
   return result;
 };
 
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
 
@@ -96,6 +239,16 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -106,7 +259,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 /* eslint-disable @typescript-eslint/no-unused-expressions */
-// @ts-nocheck
 
 var React = __importStar(require("react"));
 
@@ -122,6 +274,8 @@ var useUpdateEffect_1 = __importDefault(require("ahooks/lib/useUpdateEffect"));
 
 var CloseOutlined_1 = __importDefault(require("a-icons/lib/CloseOutlined"));
 
+var isObject_1 = __importDefault(require("lodash/isObject"));
+
 var getLocalImgURL = function getLocalImgURL(file) {
   var URL = window.URL || window.webkitURL;
   var imgURL = URL.createObjectURL(file);
@@ -137,9 +291,10 @@ var SingleImgUpload = function SingleImgUpload(props) {
       onDeleteUpload = props.onDeleteUpload,
       onFormatResData = props.onFormatResData,
       onSuccess = props.onSuccess,
+      beforeUpload = props.beforeUpload,
       onError = props.onError,
       disabled = props.disabled,
-      restProps = __rest(props, ["className", "wrapperClassName", "children", "value", "onStart", "onDeleteUpload", "onFormatResData", "onSuccess", "onError", "disabled"]);
+      restProps = __rest(props, ["className", "wrapperClassName", "children", "value", "onStart", "onDeleteUpload", "onFormatResData", "onSuccess", "beforeUpload", "onError", "disabled"]);
 
   var uploadInstanceRef = React.useRef();
   var fileRef = React.useRef();
@@ -166,10 +321,54 @@ var SingleImgUpload = function SingleImgUpload(props) {
     }
   }, [value]);
 
+  var onBeforeUpload = function onBeforeUpload() {
+    var rest = [];
+
+    for (var _i = 0; _i < arguments.length; _i++) {
+      rest[_i] = arguments[_i];
+    }
+
+    return __awaiter(void 0, void 0, void 0, function () {
+      var resultBefore;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setFileUrl('');
+            if (!beforeUpload) return [3
+            /*break*/
+            , 2];
+            return [4
+            /*yield*/
+            , beforeUpload.apply(void 0, __spreadArray([], __read(rest), false))];
+
+          case 1:
+            resultBefore = _a.sent();
+
+            if ((0, isObject_1["default"])(resultBefore)) {
+              setFileUrl(getLocalImgURL(resultBefore));
+            }
+
+            return [2
+            /*return*/
+            , resultBefore];
+
+          case 2:
+            return [2
+            /*return*/
+            , true];
+        }
+      });
+    });
+  };
+
   var handleStart = function handleStart(file) {
     fileRef.current = file;
     setUploadPercent(0);
-    setFileUrl(getLocalImgURL(file));
+
+    if (!fileUrl) {
+      setFileUrl(getLocalImgURL(file));
+    }
+
     setUploadStatus('uploading');
     onStart && onStart(file);
   };
@@ -247,7 +446,8 @@ var SingleImgUpload = function SingleImgUpload(props) {
     onProgress: handleProgress,
     onError: handleError,
     onSuccess: handleSuccess,
-    disabled: disabled
+    disabled: disabled,
+    beforeUpload: onBeforeUpload
   }, restProps), uploadStatus === 'init' && React.createElement("div", {
     className: (0, classnames_1["default"])('as-img-upload-button', {
       'init-disable': disabled

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.1.9",
+  "version": "2.1.12",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -70,5 +70,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "933b30054fb25eb0e1d2af97e5a2cc5c0a8b564e"
+  "gitHead": "b127f9b800a44beb657e92ca70415b90795a5759"
 }