persagy-vant 0.0.42 → 0.0.43

package/lib/vant.es.js

@@ -299,6 +299,12 @@ var stdin_default$29 = {
   },
   vanTabs: {
     moreTitle: "更多标签"
+  },
+  vanUploader: {
+    sourcePickerTitle: "选择上传方式",
+    takePhoto: "拍照",
+    recordVideo: "拍视频",
+    chooseFromAlbum: "从相册选择"
   }
 };
 const lang = ref("zh-CN");
@@ -1784,6 +1790,7 @@ const actionSheetProps = extend({}, popupSharedProps, {
   closeable: truthProp,
   cancelText: String,
   description: String,
+  contentAdaptive: Boolean,
   closeOnPopstate: truthProp,
   closeOnClickAction: Boolean,
   safeAreaInsetBottom: truthProp
@@ -1892,7 +1899,9 @@ var stdin_default$1W = defineComponent({
       }
     };
     return () => createVNode(Popup, mergeProps({
-      "class": bem$1I(),
+      "class": bem$1I({
+        "content-adaptive": props2.contentAdaptive
+      }),
       "position": "bottom",
       "onUpdate:show": updateShow
     }, pick(props2, popupInheritKeys$2)), {
@@ -19215,6 +19224,7 @@ const uploaderProps = {
   accept: makeStringProp("image/*"),
   capture: String,
   multiple: Boolean,
+  sourcePicker: Boolean,
   label: String,
   required: Boolean,
   disabled: Boolean,
@@ -19244,21 +19254,26 @@ const uploaderProps = {
 var stdin_default$7 = defineComponent({
   name: name$3,
   props: uploaderProps,
-  emits: ["delete", "oversize", "click-upload", "close-preview", "click-preview", "update:modelValue"],
+  emits: ["delete", "oversize", "click-upload", "close-preview", "click-preview", "select-source", "update:modelValue"],
   setup(props2, {
     emit,
     slots
   }) {
     const inputRef = ref();
+    const cameraInputRef = ref();
+    const videoInputRef = ref();
+    const sourcePickerVisible = ref(false);
     const urls = [];
     const getDetail = (index = props2.modelValue.length) => ({
       name: props2.name,
       index
     });
     const resetInput = () => {
-      if (inputRef.value) {
-        inputRef.value.value = "";
-      }
+      [inputRef, cameraInputRef, videoInputRef].forEach((input) => {
+        if (input.value) {
+          input.value.value = "";
+        }
+      });
     };
     const onAfterRead = (items) => {
       resetInput();
@@ -19394,21 +19409,69 @@ var stdin_default$7 = defineComponent({
         "class": bem$3("required")
       }, [createTextVNode("*")]), props2.label]);
     };
-    const onClickUpload = (event) => emit("click-upload", event);
+    const acceptTypes = () => props2.accept.split(",").map((type) => type.trim().toLowerCase()).filter(Boolean);
+    const acceptsMediaType = (type) => acceptTypes().some((accept) => accept === `${type}/*` || accept.startsWith(`${type}/`));
+    const triggerInput = (source) => {
+      const target = source === "camera" ? cameraInputRef.value : source === "video" ? videoInputRef.value : inputRef.value;
+      if (target && !props2.disabled && !props2.readonly) {
+        emit("select-source", source);
+        target.click();
+      }
+    };
+    const onClickUpload = (event) => {
+      emit("click-upload", event);
+      if (props2.sourcePicker && !props2.disabled && !props2.readonly) {
+        sourcePickerVisible.value = true;
+      }
+    };
+    const renderInput = (input, accept, capture, multiple = false, hidden = false) => createVNode("input", {
+      "ref": input,
+      "type": "file",
+      "class": bem$3("input", {
+        hidden
+      }),
+      "accept": accept,
+      "capture": capture,
+      "multiple": multiple,
+      "disabled": props2.disabled,
+      "onChange": onChange
+    }, null);
+    const renderSourcePicker = () => {
+      if (!props2.sourcePicker)
+        return;
+      const actions = [];
+      if (acceptsMediaType("image")) {
+        actions.push({
+          name: t("takePhoto"),
+          callback: () => triggerInput("camera")
+        });
+      }
+      if (acceptsMediaType("video")) {
+        actions.push({
+          name: t("recordVideo"),
+          callback: () => triggerInput("video")
+        });
+      }
+      actions.push({
+        name: t("chooseFromAlbum"),
+        callback: () => triggerInput("album")
+      });
+      return createVNode(ActionSheet, {
+        "show": sourcePickerVisible.value,
+        "title": t("sourcePickerTitle"),
+        "actions": actions,
+        "contentAdaptive": true,
+        "closeOnClickAction": true,
+        "onUpdate:show": (show) => {
+          sourcePickerVisible.value = show;
+        }
+      }, null);
+    };
     const renderUpload = () => {
       if (props2.modelValue.length >= props2.maxCount || !props2.showUpload) {
         return;
       }
-      const Input = props2.readonly ? null : createVNode("input", {
-        "ref": inputRef,
-        "type": "file",
-        "class": bem$3("input"),
-        "accept": props2.accept,
-        "capture": props2.capture,
-        "multiple": props2.multiple,
-        "disabled": props2.disabled,
-        "onChange": onChange
-      }, null);
+      const Input = props2.readonly ? null : props2.sourcePicker ? [renderInput(inputRef, props2.accept, void 0, props2.multiple, true), acceptsMediaType("image") && renderInput(cameraInputRef, "image/*", props2.capture || "environment", false, true), acceptsMediaType("video") && renderInput(videoInputRef, "video/*", props2.capture || "environment", false, true)] : renderInput(inputRef, props2.accept, props2.capture, props2.multiple);
       if (slots.default) {
         return createVNode("div", {
           "class": bem$3("input-wrapper"),
@@ -19428,8 +19491,14 @@ var stdin_default$7 = defineComponent({
         "class": bem$3("upload-text")
       }, [props2.uploadText]), Input]);
     };
-    const chooseFile = () => {
-      if (inputRef.value && !props2.disabled) {
+    const chooseFile = (source) => {
+      if (props2.disabled || props2.readonly)
+        return;
+      if (source) {
+        triggerInput(source);
+      } else if (props2.sourcePicker) {
+        sourcePickerVisible.value = true;
+      } else if (inputRef.value) {
         inputRef.value.click();
       }
     };
@@ -19449,7 +19518,7 @@ var stdin_default$7 = defineComponent({
       "class": bem$3("wrapper", {
         disabled: props2.disabled
       })
-    }, [props2.uploadFirst ? createVNode(Fragment, null, [renderUpload(), renderPreviewList()]) : createVNode(Fragment, null, [renderPreviewList(), renderUpload()])])]);
+    }, [props2.uploadFirst ? createVNode(Fragment, null, [renderUpload(), renderPreviewList()]) : createVNode(Fragment, null, [renderPreviewList(), renderUpload()])]), renderSourcePicker()]);
   }
 });
 const Uploader = withInstall(stdin_default$7);
@@ -21329,7 +21398,7 @@ const Lazyload = {
     });
   }
 };
