@hzab/form-render-mobile 1.2.6 → 1.2.8

package/CHANGELOG.md

@@ -1,4 +1,12 @@
-# @hzab/form-render-mobile@1.2.5
+# @hzab/form-render-mobile@1.2.8
+
+feat: uploader 增加点击回调
+
+# @hzab/form-render-mobile@1.2.7
+
+fix: 图片链接添加 query
+
+# @hzab/form-render-mobile@1.2.6
 
 fix: 缩略图后缀名更换
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render-mobile",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "formily-form-render-mobile",
   "main": "src",
   "scripts": {
@@ -49,6 +49,7 @@
     "@formily/core": "2.2.29",
     "@formily/react": "2.2.29",
     "@hzab/data-model": "^0.0.3",
+    "@hzab/utils": "^1.0.16",
     "antd-mobile": "^5.32.0",
     "antd-mobile-icons": "^0.2.2",
     "nanoid": "^3.3.7",

package/src/components/Uploader/common/utils.js

@@ -1,6 +1,6 @@
 import { nanoid } from "nanoid";
 import { getFormRenderGlobalServeConfig } from "../../../globalConfig";
-
+import { addQuery } from "@hzab/utils/src/url";
 /**
  *  建立一个可以存取该 file 的 url
  * @param {Object} file 文件
@@ -104,16 +104,7 @@ export function handleMaxCount(fileList, maxCount) {
   }
   return list;
 }
-/**判断是否私有 */
-const isSelf = (selfUrlList, fileUrl) => {
-  let flag = "?";
-  selfUrlList?.forEach((el) => {
-    if (fileUrl?.startsWith(el)) {
-      flag = "&";
-    }
-  });
-  return flag;
-};
+
 /**
  * 处理传入的数据，数据格式统一转成 Array<fileObject>
  * @param {Array} fileList Array<fileObject|string>
@@ -134,7 +125,7 @@ export function handleInputFileList(_fileList, maxCount = 1, opt) {
       const uid = nanoid();
       let thumbnailUrl = "";
       if (getFormRenderGlobalServeConfig()?.showThumbnail) {
-        thumbnailUrl = `${file}${opt?.thumbnailParams ? isSelf(opt?.selfUrlList, file) + opt?.thumbnailParams : ""}`;
+        thumbnailUrl = addQuery(file, opt?.thumbnailParams);
       }
       return {
         name: uid,

package/src/components/Uploader/uploader.jsx

@@ -40,28 +40,30 @@ function Uploader(props, ref) {
     onCountExceed,
     headers,
     uploadBtnNode,
+    uploadCallback,
     // cordova插件上传类型  cordova-plugin-chooser | cordova-plugin-camera
     cordovaPlugin = "cordova-plugin-camera",
     uploaderProps,
-    thumbnailParams = "image_process=resize,w_200",
-    selfUrlList = ["https://self-oss.abt.hzabjt.com"]
+    thumbnailParams = { image_process: "resize,w_200" },
   } = props;
   const [loading, setLoading] = useState(false);
-  const [fileList, setFileList] = useState(handleInputFileList(value, maxCount, {
-    thumbnailParams,
-    ossOpt,
-    selfUrlList
-  }));
+  const [fileList, setFileList] = useState(
+    handleInputFileList(value, maxCount, {
+      thumbnailParams,
+      ossOpt,
+    }),
+  );
   const [actionSheetVisible, setActionSheetVisible] = useState(false);
   const uploadManagerRef = useRef(new uploadManager(new ChooserUploader()));
 
   useEffect(() => {
-    setFileList(handleInputFileList(value, maxCount, {
-      thumbnailParams,
-      ossOpt,
-      selfUrlList
-    }));
-  }, [value, thumbnailParams, ossOpt]);
+    setFileList(
+      handleInputFileList(value, maxCount, {
+        thumbnailParams,
+        ossOpt,
+      }),
+    );
+  }, [value, ossOpt]);
 
   useImperativeHandle(ref, () => ({ onPicker, setActionSheetVisible }));
 
@@ -99,7 +101,7 @@ function Uploader(props, ref) {
         axiosConf: props?.axiosConf,
         ...ossOpt,
         ossUrl,
-        thumbnailParams
+        thumbnailParams,
       });
       setLoading(false);
     }
@@ -155,7 +157,7 @@ function Uploader(props, ref) {
           onGalleryUopload?.({
             onUploadSuccess: (res) => {
               onFileChange({
-                persist: () => { },
+                persist: () => {},
                 target: {
                   value: "",
                   files: [res],
@@ -164,8 +166,8 @@ function Uploader(props, ref) {
             },
             options: {
               cameraDirection: uploaderProps?.CameraConf?.frontCamera ? Camera.Direction.FRONT : null,
-              ...uploaderProps?.CameraConf
-            }
+              ...uploaderProps?.CameraConf,
+            },
           });
         } else if (window?.chooser && cordovaPlugin === "cordova-plugin-chooser") {
           uploadManagerRef.current.uploadFile({
@@ -176,7 +178,7 @@ function Uploader(props, ref) {
             },
             onSuccess(values) {
               onFileChange({
-                persist: () => { },
+                persist: () => {},
                 target: {
                   value: "",
                   files: [values.blob],
@@ -195,7 +197,7 @@ function Uploader(props, ref) {
       case "captureImage":
         getImage(props.imgPluginOpt, props.getImgOpt).then((res) => {
           onFileChange({
-            persist: () => { },
+            persist: () => {},
             target: {
               value: "",
               files: [res],
@@ -207,7 +209,7 @@ function Uploader(props, ref) {
       case "captureVideo":
         getVideo().then((res) => {
           onFileChange({
-            persist: () => { },
+            persist: () => {},
             target: {
               value: "",
               files: [res],
@@ -273,10 +275,12 @@ function Uploader(props, ref) {
         <>
           <div
             className={`uploader-add-btn ${loading ? "uploader-add-btn-loading" : ""}`}
-            onClick={() => {
+            onClick={async () => {
               if (loading) {
                 return;
               }
+              uploadCallback && (await uploadCallback());
+
               setActionSheetVisible(true);
             }}
             loading={loading}