@nutui/nutui 3.1.15 → 3.1.17-beta.0

package/dist/packages/_es/Picker.js

@@ -18,13 +18,12 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
-import { ref, reactive, computed, onMounted, watch, toRefs, openBlock, createElementBlock, normalizeStyle, createElementVNode, Fragment, renderList, toDisplayString, toRaw, resolveComponent, normalizeClass, createVNode, withCtx } from "vue";
+import { ref, reactive, computed, watch, onMounted, toRefs, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, normalizeClass, toDisplayString, createCommentVNode, toRaw, resolveComponent, createVNode, withCtx } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useTouch } from "./index2.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import Popup, { popupProps } from "./Popup.js";
 import "./OverLay.js";
@@ -41,10 +40,6 @@ const commonProps = {
     type: Boolean,
     default: false
   },
-  visibleItemCount: {
-    type: [Number, String],
-    default: 7
-  },
   defaultIndex: {
     type: [Number, String],
     default: 0
@@ -54,206 +49,208 @@ const commonProps = {
     default: 35
   }
 };
-const MOMENTUM_LIMIT_DISTANCE = 15;
-const MOMENTUM_LIMIT_TIME = 300;
-const DEFAULT_DURATION = 200;
 const { create: create$1 } = createComponent("picker-column");
-function range(num, min, max) {
-  return Math.min(Math.max(num, min), max);
-}
-function stopPropagation(event) {
-  event.stopPropagation();
-}
-function preventDefault(event, isStopPropagation) {
-  if (typeof event.cancelable !== "boolean" || event.cancelable) {
-    event.preventDefault();
-  }
-  if (isStopPropagation) {
-    stopPropagation(event);
-  }
-}
-function getElementTranslateY(element) {
-  const style = window.getComputedStyle(element);
-  const transform = style.transform || style.webkitTransform;
-  const translateY = transform.slice(7, transform.length - 1).split(", ")[5];
-  return Number(translateY);
-}
-function isObject(val) {
-  return val !== null && typeof val === "object";
-}
-function isOptionDisabled(option) {
-  return isObject(option) && option.disabled;
-}
 const _sfc_main$1 = create$1({
   props: __spreadValues({
-    dataType: String
+    dataType: String,
+    itemShow: {
+      type: Boolean,
+      default: false
+    }
   }, commonProps),
   emits: ["click", "change"],
   setup(props, { emit }) {
     const wrapper = ref();
     const state = reactive({
-      index: props.defaultIndex,
-      offset: 0,
-      duration: 0,
-      options: props.listData,
-      moving: false,
-      startOffset: 0,
-      touchStartTime: 0,
-      momentumOffset: 0,
-      transitionEndTrigger: null
+      touchParams: {
+        startY: 0,
+        endY: 0,
+        startTime: 0,
+        endTime: 0,
+        lastY: 0
+      },
+      currIndex: 1,
+      transformY: 0,
+      scrollDistance: 0,
+      lineSpacing: 36,
+      rotation: 20,
+      timer: null
+    });
+    const roller = ref(null);
+    const list = ref(null);
+    const listItem = ref(null);
+    const touchDeg = ref(0);
+    const touchTime = ref(0);
+    const touchTranslateY = ref(0);
+    const touchListStyle = computed(() => {
+      return {
+        transition: `transform ${touchTime.value}ms cubic-bezier(0.19, 1, 0.22, 1)`,
+        transform: `translate3d(0, ${state.scrollDistance}px, 0)`
+      };
+    });
+    const touchRollerStyle = computed(() => {
+      return {
+        transition: `transform ${touchTime.value}ms cubic-bezier(0.19, 1, 0.22, 1)`,
+        transform: `rotate3d(1, 0, 0, ${touchDeg.value})`
+      };
     });
-    const touch = useTouch();
-    const wrapperStyle = computed(() => ({
-      transform: `translate3d(0, ${state.offset + baseOffset()}px, 0)`,
-      transitionDuration: `${state.duration}ms`,
-      transitionProperty: state.duration ? "all" : "none"
-    }));
-    const getIndexByOffset = (offset) => {
-      return range(Math.round(-offset / +props.itemHeight), 0, state.options.length - 1);
+    const onTouchStart = (event) => {
+      event.preventDefault();
+      let changedTouches = event.changedTouches[0];
+      state.touchParams.startY = changedTouches.pageY;
+      state.touchParams.startTime = event.timeStamp || Date.now();
+      state.transformY = state.scrollDistance;
     };
-    const baseOffset = () => {
-      return +props.itemHeight * (+props.visibleItemCount - 1) / 2;
+    const onTouchMove = (event) => {
+      event.preventDefault();
+      let changedTouches = event.changedTouches[0];
+      state.touchParams.lastY = changedTouches.pageY;
+      state.touchParams.lastTime = event.timeStamp || Date.now();
+      let move = state.touchParams.lastY - state.touchParams.startY;
+      setMove(move);
     };
-    const stopMomentum = () => {
-      state.moving = false;
-      state.duration = 0;
-      if (state.transitionEndTrigger) {
-        state.transitionEndTrigger();
-        state.transitionEndTrigger = null;
+    const onTouchEnd = (event) => {
+      event.preventDefault();
+      let changedTouches = event.changedTouches[0];
+      state.touchParams.lastY = changedTouches.pageY;
+      state.touchParams.lastTime = event.timestamp || Date.now();
+      let move = state.touchParams.lastY - state.touchParams.startY;
+      let moveTime = state.touchParams.lastTime - state.touchParams.startTime;
+      if (moveTime <= 300) {
+        move = move * 2;
+        moveTime = moveTime + 1e3;
+        setMove(move, "end", moveTime);
+      } else {
+        setMove(move, "end");
       }
     };
-    const adjustIndex = (index) => {
-      index = range(index, 0, state.options.length);
-      for (let i = index; i < state.options.length; i++) {
-        if (!isOptionDisabled(state.options[i]))
-          return i;
-      }
-      for (let i = index - 1; i >= 0; i--) {
-        if (!isOptionDisabled(state.options[i]))
-          return i;
-      }
+    const setRollerStyle = (index) => {
+      return `transform: rotate3d(1, 0, 0, ${-state.rotation * index}deg) translate3d(0px, 0px, 104px)`;
     };
-    const setIndex = (index, emitChange = false) => {
-      index = adjustIndex(index) || 0;
-      const offset = -index * +props.itemHeight;
-      const trigger = () => {
-        if (index !== state.index) {
-          state.index = index;
-          if (emitChange) {
-            emit("change", index);
-          }
-        }
-      };
-      if (state.moving && offset !== state.offset) {
-        state.transitionEndTrigger = trigger;
+    const isHidden = (index) => {
+      if (index >= state.currIndex + 8 || index <= state.currIndex - 8) {
+        return true;
       } else {
-        trigger();
+        return false;
       }
-      state.offset = offset;
-    };
-    const momentum = (distance, duration) => {
-      const speed = Math.abs(distance / duration);
-      distance = state.offset + speed / 0.03 * (distance < 0 ? -1 : 1);
-      const index = getIndexByOffset(distance);
-      setIndex(index, true);
     };
-    const onTouchStart = (event) => {
-      if (props.readonly) {
-        return;
-      }
-      touch.start(event);
-      if (state.moving) {
-        const translateY = getElementTranslateY(wrapper.value);
-        state.offset = Math.min(0, translateY - baseOffset());
-        state.startOffset = state.offset;
+    const setTransform = (translateY = 0, type, time = 1e3, deg) => {
+      if (type === "end") {
+        touchTime.value = time;
       } else {
-        state.startOffset = state.offset;
+        touchTime.value = 0;
       }
-      state.duration = 0;
-      state.touchStartTime = Date.now();
-      state.momentumOffset = state.startOffset;
-      state.transitionEndTrigger = null;
+      touchDeg.value = deg;
+      touchTranslateY.value = translateY;
+      state.scrollDistance = translateY;
     };
-    const onTouchMove = (event) => {
-      if (props.readonly) {
-        return;
-      }
-      state.moving = true;
-      touch.move(event);
-      if (touch.isVertical()) {
-        state.moving = true;
-        preventDefault(event, true);
-      }
-      const moveOffset = state.startOffset + touch.deltaY.value;
-      if (moveOffset > props.itemHeight) {
-        state.offset = props.itemHeight;
+    const setMove = (move, type, time) => {
+      let updateMove = move + state.transformY;
+      if (type === "end") {
+        if (updateMove > 0) {
+          updateMove = 0;
+        }
+        if (updateMove < -(props.listData.values.length - 1) * state.lineSpacing) {
+          updateMove = -(props.listData.values.length - 1) * state.lineSpacing;
+        }
+        let endMove = Math.round(updateMove / state.lineSpacing) * state.lineSpacing;
+        let deg = `${(Math.abs(Math.round(endMove / state.lineSpacing)) + 1) * state.rotation}deg`;
+        setTransform(endMove, type, time, deg);
+        let t = time ? time / 2 : 0;
+        state.timer = setTimeout(() => {
+          setChooseValue();
+        }, t);
+        state.currIndex = Math.abs(Math.round(endMove / state.lineSpacing)) + 1;
       } else {
-        state.offset = state.startOffset + touch.deltaY.value;
-      }
-      const now = Date.now();
-      if (now - state.touchStartTime > MOMENTUM_LIMIT_TIME) {
-        state.touchStartTime = now;
-        state.momentumOffset = state.offset;
+        let deg = "0deg";
+        if (updateMove < 0) {
+          deg = `${(Math.abs(updateMove / state.lineSpacing) + 1) * state.rotation}deg`;
+        } else {
+          deg = `${(-updateMove / state.lineSpacing + 1) * state.rotation}deg`;
+        }
+        setTransform(updateMove, null, void 0, deg);
+        state.currIndex = Math.abs(Math.round(updateMove / state.lineSpacing)) + 1;
       }
     };
-    const onTouchEnd = () => {
-      const index = getIndexByOffset(state.offset);
-      state.duration = DEFAULT_DURATION;
-      setIndex(index, true);
-      const distance = state.offset - state.momentumOffset;
-      const duration = Date.now() - state.touchStartTime;
-      const allowMomentum = duration < MOMENTUM_LIMIT_TIME && Math.abs(distance) > MOMENTUM_LIMIT_DISTANCE;
-      if (allowMomentum) {
-        momentum(distance, duration);
-        return;
-      }
+    const setChooseValue = () => {
+      emit("change", state.currIndex - 1);
+    };
+    const modifyStatus = (type) => {
+      let index = props.defaultIndex;
+      state.currIndex = index === -1 ? 1 : index + 1;
+      let move = index === -1 ? 0 : index * state.lineSpacing;
+      type && setChooseValue();
+      setMove(-move);
     };
-    onMounted(() => {
-      setIndex(+props.defaultIndex);
-    });
     watch(() => props.listData, (val) => {
-      if (val) {
-        state.options = val;
-      }
+      state.transformY = 0;
+      modifyStatus(false);
+    }, {
+      deep: true
     });
     watch(() => props.defaultIndex, (val) => {
-      setIndex(+val);
+      state.transformY = 0;
+      modifyStatus(false);
+    });
+    onMounted(() => {
+      modifyStatus(true);
     });
-    return __spreadProps(__spreadValues({}, toRefs(state)), {
+    return __spreadProps(__spreadValues(__spreadValues({}, toRefs(state)), toRefs(props)), {
       wrapper,
+      setRollerStyle,
+      isHidden,
+      roller,
+      list,
+      listItem,
       onTouchStart,
       onTouchMove,
       onTouchEnd,
-      wrapperStyle,
-      stopMomentum,
-      columns: state.options,
-      height: Number(props.visibleItemCount) * +props.itemHeight
+      touchRollerStyle,
+      touchListStyle
     });
   }
 });
+const _hoisted_1$1 = { class: "nut-picker-content" };
+const _hoisted_2$1 = {
+  key: 0,
+  class: "nut-picker-placeholder"
+};
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
-    class: "nut-picker__content",
-    style: normalizeStyle({ height: _ctx.height + "px" }),
+    class: "nut-picker__list",
     onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.onTouchStart && _ctx.onTouchStart(...args)),
     onTouchmove: _cache[1] || (_cache[1] = (...args) => _ctx.onTouchMove && _ctx.onTouchMove(...args)),
-    onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args)),
-    onTouchcancel: _cache[3] || (_cache[3] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args)),
-    onTransitionend: _cache[4] || (_cache[4] = (...args) => _ctx.stopMomentum && _ctx.stopMomentum(...args))
+    onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args))
   }, [
     createElementVNode("view", {
-      class: "nut-picker__wrapper",
-      ref: "wrapper",
-      style: normalizeStyle(_ctx.wrapperStyle)
+      class: "nut-picker-roller",
+      ref: "roller",
+      style: normalizeStyle(_ctx.touchRollerStyle)
     }, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.options, (item, index) => {
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index) => {
         return openBlock(), createElementBlock("view", {
-          class: "nut-picker__item",
-          key: index
-        }, toDisplayString(_ctx.dataType === "cascade" ? item.text : item), 1);
+          class: normalizeClass(["nut-picker-roller-item", { "nut-picker-roller-item-hidden": _ctx.isHidden(index + 1) }]),
+          style: normalizeStyle(_ctx.setRollerStyle(index + 1)),
+          key: item.label ? item.label : index
+        }, toDisplayString(_ctx.dataType === "cascade" ? item.text : item), 7);
       }), 128))
-    ], 4)
-  ], 36);
+    ], 4),
+    createElementVNode("view", _hoisted_1$1, [
+      createElementVNode("view", {
+        class: "nut-picker-list-panel",
+        ref: "list",
+        style: normalizeStyle(_ctx.touchListStyle)
+      }, [
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index) => {
+          return openBlock(), createElementBlock("view", {
+            class: "nut-picker-item nut-picker-item-ref",
+            key: item.label ? item.label : index
+          }, toDisplayString(_ctx.dataType === "cascade" ? item.text : item), 1);
+        }), 128)),
+        _ctx.listData && _ctx.listData.length === 1 ? (openBlock(), createElementBlock("view", _hoisted_2$1)) : createCommentVNode("", true)
+      ], 4)
+    ])
+  ], 32);
 }
 var column = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1]]);
 const { create, componentName } = createComponent("picker");
