widget.qw 1.0.77 → 1.0.79

package/build/style.css

@@ -394,7 +394,7 @@
   cursor: not-allowed;
   opacity: 1;
   -webkit-text-fill-color: #000;
-}.image-box .cover[data-v-dc257922] {
+}.image-box .cover[data-v-92119e14] {
   width: 80px;
   height: 80px;
 }[data-v-df75f4fa] .label {

package/build/widget.qw.es.js

@@ -11522,8 +11522,8 @@ const compress_image = (file) => __async(this, null, function* () {
   return new Promise((resolve, reject) => {
     new Compressor(file, {
       quality: 0.7,
-      maxWidth: 800,
-      maxHeight: 800,
+      maxWidth: 1024,
+      maxHeight: 1024,
       success(result) {
         console.log("\u538B\u7F29\u540E\u7684\u56FE\u7247", result);
         let compress_file = blob2file(result, result.name);
@@ -19943,7 +19943,7 @@ const _sfc_main$j = {
   }
 };
 var ImagePicker = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-16be97a4"]]);
-var images_picker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".image-box .cover[data-v-dc257922] {\n  width: 80px;\n  height: 80px;\n}")();
+var images_picker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".image-box .cover[data-v-92119e14] {\n  width: 80px;\n  height: 80px;\n}")();
 const _hoisted_1$c = {
   class: "image-box"
 };
@@ -20019,24 +20019,29 @@ const _sfc_main$i = {
     });
     onMounted(() => {
     });
-    const onAfterRead = (file) => __async(this, null, function* () {
-      console.log(file);
-      let compress_file = file.file;
-      if (props.compress) {
-        compress_file = yield util.compress_image(file.file);
+    const onAfterRead = (e) => __async(this, null, function* () {
+      console.log("onAfterRead", e);
+      if (e && e.length > 0) {
+        for (var i = 0; i < e.length; i++) {
+          let compress_file = e[i].file;
+          if (props.compress) {
+            compress_file = yield util.compress_image(compress_file);
+          }
+          let params = {
+            file: compress_file
+          };
+          let res = yield util.file_upload(params);
+          if (res.code == 200) {
+            let newUrls = [];
+            if (props.modelValue && props.modelValue.length > 0)
+              newUrls = [...props.modelValue, res.data];
+            else
+              newUrls = [res.data];
+            emit("update:modelValue", newUrls);
+          }
+        }
+        return Promise.resolve(e);
       }
-      let params = {
-        file: compress_file
-      };
-      return util.file_upload(params).then((res) => {
-        let newUrls = [];
-        if (props.modelValue && props.modelValue.length > 0)
-          newUrls = [...props.modelValue, res.data];
-        else
-          newUrls = [res.data];
-        emit("update:modelValue", newUrls);
-        return Promise.resolve(file);
-      });
     });
     const onBeforeDelete = (e) => {
       let newUrls = props.modelValue.filter((item) => {
@@ -20084,6 +20089,7 @@ const _sfc_main$i = {
           key: 0,
           modelValue: files.value,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => files.value = $event),
+          multiple: "",
           "max-count": props.max,
           capture: props.capture,
           accept: "image/jpeg,image/png",
@@ -20096,6 +20102,7 @@ const _sfc_main$i = {
           key: 1,
           modelValue: files.value,
           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => files.value = $event),
+          multiple: "",
           "max-count": props.max,
           accept: "image/jpeg,image/png",
           disabled: unref(isDisabled),
@@ -20122,7 +20129,7 @@ const _sfc_main$i = {
     };
   }
 };
-var ImagesPicker = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-dc257922"]]);
+var ImagesPicker = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-92119e14"]]);
 var FilePicker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-df75f4fa] .label {\n  color: #000 !important;\n}\n[data-v-df75f4fa] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
 const _hoisted_1$b = {
   class: "file-box"

package/build/widget.qw.umd.js

@@ -11525,8 +11525,8 @@ var __async = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       new Compressor(file, {
         quality: 0.7,
-        maxWidth: 800,
-        maxHeight: 800,
+        maxWidth: 1024,
+        maxHeight: 1024,
         success(result) {
           console.log("\u538B\u7F29\u540E\u7684\u56FE\u7247", result);
           let compress_file = blob2file(result, result.name);
@@ -19946,7 +19946,7 @@ var __async = (__this, __arguments, generator) => {
     }
   };
   var ImagePicker = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-16be97a4"]]);
-  var images_picker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".image-box .cover[data-v-dc257922] {\n  width: 80px;\n  height: 80px;\n}")();
+  var images_picker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".image-box .cover[data-v-92119e14] {\n  width: 80px;\n  height: 80px;\n}")();
   const _hoisted_1$c = {
     class: "image-box"
   };
@@ -20022,24 +20022,29 @@ var __async = (__this, __arguments, generator) => {
       });
       vue.onMounted(() => {
       });
-      const onAfterRead = (file) => __async(this, null, function* () {
-        console.log(file);
-        let compress_file = file.file;
-        if (props.compress) {
-          compress_file = yield util.compress_image(file.file);
+      const onAfterRead = (e) => __async(this, null, function* () {
+        console.log("onAfterRead", e);
+        if (e && e.length > 0) {
+          for (var i = 0; i < e.length; i++) {
+            let compress_file = e[i].file;
+            if (props.compress) {
+              compress_file = yield util.compress_image(compress_file);
+            }
+            let params = {
+              file: compress_file
+            };
+            let res = yield util.file_upload(params);
+            if (res.code == 200) {
+              let newUrls = [];
+              if (props.modelValue && props.modelValue.length > 0)
+                newUrls = [...props.modelValue, res.data];
+              else
+                newUrls = [res.data];
+              emit("update:modelValue", newUrls);
+            }
+          }
+          return Promise.resolve(e);
         }
-        let params = {
-          file: compress_file
-        };
-        return util.file_upload(params).then((res) => {
-          let newUrls = [];
-          if (props.modelValue && props.modelValue.length > 0)
-            newUrls = [...props.modelValue, res.data];
-          else
-            newUrls = [res.data];
-          emit("update:modelValue", newUrls);
-          return Promise.resolve(file);
-        });
       });
       const onBeforeDelete = (e) => {
         let newUrls = props.modelValue.filter((item) => {
@@ -20087,6 +20092,7 @@ var __async = (__this, __arguments, generator) => {
             key: 0,
             modelValue: files.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => files.value = $event),
+            multiple: "",
             "max-count": props.max,
             capture: props.capture,
             accept: "image/jpeg,image/png",
@@ -20099,6 +20105,7 @@ var __async = (__this, __arguments, generator) => {
             key: 1,
             modelValue: files.value,
             "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => files.value = $event),
+            multiple: "",
             "max-count": props.max,
             accept: "image/jpeg,image/png",
             disabled: vue.unref(isDisabled),
@@ -20125,7 +20132,7 @@ var __async = (__this, __arguments, generator) => {
       };
     }
   };
-  var ImagesPicker = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-dc257922"]]);
+  var ImagesPicker = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-92119e14"]]);
   var FilePicker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-df75f4fa] .label {\n  color: #000 !important;\n}\n[data-v-df75f4fa] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
   const _hoisted_1$b = {
     class: "file-box"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "widget.qw",
   "private": false,
-  "version": "1.0.77",
+  "version": "1.0.79",
   "description": "marqstree Vue3组件库",
   "main": "build/widget.qw.es.js",
   "keywords": [

package/src/components/images_picker.vue

@@ -3,15 +3,18 @@
         :placeholder="props.placeholder">
         <template #input>
             <div class="image-box">
-                <van-uploader v-if="props.capture && (!isReadonly && !isDisabled)" v-model="files" :max-count="props.max"
-                    :capture="props.capture" accept="image/jpeg,image/png" :disabled="isDisabled"
+                <van-uploader v-if="props.capture && (!isReadonly && !isDisabled)" v-model="files" multiple
+                    :max-count="props.max" :capture="props.capture" accept="image/jpeg,image/png" :disabled="isDisabled"
                     :deletable="!isRequired && !isDisabled" :afterRead="onAfterRead" :before-delete="onBeforeDelete"
                     :show-upload="!isReadonly" />
-                <van-uploader v-if="!props.capture && (!isReadonly && !isDisabled)" v-model="files" :max-count="props.max"
-                    accept="image/jpeg,image/png" :disabled="isDisabled" :deletable="!isReadonly && !isDisabled"
-                    :afterRead="onAfterRead" :before-delete="onBeforeDelete" :show-upload="!isReadonly" />
-                <img class="cover" v-if="isReadonly || isDisabled" v-for="(cover, i) in previews" :key="i" :src="cover" @click="onPreview(i)" />
-                <van-icon v-if="modelValue.length>props.maxPreview && (isReadonly || isDisabled)" name="ellipsis" @click="onToggleMore"/>
+                <van-uploader v-if="!props.capture && (!isReadonly && !isDisabled)" v-model="files" multiple
+                    :max-count="props.max" accept="image/jpeg,image/png" :disabled="isDisabled"
+                    :deletable="!isReadonly && !isDisabled" :afterRead="onAfterRead" :before-delete="onBeforeDelete"
+                    :show-upload="!isReadonly" />
+                <img class="cover" v-if="isReadonly || isDisabled" v-for="(cover, i) in previews" :key="i" :src="cover"
+                    @click="onPreview(i)" />
+                <van-icon v-if="modelValue.length > props.maxPreview && (isReadonly || isDisabled)" name="ellipsis"
+                    @click="onToggleMore" />
             </div>
         </template>
     </van-field>
@@ -73,12 +76,12 @@ const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
 const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
 const files = ref([])
-const isPreviewMore=ref(false)
-const previews=computed(()=>{
-    if(!modelValue.value || modelValue.value.length<1)
+const isPreviewMore = ref(false)
+const previews = computed(() => {
+    if (!modelValue.value || modelValue.value.length < 1)
         return []
 
-    if(props.maxPreview > modelValue.value.length || isPreviewMore.value)
+    if (props.maxPreview > modelValue.value.length || isPreviewMore.value)
         return modelValue.value
 
     return modelValue.value.slice(0, props.maxPreview)
@@ -88,28 +91,34 @@ onMounted(() => {
 
 })
 
-const onAfterRead = async (file) => {
-    console.log(file)
+const onAfterRead = async (e) => {
+    console.log('onAfterRead', e)
 
-    let compress_file = file.file
-    if (props.compress) {
-        compress_file = await util.compress_image(file.file)
-    }
+    if (e && e.length > 0) {
+        for (var i = 0; i < e.length; i++) {
+            let compress_file = e[i].file
+            if (props.compress) {
+                compress_file = await util.compress_image(compress_file)
+            }
 
-    let params = {
-        file: compress_file
-    }
+            let params = {
+                file: compress_file
+            }
 
-    return util.file_upload(params).then(res => {
-        let newUrls = []
-        if (props.modelValue && props.modelValue.length > 0)
-            newUrls = [...props.modelValue, res.data]
-        else
-            newUrls = [res.data]
+            let res = await util.file_upload(params)
+            if (res.code == 200) {
+                let newUrls = []
+                if (props.modelValue && props.modelValue.length > 0)
+                    newUrls = [...props.modelValue, res.data]
+                else
+                    newUrls = [res.data]
 
-        emit('update:modelValue', newUrls)
-        return Promise.resolve(file)
-    })
+                emit('update:modelValue', newUrls)
+            }
+        }
+
+        return Promise.resolve(e)
+    }
 }
 
 const onBeforeDelete = (e) => {
@@ -121,10 +130,10 @@ const onBeforeDelete = (e) => {
 }
 
 const onPreview = (i) => {
-    showImagePreview({images:modelValue.value, startPosition:i})
+    showImagePreview({ images: modelValue.value, startPosition: i })
 }
 
-const onToggleMore=()=>{
+const onToggleMore = () => {
     isPreviewMore.value = !isPreviewMore.value
 }
 
@@ -149,12 +158,11 @@ watch(() => props.modelValue,
 </script>
 
 <style lang="scss" scoped>
+.image-box {
 
-    .image-box {
-
-        .cover {
-            width: 80px;
-            height: 80px;
-        }
+    .cover {
+        width: 80px;
+        height: 80px;
     }
+}
 </style>

package/src/util/image_util.js

@@ -5,8 +5,8 @@ export const compress_image = async (file) => {
     return new Promise((resolve, reject) => {
         new Compressor(file, {
             quality: 0.7,
-            maxWidth: 800,
-            maxHeight: 800,
+            maxWidth: 1024,
+            maxHeight: 1024,
             success(result) {
                 console.log('压缩后的图片', result);
                 let compress_file = blob2file(result, result.name)