@nutui/nutui 3.1.10-beta.3 → 3.1.12-beta.0

package/dist/packages/_es/Toast.js

@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
@@ -306,8 +306,8 @@ const ToastFunction = {
       type: "loading"
     }));
   },
-  hide() {
-    clearToast();
+  hide(id) {
+    clearToast(id);
   },
   install(app) {
     app.use(Toast);

package/dist/packages/_es/Uploader.js

@@ -19,11 +19,11 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
-import { reactive, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, Fragment, createCommentVNode, renderList, createElementVNode, createBlock, toDisplayString, createVNode } from "vue";
+import { reactive, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, Fragment, createCommentVNode, renderList, createElementVNode, toDisplayString, createVNode, createBlock, createTextVNode } from "vue";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 class UploadOptions {
@@ -61,7 +61,7 @@ class Uploader {
       xhr.onreadystatechange = () => {
         var _a2, _b;
         if (xhr.readyState === 4) {
-          if (xhr.status === options.xhrState) {
+          if (xhr.status == options.xhrState) {
             (_a2 = options.onSuccess) == null ? void 0 : _a2.call(options, xhr.responseText, options);
           } else {
             (_b = options.onFailure) == null ? void 0 : _b.call(options, xhr.responseText, options);
@@ -92,7 +92,7 @@ class Uploader {
       name: options.name,
       success(response) {
         var _a2, _b;
-        if (options.xhrState === response.statusCode) {
+        if (options.xhrState == response.statusCode) {
           (_a2 = options.onSuccess) == null ? void 0 : _a2.call(options, response, options);
         } else {
           (_b = options.onFailure) == null ? void 0 : _b.call(options, response, options);
@@ -114,10 +114,12 @@ const { componentName, create } = createComponent("uploader");
 class FileItem {
   constructor() {
     __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, "type");
+    __publicField(this, "percentage", 0);
     __publicField(this, "formData", new FormData());
   }
 }
@@ -128,12 +130,13 @@ const _sfc_main = create({
     timeout: { type: [Number, String], default: 1e3 * 30 },
     fileList: { type: Array, default: () => [] },
     isPreview: { type: Boolean, default: true },
+    listType: { type: String, default: "picture" },
     isDeletable: { type: Boolean, default: true },
     method: { type: String, default: "post" },
     capture: { type: Boolean, default: false },
     maximize: { type: [Number, String], default: Number.MAX_VALUE },
     maximum: { type: [Number, String], default: 1 },
-    clearInput: { type: Boolean, default: false },
+    clearInput: { type: Boolean, default: true },
     accept: { type: String, default: "*" },
     headers: { type: Object, default: {} },
     data: { type: Object, default: {} },
@@ -156,7 +159,17 @@ const _sfc_main = create({
     },
     onChange: { type: Function }
   },
-  emits: ["start", "progress", "oversize", "success", "failure", "change", "delete", "update:fileList"],
+  emits: [
+    "start",
+    "progress",
+    "oversize",
+    "success",
+    "failure",
+    "change",
+    "delete",
+    "update:fileList",
+    "file-item-click"
+  ],
   setup(props, { emit }) {
     const fileList = reactive(props.fileList);
     let uploadQueue = [];
@@ -169,12 +182,12 @@ const _sfc_main = create({
     const clearInput = (el) => {
       el.value = "";
     };
+    const fileItemClick = (fileItem) => {
+      emit("file-item-click", { fileItem });
+    };
     const executeUpload = (fileItem, index2) => {
       const uploadOption = new UploadOptions();
       uploadOption.url = props.url;
-      for (const [key, value] of Object.entries(props.data)) {
-        fileItem.formData.append(key, value);
-      }
       uploadOption.formData = fileItem.formData;
       uploadOption.timeout = props.timeout * 1;
       uploadOption.method = props.method;
@@ -183,26 +196,33 @@ const _sfc_main = create({
       uploadOption.withCredentials = props.withCredentials;
       uploadOption.onStart = (option) => {
         fileItem.status = "ready";
+        fileItem.message = "\u51C6\u5907\u4E0A\u4F20";
         clearUploadQueue(index2);
         emit("start", option);
       };
-      uploadOption.onProgress = (e, option) => {
+      uploadOption.onProgress = (event, option) => {
         fileItem.status = "uploading";
-        emit("progress", { e, option });
+        fileItem.message = "\u4E0A\u4F20\u4E2D";
+        fileItem.percentage = (event.loaded / event.total * 100).toFixed(0);
+        emit("progress", { event, option, percentage: fileItem.percentage });
       };
       uploadOption.onSuccess = (responseText, option) => {
         fileItem.status = "success";
+        fileItem.message = "\u4E0A\u4F20\u6210\u529F";
         emit("success", {
           responseText,
-          option
+          option,
+          fileItem
         });
         emit("update:fileList", fileList);
       };
       uploadOption.onFailure = (responseText, option) => {
         fileItem.status = "error";
+        fileItem.message = "\u4E0A\u4F20\u5931\u8D25";
         emit("failure", {
           responseText,
-          option
+          option,
+          fileItem
         });
       };
       let task = new Uploader(uploadOption);
@@ -229,12 +249,16 @@ const _sfc_main = create({
     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 fileItem = reactive(new FileItem());
         fileItem.name = file.name;
         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();
@@ -308,6 +332,7 @@ const _sfc_main = create({
       onDelete,
       fileList,
       classes,
+      fileItemClick,
       clearUploadQueue,
       submit
     };
@@ -319,20 +344,37 @@ const _hoisted_1 = {
 };
 const _hoisted_2 = ["accept", "multiple", "name", "disabled"];
 const _hoisted_3 = ["accept", "multiple", "name", "disabled"];
-const _hoisted_4 = { class: "nut-uploader__preview-img" };
-const _hoisted_5 = ["src"];
-const _hoisted_6 = {
-  key: 2,
-  class: "tips"
+const _hoisted_4 = {
+  key: 0,
+  class: "nut-uploader__preview-img"
 };
-const _hoisted_7 = {
+const _hoisted_5 = {
   key: 0,
-  class: "nut-uploader__upload"
+  class: "nut-uploader__preview__progress"
+};
+const _hoisted_6 = { class: "nut-uploader__preview__progress__msg" };
+const _hoisted_7 = {
+  key: 1,
+  class: "nut-uploader__preview__progress"
 };
-const _hoisted_8 = ["accept", "multiple", "name", "disabled"];
-const _hoisted_9 = ["accept", "multiple", "name", "disabled"];
+const _hoisted_8 = { class: "nut-uploader__preview__progress__msg" };
+const _hoisted_9 = ["onClick", "src"];
+const _hoisted_10 = {
+  key: 4,
+  class: "nut-uploader__preview-img__file"
+};
+const _hoisted_11 = ["onClick"];
+const _hoisted_12 = { class: "tips" };
+const _hoisted_13 = {
+  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"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_icon = resolveComponent("nut-icon");
+  const _component_nut_progress = resolveComponent("nut-progress");
   return openBlock(), createElementBlock("view", {
     class: normalizeClass(_ctx.classes)
   }, [
@@ -360,57 +402,101 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onChange: _cache[1] || (_cache[1] = (...args) => _ctx.onChange && _ctx.onChange(...args))
         }, null, 40, _hoisted_3))
       ], 64)) : createCommentVNode("", true)
-    ])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.fileList, (item, index2) => {
-        return openBlock(), createElementBlock("view", {
-          class: "nut-uploader__preview",
-          key: item.uid
-        }, [
-          createElementVNode("view", _hoisted_4, [
-            _ctx.isDeletable ? (openBlock(), createBlock(_component_nut_icon, {
-              key: 0,
-              color: "rgba(0,0,0,0.6)",
-              onClick: ($event) => _ctx.onDelete(item, index2),
-              class: "close",
-              name: "circle-close"
-            }, null, 8, ["onClick"])) : createCommentVNode("", true),
-            item.type.includes("image") && item.url ? (openBlock(), createElementBlock("img", {
-              key: 1,
-              class: "nut-uploader__preview-img__c",
-              src: item.url
-            }, null, 8, _hoisted_5)) : createCommentVNode("", true),
-            item.status != "success" ? (openBlock(), createElementBlock("view", _hoisted_6, toDisplayString(item.status), 1)) : createCommentVNode("", true)
-          ])
-        ]);
-      }), 128)),
-      _ctx.maximum - _ctx.fileList.length ? (openBlock(), createElementBlock("view", _hoisted_7, [
-        createVNode(_component_nut_icon, {
-          size: _ctx.uploadIconSize,
-          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_8)) : (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[3] || (_cache[3] = (...args) => _ctx.onChange && _ctx.onChange(...args))
-        }, null, 40, _hoisted_9))
-      ])) : createCommentVNode("", true)
-    ], 64))
+    ])) : createCommentVNode("", true),
+    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.fileList, (item, index2) => {
+      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, [
+            createVNode(_component_nut_icon, {
+              color: "#fff",
+              name: item.status == "error" ? "failure" : "loading"
+            }, null, 8, ["name"]),
+            createElementVNode("view", _hoisted_8, 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),
+            class: "close",
+            name: "failure"
+          }, null, 8, ["onClick"])) : createCommentVNode("", true),
+          item.type.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, [
+            createElementVNode("view", {
+              onClick: ($event) => _ctx.fileItemClick(item),
+              class: "nut-uploader__preview-img__file__name"
+            }, [
+              createVNode(_component_nut_icon, {
+                color: "#808080",
+                name: "link"
+              }),
+              createTextVNode("\xA0" + toDisplayString(item.name), 1)
+            ], 8, _hoisted_11)
+          ])),
+          createElementVNode("view", _hoisted_12, toDisplayString(item.name), 1)
+        ])) : _ctx.listType == "list" ? (openBlock(), createElementBlock("view", _hoisted_13, [
+          createElementVNode("view", {
+            onClick: ($event) => _ctx.fileItemClick(item),
+            class: normalizeClass(["nut-uploader__preview-img__file__name", [item.status]])
+          }, [
+            createVNode(_component_nut_icon, { name: "link" }),
+            createTextVNode("\xA0" + toDisplayString(item.name), 1)
+          ], 10, _hoisted_14),
+          createVNode(_component_nut_icon, {
+            class: "nut-uploader__preview-img__file__del",
+            onClick: ($event) => _ctx.onDelete(item, index2),
+            color: "#808080",
+            name: "del"
+          }, null, 8, ["onClick"]),
+          item.status == "uploading" ? (openBlock(), createBlock(_component_nut_progress, {
+            key: 0,
+            size: "small",
+            percentage: item.percentage,
+            "stroke-color": "linear-gradient(270deg, rgba(18,126,255,1) 0%,rgba(32,147,255,1) 32.815625%,rgba(13,242,204,1) 100%)",
+            "show-text": false
+          }, null, 8, ["percentage"])) : createCommentVNode("", true)
+        ])) : createCommentVNode("", true)
+      ], 2);
+    }), 128)),
+    _ctx.listType == "picture" && !_ctx.$slots.default && _ctx.maximum - _ctx.fileList.length ? (openBlock(), createElementBlock("view", {
+      key: 1,
+      class: normalizeClass(["nut-uploader__upload", [_ctx.listType]])
+    }, [
+      createVNode(_component_nut_icon, {
+        size: _ctx.uploadIconSize,
+        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,
+        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))
+    ], 2)) : createCommentVNode("", true)
   ], 2);
 }
 var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

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.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/component.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index2.js