@@ -293,12 +290,6 @@ const _sfc_main = create({
         [prefixCls]: true
       };
     });
-    const top = computed(() => {
-      return Number(+props.visibleItemCount - 1) / 2 * +props.itemHeight;
-    });
-    const height = computed(() => {
-      return Number(props.visibleItemCount) * +props.itemHeight;
-    });
     const dataType = computed(() => {
       const firstColumn = state.formattedColumns[0];
       if (typeof firstColumn === "object") {
@@ -313,9 +304,7 @@ const _sfc_main = create({
     });
     const columnList = computed(() => {
       if (dataType.value === "text") {
-        return [
-          { values: state.formattedColumns, defaultIndex: state.defaultIndex }
-        ];
+        return [{ values: state.formattedColumns, defaultIndex: state.defaultIndex }];
       } else if (dataType.value === "multipleColumns") {
         return state.formattedColumns;
       } else if (dataType.value === "cascade") {
@@ -380,7 +369,7 @@ const _sfc_main = create({
       } else if (dataType.value === "multipleColumns") {
         defaultIndexList[columnIndex] = dataIndex;
         const val = defaultIndexList.map((res, i) => toRaw(state.formattedColumns)[i].values[res]);
-        emit("change", val);
+        emit("change", val, columnIndex, dataIndex);
       }
     };
     const confirm = () => {
@@ -410,8 +399,6 @@ const _sfc_main = create({
       column,
       dataType,
       columnList,
-      top,
-      height,
       close,
       changeHandler,
       confirm
@@ -420,6 +407,7 @@ const _sfc_main = create({
 });
 const _hoisted_1 = { class: "nut-picker__bar" };
 const _hoisted_2 = { class: "nut-picker__column" };
+const _hoisted_3 = /* @__PURE__ */ createElementVNode("view", { class: "nut-picker__hairline" }, null, -1);
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_picker_column = resolveComponent("nut-picker-column");
   const _component_nut_popup = resolveComponent("nut-popup");
@@ -428,13 +416,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, [
     createVNode(_component_nut_popup, {
       position: "bottom",
-      style: normalizeStyle({ height: _ctx.height + 56 + "px" }),
       visible: _ctx.show,
       "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => _ctx.show = $event),
       teleport: _ctx.teleport,
       "lock-scroll": _ctx.lockScroll,
       "close-on-click-overlay": _ctx.closeOnClickOverlay,
-      onClose: _ctx.close
+      onClose: _ctx.close,
+      round: true
     }, {
       default: withCtx(() => [
         createElementVNode("view", _hoisted_1, [
@@ -449,36 +437,29 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, toDisplayString(_ctx.okText), 1)
         ]),
         createElementVNode("view", _hoisted_2, [
-          createElementVNode("view", {
-            class: "nut-picker__mask",
-            style: normalizeStyle({ backgroundSize: `100% ${_ctx.top}px` })
-          }, null, 4),
-          createElementVNode("view", {
-            class: "nut-picker__hairline",
-            style: normalizeStyle({ top: ` ${_ctx.top}px` })
-          }, null, 4),
+          _hoisted_3,
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columnList, (item, columnIndex) => {
             return openBlock(), createElementBlock("view", {
               class: "nut-picker__columnitem",
               key: columnIndex
             }, [
               createVNode(_component_nut_picker_column, {
-                "list-data": item.values,
+                itemShow: _ctx.show,
+                "list-data": item,
                 readonly: _ctx.readonly,
                 "default-index": item.defaultIndex,
                 "visible-item-count": _ctx.visibleItemCount,
-                "item-height": _ctx.itemHeight,
                 "data-type": _ctx.dataType,
                 onChange: (dataIndex) => {
                   _ctx.changeHandler(columnIndex, dataIndex);
                 }
-              }, null, 8, ["list-data", "readonly", "default-index", "visible-item-count", "item-height", "data-type", "onChange"])
+              }, null, 8, ["itemShow", "list-data", "readonly", "default-index", "visible-item-count", "data-type", "onChange"])
             ]);
           }), 128))
         ])
       ]),
       _: 1
-    }, 8, ["style", "visible", "teleport", "lock-scroll", "close-on-click-overlay", "onClose"])
+    }, 8, ["visible", "teleport", "lock-scroll", "close-on-click-overlay", "onClose"])
   ], 2);
 }
 var picker = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/dist/packages/_es/Popover.js

