@nutui/nutui 3.1.23-beta.6 → 3.2.2-beta.1

package/dist/packages/_es/Notify.js

@@ -1,24 +1,5 @@
-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.23-beta.6 Thu Jul 28 2022 18:06:31 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.2-beta.1 Mon Aug 22 2022 15:19:47 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -96,11 +77,14 @@ const _sfc_main = create({
     if (props.duration) {
       show();
     }
-    watch(() => props.duration, (val) => {
-      if (val) {
-        show();
+    watch(
+      () => props.duration,
+      (val) => {
+        if (val) {
+          show();
+        }
       }
-    });
+    );
     const onAfterLeave = () => {
       clearTimer();
       props.unmount && props.unmount(props.id);
@@ -168,9 +152,9 @@ const updateNotify = (opts) => {
   if (container) {
     const currentOpt = optsMap.find((item) => item.id === opts.id);
     if (currentOpt) {
-      opts = __spreadValues(__spreadValues(__spreadValues({}, defaultOptions), currentOpt), opts);
+      opts = { ...defaultOptions, ...currentOpt, ...opts };
     } else {
-      opts = __spreadValues(__spreadValues({}, defaultOptions), opts);
+      opts = { ...defaultOptions, ...opts };
     }
     const instance = createVNode(Notify, opts);
     render(instance, container);
@@ -188,7 +172,7 @@ const mountNotify = (opts) => {
   } else {
     _id = new Date().getTime() + "";
   }
-  opts = __spreadValues(__spreadValues({}, defaultOptions), opts);
+  opts = { ...defaultOptions, ...opts };
   opts.id = _id;
   idsMap.push(opts.id);
   optsMap.push(opts);
@@ -220,23 +204,23 @@ const errorMsg = (msg) => {
 const NotifyFunction = {
   text(msg, obj = {}) {
     errorMsg(msg);
-    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg }));
+    return mountNotify({ ...obj, msg });
   },
   primary(msg, obj = {}) {
     errorMsg(msg);
-    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "primary" }));
+    return mountNotify({ ...obj, msg, type: "primary" });
   },
   success(msg, obj = {}) {
     errorMsg(msg);
-    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "success" }));
+    return mountNotify({ ...obj, msg, type: "success" });
   },
   danger(msg, obj = {}) {
     errorMsg(msg);
-    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "danger" }));
+    return mountNotify({ ...obj, msg, type: "danger" });
   },
   warn(msg, obj = {}) {
     errorMsg(msg);
-    return mountNotify(__spreadProps(__spreadValues({}, obj), { msg, type: "warning" }));
+    return mountNotify({ ...obj, msg, type: "warning" });
   },
   hide() {
     clearNotify();

package/dist/packages/_es/NumberKeyboard.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.6 Thu Jul 28 2022 18:06:31 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.2-beta.1 Mon Aug 22 2022 15:19:47 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -96,19 +96,21 @@ const _sfc_main = create({
       if (customKeys.length > 2) {
         customKeys = [customKeys[0], customKeys[1]];
       }
+      if (customKeys.length == 2 && props.title && props.type != "rightColumn") {
+        customKeys = [customKeys[0]];
+      }
       if (customKeys.length === 1) {
-        if (props.title) {
+        if (props.title && props.type != "rightColumn") {
           keys.push({ id: customKeys[0], type: "custom" }, { id: 0, type: "number" }, { id: "delete", type: "delete" });
         } else {
           keys.push({ id: 0, type: "number" }, { id: customKeys[0], type: "custom" });
         }
       } else if (customKeys.length === 2) {
-        keys.push({ id: customKeys[0], type: "custom" }, { id: 0, type: "number" }, { id: customKeys[1], type: "custom" });
-        if (props.title) {
-          keys.push({ id: "delete", type: "delete" });
-        }
-      } else {
-        keys.push({ id: 0, type: "number" });
+        keys.push(
+          { id: customKeys[0], type: "custom" },
+          { id: 0, type: "number" },
+          { id: customKeys[1], type: "custom" }
+        );
       }
       return keys;
     }
@@ -118,9 +120,12 @@ const _sfc_main = create({
       }
       return defaultKey();
     });
-    watch(() => props.visible, (value) => {
-      show.value = value;
-    });
+    watch(
+      () => props.visible,
+      (value) => {
+        show.value = value;
+      }
+    );
     function onTouchstart(item, event) {
       event.stopPropagation();
       clickKeyIndex.value = item.id;
@@ -212,10 +217,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       createElementVNode("div", _hoisted_1, [
         _ctx.title ? (openBlock(), createElementBlock("div", _hoisted_2, [
           createElementVNode("h3", _hoisted_3, toDisplayString(_ctx.title), 1),
-          createElementVNode("span", {
+          _ctx.type == "default" ? (openBlock(), createElementBlock("span", {
+            key: 0,
             class: "keyboard-close",
             onClick: _cache[0] || (_cache[0] = ($event) => _ctx.closeBoard())
-          }, toDisplayString(_ctx.translate("done")), 1)
+          }, toDisplayString(_ctx.translate("done")), 1)) : createCommentVNode("", true)
         ])) : createCommentVNode("", true),
         createElementVNode("div", _hoisted_4, [
           createElementVNode("div", _hoisted_5, [
@@ -258,15 +264,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 onTouchend: _cache[4] || (_cache[4] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args))
               }, _hoisted_12, 34)
             ]),
-            _ctx.title == "" ? (openBlock(), createElementBlock("div", {
-              key: 0,
+            createElementVNode("div", {
               class: "key-board-wrapper key-board-finish",
               onClick: _cache[5] || (_cache[5] = ($event) => _ctx.closeBoard())
             }, [
               createElementVNode("div", {
                 class: normalizeClass(["key", "finish", { activeFinsh: _ctx.clickKeyIndex == "finish" }])
               }, toDisplayString(_ctx.confirmText || _ctx.translate("done")), 3)
-            ])) : createCommentVNode("", true)
+            ])
           ])) : createCommentVNode("", true)
         ])
       ], 512)

