@nutui/nutui 3.1.19-beta.0 → 3.1.19-beta.1

package/dist/packages/_es/Uploader.js

@@ -19,12 +19,13 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { reactive, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, Fragment, createCommentVNode, renderList, createElementVNode, toDisplayString, createVNode, createBlock, createTextVNode } from "vue";
+import { reactive, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, createBlock, createCommentVNode, Fragment, renderList, createElementVNode, toDisplayString, createVNode, createTextVNode } from "vue";
 import { c as createComponent } from "./component.js";
+import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 class UploadOptions {
   constructor() {
@@ -116,17 +117,26 @@ class FileItem {
     __publicField(this, "status", "ready");
     __publicField(this, "message", "\u51C6\u5907\u5B8C\u6210");
     __publicField(this, "uid", new Date().getTime().toString());
-    __publicField(this, "name");
     __publicField(this, "url");
+    __publicField(this, "path");
+    __publicField(this, "name");
     __publicField(this, "type");
     __publicField(this, "percentage", 0);
-    __publicField(this, "formData", new FormData());
+    __publicField(this, "formData", {});
   }
 }
 const _sfc_main = create({
   props: {
     name: { type: String, default: "file" },
     url: { type: String, default: "" },
+    sizeType: {
+      type: Array,
+      default: () => ["original", "compressed"]
+    },
+    sourceType: {
+      type: Array,
+      default: () => ["album", "camera"]
+    },
     timeout: { type: [Number, String], default: 1e3 * 30 },
     fileList: { type: Array, default: () => [] },
     isPreview: { type: Boolean, default: true },
@@ -135,7 +145,7 @@ const _sfc_main = create({
     method: { type: String, default: "post" },
     capture: { type: Boolean, default: false },
     maximize: { type: [Number, String], default: Number.MAX_VALUE },
-    maximum: { type: [Number, String], default: 1 },
+    maximum: { type: [Number, String], default: 9 },
     clearInput: { type: Boolean, default: true },
     accept: { type: String, default: "*" },
     headers: { type: Object, default: {} },
@@ -143,8 +153,6 @@ const _sfc_main = create({
     uploadIcon: { type: String, default: "photograph" },
     uploadIconSize: { type: [String, Number], default: "" },
     xhrState: { type: [Number, String], default: 200 },
-    withCredentials: { type: Boolean, default: false },
-    multiple: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
     autoUpload: { type: Boolean, default: true },
     beforeUpload: {
@@ -179,97 +187,101 @@ const _sfc_main = create({
         [prefixCls]: true
       };
     });
-    const clearInput = (el) => {
-      el.value = "";
+    const chooseImage = () => {
+      if (props.disabled) {
+        return;
+      }
+      Taro.chooseImage({
+        count: props.maximum * 1 - props.fileList.length,
+        sizeType: props.sizeType,
+        sourceType: props.sourceType,
+        success: onChange
+      });
     };
     const fileItemClick = (fileItem) => {
       emit("file-item-click", { fileItem });
     };
-    const executeUpload = (fileItem, index2) => {
+    const executeUpload = (fileItem, index) => {
       const uploadOption = new UploadOptions();
+      uploadOption.name = props.name;
       uploadOption.url = props.url;
+      for (const [key, value] of Object.entries(props.data)) {
+        fileItem.formData[key] = value;
+      }
       uploadOption.formData = fileItem.formData;
-      uploadOption.timeout = props.timeout * 1;
       uploadOption.method = props.method;
-      uploadOption.xhrState = props.xhrState;
       uploadOption.headers = props.headers;
-      uploadOption.withCredentials = props.withCredentials;
+      uploadOption.taroFilePath = fileItem.path;
       uploadOption.onStart = (option) => {
         fileItem.status = "ready";
         fileItem.message = "\u51C6\u5907\u4E0A\u4F20";
-        clearUploadQueue(index2);
+        clearUploadQueue(index);
         emit("start", option);
       };
       uploadOption.onProgress = (event, option) => {
         fileItem.status = "uploading";
         fileItem.message = "\u4E0A\u4F20\u4E2D";
-        fileItem.percentage = (event.loaded / event.total * 100).toFixed(0);
+        fileItem.percentage = event.progress;
         emit("progress", { event, option, percentage: fileItem.percentage });
       };
-      uploadOption.onSuccess = (responseText, option) => {
+      uploadOption.onSuccess = (data, option) => {
         fileItem.status = "success";
         fileItem.message = "\u4E0A\u4F20\u6210\u529F";
         emit("success", {
-          responseText,
+          data,
           option,
           fileItem
         });
         emit("update:fileList", fileList);
       };
-      uploadOption.onFailure = (responseText, option) => {
+      uploadOption.onFailure = (data, option) => {
         fileItem.status = "error";
         fileItem.message = "\u4E0A\u4F20\u5931\u8D25";
         emit("failure", {
-          responseText,
+          data,
           option,
           fileItem
         });
       };
       let task = new Uploader(uploadOption);
       if (props.autoUpload) {
-        task.upload();
+        task.uploadTaro(Taro.uploadFile);
       } else {
         uploadQueue.push(new Promise((resolve, reject) => {
           resolve(task);
         }));
       }
     };
-    const clearUploadQueue = (index2 = -1) => {
-      if (index2 > -1) {
-        uploadQueue.splice(index2, 1);
+    const clearUploadQueue = (index = -1) => {
+      if (index > -1) {
+        uploadQueue.splice(index, 1);
       } else {
         uploadQueue = [];
       }
     };
     const submit = () => {
       Promise.all(uploadQueue).then((res) => {
-        res.forEach((i) => i.upload());
+        res.forEach((i) => i.uploadTaro(Taro.uploadFile));
       });
     };
     const readFile = (files) => {
-      files.forEach((file, index2) => {
-        const formData = new FormData();
-        for (const [key, value] of Object.entries(props.data)) {
-          formData.append(key, value);
-        }
-        formData.append(props.name, file);
+      const imgReg = /\.(png|jpeg|jpg|webp|gif)$/i;
+      files.forEach((file, index) => {
+        let fileType = file.type;
         const fileItem = reactive(new FileItem());
-        fileItem.name = file.name;
+        if (!fileType && imgReg.test(file.path)) {
+          fileType = "image";
+        }
+        fileItem.path = file.path;
+        fileItem.name = file.path;
         fileItem.status = "ready";
-        fileItem.type = file.type;
-        fileItem.formData = formData;
         fileItem.message = "\u7B49\u5F85\u4E0A\u4F20";
-        executeUpload(fileItem, index2);
-        if (props.isPreview && file.type.includes("image")) {
-          const reader = new FileReader();
-          reader.onload = (event) => {
-            fileItem.url = event.target.result;
-            fileList.push(fileItem);
-          };
-          reader.readAsDataURL(file);
-        } else {
-          fileList.push(fileItem);
+        fileItem.type = fileType;
+        if (props.isPreview) {
+          fileItem.url = file.path;
         }
+        fileList.push(fileItem);
+        executeUpload(fileItem, index);
       });
     };
     const filterFiles = (files) => {
@@ -293,45 +305,39 @@ const _sfc_main = create({
       }
       return files;
     };
-    const onDelete = (file, index2) => {
-      clearUploadQueue(index2);
+    const onDelete = (file, index) => {
+      clearUploadQueue(index);
       if (props.beforeDelete(file, fileList)) {
-        fileList.splice(index2, 1);
+        fileList.splice(index, 1);
         emit("delete", {
           file,
           fileList,
-          index: index2
+          index
         });
+      } else {
+        console.log("\u7528\u6237\u963B\u6B62\u4E86\u5220\u9664\uFF01");
       }
     };
-    const onChange = (event) => {
-      if (props.disabled) {
-        return;
-      }
-      const $el = event.target;
-      let { files } = $el;
+    const onChange = (res) => {
+      const { tempFilePaths, tempFiles } = res;
       if (props.beforeUpload) {
-        props.beforeUpload(files).then((f) => {
-          const _files = filterFiles(new Array().slice.call(f));
+        props.beforeUpload(tempFiles).then((f) => {
+          const _files = filterFiles(f);
           readFile(_files);
         });
       } else {
-        const _files = filterFiles(new Array().slice.call(files));
+        const _files = filterFiles(tempFiles);
         readFile(_files);
       }
       emit("change", {
-        fileList,
-        event
+        fileList
       });
-      if (props.clearInput) {
-        clearInput($el);
-      }
     };
     return {
-      onChange,
       onDelete,
       fileList,
       classes,
+      chooseImage,
       fileItemClick,
       clearUploadQueue,
       submit
@@ -342,37 +348,34 @@ const _hoisted_1 = {
   key: 0,
   class: "nut-uploader__slot"
 };
-const _hoisted_2 = ["accept", "multiple", "name", "disabled"];
-const _hoisted_3 = ["accept", "multiple", "name", "disabled"];
-const _hoisted_4 = {
+const _hoisted_2 = {
   key: 0,
   class: "nut-uploader__preview-img"
 };
-const _hoisted_5 = {
+const _hoisted_3 = {
   key: 0,
   class: "nut-uploader__preview__progress"
 };
-const _hoisted_6 = { class: "nut-uploader__preview__progress__msg" };
-const _hoisted_7 = {
+const _hoisted_4 = { class: "nut-uploader__preview__progress__msg" };
+const _hoisted_5 = {
   key: 1,
   class: "nut-uploader__preview__progress"
 };
-const _hoisted_8 = { class: "nut-uploader__preview__progress__msg" };
-const _hoisted_9 = ["onClick", "src"];
-const _hoisted_10 = {
+const _hoisted_6 = { class: "nut-uploader__preview__progress__msg" };
+const _hoisted_7 = ["onClick", "src"];
+const _hoisted_8 = {
   key: 4,
   class: "nut-uploader__preview-img__file"
 };
-const _hoisted_11 = ["onClick"];
-const _hoisted_12 = { class: "tips" };
-const _hoisted_13 = {
+const _hoisted_9 = ["onClick"];
+const _hoisted_10 = { class: "tips" };
+const _hoisted_11 = {
   key: 1,
   class: "nut-uploader__preview-list"
 };
-const _hoisted_14 = ["onClick"];
-const _hoisted_15 = ["accept", "multiple", "name", "disabled"];
-const _hoisted_16 = ["accept", "multiple", "name", "disabled"];
+const _hoisted_12 = ["onClick"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_nut_button = resolveComponent("nut-button");
   const _component_nut_icon = resolveComponent("nut-icon");
   const _component_nut_progress = resolveComponent("nut-progress");
   return openBlock(), createElementBlock("view", {
@@ -380,80 +383,64 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, [
     _ctx.$slots.default ? (openBlock(), createElementBlock("view", _hoisted_1, [
       renderSlot(_ctx.$slots, "default"),
-      _ctx.maximum - _ctx.fileList.length ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-        _ctx.capture ? (openBlock(), createElementBlock("input", {
-          key: 0,
-          class: "nut-uploader__input",
-          type: "file",
-          capture: "camera",
-          accept: _ctx.accept,
-          multiple: _ctx.multiple,
-          name: _ctx.name,
-          disabled: _ctx.disabled,
-          onChange: _cache[0] || (_cache[0] = (...args) => _ctx.onChange && _ctx.onChange(...args))
-        }, null, 40, _hoisted_2)) : (openBlock(), createElementBlock("input", {
-          key: 1,
-          class: "nut-uploader__input",
-          type: "file",
-          accept: _ctx.accept,
-          multiple: _ctx.multiple,
-          name: _ctx.name,
-          disabled: _ctx.disabled,
-          onChange: _cache[1] || (_cache[1] = (...args) => _ctx.onChange && _ctx.onChange(...args))
-        }, null, 40, _hoisted_3))
-      ], 64)) : createCommentVNode("", true)
+      _ctx.maximum - _ctx.fileList.length ? (openBlock(), createBlock(_component_nut_button, {
+        key: 0,
+        class: "nut-uploader__input",
+        onClick: _ctx.chooseImage
+      }, null, 8, ["onClick"])) : createCommentVNode("", true)
     ])) : createCommentVNode("", true),
-    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.fileList, (item, index2) => {
+    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.fileList, (item, index) => {
+      var _a;
       return openBlock(), createElementBlock("view", {
         class: normalizeClass(["nut-uploader__preview", [_ctx.listType]]),
         key: item.uid
       }, [
-        _ctx.listType == "picture" && !_ctx.$slots.default ? (openBlock(), createElementBlock("view", _hoisted_4, [
-          item.status == "ready" ? (openBlock(), createElementBlock("view", _hoisted_5, [
-            createElementVNode("view", _hoisted_6, toDisplayString(item.message), 1)
-          ])) : item.status != "success" ? (openBlock(), createElementBlock("view", _hoisted_7, [
+        _ctx.listType == "picture" && !_ctx.$slots.default ? (openBlock(), createElementBlock("view", _hoisted_2, [
+          item.status == "ready" ? (openBlock(), createElementBlock("view", _hoisted_3, [
+            createElementVNode("view", _hoisted_4, toDisplayString(item.message), 1)
+          ])) : item.status != "success" ? (openBlock(), createElementBlock("view", _hoisted_5, [
             createVNode(_component_nut_icon, {
               color: "#fff",
               name: item.status == "error" ? "failure" : "loading"
             }, null, 8, ["name"]),
-            createElementVNode("view", _hoisted_8, toDisplayString(item.message), 1)
+            createElementVNode("view", _hoisted_6, toDisplayString(item.message), 1)
           ])) : createCommentVNode("", true),
           _ctx.isDeletable ? (openBlock(), createBlock(_component_nut_icon, {
             key: 2,
             color: "rgba(0,0,0,0.6)",
-            onClick: ($event) => _ctx.onDelete(item, index2),
+            onClick: ($event) => _ctx.onDelete(item, index),
             class: "close",
             name: "failure"
           }, null, 8, ["onClick"])) : createCommentVNode("", true),
-          item.type.includes("image") && item.url ? (openBlock(), createElementBlock("img", {
+          ((_a = item.type) == null ? void 0 : _a.includes("image")) && item.url ? (openBlock(), createElementBlock("img", {
             key: 3,
             class: "nut-uploader__preview-img__c",
             onClick: ($event) => _ctx.fileItemClick(item),
             src: item.url
-          }, null, 8, _hoisted_9)) : (openBlock(), createElementBlock("view", _hoisted_10, [
+          }, null, 8, _hoisted_7)) : (openBlock(), createElementBlock("view", _hoisted_8, [
             createElementVNode("view", {
-              onClick: ($event) => _ctx.fileItemClick(item),
-              class: "nut-uploader__preview-img__file__name"
+              class: "nut-uploader__preview-img__file__name",
+              onClick: ($event) => _ctx.fileItemClick(item)
             }, [
               createVNode(_component_nut_icon, {
                 color: "#808080",
                 name: "link"
               }),
               createTextVNode("\xA0" + toDisplayString(item.name), 1)
-            ], 8, _hoisted_11)
+            ], 8, _hoisted_9)
           ])),
-          createElementVNode("view", _hoisted_12, toDisplayString(item.name), 1)
-        ])) : _ctx.listType == "list" ? (openBlock(), createElementBlock("view", _hoisted_13, [
+          createElementVNode("view", _hoisted_10, toDisplayString(item.name), 1)
+        ])) : _ctx.listType == "list" ? (openBlock(), createElementBlock("view", _hoisted_11, [
           createElementVNode("view", {
-            onClick: ($event) => _ctx.fileItemClick(item),
-            class: normalizeClass(["nut-uploader__preview-img__file__name", [item.status]])
+            class: normalizeClass(["nut-uploader__preview-img__file__name", [item.status]]),
+            onClick: ($event) => _ctx.fileItemClick(item)
           }, [
             createVNode(_component_nut_icon, { name: "link" }),
             createTextVNode("\xA0" + toDisplayString(item.name), 1)
-          ], 10, _hoisted_14),
+          ], 10, _hoisted_12),
           createVNode(_component_nut_icon, {
             class: "nut-uploader__preview-img__file__del",
-            onClick: ($event) => _ctx.onDelete(item, index2),
+            onClick: ($event) => _ctx.onDelete(item, index),
             color: "#808080",
             name: "del"
           }, null, 8, ["onClick"]),
@@ -476,28 +463,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         color: "#808080",
         name: _ctx.uploadIcon
       }, null, 8, ["size", "name"]),
-      _ctx.capture ? (openBlock(), createElementBlock("input", {
-        key: 0,
-        class: "nut-uploader__input",
-        type: "file",
-        capture: "camera",
-        accept: _ctx.accept,
-        multiple: _ctx.multiple,
-        name: _ctx.name,
-        disabled: _ctx.disabled,
-        onChange: _cache[2] || (_cache[2] = (...args) => _ctx.onChange && _ctx.onChange(...args))
-      }, null, 40, _hoisted_15)) : (openBlock(), createElementBlock("input", {
-        key: 1,
+      createVNode(_component_nut_button, {
         class: "nut-uploader__input",
-        type: "file",
-        accept: _ctx.accept,
-        multiple: _ctx.multiple,
-        name: _ctx.name,
-        disabled: _ctx.disabled,
-        onChange: _cache[3] || (_cache[3] = (...args) => _ctx.onChange && _ctx.onChange(...args))
-      }, null, 40, _hoisted_16))
+        onClick: _ctx.chooseImage
+      }, null, 8, ["onClick"])
     ], 2)) : createCommentVNode("", true)
   ], 2);
 }
-var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { FileItem, index as default };
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { FileItem, index_taro as default };

package/dist/packages/_es/Video.js

@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -351,5 +351,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 512);
 }
-var Video = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { Video as default };
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };

package/dist/packages/_es/common.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/component.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index.js

@@ -1,11 +1,49 @@
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { getCurrentInstance } from "vue";
-function useRouter() {
-  const proxy = getCurrentInstance().proxy;
-  return proxy.$router || null;
+import { unref } from "vue";
+function isWindow(val) {
+  return val === window;
 }
-export { useRouter as u };
+const useTaroRect = (elementRef, Taro) => {
+  let element = unref(elementRef);
+  return new Promise((resolve) => {
+    if (Taro.getEnv() === "WEB") {
+      if (element && element.$el) {
+        element = element.$el;
+      }
+      if (isWindow(element)) {
+        const width = element.innerWidth;
+        const height = element.innerHeight;
+        resolve({
+          top: 0,
+          left: 0,
+          right: width,
+          bottom: height,
+          width,
+          height
+        });
+      }
+      if (element && element.getBoundingClientRect) {
+        resolve(element.getBoundingClientRect());
+      }
+      resolve({
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        width: 0,
+        height: 0
+      });
+    } else {
+      const query = Taro.createSelectorQuery();
+      query.select(`#${element.id}`) && query.select(`#${element.id}`).boundingClientRect();
+      query.exec(function(res) {
+        resolve(res[0]);
+      });
+    }
+  });
+};
+export { useTaroRect as u };