@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Popup.js

@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Price.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
@@ -22,7 +22,7 @@ const _sfc_main = create({
       default: "¥"
     },
     decimalDigits: {
-      type: Number,
+      type: [Number, String],
       default: 2
     },
     thousands: {

package/dist/packages/_es/Progress.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
@@ -49,11 +49,16 @@ const _sfc_main = create({
     iconColor: {
       type: String,
       default: "#439422"
+    },
+    isShowPercentage: {
+      type: Boolean,
+      default: true
     }
   },
   setup(props, { emit }) {
     const height = ref(props.strokeWidth + "px");
     const progressOuter = ref();
+    const insideText = ref();
     const left = ref();
     const bgStyle = computed(() => {
       return {
@@ -66,19 +71,29 @@ 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) => {
-      console.log("progressOuter.value.offsetWidth", progressOuter.value.offsetWidth);
-      console.log("values", values);
-      left.value = progressOuter.value.offsetWidth * Number(values) * 0.01 - 5 + "px";
+      slideLeft(values);
     });
     onMounted(() => {
-      left.value = progressOuter.value.offsetWidth * Number(props.percentage) * 0.01 - 5 + "px";
+      slideLeft(props.percentage);
     });
     return {
       height,
       bgStyle,
       textStyle,
       progressOuter,
+      insideText,
       left
     };
   }
@@ -88,10 +103,7 @@ 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 : ""
-      ]]),
+      class: normalizeClass(["nut-progress-outer", [_ctx.showText && !_ctx.textInside ? "nut-progress-outer-part" : "", _ctx.size ? "nut-progress-" + _ctx.size : ""]]),
       ref: "progressOuter",
       style: normalizeStyle({ height: _ctx.height })
     }, [
@@ -102,11 +114,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         _ctx.showText && _ctx.textInside ? (openBlock(), createElementBlock("div", {
           key: 0,
           class: "nut-progress-text nut-progress-insidetext",
+          ref: "insideText",
           style: normalizeStyle({ lineHeight: _ctx.height, left: _ctx.left })
         }, [
           createElementVNode("span", {
             style: normalizeStyle(_ctx.textStyle)
-          }, toDisplayString(_ctx.percentage) + "%", 5)
+          }, toDisplayString(_ctx.percentage) + toDisplayString(_ctx.isShowPercentage ? "%" : ""), 5)
         ], 4)) : createCommentVNode("", true)
       ], 6)
     ], 6),
