@nutui/nutui 3.2.5 → 3.2.6-beta.1

package/dist/packages/_es/DatePicker.js

@@ -1,18 +1,22 @@
 /*!
-* @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 { reactive, computed, onBeforeMount, watch, toRefs, resolveComponent, openBlock, createBlock, withCtx, renderSlot } from "vue";
-import Picker from "./Picker.js";
-import { popupProps } from "./Popup.js";
+import { reactive, computed, onBeforeMount, watch, toRefs, resolveComponent, openBlock, createBlock, withCtx, renderSlot, createTextVNode } 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 "./index4.js";
+import "./Popup.js";
+import "./use-lock-scroll.js";
 import "./OverLay.js";
 import "../locale/lang";
 import "./Icon.js";
 import "./pxCheck.js";
+import "./index3.js";
+import "./index.js";
+import "@tarojs/taro";
 function padZero(num, targetLength = 2) {
   let str = num + "";
   while (str.length < targetLength) {
@@ -20,22 +24,22 @@ function padZero(num, targetLength = 2) {
   }
   return str;
 }
-const { componentName, create, translate } = createComponent("datepicker");
+const { componentName, create } = createComponent("datepicker");
 const currentYear = new Date().getFullYear();
 function isDate(val) {
   return Object.prototype.toString.call(val) === "[object Date]" && !isNaN(val.getTime());
 }
 const zhCNType = {
-  day: translate("day"),
-  year: translate("year"),
-  month: translate("month"),
-  hour: translate("hour"),
-  minute: translate("minute"),
-  seconds: translate("seconds")
+  day: "\u65E5",
+  year: "\u5E74",
+  month: "\u6708",
+  hour: "\u65F6",
+  minute: "\u5206",
+  seconds: "\u79D2"
 };
 const _sfc_main = create({
   components: {
-    [Picker.name]: Picker
+    nutPicker
   },
   props: {
     ...popupProps,
@@ -88,7 +92,7 @@ const _sfc_main = create({
     },
     filter: Function
   },
-  emits: ["click", "update:visible", "change", "confirm", "update:modelValue"],
+  emits: ["click", "update:visible", "change", "confirm", "update:moduleValue"],
   setup(props, { emit }) {
     const state = reactive({
       show: props.visible,
@@ -111,12 +115,12 @@ const _sfc_main = create({
       const boundary = props[`${type}Date`];
       const year = boundary.getFullYear();
       let month = 1;
-      let day = 1;
+      let date = 1;
       let hour = 0;
       let minute = 0;
       if (type === "max") {
         month = 12;
-        day = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
+        date = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
         hour = 23;
         minute = 59;
       }
@@ -124,36 +128,27 @@ const _sfc_main = create({
       if (value.getFullYear() === year) {
         month = boundary.getMonth() + 1;
         if (value.getMonth() + 1 === month) {
-          day = boundary.getDate();
-          if (value.getDate() === day) {
+          date = boundary.getDate();
+          if (value.getDate() === date) {
             hour = boundary.getHours();
             if (value.getHours() === hour) {
               minute = boundary.getMinutes();
             }
           }
         }
-      } else {
-        return {
-          [`${type}Year`]: year,
-          [`${type}Month`]: month,
-          [`${type}Day`]: day,
-          [`${type}Hour`]: hour,
-          [`${type}Minute`]: minute,
-          [`${type}Seconds`]: seconds
-        };
       }
       return {
         [`${type}Year`]: year,
         [`${type}Month`]: month,
-        [`${type}Day`]: day,
+        [`${type}Date`]: date,
         [`${type}Hour`]: hour,
         [`${type}Minute`]: minute,
         [`${type}Seconds`]: seconds
       };
     };
     const ranges = computed(() => {
-      const { maxYear, maxDay, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", state.currentDate);
-      const { minYear, minDay, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", state.currentDate);
+      const { maxYear, maxDate, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", state.currentDate);
+      const { minYear, minDate, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", state.currentDate);
       let result = [
         {
           type: "year",
@@ -165,7 +160,7 @@ const _sfc_main = create({
         },
         {
           type: "day",
-          range: [minDay, maxDay]
+          range: [minDate, maxDate]
         },
         {
           type: "hour",
@@ -218,11 +213,11 @@ const _sfc_main = create({
         selectedValue.forEach((item) => {
           formatDate.push(item);
         });
-        if (props.type == "month-day" && formatDate.length < 3) {
-          formatDate.unshift(new Date(state.currentDate || props.minDate || props.maxDate).getFullYear());
+        if (props.type == "month-day") {
+          formatDate.unshift(new Date(props.modelValue || props.minDate || props.maxDate).getFullYear());
         }
         if (props.type == "year-month" && formatDate.length < 3) {
-          formatDate.push(new Date(state.currentDate || props.minDate || props.maxDate).getDate());
+          formatDate.push(new Date(props.modelValue || props.minDate || props.maxDate).getDate());
         }
         const year = Number(formatDate[0]);
         const month = Number(formatDate[1]) - 1;
@@ -253,7 +248,7 @@ const _sfc_main = create({
     };
     const generateValue = (min, max, val, type, columnIndex) => {
       const arr = [];
-      let index2 = 0;
+      let index = 0;
       while (min <= max) {
         arr.push(formatterOption(type, min));
         if (type === "minute") {
@@ -262,10 +257,10 @@ const _sfc_main = create({
           min++;
         }
         if (min <= val) {
-          index2++;
+          index++;
         }
       }
-      state.selectedValue[columnIndex] = arr[index2].value;
+      state.selectedValue[columnIndex] = arr[index].value;
       return props.filter ? props.filter(type, arr) : arr;
     };
     const getDateIndex = (type) => {
@@ -292,25 +287,13 @@ const _sfc_main = create({
       emit("confirm", val);
     };
     onBeforeMount(() => {
+      console.log("\u5E73\u94FA\u5C55\u793A");
       state.currentDate = formatValue(props.modelValue);
     });
     watch(
       () => props.modelValue,
       (value) => {
-        const newValues = formatValue(value);
-        const isSameValue = JSON.stringify(newValues) === JSON.stringify(state.currentDate);
-        if (!isSameValue) {
-          state.currentDate = newValues;
-        }
-      }
-    );
-    watch(
-      () => state.currentDate,
-      (newValues) => {
-        const isSameValue = JSON.stringify(newValues) === JSON.stringify(props.modelValue);
-        if (!isSameValue) {
-          emit("update:modelValue", newValues);
-        }
+        state.currentDate = formatValue(value);
       }
     );
     watch(
@@ -340,7 +323,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     modelValue: _ctx.selectedValue,
     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.selectedValue = $event),
     visible: _ctx.show,
-    "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => _ctx.show = $event),
     okText: _ctx.okText,
     cancelText: _ctx.cancelText,
     onClose: _ctx.closeHandler,
@@ -358,10 +340,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       renderSlot(_ctx.$slots, "top")
     ]),
     default: withCtx(() => [
+      createTextVNode(),
       renderSlot(_ctx.$slots, "default")
     ]),
     _: 3
   }, 8, ["modelValue", "visible", "okText", "cancelText", "onClose", "columns", "onChange", "title", "onConfirm", "isWrapTeleport", "threeDimensional", "swipeDuration", "safeAreaInsetBottom", "destroyOnClose"]);
 }
-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/Dialog.js

@@ -1,14 +1,15 @@
 /*!
-* @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, onMounted, watch, computed, resolveComponent, openBlock, createBlock, normalizeStyle, withCtx, createElementVNode, normalizeClass, createElementBlock, renderSlot, Fragment, createTextVNode, toDisplayString, createCommentVNode, resolveDynamicComponent, createVNode, render, h } from "vue";
+import { ref, onMounted, watch, computed, resolveComponent, openBlock, createBlock, normalizeStyle, withCtx, createElementVNode, normalizeClass, createElementBlock, renderSlot, Fragment, createTextVNode, toDisplayString, createCommentVNode, resolveDynamicComponent } from "vue";
 import { i as isPromise, c as createComponent } from "./component.js";
 import Popup, { popupProps } from "./Popup.js";
 import Button from "./Button.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
+import "./use-lock-scroll.js";
 import "./OverLay.js";
 import "./Icon.js";
 import "./pxCheck.js";
@@ -132,8 +133,8 @@ const _sfc_main = create({
       }
     };
     const onOk = () => {
-      emit("ok");
       closed("ok");
+      emit("ok");
     };
     return {
       closed,
@@ -176,6 +177,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             createTextVNode(toDisplayString(_ctx.title), 1)
           ], 64))
         ])) : createCommentVNode("", true),
+        createTextVNode(),
         createElementVNode("view", {
           class: "nut-dialog__content",
           style: normalizeStyle({ textAlign: _ctx.textAlign })
@@ -185,6 +187,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             innerHTML: _ctx.content
           }, null, 8, _hoisted_2)) : (openBlock(), createBlock(resolveDynamicComponent(_ctx.content), { key: 2 }))
         ], 4),
+        createTextVNode(),
         !_ctx.noFooter ? (openBlock(), createElementBlock("view", {
           key: 1,
           class: normalizeClass(["nut-dialog__footer", { [_ctx.footerDirection]: _ctx.footerDirection }])
@@ -203,6 +206,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ]),
               _: 1
             }, 8, ["onClick"])) : createCommentVNode("", true),
+            createTextVNode(),
             !_ctx.noOkBtn ? (openBlock(), createBlock(_component_nut_button, {
               key: 1,
               size: "small",
@@ -222,88 +226,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   }, 8, ["teleport", "visible", "close-on-click-overlay", "lock-scroll", "pop-class", "style", "overlay-class", "overlay-style", "onClickOverlay", "onClickCloseIcon"]);
 }
-var Dialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-class DialogOptions {
-  constructor() {
-    this.title = "";
-    this.content = "";
-    this.cancelText = "";
-    this.okText = "";
-    this.textAlign = "center";
-    this.customClass = "";
-    this.overlayStyle = {};
-    this.overlayClass = "";
-    this.popStyle = {};
-    this.popClass = "";
-    this.teleport = "body";
-    this.id = new Date().getTime();
-    this.footerDirection = "horizontal";
-    this.onUpdate = (value) => {
-    };
-    this.onOk = () => {
-    };
-    this.onCancel = () => {
-    };
-    this.onOpened = () => {
-    };
-    this.onClosed = () => {
-    };
-    this.visible = true;
-    this.noFooter = false;
-    this.noOkBtn = false;
-    this.noCancelBtn = false;
-    this.okBtnDisabled = false;
-    this.closeOnPopstate = false;
-    this.lockScroll = false;
-  }
-}
-class DialogFunction {
-  constructor(_options) {
-    this.options = new DialogOptions();
-    this.close = () => {
-    };
-    this.setDefaultOptions = (options2) => {
-    };
-    this.resetDefaultOptions = () => {
-    };
-    let options = Object.assign(this.options, _options);
-    let elWarp = document.body;
-    let teleport = options.teleport;
-    if (teleport != "body") {
-      if (typeof teleport == "string") {
-        elWarp = document.querySelector(teleport);
-      } else {
-        elWarp = options.teleport;
-      }
-    }
-    const root = document.createElement("view");
-    root.id = "dialog-" + options.id;
-    const Wrapper = {
-      setup() {
-        options.onUpdate = (val) => {
-          if (val == false) {
-            elWarp.removeChild(root);
-          }
-        };
-        if (options == null ? void 0 : options.onOpened) {
-          options == null ? void 0 : options.onOpened();
-        }
-        options.teleport = `#${root.id}`;
-        return () => {
-          return h(Dialog, options);
-        };
-      }
-    };
-    this.instance = createVNode(Wrapper);
-    elWarp.appendChild(root);
-    render(this.instance, root);
-  }
-}
-const _Dialog = function(options) {
-  return new DialogFunction(options);
-};
-_Dialog.install = (app) => {
-  app.use(Dialog);
-  app.config.globalProperties.$dialog = _Dialog;
-};
-export { Dialog, DialogOptions, _Dialog as default };
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index_taro as default };

package/dist/packages/_es/Divider.js

@@ -1,5 +1,5 @@
 /*!
-* @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.
 */
