@nutui/nutui 4.1.2 → 4.1.4

package/dist/packages/_es/Picker.js

@@ -17,72 +17,91 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { reactive, ref, computed, watch, toRefs, onMounted, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, normalizeClass, toDisplayString, createCommentVNode, resolveComponent, renderSlot, createVNode } from "vue";
+import { reactive, computed, ref, watch, toRefs, onMounted, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, normalizeClass, toDisplayString, createCommentVNode, resolveComponent, renderSlot, createVNode } from "vue";
 import { c as createComponent, d as preventDefault, e as clamp } from "./component-0fbad28e.js";
 import { p as pxCheck } from "./pxCheck-c6b9f6b7.js";
 import { u as useTouch } from "./index-7a7385e4.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-const { componentName } = createComponent("picker");
+const DEFAULT_FILED_NAMES = {
+  text: "text",
+  value: "value",
+  children: "children"
+};
 const usePicker = (props, emit) => {
   const state = reactive({
     formattedColumns: props.columns
   });
+  const columnFieldNames = computed(() => {
+    return __spreadValues(__spreadValues({}, DEFAULT_FILED_NAMES), props.fieldNames);
+  });
   const defaultValues = ref([]);
+  const defaultIndexes = computed(() => {
+    const fields = columnFieldNames.value;
+    return columnsList.value.map((column2, index) => {
+      const targetIndex = column2.findIndex((item) => item[fields.value] === defaultValues.value[index]);
+      return targetIndex === -1 ? 0 : targetIndex;
+    });
+  });
   const pickerColumn = ref([]);
   const swipeRef = (el) => {
     if (el && pickerColumn.value.length < columnsList.value.length) {
       pickerColumn.value.push(el);
     }
   };
-  const classes = computed(() => {
-    const prefixCls = componentName;
-    return {
-      [prefixCls]: true
-    };
-  });
   const selectedOptions = computed(() => {
+    const fields = columnFieldNames.value;
     return columnsList.value.map((column2, index) => {
-      return column2.find((item) => item.value === defaultValues.value[index]);
+      return column2.find((item) => item[fields.value] === defaultValues.value[index]) || column2[0];
     });
   });
   const columnsType = computed(() => {
     const firstColumn = state.formattedColumns[0];
+    const fields = columnFieldNames.value;
     if (firstColumn) {
       if (Array.isArray(firstColumn)) {
         return "multiple";
       }
-      if ("children" in firstColumn) {
+      if (fields.children in firstColumn) {
         return "cascade";
       }
     }
     return "single";
   });
   const columnsList = computed(() => {
+    let result = [];
     switch (columnsType.value) {
       case "multiple":
-        return state.formattedColumns;
+        result = state.formattedColumns;
+        break;
       case "cascade":
-        return formatCascade(state.formattedColumns, defaultValues.value ? defaultValues.value : []);
+        result = formatCascade(
+          state.formattedColumns,
+          defaultValues.value ? defaultValues.value : []
+        );
+        break;
       default:
-        return [state.formattedColumns];
+        result = [state.formattedColumns];
+        break;
     }
+    return result;
   });
   const formatCascade = (columns, defaultValues2) => {
     const formatted = [];
+    const fields = columnFieldNames.value;
     let cursor = {
       text: "",
       value: "",
-      children: columns
+      [fields.children]: columns
     };
     let columnIndex = 0;
-    while (cursor && cursor.children) {
-      const options = cursor.children;
+    while (cursor && cursor[fields.children]) {
+      const options = cursor[fields.children];
       const value = defaultValues2[columnIndex];
-      let index = options.findIndex((columnItem) => columnItem.value === value);
+      let index = options.findIndex((columnItem) => columnItem[fields.value] === value);
       if (index === -1)
         index = 0;
-      cursor = cursor.children[index];
+      cursor = cursor[fields.children][index];
       columnIndex++;
       formatted.push(options);
     }
@@ -95,22 +114,24 @@ const usePicker = (props, emit) => {
     });
   };
   const changeHandler = (columnIndex, option) => {
+    var _a;
+    const fields = columnFieldNames.value;
     if (option && Object.keys(option).length) {
       defaultValues.value = defaultValues.value ? defaultValues.value : [];
       if (columnsType.value === "cascade") {
-        defaultValues.value[columnIndex] = option.value ? option.value : "";
+        defaultValues.value[columnIndex] = (_a = option[fields.value]) != null ? _a : "";
         let index = columnIndex;
         let cursor = option;
-        while (cursor && cursor.children && cursor.children[0]) {
-          defaultValues.value[index + 1] = cursor.children[0].value;
+        while (cursor && cursor[fields.children] && cursor[fields.children][0]) {
+          defaultValues.value[index + 1] = cursor[fields.children][0][fields.value];
           index++;
-          cursor = cursor.children[0];
+          cursor = cursor[fields.children][0];
         }
-        if (cursor && cursor.children && cursor.children.length === 0) {
+        if (cursor && cursor[fields.children] && cursor[fields.children].length === 0) {
           defaultValues.value = defaultValues.value.slice(0, index + 1);
         }
       } else {
-        defaultValues.value[columnIndex] = Object.prototype.hasOwnProperty.call(option, "value") ? option.value : "";
+        defaultValues.value[columnIndex] = Object.prototype.hasOwnProperty.call(option, fields.value) ? option[fields.value] : "";
       }
       emit("change", {
         columnIndex,
@@ -120,9 +141,10 @@ const usePicker = (props, emit) => {
     }
   };
   const confirm = () => {
+    const fields = columnFieldNames.value;
     if (defaultValues.value && !defaultValues.value.length) {
       columnsList.value.forEach((columns) => {
-        defaultValues.value.push(columns[0].value);
+        defaultValues.value.push(columns[0][fields.value]);
       });
     }
     emit("confirm", {
@@ -156,15 +178,15 @@ const usePicker = (props, emit) => {
         state.formattedColumns = val;
     }
   );
-  return __spreadProps(__spreadValues({
-    classes
-  }, toRefs(state)), {
+  return __spreadProps(__spreadValues({}, toRefs(state)), {
     columnsType,
     columnsList,
+    columnFieldNames,
     cancel,
     changeHandler,
     confirm,
     defaultValues,
+    defaultIndexes,
     pickerColumn,
     swipeRef,
     selectedOptions,
@@ -197,6 +219,15 @@ const _sfc_main$1 = create$1({
     optionHeight: {
       type: [Number, String],
       default: 36
+    },
+    fieldNames: {
+      type: Object,
+      default: () => ({})
+    },
+    // 特殊环境判断
+    taro: {
+      type: Boolean,
+      defualt: false
     }
   },
   emits: ["click", "change"],
@@ -249,8 +280,8 @@ const _sfc_main$1 = create$1({
     });
     const onTouchStart = (event) => {
       touch.start(event);
-      if (moving.value) {
-        let dom = roller.value;
+      if (moving.value && !props.taro) {
+        const dom = roller.value;
         const { transform } = window.getComputedStyle(dom);
         if (props.threeDimensional) {
           const circle = Math.floor(parseInt(touchDeg.value) / 360);
@@ -346,7 +377,7 @@ const _sfc_main$1 = create$1({
     };
     const modifyStatus = (type) => {
       const { column: column2 } = props;
-      let index = column2.findIndex((columnItem) => columnItem.value === props.value);
+      let index = column2.findIndex((columnItem) => columnItem[props.fieldNames.value] === props.value);
       state.currIndex = index === -1 ? 1 : index + 1;
       let move = index === -1 ? 0 : index * +props.optionHeight;
       type && setChooseValue();
@@ -412,19 +443,20 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
       onTransitionend: _cache[0] || (_cache[0] = (...args) => _ctx.stopMomentum && _ctx.stopMomentum(...args))
     }, [
       (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.column, (item, index) => {
+        var _a;
         return openBlock(), createElementBlock(Fragment, {
-          key: item.value ? item.value : index
+          key: (_a = item[_ctx.fieldNames.value]) != null ? _a : index
         }, [
-          item && item.text && _ctx.threeDimensional ? (openBlock(), createElementBlock("view", {
+          item && item[_ctx.fieldNames.text] && _ctx.threeDimensional ? (openBlock(), createElementBlock("view", {
             key: 0,
             class: normalizeClass(["nut-picker-roller-item", { "nut-picker-roller-item-hidden": _ctx.isHidden(index + 1) }]),
             style: normalizeStyle(_ctx.setRollerStyle(index + 1))
-          }, toDisplayString(item.text), 7)) : createCommentVNode("", true),
-          item && item.text && !_ctx.threeDimensional ? (openBlock(), createElementBlock("view", {
+          }, toDisplayString(item[_ctx.fieldNames.text]), 7)) : createCommentVNode("", true),
+          item && item[_ctx.fieldNames.text] && !_ctx.threeDimensional ? (openBlock(), createElementBlock("view", {
             key: 1,
             class: "nut-picker-roller-item-tile",
             style: normalizeStyle({ height: _ctx.pxCheck(_ctx.optionHeight), lineHeight: _ctx.pxCheck(_ctx.optionHeight) })
-          }, toDisplayString(item.text), 5)) : createCommentVNode("", true)
+          }, toDisplayString(item[_ctx.fieldNames.text]), 5)) : createCommentVNode("", true)
         ], 64);
       }), 128))
     ], 36),
@@ -460,7 +492,7 @@ const baseProps = {
   },
   threeDimensional: {
     type: Boolean,
-    default: true
+    default: false
   },
   swipeDuration: {
     type: [Number, String],
@@ -477,6 +509,10 @@ const baseProps = {
   optionHeight: {
     type: [Number, String],
     default: 36
+  },
+  fieldNames: {
+    type: Object,
+    default: () => ({})
   }
 };
 const { create, translate } = createComponent("picker");
@@ -487,7 +523,10 @@ const _sfc_main = create({
   props: baseProps,
   emits: ["cancel", "change", "confirm", "update:modelValue"],
   setup(props, { emit }) {
-    const { changeHandler, confirm, defaultValues, columnsList, columnsType, classes, cancel } = usePicker(props, emit);
+    const { changeHandler, confirm, defaultValues, columnsList, columnsType, columnFieldNames, cancel } = usePicker(
+      props,
+      emit
+    );
     const pickerColumn = ref([]);
     const swipeRef = (el) => {
       if (el && pickerColumn.value.length < columnsList.value.length) {
@@ -507,10 +546,10 @@ const _sfc_main = create({
       confirm();
     };
     return {
-      classes,
       column,
       columnsType,
       columnsList,
+      columnFieldNames,
       cancel,
       changeHandler,
       confirmHandler,
@@ -522,25 +561,24 @@ const _sfc_main = create({
     };
   }
 });
-const _hoisted_1 = {
+const _hoisted_1 = { class: "nut-picker" };
+const _hoisted_2 = {
   key: 0,
   class: "nut-picker__bar"
 };
-const _hoisted_2 = { class: "nut-picker__title" };
+const _hoisted_3 = { class: "nut-picker__title" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_picker_column = resolveComponent("nut-picker-column");
-  return openBlock(), createElementBlock("div", {
-    class: normalizeClass(_ctx.classes)
-  }, [
-    _ctx.showToolbar ? (openBlock(), createElementBlock("view", _hoisted_1, [
+  return openBlock(), createElementBlock("div", _hoisted_1, [
+    _ctx.showToolbar ? (openBlock(), createElementBlock("view", _hoisted_2, [
       createElementVNode("view", {
         class: "nut-picker__left",
         onClick: _cache[0] || (_cache[0] = (...args) => _ctx.cancel && _ctx.cancel(...args))
       }, toDisplayString(_ctx.cancelText || _ctx.translate("cancel")), 1),
-      createElementVNode("view", _hoisted_2, toDisplayString(_ctx.title), 1),
+      createElementVNode("view", _hoisted_3, toDisplayString(_ctx.title), 1),
       createElementVNode("view", {
         class: "nut-picker__right",
-        onClick: _cache[1] || (_cache[1] = ($event) => _ctx.confirmHandler())
+        onClick: _cache[1] || (_cache[1] = (...args) => _ctx.confirmHandler && _ctx.confirmHandler(...args))
       }, toDisplayString(_ctx.okText || _ctx.translate("confirm")), 1)
     ])) : createCommentVNode("", true),
     renderSlot(_ctx.$slots, "top"),
@@ -557,21 +595,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ref_for: true,
             ref: _ctx.swipeRef,
             column: column2,
-            columnsType: _ctx.columnsType,
+            "columns-type": _ctx.columnsType,
+            "field-names": _ctx.columnFieldNames,
             value: _ctx.defaultValues && _ctx.defaultValues[columnIndex],
-            threeDimensional: _ctx.threeDimensional,
-            swipeDuration: _ctx.swipeDuration,
-            visibleOptionNum: _ctx.visibleOptionNum,
-            optionHeight: _ctx.optionHeight,
+            "three-dimensional": _ctx.threeDimensional,
+            "swipe-duration": _ctx.swipeDuration,
+            "visible-option-num": _ctx.visibleOptionNum,
+            "option-height": _ctx.optionHeight,
             onChange: (option) => {
               _ctx.changeHandler(columnIndex, option);
             }
-          }, null, 8, ["column", "columnsType", "value", "threeDimensional", "swipeDuration", "visibleOptionNum", "optionHeight", "onChange"])
+          }, null, 8, ["column", "columns-type", "field-names", "value", "three-dimensional", "swipe-duration", "visible-option-num", "option-height", "onChange"])
         ]);
       }), 128))
     ], 4),
     renderSlot(_ctx.$slots, "default")
-  ], 2);
+  ]);
 }
 const Picker = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/dist/packages/_es/Popover.js

@@ -2,11 +2,11 @@ import { ref, computed, onMounted, watch, resolveComponent, openBlock, createEle
 import { i as isArray, c as createComponent } from "./component-0fbad28e.js";
 import { r as renderIcon } from "./renderIcon-3d0fd47c.js";
 import { u as useRect } from "./index-29892cda.js";
-import { P as Popup } from "./index-5ffbc437.js";
+import { P as Popup } from "./index-7fe29a2f.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-import "./Overlay.js";
 import "@nutui/icons-vue";
+import "./Overlay.js";
 const { create } = createComponent("popover");
 const _sfc_main = create({
   components: {

package/dist/packages/_es/Popup.js

@@ -1,10 +1,10 @@
-import { P } from "./index-5ffbc437.js";
+import { P } from "./index-7fe29a2f.js";
 import "vue";
 import "./_plugin-vue_export-helper-cc2b3d55.js";
+import "@nutui/icons-vue";
+import "./Overlay.js";
 import "./component-0fbad28e.js";
 import "../locale/lang";
-import "./Overlay.js";
-import "@nutui/icons-vue";
 export {
   P as default
 };

package/dist/packages/_es/ShortPassword.js

@@ -1,6 +1,6 @@
 import { ref, computed, watch, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, createElementVNode, toDisplayString, Fragment, renderList, createCommentVNode } from "vue";
 import { c as createComponent } from "./component-0fbad28e.js";
-import { P as Popup } from "./index-5ffbc437.js";
+import { P as Popup } from "./index-7fe29a2f.js";
 import { Tips } from "@nutui/icons-vue";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";

package/dist/packages/_es/Skeleton.js

@@ -3,103 +3,98 @@ import { toRefs, computed, resolveComponent, openBlock, createElementBlock, rend
 import Avatar from "./Avatar.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-const component = (components) => {
-  return {
-    components,
-    props: {
-      //每行宽度
-      width: {
-        type: String,
-        default: "100px"
-      },
-      //每行高度
-      height: {
-        type: String,
-        default: "15px"
-      },
-      //是否显示动画
-      animated: {
-        type: Boolean,
-        default: false
-      },
-      //头像
-      avatar: {
-        type: Boolean,
-        default: false
-      },
-      //头像形状：正方形/圆形
-      avatarShape: {
-        type: String,
-        default: "round"
-      },
-      //头像大小
-      avatarSize: {
-        type: String,
-        default: "50px"
-      },
-      //是否显示骨架屏
-      loading: {
-        type: Boolean,
-        default: true
-      },
-      //标题/段落 圆角风格
-      round: {
-        type: Boolean,
-        default: false
-      },
-      //显示段落行数
-      row: {
-        type: String,
-        default: "1"
-      },
-      //是否显示段落标题
-      title: {
-        type: Boolean,
-        default: true
-      }
+const { create } = createComponent("skeleton");
+const _sfc_main = create({
+  components: {
+    [Avatar.name]: Avatar
+  },
+  props: {
+    //每行宽度
+    width: {
+      type: String,
+      default: "100px"
     },
-    setup(props) {
-      const { avatarShape, round, avatarSize } = toRefs(props);
-      const avatarClass = computed(() => {
-        const prefixCls = "avatarClass";
-        return {
-          [prefixCls]: true,
-          [`${prefixCls}--${avatarShape.value}`]: avatarShape.value
-        };
-      });
-      const getBlockClass = (prefixCls) => {
-        return {
-          [prefixCls]: true,
-          [`${prefixCls}--round`]: round.value
-        };
+    //每行高度
+    height: {
+      type: String,
+      default: "15px"
+    },
+    //是否显示动画
+    animated: {
+      type: Boolean,
+      default: false
+    },
+    //头像
+    avatar: {
+      type: Boolean,
+      default: false
+    },
+    //头像形状：正方形/圆形
+    avatarShape: {
+      type: String,
+      default: "round"
+    },
+    //头像大小
+    avatarSize: {
+      type: String,
+      default: "50px"
+    },
+    //是否显示骨架屏
+    loading: {
+      type: Boolean,
+      default: true
+    },
+    //标题/段落 圆角风格
+    round: {
+      type: Boolean,
+      default: false
+    },
+    //显示段落行数
+    row: {
+      type: String,
+      default: "1"
+    },
+    //是否显示段落标题
+    title: {
+      type: Boolean,
+      default: true
+    }
+  },
+  setup(props) {
+    const { avatarShape, round, avatarSize } = toRefs(props);
+    const avatarClass = computed(() => {
+      const prefixCls = "avatarClass";
+      return {
+        [prefixCls]: true,
+        [`${prefixCls}--${avatarShape.value}`]: avatarShape.value
+      };
+    });
+    const getBlockClass = (prefixCls) => {
+      return {
+        [prefixCls]: true,
+        [`${prefixCls}--round`]: round.value
       };
-      const getStyle = () => {
-        if (avatarSize.value) {
-          return {
-            width: avatarSize.value,
-            height: avatarSize.value
-          };
-        }
+    };
+    const getStyle = () => {
+      if (avatarSize.value) {
         return {
-          width: "50px",
-          height: "50px"
+          width: avatarSize.value,
+          height: avatarSize.value
         };
-      };
+      }
       return {
-        avatarShape,
-        avatarClass,
-        getBlockClass,
-        getStyle
+        width: "50px",
+        height: "50px"
       };
-    }
-  };
-};
-const { create } = createComponent("skeleton");
-const _sfc_main = create(
-  component({
-    [Avatar.name]: Avatar
-  })
-);
+    };
+    return {
+      avatarShape,
+      avatarClass,
+      getBlockClass,
+      getStyle
+    };
+  }
+});
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = {
   key: 1,

package/dist/packages/_es/Sku.js

@@ -22,7 +22,7 @@ import Price from "./Price.js";
 import { c as createComponent, T as TypeOfFun } from "./component-0fbad28e.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import InputNumber from "./InputNumber.js";
-import { p as popupProps, P as Popup } from "./index-5ffbc437.js";
+import { p as popupProps, P as Popup } from "./index-7fe29a2f.js";
 import "../locale/lang";
 import "./pxCheck-c6b9f6b7.js";
 import "@nutui/icons-vue";

package/dist/packages/_es/TimeSelect.js

@@ -1,10 +1,10 @@
 import { computed, provide, resolveComponent, openBlock, createBlock, normalizeStyle, withCtx, createElementVNode, normalizeClass, createElementBlock, toDisplayString, renderSlot } from "vue";
 import { c as createComponent } from "./component-0fbad28e.js";
-import { P as Popup } from "./index-5ffbc437.js";
+import { P as Popup } from "./index-7fe29a2f.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-import "./Overlay.js";
 import "@nutui/icons-vue";
+import "./Overlay.js";
 const { componentName, create, translate } = createComponent("time-select");
 const _sfc_main = create({
   components: {

package/dist/packages/_es/Tour.js

@@ -25,7 +25,7 @@ import Popover from "./Popover.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
 import "./renderIcon-3d0fd47c.js";
-import "./index-5ffbc437.js";
+import "./index-7fe29a2f.js";
 import "./Overlay.js";
 const { create } = createComponent("tour");
 const _sfc_main = create({