-const version = "0.0.42";
+const version = "0.0.43";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -656,6 +656,12 @@
     },
     vanTabs: {
       moreTitle: "更多标签"
+    },
+    vanUploader: {
+      sourcePickerTitle: "选择上传方式",
+      takePhoto: "拍照",
+      recordVideo: "拍视频",
+      chooseFromAlbum: "从相册选择"
     }
   };
   const lang = vue.ref("zh-CN");
@@ -3035,6 +3041,7 @@
     closeable: truthProp,
     cancelText: String,
     description: String,
+    contentAdaptive: Boolean,
     closeOnPopstate: truthProp,
     closeOnClickAction: Boolean,
     safeAreaInsetBottom: truthProp
@@ -3143,7 +3150,9 @@
         }
       };
       return () => vue.createVNode(Popup, vue.mergeProps({
-        "class": bem$1I(),
+        "class": bem$1I({
+          "content-adaptive": props2.contentAdaptive
+        }),
         "position": "bottom",
         "onUpdate:show": updateShow
       }, pick(props2, popupInheritKeys$2)), {
@@ -20404,6 +20413,7 @@
     accept: makeStringProp("image/*"),
     capture: String,
     multiple: Boolean,
+    sourcePicker: Boolean,
     label: String,
     required: Boolean,
     disabled: Boolean,
@@ -20433,21 +20443,26 @@
   var stdin_default$7 = vue.defineComponent({
     name: name$3,
     props: uploaderProps,
-    emits: ["delete", "oversize", "click-upload", "close-preview", "click-preview", "update:modelValue"],
+    emits: ["delete", "oversize", "click-upload", "close-preview", "click-preview", "select-source", "update:modelValue"],
     setup(props2, {
       emit,
       slots
     }) {
       const inputRef = vue.ref();
+      const cameraInputRef = vue.ref();
+      const videoInputRef = vue.ref();
+      const sourcePickerVisible = vue.ref(false);
       const urls = [];
       const getDetail = (index = props2.modelValue.length) => ({
         name: props2.name,
         index
       });
       const resetInput = () => {
-        if (inputRef.value) {
-          inputRef.value.value = "";
-        }
+        [inputRef, cameraInputRef, videoInputRef].forEach((input) => {
+          if (input.value) {
+            input.value.value = "";
+          }
+        });
       };
       const onAfterRead = (items) => {
         resetInput();
@@ -20583,21 +20598,69 @@
           "class": bem$3("required")
         }, [vue.createTextVNode("*")]), props2.label]);
       };
-      const onClickUpload = (event) => emit("click-upload", event);
+      const acceptTypes = () => props2.accept.split(",").map((type) => type.trim().toLowerCase()).filter(Boolean);
+      const acceptsMediaType = (type) => acceptTypes().some((accept) => accept === `${type}/*` || accept.startsWith(`${type}/`));
+      const triggerInput = (source2) => {
+        const target = source2 === "camera" ? cameraInputRef.value : source2 === "video" ? videoInputRef.value : inputRef.value;
+        if (target && !props2.disabled && !props2.readonly) {
+          emit("select-source", source2);
+          target.click();
+        }
+      };
+      const onClickUpload = (event) => {
+        emit("click-upload", event);
+        if (props2.sourcePicker && !props2.disabled && !props2.readonly) {
+          sourcePickerVisible.value = true;
+        }
+      };
+      const renderInput = (input, accept, capture, multiple = false, hidden = false) => vue.createVNode("input", {
+        "ref": input,
+        "type": "file",
+        "class": bem$3("input", {
+          hidden
+        }),
+        "accept": accept,
+        "capture": capture,
+        "multiple": multiple,
+        "disabled": props2.disabled,
+        "onChange": onChange
+      }, null);
+      const renderSourcePicker = () => {
+        if (!props2.sourcePicker)
+          return;
+        const actions = [];
+        if (acceptsMediaType("image")) {
+          actions.push({
+            name: t("takePhoto"),
+            callback: () => triggerInput("camera")
+          });
+        }
+        if (acceptsMediaType("video")) {
+          actions.push({
+            name: t("recordVideo"),
+            callback: () => triggerInput("video")
+          });
+        }
+        actions.push({
+          name: t("chooseFromAlbum"),
+          callback: () => triggerInput("album")
+        });
+        return vue.createVNode(ActionSheet, {
+          "show": sourcePickerVisible.value,
+          "title": t("sourcePickerTitle"),
+          "actions": actions,
+          "contentAdaptive": true,
+          "closeOnClickAction": true,
+          "onUpdate:show": (show) => {
+            sourcePickerVisible.value = show;
+          }
+        }, null);
+      };
       const renderUpload = () => {
         if (props2.modelValue.length >= props2.maxCount || !props2.showUpload) {
           return;
         }
-        const Input = props2.readonly ? null : vue.createVNode("input", {
-          "ref": inputRef,
-          "type": "file",
-          "class": bem$3("input"),
-          "accept": props2.accept,
-          "capture": props2.capture,
-          "multiple": props2.multiple,
-          "disabled": props2.disabled,
-          "onChange": onChange
-        }, null);
+        const Input = props2.readonly ? null : props2.sourcePicker ? [renderInput(inputRef, props2.accept, void 0, props2.multiple, true), acceptsMediaType("image") && renderInput(cameraInputRef, "image/*", props2.capture || "environment", false, true), acceptsMediaType("video") && renderInput(videoInputRef, "video/*", props2.capture || "environment", false, true)] : renderInput(inputRef, props2.accept, props2.capture, props2.multiple);
         if (slots.default) {
           return vue.createVNode("div", {
             "class": bem$3("input-wrapper"),
@@ -20617,8 +20680,14 @@
           "class": bem$3("upload-text")
         }, [props2.uploadText]), Input]);
       };
-      const chooseFile = () => {
-        if (inputRef.value && !props2.disabled) {
+      const chooseFile = (source2) => {
+        if (props2.disabled || props2.readonly)
+          return;
+        if (source2) {
+          triggerInput(source2);
+        } else if (props2.sourcePicker) {
+          sourcePickerVisible.value = true;
+        } else if (inputRef.value) {
           inputRef.value.click();
         }
       };
@@ -20638,7 +20707,7 @@
         "class": bem$3("wrapper", {
           disabled: props2.disabled
         })
-      }, [props2.uploadFirst ? vue.createVNode(vue.Fragment, null, [renderUpload(), renderPreviewList()]) : vue.createVNode(vue.Fragment, null, [renderPreviewList(), renderUpload()])])]);
+      }, [props2.uploadFirst ? vue.createVNode(vue.Fragment, null, [renderUpload(), renderPreviewList()]) : vue.createVNode(vue.Fragment, null, [renderPreviewList(), renderUpload()])]), renderSourcePicker()]);
     }
   });
   const Uploader = withInstall(stdin_default$7);
@@ -24918,7 +24987,7 @@
       });
     }
   };
-  const version = "0.0.42";
+  const version = "0.0.43";
   function install(app) {
     const components = [
       ActionBar,