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

package/dist/packages/_es/CollapseItem.js

@@ -18,11 +18,12 @@ 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 { inject, reactive, computed, getCurrentInstance, ref, watch, onMounted, toRefs, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, createBlock, createCommentVNode, renderSlot, normalizeStyle } from "vue";
+import { inject, ref, reactive, computed, getCurrentInstance, watch, onMounted, toRefs, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, createBlock, createCommentVNode, renderSlot, normalizeStyle } from "vue";
+import Taro, { eventCenter, getCurrentInstance as getCurrentInstance$1 } from "@tarojs/taro";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { create, componentName } = createComponent("collapse-item");
@@ -51,6 +52,7 @@ const _sfc_main = create({
   },
   setup(props, ctx) {
     const collapse = inject("collapseParent");
+    const conHeight = ref("auto");
     const parent = reactive(collapse);
     const classes = computed(() => {
       const prefixCls = componentName;
@@ -69,7 +71,7 @@ const _sfc_main = create({
       icon: parent.props.icon,
       iconSize: parent.props.iconSize,
       iconColor: parent.props.iconColor,
-      openExpanded: false,
+      openExpanded: null,
       iconStyle: {
         transform: "rotate(0deg)",
         marginTop: parent.props.iconHeght ? "-" + parent.props.iconHeght / 2 + "px" : "-10px"
@@ -84,31 +86,33 @@ const _sfc_main = create({
     const wrapperRef = ref(null);
     const contentRef = ref(null);
     const onTransitionEnd = () => {
-      const wrapperRefEle = document.getElementsByClassName("collapse-wrapper")[0];
-      if (wrapperRefEle) {
-        wrapperRefEle.style.willChange = "auto";
-      }
+      nextTick(() => {
+        parent.children.forEach((item1, index) => {
+          let ary = Array.from(item1.$el.children);
+          ary.forEach((item2, index2) => {
+            if (item2.className.includes("collapse-wrapper")) {
+              item2.style.willChange = "auto";
+            }
+          });
+        });
+      });
     };
     const animation = () => {
-      const wrapperRefEle = wrapperRef.value;
-      const contentRefEle = contentRef.value;
-      if (!wrapperRefEle || !contentRefEle) {
-        return;
+      if (parent.props.icon && !proxyData.openExpanded) {
+        proxyData.iconStyle["transform"] = "rotate(0deg)";
+      } else {
+        proxyData.iconStyle["transform"] = "rotate(" + parent.props.rotate + "deg)";
       }
-      const offsetHeight = contentRefEle.offsetHeight || "auto";
-      if (offsetHeight) {
-        const contentHeight = `${offsetHeight}px`;
-        wrapperRefEle.style.willChange = "height";
-        wrapperRefEle.style.height = !proxyData.openExpanded ? 0 : contentHeight;
-        if (parent.props.icon && !proxyData.openExpanded) {
-          proxyData.iconStyle["transform"] = "rotate(0deg)";
-        } else {
-          proxyData.iconStyle["transform"] = "rotate(" + parent.props.rotate + "deg)";
+      nextTick(() => {
+        const query = Taro.getEnv() === "ALIPAY" ? my.createSelectorQuery() : Taro.createSelectorQuery();
+        query.selectAll(".collapse-content").boundingClientRect();
+        query.exec((res) => {
+          getH(res[0]);
+        });
+        if (!proxyData.openExpanded) {
+          onTransitionEnd();
         }
-      }
-      if (!proxyData.openExpanded) {
-        onTransitionEnd();
-      }
+      });
     };
     const open = () => {
       proxyData.openExpanded = !proxyData.openExpanded;
@@ -123,7 +127,7 @@ const _sfc_main = create({
     const currentName = computed(() => props.name);
     const toggleOpen = () => {
       if (parent.props.accordion) {
-        parent.children.forEach((item, index2) => {
+        parent.children.forEach((item, index) => {
           if (currentName.value == item.name) {
             item.changeOpen(!item.openExpanded);
           } else {
@@ -157,11 +161,40 @@ const _sfc_main = create({
     watch(() => {
       var _a, _b;
       return (_b = (_a = ctx == null ? void 0 : ctx.slots) == null ? void 0 : _a.default) == null ? void 0 : _b.call(_a);
-    }, () => {
+    }, (vnodes) => {
       setTimeout(() => {
-        animation();
+        getRefHeight();
       }, 300);
     });
+    const getH = (list) => {
+      parent.children.forEach((item1, index1) => {
+        let ary = Array.from(item1.$el.children);
+        let _uid = ary[1].children[0]["uid"];
+        let tm = list.filter((item2) => item2.id == _uid);
+        if (tm && tm.length > 0) {
+          let h = tm[0]["height"];
+          item1.conHeight = h;
+        }
+      });
+    };
+    const getH5 = () => {
+      parent.children.forEach((item1, index1) => {
+        let ary = Array.from(item1.$el.children);
+        let h = ary[1].children[0]["offsetHeight"];
+        item1.conHeight = h;
+      });
+    };
+    const getRefHeight = () => {
+      const query = Taro.getEnv() === "ALIPAY" ? my.createSelectorQuery() : Taro.createSelectorQuery();
+      query.selectAll(".collapse-content").boundingClientRect();
+      query.exec((res) => {
+        if (Taro.getEnv() === "WEB") {
+          getH5();
+        } else {
+          getH(res[0]);
+        }
+      });
+    };
     onMounted(() => {
       const { name } = props;
       const active = parent && parent.props.active;
@@ -175,10 +208,18 @@ const _sfc_main = create({
           defaultOpen();
         }
       }
+      if (Taro.getEnv() === "WEB") {
+        getRefHeight();
+      } else {
+        eventCenter.once(getCurrentInstance$1().router.onReady, () => {
+          getRefHeight();
+        });
+      }
     });
     return __spreadProps(__spreadValues(__spreadValues(__spreadValues({
       classes
     }, toRefs(proxyData)), toRefs(parent.props)), toRefs(titleIconStyle)), {
+      conHeight,
       wrapperRef,
       contentRef,
       open,
@@ -197,10 +238,6 @@ const _hoisted_4 = {
 };
 const _hoisted_5 = ["innerHTML"];
 const _hoisted_6 = {
-  class: "collapse-wrapper",
-  ref: "wrapperRef"
-};
-const _hoisted_7 = {
   class: "collapse-content",
   ref: "contentRef"
 };
@@ -221,7 +258,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               name: _ctx.titleIcon,
               size: _ctx.titleIconSize,
               color: _ctx.titleIconColor,
-              class: normalizeClass([_ctx.titleIconPosition == "left" ? "titleIconLeft" : "titleIconRight"])
+              class: normalizeClass(["collapse-title-icon", _ctx.titleIconPosition == "left" ? "titleIconLeft" : "titleIconRight"])
             }, null, 8, ["name", "size", "color", "class"])) : createCommentVNode("", true),
             _ctx.$slots.mTitle ? renderSlot(_ctx.$slots, "mTitle", { key: 1 }) : (openBlock(), createElementBlock("view", {
               key: 2,
@@ -247,12 +284,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         style: normalizeStyle(_ctx.iconStyle)
       }, null, 8, ["name", "size", "color", "class", "style"])) : createCommentVNode("", true)
     ], 2),
-    createElementVNode("view", _hoisted_6, [
-      createElementVNode("view", _hoisted_7, [
+    createElementVNode("view", {
+      class: normalizeClass(["collapse-wrapper", _ctx.openExpanded ? "open-style" : "close-style"]),
+      ref: "wrapperRef",
+      style: normalizeStyle({ height: _ctx.openExpanded ? _ctx.conHeight == "auto" ? "auto" : _ctx.conHeight + "px" : 0 })
+    }, [
+      createElementVNode("view", _hoisted_6, [
         renderSlot(_ctx.$slots, "default")
       ], 512)
-    ], 512)
+    ], 6)
   ], 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/CountDown.js

@@ -18,8 +18,8 @@ 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, watch, toRefs, openBlock, createElementBlock, normalizeClass, renderSlot, toDisplayString, Fragment, createElementVNode, createCommentVNode } from "vue";
@@ -62,7 +62,7 @@ const _sfc_main = create({
     }
   },
   components: {},
-  emits: ["input", "on-end", "on-restart", "on-paused", "update:modelValue"],
+  emits: ["input", "on-end", "on-restart", "on-paused"],
   setup(props, { emit, slots }) {
     const state = reactive({
       restTime: 0,
@@ -125,11 +125,13 @@ const _sfc_main = create({
       const end = getTimeStamp(props.endTime || curr);
       const diffTime = curr - start;
       state.restTime = end - (start + diffTime);
+      clearInterval(state.timer);
+      state.timer = null;
       state.timer = setInterval(() => {
         if (!props.paused) {
           let restTime2 = end - (Date.now() - state.p + diffTime);
           state.restTime = restTime2;
-          if (restTime2 < 0) {
+          if (restTime2 < delay) {
             state.restTime = 0;
             emit("on-end");
             clearInterval(state.timer);
@@ -219,5 +221,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 64))
   ], 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/CountUp.js

@@ -18,8 +18,8 @@ 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 { getCurrentInstance, reactive, watch, nextTick, onMounted, onUnmounted, toRefs, openBlock, createElementBlock, Fragment, normalizeStyle, renderList, createCommentVNode, toDisplayString, createTextVNode } from "vue";
@@ -179,20 +179,20 @@ const _sfc_main = create({
         return m / baseNum;
       }
     };
-    const topNumber = (index2) => {
+    const topNumber = (index) => {
       let { num_total_len, pointNum, initDigit1, initDigit2, sortFlag } = data;
-      let idx1 = sortFlag == "add" || sortFlag == "equal" ? String(initDigit2)[index2 - (num_total_len - pointNum)] : 10 - Number(String(initDigit2)[index2 - (num_total_len - pointNum)]);
-      let idx2 = sortFlag == "add" || sortFlag == "equal" ? String(initDigit1)[index2] : 10 - Number(String(initDigit1)[index2]);
-      let num = index2 > num_total_len - pointNum - 1 ? -idx1 * 100 + "%" : index2 <= String(initDigit1).length - 1 ? -idx2 * 100 + "%" : 0;
+      let idx1 = sortFlag == "add" || sortFlag == "equal" ? String(initDigit2)[index - (num_total_len - pointNum)] : 10 - Number(String(initDigit2)[index - (num_total_len - pointNum)]);
+      let idx2 = sortFlag == "add" || sortFlag == "equal" ? String(initDigit1)[index] : 10 - Number(String(initDigit1)[index]);
+      let num = index > num_total_len - pointNum - 1 ? -idx1 * 100 + "%" : index <= String(initDigit1).length - 1 ? -idx2 * 100 + "%" : 0;
       if (num == "-1000%") {
         num = 0;
       }
       return num;
     };
-    const turnNumber = (index2) => {
+    const turnNumber = (index) => {
       let { num_total_len, pointNum, initDigit1, initDigit2, sortFlag } = data;
-      let idx1 = String(initDigit2)[index2 - (num_total_len - pointNum)];
-      let num = index2 > num_total_len - pointNum - 1 ? idx1 ? idx1 : 0 : index2 <= String(initDigit1).length - 1 ? String(initDigit1)[index2] : 0;
+      let idx1 = String(initDigit2)[index - (num_total_len - pointNum)];
+      let num = index > num_total_len - pointNum - 1 ? idx1 ? idx1 : 0 : index <= String(initDigit1).length - 1 ? String(initDigit1)[index] : 0;
       return num;
     };
     const countChange = () => {
@@ -322,21 +322,21 @@ const _sfc_main = create({
       }, props.during);
     };
     const runStep = (el) => {
-      let currentTurn = el.getAttribute("turn-number");
+      let currentTurn = el.style.all;
       let turningNum;
       if (data.sortFlag == "add") {
         turningNum = parseInt(String(currentTurn)) + 1;
       } else {
         turningNum = parseInt(String(currentTurn)) - 1 >= 0 ? parseInt(String(currentTurn)) - 1 : 9;
       }
-      el.setAttribute("turn-number", String(turningNum));
-      if (el.style.transition == "none 0s ease 0s" || turningNum == 1 || !el.style.transition) {
+      el.style.all = String(turningNum);
+      if (el.style.transition == "none" || turningNum == 1 || !el.style.transition) {
         el.style.transition = `all linear ${props.during}ms`;
       }
       if (turningNum == 10 || data.sortFlag == "reduce" && turningNum == 0) {
         var timeOut = null;
         el.style.top = `-${data.sortFlag == "add" ? turningNum * 100 : (10 - turningNum) * 100}%`;
-        el.setAttribute("turn-number", "0");
+        el.style.all = "0";
         timeOut = setTimeout(() => {
           timeOut && clearTimeout(timeOut);
           el.style.transition = "none";
@@ -397,16 +397,16 @@ const _sfc_main = create({
       }
     };
     useExtend({ machineLuck });
-    const scrollTime = (index2, total, num) => {
+    const scrollTime = (index, total, num) => {
       let t = setInterval(() => {
         if (num <= total) {
           num += 10;
-          data.prizeY[index2] = parseFloat(String(num));
+          data.prizeY[index] = parseFloat(String(num));
         } else {
           clearInterval(t);
           t = null;
           data.finshMachine += 1;
-          data.prizeY[index2] = total;
+          data.prizeY[index] = total;
           if (data.finshMachine == props.machineNum) {
             let distance = props.numHeight * props.machinePrizeNum;
             data.prizeYPrev = [];
@@ -458,17 +458,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         class: "run-number-machine-img",
         style: normalizeStyle({ height: _ctx.numHeight + "px" })
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.machineNum, (val, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.machineNum, (val, index) => {
           return openBlock(), createElementBlock("view", {
             class: "run-number-machine-img-li",
             ref_for: true,
             ref: "run-number-machine-img-li",
-            key: "mImg" + index2,
+            key: "mImg" + index,
             style: normalizeStyle({
               width: _ctx.numWidth + "px",
               height: _ctx.numHeight + "px",
-              backgroundImage: "url(" + _ctx.customBgImg + ")",
-              backgroundPositionY: _ctx.prizeY[index2] + "px"
+              background: "url(" + _ctx.customBgImg + ") ",
+              backgroundPosition: "0 " + _ctx.prizeY[index] + "px"
             })
           }, null, 4);
         }), 128))
@@ -477,16 +477,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         class: "run-number-img",
         style: normalizeStyle({ height: _ctx.numHeight + "px" })
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.num_total_len, (val, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.num_total_len, (val, index) => {
           return openBlock(), createElementBlock("view", {
             class: "run-number-img-li",
-            key: "cImg" + index2,
+            key: "cImg" + index,
             style: normalizeStyle({
               width: _ctx.numWidth + "px",
               height: _ctx.numHeight + "px",
-              left: _ctx.numWidth * (index2 > _ctx.num_total_len - _ctx.pointNum - 1 ? index2 == _ctx.num_total_len - _ctx.pointNum ? index2 * 1.5 : index2 * 1.3 : index2) + "px",
+              left: _ctx.numWidth * (index > _ctx.num_total_len - _ctx.pointNum - 1 ? index == _ctx.num_total_len - _ctx.pointNum ? index * 1.5 : index * 1.3 : index) + "px",
               backgroundImage: "url(" + _ctx.customBgImg + ")",
-              backgroundPosition: "0 " + -(String(_ctx.relNum)[index2] * _ctx.numHeight + _ctx.customSpacNum * String(_ctx.relNum)[index2]) + "px",
+              backgroundPosition: "0 " + -(String(_ctx.relNum)[index] * _ctx.numHeight + _ctx.customSpacNum * String(_ctx.relNum)[index]) + "px",
               transition: "all linear " + _ctx.during / 10 + "ms"
             })
           }, null, 4);
@@ -512,17 +512,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           lineHeight: _ctx.numHeight + "px"
         })
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.num_total_len, (val, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.num_total_len, (val, index) => {
           return openBlock(), createElementBlock("view", {
             ref_for: true,
             ref: "numberItem",
             class: "numberItem",
             key: val,
             style: normalizeStyle({
-              top: _ctx.topNumber(index2),
-              left: _ctx.numWidth * (index2 > _ctx.num_total_len - _ctx.pointNum - 1 ? index2 * 1.1 : index2) + "px"
+              all: _ctx.turnNumber(index),
+              top: _ctx.topNumber(index),
+              left: _ctx.numWidth * (index > _ctx.num_total_len - _ctx.pointNum - 1 ? index * 1.1 : index) + "px"
             }),
-            "turn-number": _ctx.turnNumber(index2)
+            "turn-number": _ctx.turnNumber(index)
           }, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.to0_10, (item, idx) => {
               return openBlock(), createElementBlock("view", {
@@ -554,5 +555,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 64))
   ]);
 }
-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/DatePicker.js

@@ -18,18 +18,29 @@ 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, watch, toRefs, resolveComponent, openBlock, createBlock } from "vue";
-import picker from "./Picker.js";
+import { reactive, computed, onBeforeMount, watch, toRefs, resolveComponent, openBlock, createBlock } from "vue";
+import nutPicker from "./Picker.js";
+import { p as popupProps } from "./index4.js";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "./Popup.js";
+import "./use-lock-scroll.js";
 import "./OverLay.js";
 import "./Icon.js";
 import "./pxCheck.js";
+import "./index.js";
+import "@tarojs/taro";
+function padZero(num, targetLength = 2) {
+  let str = num + "";
+  while (str.length < targetLength) {
+    str = "0" + str;
+  }
+  return str;
+}
 const { componentName, create } = createComponent("datepicker");
 const currentYear = new Date().getFullYear();
 function isDate(val) {
@@ -45,25 +56,29 @@ const zhCNType = {
 };
 const _sfc_main = create({
   components: {
-    [picker.name]: picker
+    nutPicker
   },
-  props: {
+  props: __spreadProps(__spreadValues({}, popupProps), {
     modelValue: null,
-    visible: {
-      type: Boolean,
-      default: false
-    },
     title: {
       type: String,
       default: ""
     },
+    okText: {
+      type: String,
+      default: "\u786E\u5B9A"
+    },
+    cancelText: {
+      type: String,
+      default: "\u53D6\u6D88"
+    },
     type: {
       type: String,
       default: "date"
     },
     isShowChinese: {
       type: Boolean,
-      default: true
+      default: false
     },
     minuteStep: {
       type: Number,
@@ -78,14 +93,20 @@ const _sfc_main = create({
       type: Date,
       default: () => new Date(currentYear + 10, 11, 31),
       validator: isDate
-    }
-  },
-  emits: ["click", "update:visible", "confirm"],
+    },
+    formatter: {
+      type: Function,
+      default: null
+    },
+    filter: Function
+  }),
+  emits: ["click", "update:visible", "change", "confirm", "update:moduleValue"],
   setup(props, { emit }) {
     const state = reactive({
       show: false,
       currentDate: new Date(),
-      title: props.title
+      title: props.title,
+      selectedValue: []
     });
     const formatValue = (value) => {
       if (!isDate(value)) {
@@ -181,42 +202,56 @@ const _sfc_main = create({
       }
       return result;
     });
-    const changeHandler = (val) => {
+    const columns = computed(() => {
+      const val = ranges.value.map((res, columnIndex) => {
+        return generateValue(res.range[0], res.range[1], getDateIndex(res.type), res.type, columnIndex);
+      });
+      return val;
+    });
+    const changeHandler = ({
+      columnIndex,
+      selectedValue,
+      selectedOptions
+    }) => {
       if (["date", "datetime"].includes(props.type)) {
         let formatDate = [];
-        if (props.isShowChinese) {
-          formatDate = val.map((res) => {
-            return Number(res.slice(0, res.length - 1));
-          });
-        } else {
-          formatDate = val;
-        }
+        formatDate = selectedValue;
         if (props.type === "date") {
           state.currentDate = formatValue(new Date(formatDate[0], formatDate[1] - 1, Math.min(formatDate[2], getMonthEndDay(formatDate[0], formatDate[1]))));
         } else if (props.type === "datetime") {
           state.currentDate = formatValue(new Date(formatDate[0], formatDate[1] - 1, Math.min(formatDate[2], getMonthEndDay(formatDate[0], formatDate[1])), formatDate[3], formatDate[4]));
         }
       }
+      emit("change", { columnIndex, selectedValue, selectedOptions });
+    };
+    const formatterOption = (type, value) => {
+      const { filter, formatter, isShowChinese } = props;
+      let fOption = null;
+      if (formatter) {
+        fOption = formatter(type, { text: padZero(value, 2), value: padZero(value, 2) });
+      } else {
+        const padMin = padZero(value, 2);
+        const fatter = isShowChinese ? zhCNType[type] : "";
+        fOption = { text: padMin + fatter, value: padMin };
+      }
+      return fOption;
     };
-    const generateValue = (min, max, val, type) => {
+    const generateValue = (min, max, val, type, columnIndex) => {
       const arr = [];
-      let index2 = 0;
+      let index = 0;
       while (min <= max) {
-        if (props.isShowChinese) {
-          arr.push(min + zhCNType[type]);
-        } else {
-          arr.push(min);
-        }
+        arr.push(formatterOption(type, min));
         if (type === "minute") {
           min += props.minuteStep;
         } else {
           min++;
         }
         if (min <= val) {
-          index2++;
+          index++;
         }
       }
-      return { values: arr, defaultIndex: index2 };
+      state.selectedValue[columnIndex] = arr[index].value;
+      return props.filter ? props.filter(type, arr) : arr;
     };
     const getDateIndex = (type) => {
       if (type === "year") {
@@ -234,12 +269,6 @@ const _sfc_main = create({
       }
       return 0;
     };
-    const columns = computed(() => {
-      const val = ranges.value.map((res) => {
-        return generateValue(res.range[0], res.range[1], getDateIndex(res.type), res.type);
-      });
-      return val;
-    });
     const closeHandler = () => {
       emit("update:visible", false);
     };
@@ -247,9 +276,12 @@ const _sfc_main = create({
       emit("update:visible", false);
       emit("confirm", val);
     };
-    onMounted(() => {
+    onBeforeMount(() => {
       state.currentDate = formatValue(props.modelValue);
     });
+    watch(() => props.modelValue, (value) => {
+      state.currentDate = formatValue(value);
+    });
     watch(() => props.title, (val) => {
       state.title = val;
     });
@@ -267,13 +299,18 @@ const _sfc_main = create({
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_picker = resolveComponent("nut-picker");
   return openBlock(), createBlock(_component_nut_picker, {
+    modelValue: _ctx.selectedValue,
+    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.selectedValue = $event),
     visible: _ctx.show,
+    okText: _ctx.okText,
+    cancelText: _ctx.cancelText,
     onClose: _ctx.closeHandler,
-    "list-data": _ctx.columns,
+    columns: _ctx.columns,
     onChange: _ctx.changeHandler,
     title: _ctx.title,
-    onConfirm: _ctx.confirm
-  }, null, 8, ["visible", "onClose", "list-data", "onChange", "title", "onConfirm"]);
+    onConfirm: _ctx.confirm,
+    isWrapTeleport: _ctx.isWrapTeleport
+  }, null, 8, ["modelValue", "visible", "okText", "cancelText", "onClose", "columns", "onChange", "title", "onConfirm", "isWrapTeleport"]);
 }
-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 };