package/dist/packages/_es/OldPicker.js

@@ -1,24 +1,5 @@
-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.23-beta.6 Thu Jul 28 2022 18:06:31 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.2-beta.1 Mon Aug 22 2022 15:19:47 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -177,20 +158,29 @@ const _sfc_main$1 = create$1({
       type && setChooseValue();
       setMove(-move);
     };
-    watch(() => props.listData, (val) => {
-      state.transformY = 0;
-      modifyStatus(false);
-    }, {
-      deep: true
-    });
-    watch(() => props.defaultIndex, (val) => {
-      state.transformY = 0;
-      modifyStatus(false);
-    });
+    watch(
+      () => props.listData,
+      (val) => {
+        state.transformY = 0;
+        modifyStatus(false);
+      },
+      {
+        deep: true
+      }
+    );
+    watch(
+      () => props.defaultIndex,
+      (val) => {
+        state.transformY = 0;
+        modifyStatus(false);
+      }
+    );
     onMounted(() => {
       modifyStatus(true);
     });
-    return __spreadProps(__spreadValues(__spreadValues({}, toRefs(state)), toRefs(props)), {
+    return {
+      ...toRefs(state),
+      ...toRefs(props),
       wrapper,
       setRollerStyle,
       isHidden,
@@ -203,7 +193,7 @@ const _sfc_main$1 = create$1({
       touchRollerStyle,
       touchListStyle,
       setMove
-    });
+    };
   }
 });
 const _hoisted_1$1 = { class: "nut-oldpicker-content" };
@@ -255,7 +245,8 @@ const _sfc_main = create({
     [column.name]: column,
     [Popup.name]: Popup
   },
-  props: __spreadProps(__spreadValues({}, popupProps), {
+  props: {
+    ...popupProps,
     title: {
       type: String,
       default: ""
@@ -282,7 +273,7 @@ const _sfc_main = create({
       type: [Number, String],
       default: 0
     }
-  }),
+  },
   emits: ["close", "change", "confirm", "update:visible"],
   setup(props, { emit }) {
     const childrenKey = "children";
@@ -378,7 +369,9 @@ const _sfc_main = create({
         _defaultIndex = dataIndex;
       } else if (dataType.value === "multipleColumns") {
         defaultIndexList[columnIndex] = dataIndex;
-        const val = defaultIndexList.map((res, i) => toRaw(state.formattedColumns)[i].values[res]);
+        const val = defaultIndexList.map(
+          (res, i) => toRaw(state.formattedColumns)[i].values[res]
+        );
         emit("change", val, columnIndex, dataIndex);
       }
     };
@@ -390,7 +383,9 @@ const _sfc_main = create({
         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]);
+        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));
@@ -405,22 +400,28 @@ const _sfc_main = create({
       if (props.visible)
         state.show = false;
     });
-    watch(() => props.visible, (val) => {
-      state.show = val;
-    });
-    watch(() => props.listData, (val) => {
-      state.formattedColumns = val;
-    });
-    return __spreadProps(__spreadValues({
-      classes
-    }, toRefs(state)), {
+    watch(
+      () => props.visible,
+      (val) => {
+        state.show = val;
+      }
+    );
+    watch(
+      () => props.listData,
+      (val) => {
+        state.formattedColumns = val;
+      }
+    );
+    return {
+      classes,
+      ...toRefs(state),
       column,
       dataType,
       columnList,
       close,
       changeHandler,
       confirm
-    });
+    };
   }
 });
 const _hoisted_1 = { class: "nut-oldpicker__bar" };

