@pisell/materials 6.0.1 → 6.0.3

package/es/components/dataSourceComponents/fields/Upload/BaseUpload.js

@@ -25,7 +25,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useState, useMemo, useCallback, useEffect } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import { Upload, Image } from 'antd';
-import { useDebounceFn } from 'ahooks';
+import { useDebounceFn, useMemoizedFn } from 'ahooks';
 import { isBoolean } from '@pisell/utils';
 import IconFont from "../../../iconfont";
 import PisellModal from "../../../pisellModal";
@@ -419,6 +419,36 @@ var BaseUpload = function BaseUpload(props) {
       onClick: handleGlobeIconClick
     }));
   }, [restProps.disabled, handleGlobeIconClick]);
+  var itemRender = useMemoizedFn(function (originNode, file) {
+    var _useState13 = useState(''),
+      _useState14 = _slicedToArray(_useState13, 2),
+      itemUrl = _useState14[0],
+      setItemUrl = _useState14[1];
+    useEffect(function () {
+      getItemUrl(file).then(setItemUrl);
+    }, [file]);
+    var newNode = /*#__PURE__*/React.cloneElement(originNode, {
+      children: React.Children.map(originNode.props.children, function (child) {
+        if ((child === null || child === void 0 ? void 0 : child.type) === 'a') {
+          return /*#__PURE__*/React.cloneElement(child, {
+            children: React.Children.map(child.props.children, function (grandChild) {
+              if ((grandChild === null || grandChild === void 0 ? void 0 : grandChild.type) === 'img') {
+                return /*#__PURE__*/React.cloneElement(grandChild, {
+                  src: itemUrl,
+                  onError: function onError() {
+                    return handleImageError(file);
+                  }
+                });
+              }
+              return grandChild;
+            })
+          });
+        }
+        return child;
+      })
+    });
+    return newNode;
+  });
   var uploadProps = _objectSpread(_objectSpread({}, restProps), {}, {
     multiple: multiple,
     showUploadList: {
@@ -457,38 +487,37 @@ var BaseUpload = function BaseUpload(props) {
     },
     headers: getHeaders === null || getHeaders === void 0 ? void 0 : getHeaders(),
     beforeUpload: beforeUpload,
-    className: 'pisell-data-source-upload',
-    itemRender: function itemRender(originNode, file) {
-      var _useState13 = useState(''),
-        _useState14 = _slicedToArray(_useState13, 2),
-        itemUrl = _useState14[0],
-        setItemUrl = _useState14[1];
-      useEffect(function () {
-        getItemUrl(file).then(setItemUrl);
-      }, [file]);
-      var newNode = /*#__PURE__*/React.cloneElement(originNode, {
-        children: React.Children.map(originNode.props.children, function (child) {
-          if ((child === null || child === void 0 ? void 0 : child.type) === 'a') {
-            return /*#__PURE__*/React.cloneElement(child, {
-              children: React.Children.map(child.props.children, function (grandChild) {
-                if ((grandChild === null || grandChild === void 0 ? void 0 : grandChild.type) === 'img') {
-                  return /*#__PURE__*/React.cloneElement(grandChild, {
-                    src: itemUrl,
-                    onError: function onError() {
-                      return handleImageError(file);
-                    }
-                  });
-                }
-                return grandChild;
-              })
-            });
-          }
-          return child;
-        })
-      });
-      return newNode;
-    }
+    className: 'pisell-data-source-upload'
+    // itemRender: (originNode: React.ReactElement, file: UploadFile) => {
+    //   const [itemUrl, setItemUrl] = useState<string>('');
+
+    //   useEffect(() => {
+    //     getItemUrl(file).then(setItemUrl);
+    //   }, [file]);
+
+    //   const newNode = React.cloneElement(originNode, {
+    //     children: React.Children.map(originNode.props.children, child => {
+    //       if (child?.type === 'a') {
+    //         return React.cloneElement(child, {
+    //           children: React.Children.map(child.props.children, grandChild => {
+    //             if (grandChild?.type === 'img') {
+    //               return React.cloneElement(grandChild, {
+    //                 src: itemUrl,
+    //                 onError: () => handleImageError(file)
+    //               });
+    //             }
+    //             return grandChild;
+    //           })
+    //         });
+    //       }
+    //       return child;
+    //     })
+    //   });
+
+    //   return newNode;
+    // }
   });
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellUpload, _extends({}, uploadProps, {
     fileList: fileList
   }), fileList.length >= calcMaxCount ? null : renderUploadButton(!!enableMultilingual)), /*#__PURE__*/React.createElement(PisellModal, {

package/es/components/dataSourceComponents/fields/Upload/index.less

@@ -5,6 +5,7 @@
   border: 0;
   background: none;
   cursor: inherit;
+  color: #000;
 
   .pisell-upload-text {
     margin-top: 8px;

package/lib/components/dataSourceComponents/fields/Upload/BaseUpload.js

@@ -378,6 +378,31 @@ var BaseUpload = (props) => {
     ),
     [restProps.disabled, handleGlobeIconClick]
   );
+  const itemRender = (0, import_ahooks.useMemoizedFn)((originNode, file) => {
+    const [itemUrl, setItemUrl] = (0, import_react.useState)("");
+    (0, import_react.useEffect)(() => {
+      getItemUrl(file).then(setItemUrl);
+    }, [file]);
+    const newNode = import_react.default.cloneElement(originNode, {
+      children: import_react.default.Children.map(originNode.props.children, (child) => {
+        if ((child == null ? void 0 : child.type) === "a") {
+          return import_react.default.cloneElement(child, {
+            children: import_react.default.Children.map(child.props.children, (grandChild) => {
+              if ((grandChild == null ? void 0 : grandChild.type) === "img") {
+                return import_react.default.cloneElement(grandChild, {
+                  src: itemUrl,
+                  onError: () => handleImageError(file)
+                });
+              }
+              return grandChild;
+            })
+          });
+        }
+        return child;
+      })
+    });
+    return newNode;
+  });
   const uploadProps = {
     ...restProps,
     multiple,
@@ -412,32 +437,32 @@ var BaseUpload = (props) => {
     }),
     headers: getHeaders == null ? void 0 : getHeaders(),
     beforeUpload,
-    className: "pisell-data-source-upload",
-    itemRender: (originNode, file) => {
-      const [itemUrl, setItemUrl] = (0, import_react.useState)("");
-      (0, import_react.useEffect)(() => {
-        getItemUrl(file).then(setItemUrl);
-      }, [file]);
-      const newNode = import_react.default.cloneElement(originNode, {
-        children: import_react.default.Children.map(originNode.props.children, (child) => {
-          if ((child == null ? void 0 : child.type) === "a") {
-            return import_react.default.cloneElement(child, {
-              children: import_react.default.Children.map(child.props.children, (grandChild) => {
-                if ((grandChild == null ? void 0 : grandChild.type) === "img") {
-                  return import_react.default.cloneElement(grandChild, {
-                    src: itemUrl,
-                    onError: () => handleImageError(file)
-                  });
-                }
-                return grandChild;
-              })
-            });
-          }
-          return child;
-        })
-      });
-      return newNode;
-    }
+    className: "pisell-data-source-upload"
+    // itemRender: (originNode: React.ReactElement, file: UploadFile) => {
+    //   const [itemUrl, setItemUrl] = useState<string>('');
+    //   useEffect(() => {
+    //     getItemUrl(file).then(setItemUrl);
+    //   }, [file]);
+    //   const newNode = React.cloneElement(originNode, {
+    //     children: React.Children.map(originNode.props.children, child => {
+    //       if (child?.type === 'a') {
+    //         return React.cloneElement(child, {
+    //           children: React.Children.map(child.props.children, grandChild => {
+    //             if (grandChild?.type === 'img') {
+    //               return React.cloneElement(grandChild, {
+    //                 src: itemUrl,
+    //                 onError: () => handleImageError(file)
+    //               });
+    //             }
+    //             return grandChild;
+    //           })
+    //         });
+    //       }
+    //       return child;
+    //     })
+    //   });
+    //   return newNode;
+    // }
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_pisellUpload.default, { ...uploadProps, fileList }, fileList.length >= calcMaxCount ? null : renderUploadButton(!!enableMultilingual)), /* @__PURE__ */ import_react.default.createElement(
     import_pisellModal.default,

package/lib/components/dataSourceComponents/fields/Upload/index.less

@@ -5,6 +5,7 @@
   border: 0;
   background: none;
   cursor: inherit;
+  color: #000;
 
   .pisell-upload-text {
     margin-top: 8px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -65,9 +65,9 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@zxing/library": "0.21.2",
-    "@pisell/utils": "1.0.42",
     "@pisell/date-picker": "1.0.100",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "1.0.42"
   },
   "peerDependencies": {
     "react": "^18.0.0",