@nutui/nutui 3.2.5 → 3.2.6-beta.1

package/dist/packages/_es/Ecard.js

@@ -1,13 +1,13 @@
 /*!
-* @nutui/nutui v3.2.5 Tue Oct 25 2022 18:40:57 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { ref, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, toDisplayString, Fragment, renderList, normalizeClass, withDirectives, vModelText, createTextVNode, createVNode } from "vue";
+import { ref, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, toDisplayString, createTextVNode, Fragment, renderList, normalizeClass, withDirectives, vModelText, createVNode } from "vue";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
-const { create, translate } = createComponent("ecard");
+const { componentName, create, translate } = createComponent("ecard");
 const _sfc_main = create({
   props: {
     chooseText: {
@@ -41,7 +41,7 @@ const _sfc_main = create({
       default: 9999
     },
     modelValue: {
-      type: [Number, String],
+      type: Number,
       default: 0
     },
     placeholder: {
@@ -57,15 +57,15 @@ const _sfc_main = create({
   setup(props, { emit }) {
     const currentIndex = ref(null);
     const currentValue = ref(null);
-    const inputValue = ref("");
+    const inputValue = ref();
     const stepValue = ref(props.cardAmountMin);
     const money = ref(props.modelValue);
-    const handleClick = (item, index2) => {
-      currentIndex.value = index2;
+    const handleClick = (item, index) => {
+      currentIndex.value = index;
+      inputValue.value = "";
       stepValue.value = props.cardAmountMin;
       currentValue.value = item.price;
       emit("change", item);
-      emit("update:modelValue", item.price);
     };
     const change = (event) => {
       let input = event.target;
@@ -81,13 +81,11 @@ const _sfc_main = create({
         currentValue.value = props.cardAmountMin;
       }
       emit("inputChange", Number(inputValue.value));
-      emit("update:modelValue", Number(inputValue.value));
     };
     const inputClick = () => {
       currentIndex.value = "input";
       stepValue.value = props.cardAmountMin;
-      currentValue.value = inputValue.value;
-      emit("update:modelValue", inputValue.value);
+      emit("update:modelValue", 0);
       emit("inputClick");
     };
     const changeStep = (value) => {
@@ -124,22 +122,24 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_inputnumber = resolveComponent("nut-inputnumber");
   return openBlock(), createElementBlock("view", _hoisted_1, [
     createElementVNode("view", _hoisted_2, toDisplayString(_ctx.chooseText || _ctx.translate("chooseText")), 1),
+    createTextVNode(),
     createElementVNode("view", _hoisted_3, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.dataList, (item, index2) => {
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.dataList, (item, index) => {
         return openBlock(), createElementBlock("view", {
-          key: index2,
-          class: normalizeClass(["nut-ecard__list__item", _ctx.currentIndex == index2 ? "active" : ""]),
-          onClick: ($event) => _ctx.handleClick(item, index2)
+          key: index,
+          class: normalizeClass(["nut-ecard__list__item", _ctx.currentIndex == index ? "active" : ""]),
+          onClick: ($event) => _ctx.handleClick(item, index)
         }, toDisplayString(item.price), 11, _hoisted_4);
       }), 128)),
+      createTextVNode(),
       createElementVNode("view", {
         class: normalizeClass(["nut-ecard__list__input", _ctx.currentIndex == "input" ? "active" : ""]),
         onClick: _cache[2] || (_cache[2] = (...args) => _ctx.inputClick && _ctx.inputClick(...args))
       }, [
         createElementVNode("view", null, toDisplayString(_ctx.otherValueText || _ctx.translate("otherValueText")), 1),
+        createTextVNode(),
         createElementVNode("view", _hoisted_5, [
           withDirectives(createElementVNode("input", {
-            class: "nut-ecard__list__input--input",
             type: "text",
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.inputValue = $event),
             onInput: _cache[1] || (_cache[1] = (...args) => _ctx.change && _ctx.change(...args)),
@@ -150,8 +150,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           createTextVNode(" " + toDisplayString(_ctx.suffix), 1)
         ])
       ], 2),
+      createTextVNode(),
       createElementVNode("view", _hoisted_7, [
         createElementVNode("view", null, toDisplayString(_ctx.suffix) + toDisplayString(_ctx.money), 1),
+        createTextVNode(),
         createVNode(_component_nut_inputnumber, {
           modelValue: _ctx.stepValue,
           "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.stepValue = $event),
@@ -163,5 +165,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ]);
 }
-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/Elevator.js

@@ -1,11 +1,12 @@
 /*!
-* @nutui/nutui v3.2.5 Tue Oct 25 2022 18:40:57 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { ref, reactive, computed, onMounted, watch, nextTick, toRefs, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, Fragment, renderList, toDisplayString, renderSlot, withDirectives, vShow, createCommentVNode, withModifiers } from "vue";
+import { ref, reactive, computed, watch, toRefs, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, createVNode, normalizeStyle, withCtx, Fragment, renderList, createElementVNode, toDisplayString, createTextVNode, renderSlot, withDirectives, vShow, createCommentVNode, withModifiers } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useExpose } from "./index3.js";
+import { u as useExpose } from "./index2.js";
+import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
 const { componentName, create } = createComponent("elevator");
@@ -40,7 +41,8 @@ const _sfc_main = create({
   },
   emits: ["click-item", "click-index"],
   setup(props, context) {
-    const listview = ref(null);
+    const spaceHeight = 23;
+    const listview = ref();
     const state = reactive({
       anchorIndex: 0,
       codeIndex: 0,
@@ -52,6 +54,8 @@ const _sfc_main = create({
       },
       scrollStart: false,
       currentIndex: 0,
+      query: Taro.createSelectorQuery(),
+      scrollTop: 0,
       currentData: {},
       currentKey: "",
       scrollY: 0,
@@ -72,9 +76,11 @@ const _sfc_main = create({
     const clientHeight = computed(() => {
       return listview.value.clientHeight;
     });
-    const getData = (el, name) => {
-      const prefix = "data-";
-      return el.getAttribute(prefix + name);
+    const getData = (el) => {
+      if (!el.dataset.index) {
+        return "0";
+      }
+      return el.dataset.index;
     };
     const setListGroup = (el) => {
       nextTick(() => {
@@ -84,40 +90,43 @@ const _sfc_main = create({
       });
     };
     const calculateHeight = () => {
+      state.listHeight = [];
       let height = 0;
       state.listHeight.push(height);
       for (let i = 0; i < state.listGroup.length; i++) {
-        let item = state.listGroup[i];
-        height += item.clientHeight;
-        state.listHeight.push(height);
+        state.query.selectAll(`.elevator__item__${i}`).boundingClientRect();
+        state.query.exec((res) => {
+          height += res[i][0].height;
+          state.listHeight.push(height);
+        });
       }
     };
-    const scrollTo = (index2) => {
-      if (!index2 && index2 !== 0) {
+    const scrollTo = (index) => {
+      if (!index && index !== 0) {
         return;
       }
-      if (index2 < 0)
-        index2 = 0;
-      if (index2 > state.listHeight.length - 2)
-        index2 = state.listHeight.length - 2;
-      state.codeIndex = index2;
-      listview.value.scrollTo(0, state.listHeight[index2]);
+      if (index < 0)
+        index = 0;
+      if (index > state.listHeight.length - 2)
+        index = state.listHeight.length - 2;
+      state.codeIndex = index;
+      state.scrollTop = state.listHeight[index];
     };
     const touchStart = (e) => {
       state.scrollStart = true;
-      let index2 = getData(e.target, "index");
+      let index = getData(e.target);
       let firstTouch = e.touches[0];
       state.touchState.y1 = firstTouch.pageY;
-      state.anchorIndex = +index2;
-      state.codeIndex = +index2;
-      scrollTo(+index2);
+      state.anchorIndex = +index;
+      state.codeIndex = +index;
+      scrollTo(+index);
     };
     const touchMove = (e) => {
       let firstTouch = e.touches[0];
       state.touchState.y2 = firstTouch.pageY;
-      let delta = (state.touchState.y2 - state.touchState.y1) / props.spaceHeight | 0;
+      let delta = (state.touchState.y2 - state.touchState.y1) / spaceHeight | 0;
       state.codeIndex = state.anchorIndex + delta;
-      scrollTo(state.codeIndex);
+      scrollTo(state.currentIndex);
     };
     const touchEnd = () => {
       state.scrollStart = false;
@@ -134,7 +143,7 @@ const _sfc_main = create({
       let target = e.target;
       let scrollTop = target.scrollTop;
       const listHeight = state.listHeight;
-      state.scrollY = scrollTop;
+      state.scrollY = Math.floor(scrollTop);
       for (let i = 0; i < listHeight.length - 1; i++) {
         let height1 = listHeight[i];
         let height2 = listHeight[i + 1];
@@ -146,17 +155,13 @@ const _sfc_main = create({
       }
       state.currentIndex = listHeight.length - 2;
     };
-    onMounted(() => {
-      listview.value.addEventListener("scroll", listViewScroll);
-    });
     useExpose({
       scrollTo
     });
     watch(
       () => state.listGroup.length,
       () => {
-        state.listHeight = [];
-        nextTick(calculateHeight);
+        Taro.nextTick(calculateHeight);
       }
     );
     watch(
@@ -184,7 +189,8 @@ const _sfc_main = create({
       touchMove,
       touchEnd,
       handleClickItem,
-      handleClickIndex
+      handleClickIndex,
+      listViewScroll
     };
   }
 });
@@ -195,57 +201,76 @@ const _hoisted_4 = { class: "fixed-title" };
 const _hoisted_5 = { class: "nut-elevator__bars__inner" };
 const _hoisted_6 = ["data-index", "onClick"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_scroll_view = resolveComponent(function() {
+    if (process.env.TARO_ENV === "h5") {
+      return "taro-scroll-view";
+    } else {
+      return "scroll-view";
+    }
+  }());
   return openBlock(), createElementBlock("view", {
     class: normalizeClass(_ctx.classes)
   }, [
-    createElementVNode("view", {
-      class: "nut-elevator__list",
+    createVNode(_component_scroll_view, {
+      class: "nut-elevator__list scrollview",
+      "scroll-top": _ctx.scrollTop,
+      "scroll-y": true,
+      "scroll-with-animation": true,
+      "scroll-anchoring": true,
       ref: "listview",
-      style: normalizeStyle({ height: isNaN(+_ctx.height) ? _ctx.height : `${_ctx.height}px` })
-    }, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.indexList, (item) => {
-        return openBlock(), createElementBlock("view", {
-          class: "nut-elevator__list__item",
-          key: item[_ctx.acceptKey],
-          ref_for: true,
-          ref: _ctx.setListGroup
+      style: normalizeStyle({ height: isNaN(+_ctx.height) ? _ctx.height : `${_ctx.height}px` }),
+      onScroll: _ctx.listViewScroll
+    }, {
+      default: withCtx(() => [
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.indexList, (item, index) => {
+          return openBlock(), createElementBlock("view", {
+            class: normalizeClass(["nut-elevator__list__item", `elevator__item__${index}`]),
+            key: item[_ctx.acceptKey],
+            ref_for: true,
+            ref: _ctx.setListGroup
+          }, [
+            createElementVNode("view", _hoisted_1, toDisplayString(item[_ctx.acceptKey]), 1),
+            createTextVNode(),
+            (openBlock(true), createElementBlock(Fragment, null, renderList(item.list, (subitem) => {
+              return openBlock(), createElementBlock("view", {
+                class: normalizeClass(["nut-elevator__list__item__name", {
+                  "nut-elevator__list__item__name--highcolor": _ctx.currentData.id === subitem.id && _ctx.currentKey === item[_ctx.acceptKey]
+                }]),
+                key: subitem["id"],
+                onClick: ($event) => _ctx.handleClickItem(item[_ctx.acceptKey], subitem)
+              }, [
+                !_ctx.$slots.default ? (openBlock(), createElementBlock("span", {
+                  key: 0,
+                  innerHTML: subitem.name
+                }, null, 8, _hoisted_3)) : renderSlot(_ctx.$slots, "default", {
+                  key: 1,
+                  item: subitem
+                })
+              ], 10, _hoisted_2);
+            }), 128))
+          ], 2);
+        }), 128)),
+        createTextVNode(),
+        _ctx.isSticky ? withDirectives((openBlock(), createElementBlock("view", {
+          key: 0,
+          class: "nut-elevator__list__fixed",
+          style: normalizeStyle(_ctx.fixedStyle)
         }, [
-          createElementVNode("view", _hoisted_1, toDisplayString(item[_ctx.acceptKey]), 1),
-          (openBlock(true), createElementBlock(Fragment, null, renderList(item.list, (subitem) => {
-            return openBlock(), createElementBlock("view", {
-              class: normalizeClass(["nut-elevator__list__item__name", {
-                "nut-elevator__list__item__name--highcolor": _ctx.currentData.id === subitem.id && _ctx.currentKey === item[_ctx.acceptKey]
-              }]),
-              key: subitem["id"],
-              onClick: ($event) => _ctx.handleClickItem(item[_ctx.acceptKey], subitem)
-            }, [
-              !_ctx.$slots.default ? (openBlock(), createElementBlock("span", {
-                key: 0,
-                innerHTML: subitem.name
-              }, null, 8, _hoisted_3)) : renderSlot(_ctx.$slots, "default", {
-                key: 1,
-                item: subitem
-              })
-            ], 10, _hoisted_2);
-          }), 128))
-        ]);
-      }), 128)),
-      _ctx.isSticky ? withDirectives((openBlock(), createElementBlock("view", {
-        key: 0,
-        class: "nut-elevator__list__fixed",
-        style: normalizeStyle(_ctx.fixedStyle)
-      }, [
-        createElementVNode("span", _hoisted_4, toDisplayString(_ctx.indexList[_ctx.currentIndex][_ctx.acceptKey]), 1)
-      ], 4)), [
-        [vShow, _ctx.scrollY > 0]
-      ]) : createCommentVNode("", true)
-    ], 4),
-    _ctx.indexList.length ? withDirectives((openBlock(), createElementBlock("view", {
+          createElementVNode("span", _hoisted_4, toDisplayString(_ctx.indexList[_ctx.currentIndex][_ctx.acceptKey]), 1)
+        ], 4)), [
+          [vShow, _ctx.scrollY > 0]
+        ]) : createCommentVNode("", true)
+      ]),
+      _: 3
+    }, 8, ["scroll-top", "style", "onScroll"]),
+    createTextVNode(),
+    _ctx.indexList.length > 0 ? withDirectives((openBlock(), createElementBlock("view", {
       key: 0,
       class: "nut-elevator__code--current"
     }, toDisplayString(_ctx.indexList[_ctx.codeIndex][_ctx.acceptKey]), 513)), [
       [vShow, _ctx.scrollStart]
     ]) : createCommentVNode("", true),
+    createTextVNode(),
     createElementVNode("view", {
       class: "nut-elevator__bars",
       onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.touchStart && _ctx.touchStart(...args)),
@@ -253,10 +278,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.touchEnd && _ctx.touchEnd(...args))
     }, [
       createElementVNode("view", _hoisted_5, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.indexList, (item, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.indexList, (item, index) => {
           return openBlock(), createElementBlock("view", {
             class: normalizeClass(["nut-elevator__bars__inner__item", { active: item[_ctx.acceptKey] === _ctx.indexList[_ctx.currentIndex][_ctx.acceptKey] }]),
-            "data-index": index2,
+            "data-index": index,
             key: item[_ctx.acceptKey],
             onClick: ($event) => _ctx.handleClickIndex(item[_ctx.acceptKey])
           }, toDisplayString(item[_ctx.acceptKey]), 11, _hoisted_6);
@@ -265,5 +290,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 32)
   ], 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 };