@para-ui/core 3.0.19 → 3.0.21

package/Upload/index.js

@@ -908,7 +908,11 @@ var ImgCrop = /*#__PURE__*/forwardRef(function (props, ref) {
       onUploadFail = props.onUploadFail,
       cropperProps = props.cropperProps,
       children = props.children,
-      fixedCropSize = props.fixedCropSize;
+      _props$fixedCropSize = props.fixedCropSize,
+      fixedCropSize = _props$fixedCropSize === void 0 ? {
+    width: 120,
+    height: 120
+  } : _props$fixedCropSize;
   var intl = useFormatMessage('Upload', localeJson);
 
   var _useState = useState(''),
@@ -1028,7 +1032,7 @@ var ImgCrop = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var onOk = useCallback(function () {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee3() {
-      var canvas, ctx, imgSource, _easyCropRef$current$, cropWidth, cropHeight, cropX, cropY, imgWidth, imgHeight, angle, sine, cosine, squareWidth, squareHeight, squareHalfWidth, squareHalfHeight, imgX, imgY, imgData, _fileRef$current, type, name, uid, onBlob;
+      var canvas, ctx, imgSource, _easyCropRef$current$, cropWidth, cropHeight, cropX, cropY, imgWidth, imgHeight, angle, sine, cosine, squareWidth, squareHeight, squareHalfWidth, squareHalfHeight, imgX, imgY, imgData, changeImageSizeAfterCrop, _fileRef$current, type, name, uid, idx, onBlob;
 
       return regenerator.wrap(function _callee3$(_context3) {
         while (1) {
@@ -1036,7 +1040,6 @@ var ImgCrop = /*#__PURE__*/forwardRef(function (props, ref) {
             case 0:
               onClose();
               canvas = document.createElement('canvas');
-              canvas.getContext('2d');
               ctx = canvas.getContext('2d');
               imgSource = document.querySelector(".".concat(PREFIX, "-media"));
               _easyCropRef$current$ = easyCropRef.current.cropPixelsRef.current, cropWidth = _easyCropRef$current$.width, cropHeight = _easyCropRef$current$.height, cropX = _easyCropRef$current$.x, cropY = _easyCropRef$current$.y;
@@ -1074,14 +1077,67 @@ var ImgCrop = /*#__PURE__*/forwardRef(function (props, ref) {
                 ctx.fillStyle = fillColor;
                 ctx.fillRect(0, 0, cropWidth, cropHeight);
                 ctx.drawImage(imgSource, cropX, cropY, cropWidth, cropHeight, 0, 0, cropWidth, cropHeight);
-              } // get the new image
+              } //裁剪之后改变图片大小
+
+
+              changeImageSizeAfterCrop = function changeImageSizeAfterCrop(newFile) {
+                return new Promise(function (resolve) {
+                  var name = newFile.name,
+                      type = newFile.type,
+                      uid = newFile.uid;
+                  var width = fixedCropSize.width,
+                      height = fixedCropSize.height; //固定裁剪大小
+
+                  var changeCanvas = document.createElement('canvas');
+                  var changeCtx = changeCanvas.getContext('2d');
+                  var img = new Image();
+
+                  img.onload = function () {
+                    changeCanvas.width = width;
+                    changeCanvas.height = height;
+                    changeCtx.drawImage(img, 0, 0, width, height);
+                    changeCanvas.toBlob(function (cBlob) {
+                      var changeFile = Object.assign(new File([cBlob], name, {
+                        type: type
+                      }), {
+                        uid: uid
+                      });
+                      resolve(changeFile);
+                    }, type, quality);
+                  };
+
+                  img.onerror = function () {
+                    resolve(newFile);
+                  };
+
+                  var fileReader = new FileReader();
+
+                  fileReader.onload = function () {
+                    img.src = fileReader.result;
+                  };
+
+                  fileReader.onerror = function () {
+                    resolve(newFile);
+                  };
+
+                  fileReader.readAsDataURL(newFile);
+                });
+              }; // get the new image
 
 
               _fileRef$current = fileRef.current, type = _fileRef$current.type, name = _fileRef$current.name, uid = _fileRef$current.uid;
 
+              if (/svg/ig.test(type)) {
+                //svg 转为 png
+                type = 'image/png';
+                idx = name.lastIndexOf('.');
+                if (idx > -1) name = name.substring(0, idx) + '.png';
+              } //转为blob
+
+
               onBlob = function onBlob(blob) {
                 return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regenerator.mark(function _callee2() {
-                  var _a, _b, _c, _d, _e, _f, newFile, res, passedFile;
+                  var _a, _b, _c, _d, _e, _f, newFile, changeFile, res, passedFile;
 
                   return regenerator.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -1092,83 +1148,88 @@ var ImgCrop = /*#__PURE__*/forwardRef(function (props, ref) {
                           }), {
                             uid: uid
                           });
+                          _context2.next = 3;
+                          return changeImageSizeAfterCrop(newFile);
+
+                        case 3:
+                          changeFile = _context2.sent;
 
                           if (!(typeof beforeUploadRef.current !== 'function')) {
-                            _context2.next = 3;
+                            _context2.next = 6;
                             break;
                           }
 
-                          return _context2.abrupt("return", (_a = resolveRef.current) === null || _a === void 0 ? void 0 : _a.call(resolveRef, newFile));
+                          return _context2.abrupt("return", (_a = resolveRef.current) === null || _a === void 0 ? void 0 : _a.call(resolveRef, changeFile));
 
-                        case 3:
-                          res = beforeUploadRef.current(newFile, [newFile]);
+                        case 6:
+                          res = beforeUploadRef.current(changeFile, [changeFile]);
 
                           if (!(typeof res !== 'boolean' && !res)) {
-                            _context2.next = 7;
+                            _context2.next = 10;
                             break;
                           }
 
                           console.error('beforeUpload must return a boolean or Promise');
                           return _context2.abrupt("return");
 
-                        case 7:
+                        case 10:
                           if (!(res === true)) {
-                            _context2.next = 9;
+                            _context2.next = 12;
                             break;
                           }
 
-                          return _context2.abrupt("return", (_b = resolveRef.current) === null || _b === void 0 ? void 0 : _b.call(resolveRef, newFile));
+                          return _context2.abrupt("return", (_b = resolveRef.current) === null || _b === void 0 ? void 0 : _b.call(resolveRef, changeFile));
 
-                        case 9:
+                        case 12:
                           if (!(res === false)) {
-                            _context2.next = 11;
+                            _context2.next = 14;
                             break;
                           }
 
-                          return _context2.abrupt("return", (_c = resolveRef.current) === null || _c === void 0 ? void 0 : _c.call(resolveRef, newFile, false));
+                          return _context2.abrupt("return", (_c = resolveRef.current) === null || _c === void 0 ? void 0 : _c.call(resolveRef, changeFile, false));
 
-                        case 11:
+                        case 14:
                           if (!(res && res instanceof Promise)) {
-                            _context2.next = 24;
+                            _context2.next = 27;
                             break;
                           }
 
-                          _context2.prev = 12;
-                          _context2.next = 15;
+                          _context2.prev = 15;
+                          _context2.next = 18;
                           return res;
 
-                        case 15:
+                        case 18:
                           passedFile = _context2.sent;
 
                           if (!(passedFile instanceof File || passedFile instanceof Blob)) {
-                            _context2.next = 18;
+                            _context2.next = 21;
                             break;
                           }
 
                           return _context2.abrupt("return", (_d = resolveRef.current) === null || _d === void 0 ? void 0 : _d.call(resolveRef, passedFile));
 
-                        case 18:
-                          (_e = resolveRef.current) === null || _e === void 0 ? void 0 : _e.call(resolveRef, newFile, passedFile);
-                          _context2.next = 24;
+                        case 21:
+                          (_e = resolveRef.current) === null || _e === void 0 ? void 0 : _e.call(resolveRef, changeFile, passedFile);
+                          _context2.next = 27;
                           break;
 
-                        case 21:
-                          _context2.prev = 21;
-                          _context2.t0 = _context2["catch"](12);
+                        case 24:
+                          _context2.prev = 24;
+                          _context2.t0 = _context2["catch"](15);
                           (_f = rejectRef.current) === null || _f === void 0 ? void 0 : _f.call(rejectRef, _context2.t0);
 
-                        case 24:
+                        case 27:
                         case "end":
                           return _context2.stop();
                       }
                     }
-                  }, _callee2, null, [[12, 21]]);
+                  }, _callee2, null, [[15, 24]]);
                 }));
               };
 
               canvas.toBlob(onBlob, type, quality);
 
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }

package/_verture/{index-733c62a0.js → index-b4f57a63.js}

@@ -43,7 +43,7 @@ var FormRadioGroup = function FormRadioGroup(props) {
   return jsx(RadioGroup, Object.assign({
     value: selectValue,
     onChange: changeValue,
-    hideErrorDom: true
+    hideErrorDom: null
   }, props));
 };
 
@@ -76,7 +76,7 @@ var FormSelect = function FormSelect(props) {
   return jsx(Select, Object.assign({
     labelMode: "inside",
     onChange: changeValue,
-    hideErrorDom: true
+    hideErrorDom: null
   }, props, {
     value: selectValue
   }));
@@ -106,7 +106,7 @@ var FormCheckboxGroup = function FormCheckboxGroup(props) {
   return jsx(CheckboxGroup, Object.assign({
     value: selectValue,
     onChange: changeValue,
-    hideErrorDom: true
+    hideErrorDom: null
   }, props));
 };
 
@@ -402,7 +402,7 @@ var DefaultCompoments = function DefaultCompoments(props) {
     placeholder: placeholder,
     value: dValue,
     disabled: disabled,
-    hideErrorDom: true
+    hideErrorDom: null
   }, inputProps), {
     onChange: function onChange(e) {
       var _a;
@@ -566,7 +566,7 @@ var ItemType = function ItemType(props) {
           multiline: true,
           rows: 3,
           name: name,
-          hideErrorDom: true,
+          hideErrorDom: null,
           onChange: function onChange(e) {
             validateFunction(e.target.value);
           }
@@ -579,7 +579,7 @@ var ItemType = function ItemType(props) {
           defaultValue: backData[name],
           disabled: disabled,
           name: name,
-          hideErrorDom: true,
+          hideErrorDom: null,
           onChange: function onChange(val) {
             validateFunction(val);
           }
@@ -619,7 +619,7 @@ var ItemType = function ItemType(props) {
             validateFunction(e.target.value);
           },
           name: name,
-          hideErrorDom: true,
+          hideErrorDom: null,
           disabled: disabled
         }, inputProps));
     }

package/index.js

@@ -20,7 +20,7 @@ export { Drawer } from './Drawer/index.js';
 export { Dropdown } from './Dropdown/index.js';
 export { default as Empty } from './Empty/index.js';
 export { default as Form } from './Form/index.js';
-export { F as FormItem } from './_verture/index-733c62a0.js';
+export { F as FormItem } from './_verture/index-b4f57a63.js';
 export { u as FunctionModal, F as FunctionModalProvider, a as useClose } from './_verture/modalContext-8522aa7e.js';
 export { default as GlobalContext, changeConfirmLocale, getConfirmLocale } from './GlobalContext/index.js';
 export { default as Help } from './Help/index.js';
@@ -65,7 +65,7 @@ export { Timeline } from './Timeline/index.js';
 export { Title } from './Title/index.js';
 export { ToggleButton, ToggleButtonGroup } from './ToggleButton/index.js';
 export { Tooltip } from './Tooltip/index.js';
-export { Transfer } from './Transfer/index.js';
+export { SSortablejs, Transfer } from './Transfer/index.js';
 export { T as Tree } from './_verture/index-6807c0e0.js';
 export { default as Upload } from './Upload/index.js';
 import './_verture/slicedToArray-d7722f4b.js';
@@ -130,6 +130,7 @@ import '@para-ui/icons/CheckCircleF';
 import '@para-ui/icons/CloseCircleF';
 import 'rc-dialog';
 import '@para-ui/icons/WarningCircle';
+import '@para-ui/icons/PlusCircleF';
 import 'rc-notification';
 import 'rc-pagination';
 import '@para-ui/icons/Left';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@para-ui/core",
   "private": false,
-  "version": "3.0.19",
+  "version": "3.0.21",
   "main": "./index.js",
   "typings": "./index.d.ts",
   "description": "Powered by Para FED",