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

package/dist/packages/_es/OldPicker.js

@@ -0,0 +1,486 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+/*!
+* @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, computed, watch, onMounted, toRefs, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, normalizeClass, toDisplayString, createCommentVNode, toRaw, resolveComponent, createBlock, withCtx, createVNode } from "vue";
+import { c as createComponent } from "./component.js";
+import { u as useTaroRect } from "./index.js";
+import Taro from "@tarojs/taro";
+import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
+import { p as popupProps } from "./index4.js";
+import "./use-lock-scroll.js";
+import "./pxCheck.js";
+const commonProps = {
+  listData: {
+    type: Array,
+    default: () => {
+      return [];
+    }
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  defaultIndex: {
+    type: [Number, String],
+    default: 0
+  },
+  itemHeight: {
+    type: [Number, String],
+    default: 35
+  }
+};
+const { create: create$1 } = createComponent("oldpicker-column");
+const _sfc_main$1 = create$1({
+  props: __spreadValues({
+    dataType: String,
+    itemShow: {
+      type: Boolean,
+      default: false
+    }
+  }, commonProps),
+  emits: ["click", "change"],
+  setup(props, { emit }) {
+    const wrapper = ref();
+    const state = reactive({
+      touchParams: {
+        startY: 0,
+        endY: 0,
+        startTime: 0,
+        endTime: 0,
+        lastY: 0,
+        lastTime: 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 onTouchStart = (event) => {
+      console.log(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 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 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 setRollerStyle = (index) => {
+      return `transform: rotate3d(1, 0, 0, ${-state.rotation * index}deg) translate3d(0px, 0px, 104px)`;
+    };
+    const isHidden = (index) => {
+      if (index >= state.currIndex + 8 || index <= state.currIndex - 8) {
+        return true;
+      } else {
+        return false;
+      }
+    };
+    const setTransform = (translateY = 0, type, time = 1e3, deg) => {
+      if (type === "end") {
+        touchTime.value = time;
+      } else {
+        touchTime.value = 0;
+      }
+      touchDeg.value = deg;
+      touchTranslateY.value = translateY;
+      state.scrollDistance = translateY;
+    };
+    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 {
+        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 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);
+    };
+    const getReference = async () => {
+      const refe = await useTaroRect(list, Taro);
+      state.lineSpacing = refe.height / props.listData.values.length;
+      modifyStatus(true);
+    };
+    watch(() => props.listData, (val) => {
+      state.transformY = 0;
+      modifyStatus(false);
+    }, {
+      deep: true
+    });
+    watch(() => props.itemShow, (val) => {
+      if (val) {
+        setTimeout(() => {
+          getReference();
+        }, 200);
+      }
+    }, {
+      deep: true
+    });
+    watch(() => props.defaultIndex, (val) => {
+      state.transformY = 0;
+      modifyStatus(false);
+    });
+    onMounted(() => {
+      setTimeout(() => {
+        getReference();
+      }, 200);
+    });
+    const refRandomId = Math.random().toString(36).slice(-8);
+    return __spreadProps(__spreadValues(__spreadValues({}, toRefs(state)), toRefs(props)), {
+      wrapper,
+      setRollerStyle,
+      isHidden,
+      roller,
+      list,
+      listItem,
+      onTouchStart,
+      onTouchMove,
+      onTouchEnd,
+      touchRollerStyle,
+      touchListStyle,
+      refRandomId
+    });
+  }
+});
+const _hoisted_1$1 = { class: "nut-oldpicker-content" };
+const _hoisted_2$1 = ["id"];
+const _hoisted_3$1 = {
+  key: 0,
+  class: "nut-oldpicker-placeholder"
+};
+function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
+  return _ctx.itemShow ? (openBlock(), createElementBlock("view", {
+    key: 0,
+    class: "nut-oldpicker__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))
+  }, [
+    createElementVNode("view", {
+      class: "nut-oldpicker-roller",
+      ref: "roller",
+      style: normalizeStyle(_ctx.touchRollerStyle)
+    }, [
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index) => {
+        return openBlock(), createElementBlock("view", {
+          class: normalizeClass(["nut-oldpicker-roller-item", { "nut-oldpicker-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),
+    createElementVNode("view", _hoisted_1$1, [
+      createElementVNode("view", {
+        class: "nut-oldpicker-list-panel",
+        ref: "list",
+        id: "list" + _ctx.refRandomId,
+        style: normalizeStyle(_ctx.touchListStyle)
+      }, [
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index) => {
+          return openBlock(), createElementBlock("view", {
+            class: "nut-oldpicker-item nut-oldpicker-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_3$1)) : createCommentVNode("", true)
+      ], 12, _hoisted_2$1)
+    ])
+  ], 32)) : createCommentVNode("", true);
+}
+var column = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1]]);
+const { create, componentName } = createComponent("oldpicker");
+const _sfc_main = create({
+  components: {
+    [column.name]: column
+  },
+  props: __spreadValues(__spreadProps(__spreadValues({}, popupProps), {
+    title: {
+      type: String,
+      default: ""
+    },
+    cancelText: {
+      type: String,
+      default: "\u53D6\u6D88"
+    },
+    okText: {
+      type: String,
+      default: "\u786E\u5B9A"
+    }
+  }), commonProps),
+  emits: ["close", "change", "confirm", "update:visible"],
+  setup(props, { emit }) {
+    const childrenKey = "children";
+    const valuesKey = "values";
+    const state = reactive({
+      show: false,
+      formattedColumns: props.listData,
+      defaultIndex: props.defaultIndex
+    });
+    let _defaultIndex = props.defaultIndex;
+    let defaultIndexList = [];
+    const classes = computed(() => {
+      const prefixCls = componentName;
+      return {
+        [prefixCls]: true
+      };
+    });
+    const dataType = computed(() => {
+      const firstColumn = state.formattedColumns[0];
+      if (typeof firstColumn === "object") {
+        if (firstColumn[childrenKey]) {
+          return "cascade";
+        } else if (firstColumn == null ? void 0 : firstColumn[valuesKey]) {
+          addDefaultIndexList(props.listData);
+          return "multipleColumns";
+        }
+      }
+      return "text";
+    });
+    const columnList = computed(() => {
+      if (dataType.value === "text") {
+        return [{ values: state.formattedColumns, defaultIndex: state.defaultIndex }];
+      } else if (dataType.value === "multipleColumns") {
+        return state.formattedColumns;
+      } else if (dataType.value === "cascade") {
+        return formatCascade(state.formattedColumns, state.defaultIndex);
+      }
+      return state.formattedColumns;
+    });
+    const addDefaultIndexList = (listData) => {
+      defaultIndexList = [];
+      listData.forEach((res) => {
+        defaultIndexList.push(res.defaultIndex || 0);
+      });
+    };
+    const formatCascade = (listData, defaultIndex) => {
+      const formatted = [];
+      let children = listData;
+      children.defaultIndex = defaultIndex;
+      while (children) {
+        formatted.push({
+          values: children,
+          defaultIndex: children.defaultIndex || 0
+        });
+        children = children == null ? void 0 : children[children.defaultIndex || 0].children;
+      }
+      addDefaultIndexList(formatted);
+      return formatted;
+    };
+    const getCascadeData = (listData, defaultIndex) => {
+      var _a;
+      let arr = listData;
+      arr.defaultIndex = defaultIndex;
+      const dataList = [];
+      while (arr) {
+        const item = arr[(_a = arr.defaultIndex) != null ? _a : 0];
+        dataList.push(item.text);
+        arr = item.children;
+      }
+      return dataList;
+    };
+    const close = () => {
+      emit("close");
+      emit("update:visible", false);
+    };
+    const changeHandler = (columnIndex, dataIndex) => {
+      if (dataType.value === "cascade") {
+        let cursor = state.formattedColumns;
+        if (columnIndex === 0) {
+          state.defaultIndex = dataIndex;
+        }
+        let i = 0;
+        while (cursor) {
+          if (i === columnIndex) {
+            cursor.defaultIndex = dataIndex;
+          } else if (i > columnIndex) {
+            cursor.defaultIndex = 0;
+          }
+          cursor = cursor[cursor.defaultIndex || 0].children;
+          i++;
+        }
+      } else if (dataType.value === "text") {
+        _defaultIndex = dataIndex;
+      } else if (dataType.value === "multipleColumns") {
+        defaultIndexList[columnIndex] = dataIndex;
+        const val = defaultIndexList.map((res, i) => toRaw(state.formattedColumns)[i].values[res]);
+        emit("change", val, columnIndex, dataIndex);
+      }
+    };
+    const confirm = () => {
+      if (dataType.value === "text") {
+        state.defaultIndex = _defaultIndex;
+        emit("confirm", state.formattedColumns[_defaultIndex]);
+      } else if (dataType.value === "multipleColumns") {
+        for (let i = 0; i < defaultIndexList.length; i++) {
+          state.formattedColumns[i].defaultIndex = defaultIndexList[i];
+        }
+        const checkedArr = toRaw(state.formattedColumns).map((res) => res.values && res.values[res.defaultIndex]);
+        emit("confirm", checkedArr);
+      } else if (dataType.value === "cascade") {
+        emit("confirm", getCascadeData(toRaw(state.formattedColumns), state.defaultIndex));
+      }
+      emit("update:visible", false);
+    };
+    watch(() => props.visible, (val) => {
+      state.show = val;
+    });
+    watch(() => props.listData, (val) => {
+      state.formattedColumns = val;
+    });
+    return __spreadProps(__spreadValues({
+      classes
+    }, toRefs(state)), {
+      column,
+      dataType,
+      columnList,
+      close,
+      changeHandler,
+      confirm
+    });
+  }
+});
+const _hoisted_1 = { class: "nut-oldpicker__bar" };
+const _hoisted_2 = { class: "nut-oldpicker__title" };
+const _hoisted_3 = { class: "nut-oldpicker__column" };
+const _hoisted_4 = /* @__PURE__ */ createElementVNode("view", { class: "nut-oldpicker__hairline" }, null, -1);
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_nut_oldpicker_column = resolveComponent("nut-oldpicker-column");
+  const _component_nut_popup = resolveComponent("nut-popup");
+  return openBlock(), createBlock(_component_nut_popup, {
+    position: "bottom",
+    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,
+    round: true
+  }, {
+    default: withCtx(() => [
+      createElementVNode("view", _hoisted_1, [
+        createElementVNode("view", {
+          class: "nut-oldpicker__button nut-oldpicker__left",
+          onClick: _cache[0] || (_cache[0] = (...args) => _ctx.close && _ctx.close(...args))
+        }, toDisplayString(_ctx.cancelText), 1),
+        createElementVNode("view", _hoisted_2, toDisplayString(_ctx.title), 1),
+        createElementVNode("view", {
+          class: "nut-oldpicker__button nut-oldpicker__right",
+          onClick: _cache[1] || (_cache[1] = ($event) => _ctx.confirm())
+        }, toDisplayString(_ctx.okText), 1)
+      ]),
+      createElementVNode("view", _hoisted_3, [
+        _hoisted_4,
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columnList, (item, columnIndex) => {
+          return openBlock(), createElementBlock("view", {
+            class: "nut-oldpicker__columnitem",
+            key: columnIndex
+          }, [
+            createVNode(_component_nut_oldpicker_column, {
+              itemShow: _ctx.show,
+              "list-data": item,
+              readonly: _ctx.readonly,
+              "default-index": item.defaultIndex,
+              "visible-item-count": _ctx.visibleItemCount,
+              "data-type": _ctx.dataType,
+              onChange: (dataIndex) => {
+                _ctx.changeHandler(columnIndex, dataIndex);
+              }
+            }, null, 8, ["itemShow", "list-data", "readonly", "default-index", "visible-item-count", "data-type", "onChange"])
+          ]);
+        }), 128))
+      ])
+    ]),
+    _: 1
+  }, 8, ["visible", "teleport", "lock-scroll", "close-on-click-overlay", "onClose"]);
+}
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index_taro as default };