@@ -1,13 +1,36 @@
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
-import { getCurrentInstance } from "vue";
-function useExpose(apis) {
-  const instance = getCurrentInstance();
-  if (instance) {
-    Object.assign(instance.proxy, apis);
-  }
+import { unref } from "vue";
+function isWindow(val) {
+  return val === window;
 }
-export { useExpose as u };
+const useRect = (elementRef) => {
+  const element = unref(elementRef);
+  if (isWindow(element)) {
+    const width = element.innerWidth;
+    const height = element.innerHeight;
+    return {
+      top: 0,
+      left: 0,
+      right: width,
+      bottom: height,
+      width,
+      height
+    };
+  }
+  if (element && element.getBoundingClientRect) {
+    return element.getBoundingClientRect();
+  }
+  return {
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    width: 0,
+    height: 0
+  };
+};
+export { useRect as u };

package/dist/packages/_es/index3.js

@@ -0,0 +1,13 @@
+/*!
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
+* (c) 2021 @jdf2e.
+* Released under the MIT License.
+*/
+import { getCurrentInstance } from "vue";
+function useExpose(apis) {
+  const instance = getCurrentInstance();
+  if (instance) {
+    Object.assign(instance.proxy, apis);
+  }
+}
+export { useExpose as u };

package/dist/packages/_es/plugin-vue_export-helper.js

@@ -1,12 +1,13 @@
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
 var _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
   for (const [key, val] of props) {
-    sfc[key] = val;
+    target[key] = val;
   }
-  return sfc;
+  return target;
 };
 export { _export_sfc as _ };

