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

package/dist/packages/_es/Popover.js

@@ -18,18 +18,140 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
-* (c) 2021 @jdf2e.
+* @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 { ref, reactive, toRefs, computed, onMounted, watch, resolveComponent, openBlock, createElementBlock, withModifiers, normalizeClass, createElementVNode, renderSlot, Fragment, normalizeStyle, renderList, createVNode, createCommentVNode, toDisplayString } from "vue";
+import { toRefs, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, createBlock, createCommentVNode, renderSlot, ref, reactive, onMounted, watch, withModifiers, Fragment, renderList, createVNode, toDisplayString } from "vue";
 import { c as createComponent } from "./component.js";
-import Popup, { popupProps } from "./Popup.js";
-import Button from "./Button.js";
+import { _ as _sfc_main$2, P as Popup, p as popupProps } from "./index4.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
-import "./OverLay.js";
-import "./Icon.js";
+import { u as useTaroRect } from "./index.js";
+import Taro from "@tarojs/taro";
+import "./use-lock-scroll.js";
 import "./pxCheck.js";
+const { componentName: componentName$1, create: create$1 } = createComponent("button");
+const _sfc_main$1 = create$1({
+  components: {
+    [_sfc_main$2.name]: _sfc_main$2
+  },
+  props: {
+    color: String,
+    shape: {
+      type: String,
+      default: "round"
+    },
+    plain: {
+      type: Boolean,
+      default: false
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    type: {
+      type: String,
+      default: "default"
+    },
+    size: {
+      type: String,
+      default: "normal"
+    },
+    block: {
+      type: Boolean,
+      default: false
+    },
+    icon: {
+      type: String,
+      default: ""
+    },
+    iconClassPrefix: {
+      type: String,
+      default: "nut-icon"
+    },
+    iconFontClassName: {
+      type: String,
+      default: "nutui-iconfont"
+    }
+  },
+  emits: ["click"],
+  setup(props, { emit, slots }) {
+    const { type, size, shape, disabled, loading, color, plain, block } = toRefs(props);
+    const handleClick = (event) => {
+      if (!loading.value && !disabled.value) {
+        emit("click", event);
+      }
+    };
+    const classes = computed(() => {
+      const prefixCls = componentName$1;
+      return {
+        [prefixCls]: true,
+        [`${prefixCls}--${type.value}`]: type.value,
+        [`${prefixCls}--${size.value}`]: size.value,
+        [`${prefixCls}--${shape.value}`]: shape.value,
+        [`${prefixCls}--plain`]: plain.value,
+        [`${prefixCls}--block`]: block.value,
+        [`${prefixCls}--disabled`]: disabled.value,
+        [`${prefixCls}--loading`]: loading.value
+      };
+    });
+    const getStyle = computed(() => {
+      var _a;
+      const style = {};
+      if (color == null ? void 0 : color.value) {
+        if (plain.value) {
+          style.color = color.value;
+          style.background = "#fff";
+          if (!((_a = color.value) == null ? void 0 : _a.includes("gradient"))) {
+            style.borderColor = color.value;
+          }
+        } else {
+          style.color = "#fff";
+          style.background = color.value;
+        }
+      }
+      return style;
+    });
+    return {
+      handleClick,
+      classes,
+      getStyle
+    };
+  }
+});
+const _hoisted_1$1 = { class: "nut-button__warp" };
+function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_nut_icon = resolveComponent("nut-icon");
+  return openBlock(), createElementBlock("view", {
+    class: normalizeClass(_ctx.classes),
+    style: normalizeStyle(_ctx.getStyle),
+    onClick: _cache[0] || (_cache[0] = (...args) => _ctx.handleClick && _ctx.handleClick(...args))
+  }, [
+    createElementVNode("view", _hoisted_1$1, [
+      _ctx.loading ? (openBlock(), createBlock(_component_nut_icon, {
+        key: 0,
+        class: "nut-icon-loading"
+      })) : createCommentVNode("", true),
+      _ctx.icon && !_ctx.loading ? (openBlock(), createBlock(_component_nut_icon, {
+        key: 1,
+        name: _ctx.icon,
+        "class-prefix": _ctx.iconClassPrefix,
+        "font-class-name": _ctx.iconFontClassName
+      }, null, 8, ["name", "class-prefix", "font-class-name"])) : createCommentVNode("", true),
+      _ctx.$slots.default ? (openBlock(), createElementBlock("view", {
+        key: 2,
+        class: normalizeClass({ text: _ctx.icon || _ctx.loading })
+      }, [
+        renderSlot(_ctx.$slots, "default")
+      ], 2)) : createCommentVNode("", true)
+    ])
+  ], 6);
+}
+var Button = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1]]);
 const { componentName, create } = createComponent("popover");
 const _sfc_main = create({
   inheritAttrs: false,
@@ -81,15 +203,15 @@ const _sfc_main = create({
         [`${prefixCls}--${location.value}`]: location.value
       };
     });
-    function getReference() {
-      state.elWidth = reference.value.offsetWidth;
-      state.elHeight = reference.value.offsetHeight;
-    }
+    const getReference = async () => {
+      const refe = await useTaroRect(reference, Taro);
+      state.elWidth = refe.width;
+      state.elHeight = refe.height;
+    };
     const getStyle = computed(() => {
       const style = {};
       if (location.value == "top") {
-        style.bottom = state.elHeight + 20 + "px";
-        style.left = 0 + "px";
+        style.bottom = state.elHeight + 10 + "px";
       } else if (location.value == "right") {
         style.top = 0 + "px";
         style.right = -state.elWidth + "px";
@@ -97,8 +219,7 @@ const _sfc_main = create({
         style.top = 0 + "px";
         style.left = -state.elWidth + "px";
       } else {
-        style.top = state.elHeight + 20 + "px";
-        style.left = 0 + "px";
+        style.top = state.elHeight + 10 + "px";
       }
       return style;
     });
@@ -120,7 +241,9 @@ const _sfc_main = create({
       return style;
     });
     onMounted(() => {
-      getReference();
+      setTimeout(() => {
+        getReference();
+      }, 200);
     });
     watch(() => props.visible, (value) => {
       showPopup.value = value;
@@ -137,12 +260,10 @@ const _sfc_main = create({
       emit("close");
       emit("update:visible", false);
     };
-    const chooseItem = (item, index2) => {
-      if (item.disabled) {
-        return;
-      }
-      emit("choose", item, index2);
+    const chooseItem = (item, index) => {
+      emit("choose", item, index);
     };
+    const refRandomId = Math.random().toString(36).slice(-8);
     return {
       classes,
       showPopup,
@@ -154,11 +275,12 @@ const _sfc_main = create({
       getReference,
       reference,
       getStyle,
-      getArrowStyle
+      getArrowStyle,
+      refRandomId
     };
   }
 });
-const _hoisted_1 = { ref: "reference" };
+const _hoisted_1 = ["id"];
 const _hoisted_2 = ["onClick"];
 const _hoisted_3 = { class: "title-name" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
@@ -167,9 +289,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[1] || (_cache[1] = withModifiers((...args) => _ctx.openPopover && _ctx.openPopover(...args), ["stop"])),
     class: normalizeClass(_ctx.classes)
   }, [
-    createElementVNode("div", _hoisted_1, [
+    createElementVNode("div", {
+      ref: "reference",
+      id: "reference-" + _ctx.refRandomId
+    }, [
       renderSlot(_ctx.$slots, "reference")
-    ], 512),
+    ], 8, _hoisted_1),
     _ctx.showPopup ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
       createElementVNode("view", {
         class: "more-background",
@@ -184,11 +309,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           style: normalizeStyle(_ctx.getArrowStyle)
         }, null, 6),
         renderSlot(_ctx.$slots, "content"),
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.list, (item, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.list, (item, index) => {
           return openBlock(), createElementBlock("view", {
-            key: index2,
+            key: index,
             class: normalizeClass({ "title-item": true, disabled: item.disabled }),
-            onClick: withModifiers(($event) => _ctx.chooseItem(item, index2), ["stop"])
+            onClick: withModifiers(($event) => _ctx.chooseItem(item, index), ["stop"])
           }, [
             item.icon ? renderSlot(_ctx.$slots, "default", { key: 0 }, () => [
               createVNode(_component_nut_icon, {
@@ -203,5 +328,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 64)) : createCommentVNode("", true)
   ], 2);
 }
-var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index as default };
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index_taro as default };

package/dist/packages/_es/Popup.js

@@ -18,33 +18,17 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
-* (c) 2021 @jdf2e.
+* @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, onMounted, onBeforeUnmount, onBeforeMount, onActivated, onDeactivated, watch, toRefs, resolveComponent, openBlock, createBlock, Teleport, normalizeClass, normalizeStyle, createCommentVNode, createVNode, Transition, withCtx, withDirectives, createElementVNode, renderSlot, createElementBlock, vShow } from "vue";
+import { reactive, computed, onMounted, onBeforeUnmount, onBeforeMount, onActivated, onDeactivated, watch, toRefs, resolveComponent, openBlock, createElementBlock, createBlock, normalizeClass, normalizeStyle, createCommentVNode, createVNode, Transition, withCtx, withDirectives, createElementVNode, renderSlot, vShow } from "vue";
+import { u as useLockScroll } from "./use-lock-scroll.js";
 import overlay, { overlayProps } from "./OverLay.js";
 import _sfc_main$1 from "./Icon.js";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "./pxCheck.js";
-let count = 0;
-const CLSNAME = "nut-overflow-hidden";
-const useLockScroll = (isLock) => {
-  const lock = () => {
-    if (isLock()) {
-      !count && document.body.classList.add(CLSNAME);
-      count++;
-    }
-  };
-  const unlock = () => {
-    if (isLock() && count) {
-      count--;
-      !count && document.body.classList.remove(CLSNAME);
-    }
-  };
-  return [lock, unlock];
-};
 const { componentName, create } = createComponent("popup");
 let _zIndex = 2e3;
 const popupProps = __spreadProps(__spreadValues({}, overlayProps), {
@@ -87,13 +71,10 @@ const popupProps = __spreadProps(__spreadValues({}, overlayProps), {
   round: {
     type: Boolean,
     default: false
-  },
-  isWrapTeleport: {
-    type: Boolean,
-    default: true
   }
 });
 const _sfc_main = create({
+  children: [overlay],
   components: {
     [overlay.name]: overlay,
     [_sfc_main$1.name]: _sfc_main$1
@@ -218,14 +199,10 @@ const _sfc_main = create({
     });
   }
 });
-const _hoisted_1 = { key: 1 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_overlay = resolveComponent("nut-overlay");
   const _component_nut_icon = resolveComponent("nut-icon");
-  return _ctx.isWrapTeleport ? (openBlock(), createBlock(Teleport, {
-    key: 0,
-    to: _ctx.teleport
-  }, [
+  return openBlock(), createElementBlock("view", null, [
     _ctx.overlay ? (openBlock(), createBlock(_component_nut_overlay, {
       key: 0,
       visible: _ctx.visible,
@@ -265,47 +242,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       _: 3
     }, 8, ["name", "onAfterEnter", "onAfterLeave"])
-  ], 8, ["to"])) : (openBlock(), createElementBlock("view", _hoisted_1, [
-    _ctx.overlay ? (openBlock(), createBlock(_component_nut_overlay, {
-      key: 0,
-      visible: _ctx.visible,
-      "close-on-click-overlay": _ctx.closeOnClickOverlay,
-      class: normalizeClass(_ctx.overlayClass),
-      style: normalizeStyle(_ctx.overlayStyle),
-      "z-index": _ctx.zIndex,
-      "lock-scroll": _ctx.lockScroll,
-      duration: _ctx.duration,
-      onClick: _ctx.onClickOverlay
-    }, null, 8, ["visible", "close-on-click-overlay", "class", "style", "z-index", "lock-scroll", "duration", "onClick"])) : createCommentVNode("", true),
-    createVNode(Transition, {
-      name: _ctx.transitionName,
-      onAfterEnter: _ctx.onOpened,
-      onAfterLeave: _ctx.onClosed
-    }, {
-      default: withCtx(() => [
-        withDirectives(createElementVNode("view", {
-          class: normalizeClass(_ctx.classes),
-          style: normalizeStyle(_ctx.popStyle),
-          onClick: _cache[3] || (_cache[3] = (...args) => _ctx.onClick && _ctx.onClick(...args))
-        }, [
-          _ctx.showSlot ? renderSlot(_ctx.$slots, "default", { key: 0 }) : createCommentVNode("", true),
-          _ctx.closed ? (openBlock(), createElementBlock("view", {
-            key: 1,
-            onClick: _cache[2] || (_cache[2] = (...args) => _ctx.onClickCloseIcon && _ctx.onClickCloseIcon(...args)),
-            class: normalizeClass(["nutui-popup__close-icon", "nutui-popup__close-icon--" + _ctx.closeIconPosition])
-          }, [
-            createVNode(_component_nut_icon, {
-              name: _ctx.closeIcon,
-              size: "12px"
-            }, null, 8, ["name"])
-          ], 2)) : createCommentVNode("", true)
-        ], 6), [
-          [vShow, _ctx.visible]
-        ])
-      ]),
-      _: 3
-    }, 8, ["name", "onAfterEnter", "onAfterLeave"])
-  ]));
+  ]);
 }
 var Popup = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export { Popup as default, popupProps };

package/dist/packages/_es/Price.js

@@ -1,6 +1,6 @@
 /*!
-* @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
-* (c) 2021 @jdf2e.
+* @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 { computed, openBlock, createElementBlock, normalizeClass, createCommentVNode, createElementVNode, toDisplayString } from "vue";
@@ -44,8 +44,17 @@ const _sfc_main = create({
         [componentName]: true
       };
     });
+    const replaceSpecialChar = (url) => {
+      url = url.replace(/"/g, '"');
+      url = url.replace(/&/g, "&");
+      url = url.replace(/&lt;/g, "<");
+      url = url.replace(/&gt;/g, ">");
+      url = url.replace(/&nbsp;/g, " ");
+      url = url.replace(/&yen;/g, "\uFFE5");
+      return url;
+    };
     const showSymbol = computed(() => {
-      const symbol = props.needSymbol ? props.symbol : "";
+      const symbol = props.needSymbol ? replaceSpecialChar(props.symbol) : "";
       return symbol;
     });
     const checkPoint = (price) => {
@@ -86,7 +95,8 @@ const _sfc_main = create({
       showSymbol,
       checkPoint,
       formatThousands,
-      formatDecimal
+      formatDecimal,
+      replaceSpecialChar
     };
   }
 });
@@ -99,6 +109,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _ctx.needSymbol && _ctx.position == "before" ? (openBlock(), createElementBlock("view", {
       key: 0,
       class: normalizeClass(["nut-price--symbol", `nut-price--symbol-${_ctx.size}`]),
+      decode: "true",
       innerHTML: _ctx.showSymbol
     }, null, 10, _hoisted_1)) : createCommentVNode("", true),
     createElementVNode("view", {
@@ -114,9 +125,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _ctx.needSymbol && _ctx.position == "after" ? (openBlock(), createElementBlock("view", {
       key: 2,
       class: normalizeClass(["nut-price--symbol", `nut-price--symbol-${_ctx.size}`]),
+      decode: "true",
       innerHTML: _ctx.showSymbol
     }, null, 10, _hoisted_2)) : createCommentVNode("", true)
   ], 2);
 }
-var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index as default };
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index_taro as default };

package/dist/packages/_es/Progress.js

@@ -1,10 +1,11 @@
 /*!
-* @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
-* (c) 2021 @jdf2e.
+* @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 { ref, computed, watch, onMounted, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, toDisplayString, createCommentVNode, createBlock } from "vue";
+import { ref, computed, onMounted, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, toDisplayString, createCommentVNode, createBlock } from "vue";
 import { c as createComponent } from "./component.js";
+import { eventCenter, getCurrentInstance } from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { create } = createComponent("progress");
 const _sfc_main = create({
@@ -20,7 +21,7 @@ const _sfc_main = create({
     },
     status: {
       type: String,
-      default: ""
+      default: "text"
     },
     strokeWidth: {
       type: [Number, String],
@@ -42,6 +43,10 @@ const _sfc_main = create({
       tyep: String,
       default: ""
     },
+    textBackground: {
+      tyep: String,
+      default: ""
+    },
     iconName: {
       type: String,
       default: "checked"
@@ -59,7 +64,8 @@ const _sfc_main = create({
     const height = ref(props.strokeWidth + "px");
     const progressOuter = ref();
     const insideText = ref();
-    const left = ref();
+    const refRandomId = Math.random().toString(36).slice(-8);
+    const randRef = ref(refRandomId);
     const bgStyle = computed(() => {
       return {
         width: props.percentage + "%",
@@ -71,22 +77,9 @@ const _sfc_main = create({
         color: props.textColor || ""
       };
     });
-    const slideLeft = (values) => {
-      if (props.textInside) {
-        let offsetWidth = progressOuter.value.offsetWidth;
-        let percentageWidth = progressOuter.value.offsetWidth * Number(values) * 0.01;
-        let insideTextWidth = insideText.value.offsetWidth;
-        left.value = percentageWidth - 5 + "px";
-        if (offsetWidth == percentageWidth) {
-          left.value = percentageWidth - insideTextWidth + "px";
-        }
-      }
-    };
-    watch(() => props.percentage, (values) => {
-      slideLeft(values);
-    });
     onMounted(() => {
-      slideLeft(props.percentage);
+      eventCenter.once(getCurrentInstance().router.onReady, () => {
+      });
     });
     return {
       height,
@@ -94,16 +87,19 @@ const _sfc_main = create({
       textStyle,
       progressOuter,
       insideText,
-      left
+      randRef
     };
   }
 });
 const _hoisted_1 = { class: "nut-progress" };
+const _hoisted_2 = ["id"];
+const _hoisted_3 = ["id"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_icon = resolveComponent("nut-icon");
   return openBlock(), createElementBlock("div", _hoisted_1, [
     createElementVNode("div", {
       class: normalizeClass(["nut-progress-outer", [_ctx.showText && !_ctx.textInside ? "nut-progress-outer-part" : "", _ctx.size ? "nut-progress-" + _ctx.size : ""]]),
+      id: "nut-progress-outer-taro-" + _ctx.randRef,
       ref: "progressOuter",
       style: normalizeStyle({ height: _ctx.height })
     }, [
@@ -115,20 +111,26 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           key: 0,
           class: "nut-progress-text nut-progress-insidetext",
           ref: "insideText",
-          style: normalizeStyle({ lineHeight: _ctx.height, left: _ctx.left })
+          id: "nut-progress-insidetext-taro-" + _ctx.randRef,
+          style: normalizeStyle({
+            lineHeight: _ctx.height,
+            left: `${_ctx.percentage}%`,
+            transform: `translate(-${+_ctx.percentage}%,-50%)`,
+            background: _ctx.textBackground || _ctx.strokeColor
+          })
         }, [
           createElementVNode("span", {
             style: normalizeStyle(_ctx.textStyle)
           }, toDisplayString(_ctx.percentage) + toDisplayString(_ctx.isShowPercentage ? "%" : ""), 5)
-        ], 4)) : createCommentVNode("", true)
+        ], 12, _hoisted_3)) : createCommentVNode("", true)
       ], 6)
-    ], 6),
+    ], 14, _hoisted_2),
     _ctx.showText && !_ctx.textInside ? (openBlock(), createElementBlock("div", {
       key: 0,
       class: "nut-progress-text",
       style: normalizeStyle({ lineHeight: _ctx.height })
     }, [
-      _ctx.status == "active" || _ctx.status == "" ? (openBlock(), createElementBlock("span", {
+      _ctx.status == "text" || _ctx.status == "active" ? (openBlock(), createElementBlock("span", {
         key: 0,
         style: normalizeStyle(_ctx.textStyle)
       }, toDisplayString(_ctx.percentage) + toDisplayString(_ctx.isShowPercentage ? "%" : ""), 5)) : _ctx.status == "icon" ? (openBlock(), createBlock(_component_nut_icon, {
@@ -140,5 +142,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 4)) : createCommentVNode("", true)
   ]);
 }
-var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index as default };
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index_taro as default };