package/dist/packages/_es/OverLay.js

@@ -1,21 +1,5 @@
-var __defProp = Object.defineProperty;
-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;
-};
 /*!
-* @nutui/nutui v3.1.23-beta.6 Thu Jul 28 2022 18:06:31 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.2-beta.1 Mon Aug 22 2022 15:19:47 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -64,9 +48,12 @@ const _sfc_main = create({
         [props.overlayClass]: true
       };
     });
-    watch(() => props.visible, (value) => {
-      value ? lock() : unlock();
-    });
+    watch(
+      () => props.visible,
+      (value) => {
+        value ? lock() : unlock();
+      }
+    );
     const lock = () => {
       if (props.lockScroll && props.visible) {
         document.body.classList.add("nut-overflow-hidden");
@@ -80,10 +67,11 @@ const _sfc_main = create({
     onMounted(lock);
     onActivated(lock);
     const style = computed(() => {
-      return __spreadValues({
+      return {
         animationDuration: `${props.duration}s`,
-        zIndex: props.zIndex
-      }, props.overlayStyle);
+        zIndex: props.zIndex,
+        ...props.overlayStyle
+      };
     });
     const touchmove = (e) => {
       if (props.lockScroll)

package/dist/packages/_es/Pagination.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.6 Thu Jul 28 2022 18:06:31 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.2-beta.1 Mon Aug 22 2022 15:19:47 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Picker.js

@@ -1,24 +1,5 @@
-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.23-beta.6 Thu Jul 28 2022 18:06:31 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.2-beta.1 Mon Aug 22 2022 15:19:47 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -51,6 +32,10 @@ const _sfc_main$1 = create$1({
     threeDimensional: {
       type: Boolean,
       default: true
+    },
+    swipeDuration: {
+      type: [Number, String],
+      default: 1e3
     }
   },
   emits: ["click", "change"],
@@ -78,6 +63,7 @@ const _sfc_main$1 = create$1({
     const moving = ref(false);
     const touchDeg = ref(0);
     const touchTime = ref(0);
+    const DEFAULT_DURATION = 200;
     const INERTIA_TIME = 300;
     const INERTIA_DISTANCE = 15;
     const touchRollerStyle = computed(() => {
@@ -126,7 +112,7 @@ const _sfc_main$1 = create$1({
       let moveTime = state.touchParams.lastTime - state.touchParams.startTime;
       if (moveTime <= INERTIA_TIME && Math.abs(move) > INERTIA_DISTANCE) {
         const distance = momentum(move, moveTime);
-        setMove(distance, "end", moveTime + 1e3);
+        setMove(distance, "end", +props.swipeDuration);
         return;
       } else {
         setMove(move, "end");
@@ -148,7 +134,7 @@ const _sfc_main$1 = create$1({
         return false;
       }
     };
-    const setTransform = (translateY = 0, type, time = 1e3, deg) => {
+    const setTransform = (translateY = 0, type, time = DEFAULT_DURATION, deg) => {
       if (type === "end") {
         touchTime.value = time;
       } else {
@@ -205,24 +191,34 @@ const _sfc_main$1 = create$1({
       moving.value = false;
       setChooseValue();
     };
-    watch(() => props.column, (val) => {
-      if (props.column && props.column.length > 0) {
+    watch(
+      () => props.column,
+      (val) => {
+        if (props.column && props.column.length > 0) {
+          state.transformY = 0;
+          modifyStatus(false);
+        }
+      },
+      {
+        deep: true
+      }
+    );
+    watch(
+      () => props.value,
+      (val) => {
         state.transformY = 0;
         modifyStatus(false);
+      },
+      {
+        deep: true
       }
-    }, {
-      deep: true
-    });
-    watch(() => props.value, (val) => {
-      state.transformY = 0;
-      modifyStatus(false);
-    }, {
-      deep: true
-    });
+    );
     onMounted(() => {
       modifyStatus(true);
     });
-    return __spreadProps(__spreadValues(__spreadValues({}, toRefs(state)), toRefs(props)), {
+    return {
+      ...toRefs(state),
+      ...toRefs(props),
       wrapper,
       setRollerStyle,
       isHidden,
@@ -235,7 +231,7 @@ const _sfc_main$1 = create$1({
       touchTileStyle,
       setMove,
       stopMomentum
-    });
+    };
   }
 });
 const _hoisted_1$1 = {
@@ -290,7 +286,8 @@ const _sfc_main = create({
     [column.name]: column,
     [Popup.name]: Popup
   },
-  props: __spreadProps(__spreadValues({}, popupProps), {
+  props: {
+    ...popupProps,
     modelValue: {
       type: Array,
       default: () => []
@@ -320,8 +317,12 @@ const _sfc_main = create({
     threeDimensional: {
       type: Boolean,
       default: true
+    },
+    swipeDuration: {
+      type: [Number, String],
+      default: 1e3
     }
-  }),
+  },
   emits: ["close", "change", "confirm", "update:visible", "update:modelValue"],
   setup(props, { emit }) {
     const state = reactive({
@@ -419,6 +420,12 @@ const _sfc_main = create({
       }
     };
     const confirmHandler = () => {
+      if (defaultValues.value && !defaultValues.value.length) {
+        columnsList.value.forEach((columns) => {
+          defaultValues.value.push(columns[0].value);
+          selectedOptions.value.push(columns[0]);
+        });
+      }
       emit("confirm", {
         selectedValue: defaultValues.value,
         selectedOptions: selectedOptions.value
@@ -433,28 +440,42 @@ const _sfc_main = create({
       if (props.visible)
         state.show = false;
     });
-    watch(() => props.modelValue, (newValues) => {
-      const isSameValue = JSON.stringify(newValues) === JSON.stringify(defaultValues.value);
-      if (!isSameValue) {
-        defaultValues.value = newValues;
+    watch(
+      () => props.modelValue,
+      (newValues) => {
+        const isSameValue = JSON.stringify(newValues) === JSON.stringify(defaultValues.value);
+        if (!isSameValue) {
+          defaultValues.value = newValues;
+        }
+      },
+      { deep: true }
+    );
+    watch(
+      defaultValues,
+      (newValues) => {
+        const isSameValue = JSON.stringify(newValues) === JSON.stringify(props.modelValue);
+        if (!isSameValue) {
+          emit("update:modelValue", newValues);
+        }
+      },
+      { immediate: true }
+    );
+    watch(
+      () => props.visible,
+      (val) => {
+        state.show = val;
       }
-    }, { deep: true });
-    watch(defaultValues, (newValues) => {
-      const isSameValue = JSON.stringify(newValues) === JSON.stringify(props.modelValue);
-      if (!isSameValue) {
-        emit("update:modelValue", newValues);
+    );
+    watch(
+      () => props.columns,
+      (val) => {
+        if (val.length)
+          state.formattedColumns = val;
       }
-    }, { immediate: true });
-    watch(() => props.visible, (val) => {
-      state.show = val;
-    });
-    watch(() => props.columns, (val) => {
-      if (val.length)
-        state.formattedColumns = val;
-    });
-    return __spreadProps(__spreadValues({
-      classes
-    }, toRefs(state)), {
+    );
+    return {
+      classes,
+      ...toRefs(state),
       column,
       columnsType,
       columnsList,
@@ -463,7 +484,7 @@ const _sfc_main = create({
       confirmHandler,
       defaultValues,
       translate
-    });
+    };
   }
 });
 const _hoisted_1 = { class: "nut-picker__bar" };
@@ -517,10 +538,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 columnsType: _ctx.columnsType,
                 value: _ctx.defaultValues[columnIndex],
                 threeDimensional: _ctx.threeDimensional,
+                swipeDuration: _ctx.swipeDuration,
                 onChange: (option) => {
                   _ctx.changeHandler(columnIndex, option);
                 }
-              }, null, 8, ["itemShow", "column", "readonly", "columnsType", "value", "threeDimensional", "onChange"])
+              }, null, 8, ["itemShow", "column", "readonly", "columnsType", "value", "threeDimensional", "swipeDuration", "onChange"])
             ]);
           }), 128))
         ], 512),