package/dist/packages/_es/pxCheck.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/raf.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.10-beta.3 Fri Nov 05 2021 14:31:48 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.12-beta.0 Mon Nov 22 2021 20:58:07 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/button/index.scss

@@ -14,6 +14,9 @@
   appearance: none;
   user-select: none;
   touch-action: manipulation;
+
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-tap-highlight-color: transparent;
   .text {
     margin-left: 5px;
   }

package/dist/packages/menu/index.scss

@@ -1,73 +1,45 @@
-.nut-menu {
+.nut-menu__bar {
   position: relative;
-  font-size: 14px;
-  color: #1a1a1a;
+  display: flex;
+  line-height: $nut-menu-bar-line-height;
+  background-color: $white;
+  border-bottom: 1px solid $nut-menu-bar-border-bottom-color;
 
-  .title-list {
-    display: flex;
-    line-height: 46px;
-    align-items: center;
-    background-color: #fff;
-    border-bottom: 1px solid #eaf0fb;
-
-    .title {
-      flex: 1;
-      text-align: center;
-
-      &.is-active {
-        font-weight: 600;
-      }
-
-      &.disabled {
-        color: #999;
-      }
-
-      [class*='nut-icon-arrow'] {
-        vertical-align: middle;
-        margin-right: 2px;
-      }
-    }
+  &.opened {
+    z-index: $nut-menu-bar-opened-z-index;
   }
 
-  %itemCommon {
-    position: absolute;
-    left: 0;
-    width: 100%;
-    padding-top: 12px;
-    padding-bottom: 12px;
-    border-radius: 0 0 12px 12px;
-    background-color: #fff;
-  }
+  .nut-menu__item {
+    flex: 1;
+    text-align: center;
+    font-size: $font-size-2;
+    color: $title-color;
+    min-width: 0;
 
-  .option-list {
-    @extend %itemCommon;
-    max-height: 214px;
-    overflow-y: auto;
+    &.disabled {
+      color: $nut-menu-item-disabled-color;
+    }
 
-    ul {
-      display: flex;
-      flex-wrap: wrap;
-      list-style: none;
-      margin: 0;
-      padding: 0;
+    .nut-menu__title-icon {
+      transition: all 0.2s linear;
     }
 
-    li {
-      line-height: 38px;
-      padding-left: 24px;
-      box-sizing: border-box;
+    .nut-menu__title {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      max-width: 100%;
+
+      .nut-menu__title-text {
+        @include text-ellipsis;
+        display: block;
+        padding-left: $nut-menu-title-text-padding-left;
+        padding-right: $nut-menu-title-text-padding-right;
+      }
 
-      .nut-icon-Check {
-        vertical-align: middle;
-        margin-right: 6px;
+      &.active .nut-menu__title-icon {
+        transform: rotate(180deg);
       }
     }
   }
-
-  .customer-item {
-    @extend %itemCommon;
-    padding-left: 24px;
-    padding-right: 24px;
-    box-sizing: border-box;
-  }
 }