@@ -118,7 +131,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       _ctx.status == "active" || _ctx.status == "" ? (openBlock(), createElementBlock("span", {
         key: 0,
         style: normalizeStyle(_ctx.textStyle)
-      }, toDisplayString(_ctx.percentage) + "%", 5)) : _ctx.status == "icon" ? (openBlock(), createBlock(_component_nut_icon, {
+      }, toDisplayString(_ctx.percentage) + toDisplayString(_ctx.isShowPercentage ? "%" : ""), 5)) : _ctx.status == "icon" ? (openBlock(), createBlock(_component_nut_icon, {
         key: 1,
         size: "16px",
         name: _ctx.iconName,

package/dist/packages/_es/Radio.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
@@ -36,7 +36,7 @@ const _sfc_main = create({
     }
   },
   setup(props, { emit, slots }) {
-    let parent = inject("parent");
+    let parent = inject("parent", null);
     const isCurValue = computed(() => {
       return parent.label.value == props.label;
     });

package/dist/packages/_es/RadioGroup.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Range.js

@@ -18,14 +18,14 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.15 Fri Jan 21 2022 15:38:52 GMT+0800 (GMT+08:00)
+* @nutui/nutui v3.1.16 Fri Feb 25 2022 17:05:36 GMT+0800 (GMT+08:00)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
 import { ref, computed, toRefs, openBlock, createElementBlock, toDisplayString, createCommentVNode, createElementVNode, normalizeStyle, normalizeClass, withModifiers, Fragment, renderList, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useTouch } from "./index2.js";
-import { u as useRect } from "./index3.js";
+import { u as useTouch } from "./index3.js";
+import { u as useRect } from "./index2.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { componentName, create } = createComponent("range");
 const _sfc_main = create({