@hzab/form-render-mobile 0.0.13 → 0.0.15

package/lib/index.js

@@ -41765,7 +41765,7 @@
                           (c = []),
                           null == r ||
                             r.forEach(function (e) {
-                              "string" == typeof e
+                              "string" == typeof e || e.ossUrl
                                 ? c.push(Promise.resolve(e))
                                 : c.push(
                                     u
@@ -41874,18 +41874,18 @@
             b = e.ossUrl,
             M = e.ossOpt,
             w = e.onCountExceed,
-            k = dg((0, a.useState)(s), 2),
+            k = dg((0, a.useState)(Nb(c, p)), 2),
             L = k[0],
             x = k[1],
-            Y = dg((0, a.useState)(Nb(c, p)), 2),
+            Y = dg((0, a.useState)(!1), 2),
             D = Y[0],
-            T = Y[1],
-            S = dg((0, a.useState)(!1), 2),
-            E = S[0],
-            O = S[1];
-          function j() {
+            T = Y[1];
+          function S(e) {
+            return E.apply(this, arguments);
+          }
+          function E() {
             return (
-              (j = gb(
+              (E = gb(
                 Mb().mark(function e(t) {
                   var n, r;
                   return Mb().wrap(function (e) {
@@ -41895,7 +41895,7 @@
                           if (
                             (t.persist(),
                             (n = t.target.files),
-                            (r = [].concat(mb(D), mb([].slice.call(n)))),
+                            (r = [].concat(mb(L), mb([].slice.call(n)))),
                             p > 0 &&
                               r.length > p &&
                               (w && w(r.length - p),
@@ -41918,7 +41918,7 @@
                         case 8:
                           r = e.sent;
                         case 9:
-                          (t.target.value = ""), C(r);
+                          (t.target.value = ""), O(r);
                         case 11:
                         case "end":
                           return e.stop();
@@ -41926,13 +41926,13 @@
                   }, e);
                 }),
               )),
-              j.apply(this, arguments)
+              E.apply(this, arguments)
             );
           }
-          function C(e, t) {
+          function O(e, t) {
             var n,
               r = e;
-            ("del" !== t && p > 1 && (r = [].concat(mb(D), mb(r))), (r = Rb(e, p)), T(r), _ && v) &&
+            ("del" !== t && p > 1 && (r = [].concat(mb(L), mb(r))), (r = Rb(e, p)), x(r), _ && v) &&
               (r =
                 null === (n = r) || void 0 === n
                   ? void 0
@@ -41943,12 +41943,13 @@
           }
           (0, a.useEffect)(
             function () {
-              T(Nb(c, p));
+              x(Nb(c, p));
             },
             [c],
           );
-          var P = (0, a.useRef)(),
-            A = (0, a.useMemo)(
+          var j = (0, a.useRef)(),
+            C = (0, a.useRef)(),
+            P = (0, a.useMemo)(
               function () {
                 var e = {
                   select: { text: "选择文件", key: "select" },
@@ -41974,7 +41975,7 @@
               },
               [i],
             );
-          function H(e) {
+          function A(e) {
             var t = e.index;
             return Jw.createElement(
               "div",
@@ -41992,8 +41993,8 @@
                           nu.confirm({
                             content: "确认删除？",
                             onConfirm: function () {
-                              var t = ek.cloneDeep(D);
-                              t.splice(e, 1), C(t, "del"), T(t);
+                              var t = ek.cloneDeep(L);
+                              t.splice(e, 1), O(t, "del"), x(t);
                             },
                           });
                       },
@@ -42002,35 +42003,34 @@
                   ),
             );
           }
+          var H = {
+            className: "aria-hidden",
+            style: { display: "none" },
+            id: t,
+            onChange: S,
+            type: "file",
+            name: t,
+            multiple: n,
+            accept: s,
+            capture: e.capture,
+          };
           return Jw.createElement(
             "div",
             { className: "uploader" },
-            Jw.createElement("input", {
-              className: "aria-hidden",
-              style: { display: "none" },
-              ref: P,
-              id: t,
-              onChange: function (e) {
-                return j.apply(this, arguments);
-              },
-              type: "file",
-              name: t,
-              multiple: n,
-              accept: L,
-              capture: e.capture,
-            }),
-            D.map(function (e, t) {
+            Jw.createElement("input", by({}, H, { ref: j })),
+            Jw.createElement("input", by({}, H, { ref: C, id: t + "-audio", accept: "audio/*" })),
+            L.map(function (e, t) {
               if (!e) return null;
               var n = e || {},
                 r = n.type,
                 a = n.name,
                 i = n.url,
                 o = void 0 === i ? (null == e ? void 0 : e.ossUrl) : i,
+                s = "",
                 l = "",
-                u = "",
-                c = void 0;
+                u = void 0;
               if (o) {
-                var d = (function (e) {
+                var c = (function (e) {
                   return Ab(e, [
                     "apng",
                     "avif",
@@ -42049,37 +42049,37 @@
                     "tiff",
                     "webp",
                   ]);
-                })((l = o));
-                (l.startsWith("data:image/") || (/[ ,]?image\//.test(s) && d) || d) && (u = Xw),
-                  /[ ,]?video\//.test(s) &&
-                    (function (e) {
+                })((s = o));
+                s.startsWith("data:image/") || c
+                  ? (l = Xw)
+                  : !(function (e) {
                       return Ab(e, ["3gp", "mpg", "mpeg", "mp4", "m4v", "m4p", "ogv", "ogg", "mov", "webm"]);
-                    })(l) &&
-                    (u = Kw),
-                  /[ ,]?audio\//.test(s) &&
-                    (function (e) {
+                    })(s)
+                  ? (function (e) {
                       return Ab(e, ["3gp", "adts", "mpeg", "mp3", "mp4", "ogg", "mov", "webm", "rtp", "amr", "wav"]);
-                    })(l) &&
-                    (u = Qw);
-              } else null != r && r.startsWith("image/") && ((l = Pb(e)), (u = Xw)), null != r && r.startsWith("video/") && ((l = Pb(e)), (u = Kw), (c = l)), null != r && r.startsWith("audio/") && ((l = Pb(e)), (u = Qw), (c = l));
+                    })(s) && (l = Qw)
+                  : (l = Kw);
+              } else null != r && r.startsWith("image/") && ((s = Pb(e)), (l = Xw)), null != r && r.startsWith("video/") && ((s = Pb(e)), (l = Kw), (u = s)), null != r && r.startsWith("audio/") && ((s = Pb(e)), (l = Qw), (u = s));
               return (
-                m && (l = m + l),
-                u === Xw
+                m && (s = m + s),
+                l === Xw
                   ? Jw.createElement(
-                      H,
+                      A,
                       { index: t, key: a + "_" + t },
-                      Jw.createElement(Ob, { className: "file-item-view", src: l, alt: a }),
+                      Jw.createElement(Ob, { className: "file-item-view", src: s, alt: a }),
                     )
-                  : u === Kw
-                  ? Jw.createElement(H, { index: t, key: a + "_" + t }, Jw.createElement(Db, { src: l, href: c }))
-                  : u === Qw
-                  ? Jw.createElement("audio", { src: l, controls: !0 })
-                  : null == e
-                  ? void 0
-                  : e.name
+                  : l === Kw
+                  ? Jw.createElement(A, { index: t, key: a + "_" + t }, Jw.createElement(Db, { src: s, href: u }))
+                  : l === Qw
+                  ? Jw.createElement(
+                      A,
+                      { index: t, key: a + "_" + t },
+                      Jw.createElement("audio", { src: s, controls: !0 }),
+                    )
+                  : Jw.createElement(A, { index: t, key: a + "_" + t }, null == e ? void 0 : e.name)
               );
             }),
-            l || u || (p > 0 && D.length >= p)
+            l || u || (p > 0 && L.length >= p)
               ? null
               : Jw.createElement(
                   Jw.Fragment,
@@ -42089,22 +42089,19 @@
                     {
                       className: "uploader-add-btn",
                       onClick: function () {
-                        O(!0);
+                        T(!0);
                       },
                     },
                     "+",
                   ),
                   Jw.createElement(Ji, {
                     cancelText: "取消",
-                    visible: E,
-                    actions: A,
+                    visible: D,
+                    actions: P,
                     onAction: function (e) {
                       switch (e.key) {
                         case "select":
-                          x(s),
-                            setTimeout(function () {
-                              P.current.click();
-                            }, 1e3);
+                          j.current.click();
                           break;
                         case "captureImage":
                           (function () {
@@ -42162,7 +42159,7 @@
                               );
                             });
                           })().then(function (e) {
-                            C([e]);
+                            S({ persist: function () {}, target: { value: "", files: [e] } });
                           });
                           break;
                         case "captureVideo":
@@ -42221,19 +42218,16 @@
                               );
                             });
                           })().then(function (e) {
-                            C([e]);
+                            S({ persist: function () {}, target: { value: "", files: [e] } });
                           });
                           break;
                         case "captureAudio":
-                          x("audio/*"),
-                            setTimeout(function () {
-                              P.current.click();
-                            }, 1e3);
+                          C.current.click();
                       }
-                      O(!1);
+                      T(!1);
                     },
                     onClose: function () {
-                      return O(!1);
+                      return T(!1);
                     },
                   }),
                 ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render-mobile",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "formily-form-render-mobile",
   "main": "lib",
   "scripts": {

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

@@ -100,7 +100,7 @@ export async function handleOssUpload(files, opt) {
   const promise = [];
   _files?.forEach((file) => {
     // 数据已经是 url 的情况
-    if (typeof file === "string") {
+    if (typeof file === "string" || file.ossUrl) {
       promise.push(Promise.resolve(file));
     } else {
       promise.push(

package/src/components/Uploader/uploader.jsx

@@ -50,7 +50,6 @@ function Uploader(props) {
     ossOpt,
     onCountExceed,
   } = props;
-  const [curAccept, setCurAccept] = useState(accept);
   const [fileList, setFileList] = useState(handleInputFileList(value, maxCount));
   const [actionSheetVisible, setActionSheetVisible] = useState(false);
   useEffect(() => {
@@ -114,6 +113,7 @@ function Uploader(props) {
   }
 
   const uploaderRef = useRef();
+  const audioUploaderRef = useRef();
 
   const actions = useMemo(() => {
     const allEnum = {
@@ -134,33 +134,44 @@ function Uploader(props) {
   function onPicker({ key }) {
     switch (key) {
       case "select":
-        // uploaderRef.current.click();
-        setCurAccept(accept);
-        setTimeout(() => {
-          uploaderRef.current.click();
-        }, 1000);
+        uploaderRef.current.click();
         break;
 
       case "captureImage":
         getImage().then((res) => {
-          handleChange([res]);
+          onFileChange({
+            persist: () => {},
+            target: {
+              value: "",
+              files: [res],
+            },
+          });
         });
         break;
 
       case "captureVideo":
         getVideo().then((res) => {
-          handleChange([res]);
+          onFileChange({
+            persist: () => {},
+            target: {
+              value: "",
+              files: [res],
+            },
+          });
         });
         break;
 
       case "captureAudio":
-        setCurAccept("audio/*");
-        setTimeout(() => {
-          uploaderRef.current.click();
-        }, 1000);
+        audioUploaderRef.current.click();
         // TODO: reader 报错
         // getAudio().then((res) => {
-        //   handleChange([res]);
+        //   onFileChange({
+        //     persist: () => {},
+        //     target: {
+        //       value: "",
+        //       files: [res],
+        //     },
+        //   });
         // });
         break;
     }
@@ -203,20 +214,22 @@ function Uploader(props) {
     );
   }
 
+  const inputProps = {
+    className: "aria-hidden",
+    style: { display: "none" },
+    id: name,
+    onChange: onFileChange,
+    type: "file",
+    name: name,
+    multiple: multiple,
+    accept: accept,
+    capture: props.capture,
+  };
+
   return (
     <div className="uploader">
-      <input
-        className="aria-hidden"
-        style={{ display: "none" }}
-        ref={uploaderRef}
-        id={name}
-        onChange={onFileChange}
-        type="file"
-        name={name}
-        multiple={multiple}
-        accept={curAccept}
-        capture={props.capture}
-      ></input>
+      <input {...inputProps} ref={uploaderRef}></input>
+      <input {...inputProps} ref={audioUploaderRef} id={name + "-audio"} accept="audio/*"></input>
       {fileList.map((it, idx) => {
         if (!it) {
           return null;
@@ -231,15 +244,13 @@ function Uploader(props) {
           src = url;
           // 图片
           const isImg = checkImageUrl(src);
-          if (src.startsWith("data:image/") || (/[ ,]?image\//.test(accept) && isImg) || isImg) {
+          if (src.startsWith("data:image/") || isImg) {
             fileType = TYPE_IMG;
-          }
-          // 视频
-          if (/[ ,]?video\//.test(accept) && checkVideoUrl(src)) {
+          } else if (checkVideoUrl(src)) {
+            // 视频
             fileType = TYPE_VIDEO;
-          }
-          // 音频
-          if (/[ ,]?audio\//.test(accept) && checkAudioUrl(src)) {
+          } else if (checkAudioUrl(src)) {
+            // 音频
             fileType = TYPE_AUDIO;
           }
         } else {
@@ -283,10 +294,18 @@ function Uploader(props) {
           );
         }
         if (fileType === TYPE_AUDIO) {
-          return <audio src={src} controls></audio>;
+          return (
+            <ItemRender index={idx} key={name + "_" + idx}>
+              <audio src={src} controls></audio>
+            </ItemRender>
+          );
         }
 
-        return it?.name;
+        return (
+          <ItemRender index={idx} key={name + "_" + idx}>
+            {it?.name}
+          </ItemRender>
+        );
       })}
       {disabled || readOnly || (maxCount > 0 && fileList.length >= maxCount) ? null : (
         <>