@hzab/form-render-mobile 1.2.2-beta → 1.2.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# @hzab/form-render-mobile@1.2.2
+
+feat:缩略图地址优化
+
 # @hzab/form-render-mobile@1.2.1
 
 feat:公有环境添加缩略图地址

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render-mobile",
-  "version": "1.2.2-beta",
+  "version": "1.2.2",
   "description": "formily-form-render-mobile",
   "main": "src",
   "scripts": {
@@ -44,8 +44,7 @@
     "@formily/antd-mobile": "1.0.0-beta.3",
     "@formily/core": "2.2.29",
     "@formily/react": "2.2.29",
-    "@hzab/data-model": "^1.8.8",
-    "@hzab/utils": "^1.0.4",
+    "@hzab/data-model": "^0.0.3",
     "antd-mobile": "^5.32.0",
     "antd-mobile-icons": "^0.2.2",
     "nanoid": "^3.3.7",

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

@@ -13,7 +13,7 @@ export async function handleOssUpload(files, opt) {
   const ossUpload = new OssUpload({
     axios: opt.axios,
     axiosConf: axiosConf,
-    serverUrl: ossUrl || "/api/v1/user/oss/getWebOssConfig",
+    serverUrl: ossUrl || "/api/v1/common/oss/getWebOssConfig",
   });
 
   const promise = [];

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

@@ -105,10 +105,10 @@ export function handleMaxCount(fileList, maxCount) {
 }
 /**判断是否私有 */
 const isSelf = (selfUrlList, fileUrl) => {
-  let flag = false;
+  let flag = "?";
   selfUrlList?.forEach((el) => {
     if (fileUrl?.startsWith(el)) {
-      flag = true;
+      flag = "&";
     }
   });
   return flag;
@@ -132,9 +132,7 @@ export function handleInputFileList(_fileList, maxCount = 1, opt) {
     if (typeof file === "string") {
       const uid = nanoid();
       let thumbnailUrl = "";
-      if (opt?.ossOpt?.signatureParams?.isPublic !== 0 && !isSelf(opt?.selfUrlList, file)) {
-        thumbnailUrl = `${file}${opt?.thumbnailParams ? "?" + opt?.thumbnailParams : ""}`;
-      }
+      thumbnailUrl = `${file}${opt?.thumbnailParams ? isSelf(opt?.selfUrlList, file) + opt?.thumbnailParams : ""}`;
       return {
         name: uid,
         uid: uid,

package/src/components/Uploader/uploader.jsx

@@ -23,6 +23,7 @@ function Uploader(props, ref) {
     accept,
     disabled,
     readOnly,
+    readPretty,
     value,
     baseUrl = "",
     // 文件大小限制
@@ -42,8 +43,8 @@ function Uploader(props, ref) {
     // cordova插件上传类型  cordova-plugin-chooser | cordova-plugin-camera
     cordovaPlugin = "cordova-plugin-camera",
     uploaderProps,
-    thumbnailParams = "x-oss-process=image/resize,w_100",
-    selfUrlList = ["https://abt2023-self.oss-cn-shanghai.aliyuncs.com"]
+    thumbnailParams = "image_process=resize,p_30",
+    selfUrlList = ["https://self-oss.abt.hzabjt.com"]
   } = props;
   const [loading, setLoading] = useState(false);
   const [fileList, setFileList] = useState(handleInputFileList(value, maxCount, {
@@ -134,7 +135,6 @@ function Uploader(props, ref) {
   const actions = useMemo(() => {
     const allEnum = {
       select: { text: "选择文件", key: "select" },
-      input: { text: "选择文件（H5）", key: "input" },
       image: { text: "拍照", key: "captureImage" },
       video: { text: "录像", key: "captureVideo" },
       audio: { text: "录音", key: "captureAudio" },
@@ -192,10 +192,6 @@ function Uploader(props, ref) {
         }
         break;
 
-      case "input":
-        uploaderRef.current.click();
-        console.log("使用h5上传", uploaderRef)
-        break;
       case "captureImage":
         getImage(props.imgPluginOpt, props.getImgOpt).then((res) => {
           onFileChange({
@@ -273,7 +269,7 @@ function Uploader(props, ref) {
         onItemDel={onItemDel}
         headers={headers}
       />
-      {disabled || readOnly || (maxCount > 0 && fileList.length >= maxCount) ? null : (
+      {disabled || readOnly || readPretty || (maxCount > 0 && fileList.length >= maxCount) ? null : (
         <>
           <div
             className={`uploader-add-btn ${loading ? "uploader-add-btn-loading" : ""}`}