package/dist/packages/_es/OverLay.js

@@ -15,11 +15,11 @@ var __spreadValues = (a, b) => {
   return a;
 };
 /*!
-* @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, watch, onDeactivated, onBeforeUnmount, onMounted, onActivated, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, withModifiers, normalizeStyle, renderSlot, vShow } from "vue";
+import { computed, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, normalizeStyle, renderSlot, vShow } from "vue";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { componentName, create } = createComponent("overlay");
@@ -63,38 +63,19 @@ const _sfc_main = create({
         [props.overlayClass]: true
       };
     });
-    watch(() => props.visible, (value) => {
-      value ? lock() : unlock();
-    });
-    const lock = () => {
-      if (props.lockScroll && props.visible) {
-        document.body.classList.add("nut-overflow-hidden");
-      }
-    };
-    const unlock = () => {
-      document.body.classList.remove("nut-overflow-hidden");
-    };
-    onDeactivated(unlock);
-    onBeforeUnmount(unlock);
-    onMounted(lock);
-    onActivated(lock);
     const style = computed(() => {
       return __spreadValues({
         animationDuration: `${props.duration}s`,
         zIndex: props.zIndex
       }, props.overlayStyle);
     });
-    const touchmove = (e) => {
-      if (props.lockScroll)
-        e.preventDefault();
-    };
     const onClick = (e) => {
       emit("click", e);
       if (props.closeOnClickOverlay) {
         emit("update:visible", false);
       }
     };
-    return { classes, style, touchmove, onClick };
+    return { classes, style, onClick };
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
@@ -102,12 +83,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     default: withCtx(() => [
       withDirectives(createElementVNode("view", {
         class: normalizeClass(_ctx.classes),
-        onTouchmove: _cache[0] || (_cache[0] = withModifiers((...args) => _ctx.touchmove && _ctx.touchmove(...args), ["stop"])),
-        onClick: _cache[1] || (_cache[1] = (...args) => _ctx.onClick && _ctx.onClick(...args)),
+        onClick: _cache[0] || (_cache[0] = (...args) => _ctx.onClick && _ctx.onClick(...args)),
         style: normalizeStyle(_ctx.style)
       }, [
         renderSlot(_ctx.$slots, "default")
-      ], 38), [
+      ], 6), [
         [vShow, _ctx.visible]
       ])
     ]),

package/dist/packages/_es/Pagination.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 { toRefs, computed, watchEffect, openBlock, createElementBlock, createElementVNode, normalizeClass, renderSlot, createTextVNode, toDisplayString, Fragment, renderList, createCommentVNode } from "vue";
@@ -67,13 +67,13 @@ const _sfc_main = create({
       return { number, text, active };
     };
     const pages = computed(() => {
-      if (mode.value == "simple")
-        return;
       let items = [];
       const pageCount = countRef.value;
       const pageSize = showPageSize.value;
       let startPage = 1;
       let endPage = pageCount;
+      if (mode.value == "simple")
+        return;
       const partialShow = pageCount > pageSize;
       if (partialShow) {
         startPage = Math.max(modelValue.value - Math.floor(pageSize / 2), 1);
@@ -134,9 +134,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ])
     ], 2),
     _ctx.mode == "multi" ? (openBlock(), createElementBlock("view", _hoisted_2, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.pages, (item, index2) => {
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.pages, (item, index) => {
         return openBlock(), createElementBlock("view", {
-          key: index2 + "pagination",
+          key: index + "pagination",
           class: normalizeClass(["nut-pagination-item", item.active ? "active" : ""]),
           onClick: ($event) => _ctx.select(item.number, true)
         }, [
@@ -159,5 +159,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 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 };