@@ -66,5 +66,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     class: normalizeClass(_ctx.classes)
   }, null, 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/Drag.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, onActivated, onDeactivated, openBlock, createElementBlock, normalizeClass, renderSlot } from "vue";
+import { ref, reactive, computed, onMounted, onActivated, onDeactivated, openBlock, createElementBlock, normalizeClass, withModifiers, normalizeStyle, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
 import { r as requestAniFrame } from "./raf.js";
+import Taro, { eventCenter, getCurrentInstance } from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
 const { componentName, create } = createComponent("drag");
@@ -31,7 +32,7 @@ const _sfc_main = create({
       }
     }
   },
-  setup(props) {
+  setup(props, { emit }) {
     const myDrag = ref();
     const state = reactive({
       keepAlive: false,
@@ -41,10 +42,13 @@ const _sfc_main = create({
       screenHeight: 0,
       startTop: 0,
       startLeft: 0,
+      initTop: 0,
       nx: 0,
       ny: 0,
       xPum: 0,
       yPum: 0,
+      top: 0,
+      left: 0,
       position: { x: 0, y: 0 },
       boundary: {
         top: 0,
@@ -54,54 +58,57 @@ const _sfc_main = create({
       }
     });
     const classes = computed(() => {
-      const prefixCls = componentName;
+      const prefixCls = "nut-taro-drag";
       return {
         [prefixCls]: true
       };
     });
+    const domElem = Taro.getSystemInfoSync();
     function getInfo() {
-      const domElem = document.documentElement;
-      state.elWidth = myDrag.value.offsetWidth;
-      state.elHeight = myDrag.value.offsetHeight;
-      state.screenWidth = domElem.clientWidth || 375;
-      state.screenHeight = domElem.clientHeight || 667;
+      const query = Taro.createSelectorQuery();
+      query.select(".myDrag").boundingClientRect((rec) => {
+        state.elWidth = rec.width;
+        state.elHeight = rec.height;
+        state.initTop = rec.top;
+      }).exec();
+      state.screenWidth = domElem.screenWidth;
+      state.screenHeight = domElem.screenHeight;
     }
-    function goLeft(target) {
+    function goLeft() {
       if (state.boundary.left) {
-        if (+target.style.left.split("px")[0] > state.boundary.left) {
-          target.style.left = +target.style.left.split("px")[0] - 10 + "px";
+        if (+state.left.split("px")[0] > state.boundary.left) {
+          state.left = +state.left.split("px")[0] - 10 + "px";
           requestAniFrame(() => {
-            goLeft(target);
+            goLeft();
           });
         } else {
-          target.style.left = `${state.boundary.left}px`;
+          state.left = `${state.boundary.left}px`;
         }
       } else {
-        if (+target.style.left.split("px")[0] > 10) {
-          target.style.left = +target.style.left.split("px")[0] - 10 + "px";
+        if (+state.left.split("px")[0] > 10) {
+          state.left = +state.left.split("px")[0] - 10 + "px";
           requestAniFrame(() => {
-            goLeft(target);
+            goLeft();
           });
         } else {
-          target.style.left = "0px";
+          state.left = "0px";
         }
       }
     }
-    function goRight(target, rightLocation) {
-      if (rightLocation - parseInt(target.style.left.split("px")[0]) > 10) {
-        target.style.left = parseInt(target.style.left.split("px")[0]) + 10 + "px";
+    function goRight(rightLocation) {
+      if (rightLocation - parseInt(state.left.split("px")[0]) > 10) {
+        state.left = parseInt(state.left.split("px")[0]) + 10 + "px";
         requestAniFrame(() => {
-          goRight(target, rightLocation);
+          goRight(rightLocation);
         });
       } else {
-        target.style.left = rightLocation + "px";
+        state.left = rightLocation + "px";
       }
     }
     function touchMove(e) {
       e.preventDefault();
-      const target = e.currentTarget;
-      if (e.targetTouches.length === 1) {
-        const touch = e.targetTouches[0];
+      if (e.touches.length === 1) {
+        const touch = e.touches[0];
         state.nx = touch.clientX - state.position.x;
         state.ny = touch.clientY - state.position.y;
         state.xPum = state.startLeft + state.nx;
@@ -118,15 +125,14 @@ const _sfc_main = create({
           state.yPum = state.screenHeight - state.elHeight - state.boundary.bottom;
         }
         if (props.direction != "y") {
-          target.style.left = state.xPum + "px";
+          state.left = state.xPum;
         }
         if (props.direction != "x") {
-          target.style.top = state.yPum + "px";
+          state.top = state.yPum;
         }
       }
     }
     function touchEnd(e) {
-      const target = e.currentTarget;
       const touch = e.changedTouches[0];
       let currX = touch.clientX;
       const rightLocation = state.screenWidth - state.elWidth - state.boundary.right;
@@ -140,33 +146,47 @@ const _sfc_main = create({
       if (props.direction != "y" && props.attract) {
         if (currX < state.screenWidth / 2) {
           requestAniFrame(() => {
-            goLeft(target);
+            goLeft();
           });
         } else {
           requestAniFrame(() => {
-            goRight(target, rightLocation);
+            goRight(rightLocation);
           });
         }
       }
-      if (props.direction != "x") {
-        target.style.top = state.yPum + "px";
+      if (props.direction !== "x") {
+        state.top = state.yPum;
       }
     }
     function touchStart(e) {
-      const target = e.currentTarget;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      const query = Taro.createSelectorQuery();
+      let id = (_a = e == null ? void 0 : e.mpEvent) == null ? void 0 : _a.currentTarget.id;
+      let offsetTop = (_b = e == null ? void 0 : e.currentTarget) == null ? void 0 : _b.offsetTop;
+      let offsetLeft = (_c = e == null ? void 0 : e.currentTarget) == null ? void 0 : _c.offsetLeft;
       const touches = e.touches[0];
-      const touch = e.targetTouches[0];
-      state.startTop = target.offsetTop;
-      state.startLeft = target.offsetLeft;
+      const mobileTop = (_f = (_e = (_d = e.touches[0]) == null ? void 0 : _d.target) == null ? void 0 : _e.parentNode) == null ? void 0 : _f.style.top;
+      const mobileLeft = (_i = (_h = (_g = e.touches[0]) == null ? void 0 : _g.target) == null ? void 0 : _h.parentNode) == null ? void 0 : _i.style.left;
+      query.selectAll(".myDrag").boundingClientRect((rec) => {
+        rec.forEach((element) => {
+          if (id && id == element.id) {
+            state.startTop = element.top - offsetTop;
+            state.startLeft = element.left - offsetLeft;
+          } else if (mobileTop) {
+            state.startTop = Number(mobileTop.slice(0, -2));
+            state.startLeft = Number(mobileLeft.slice(0, -2));
+          }
+        });
+      }).exec();
       state.position.x = touches.clientX;
       state.position.y = touches.clientY;
-      state.nx = touch.clientX - state.position.x;
-      state.ny = touch.clientY - state.position.y;
-      state.xPum = state.startLeft + state.nx;
-      state.yPum = state.startTop + state.ny;
     }
     onMounted(() => {
-      getInfo();
+      setTimeout(() => {
+        getInfo();
+      }, 200);
+      eventCenter.once(getCurrentInstance().router.onReady, () => {
+      });
       state.boundary = props.boundary;
     });
     onActivated(() => {
@@ -185,20 +205,26 @@ const _sfc_main = create({
       myDrag,
       touchStart,
       touchMove,
-      touchEnd
+      touchEnd,
+      state
     };
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
-    class: normalizeClass(_ctx.classes),
+    class: normalizeClass([_ctx.classes, "myDrag"]),
     ref: "myDrag",
     onTouchstart: _cache[0] || (_cache[0] = ($event) => _ctx.touchStart($event)),
-    onTouchmove: _cache[1] || (_cache[1] = ($event) => _ctx.touchMove($event)),
-    onTouchend: _cache[2] || (_cache[2] = ($event) => _ctx.touchEnd($event))
+    onTouchmove: _cache[1] || (_cache[1] = withModifiers(($event) => _ctx.touchMove($event), ["prevent"])),
+    catchtouchmove: "true",
+    style: normalizeStyle({
+      transform: ` translate(${_ctx.state.left + "px"}, ${_ctx.state.top + "px"})`,
+      top: _ctx.state.top + "px",
+      left: _ctx.state.left + "px"
+    })
   }, [
     renderSlot(_ctx.$slots, "default")
-  ], 34);
+  ], 38);
 }
-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 };