@nutui/nutui 4.1.3 → 4.1.4

package/dist/packages/_es/ActionSheet.js

@@ -91,8 +91,10 @@ const _sfc_main = create({
       }
     };
     const close = (e) => {
-      emit("close", e);
-      emit("update:visible", false);
+      if (props.closeAbled) {
+        emit("close", e);
+        emit("update:visible", false);
+      }
     };
     return {
       slotDefault,

package/dist/packages/_es/Noticebar.js

@@ -360,7 +360,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           class: normalizeClass(_ctx.wrapContentClass),
           style: normalizeStyle(_ctx.contentStyle),
           onAnimationend: _cache[0] || (_cache[0] = (...args) => _ctx.onAnimationEnd && _ctx.onAnimationEnd(...args)),
-          "on:webkitAnimationEnd": _cache[1] || (_cache[1] = (...args) => _ctx.onAnimationEnd && _ctx.onAnimationEnd(...args))
+          onWebkitAnimationEnd: _cache[1] || (_cache[1] = (...args) => _ctx.onAnimationEnd && _ctx.onAnimationEnd(...args))
         }, [
           renderSlot(_ctx.$slots, "default", {}, () => [
             createTextVNode(toDisplayString(_ctx.text), 1)

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/formitem/index.scss

@@ -37,12 +37,14 @@
     font-size: $form-item-label-font-size;
     font-weight: normal;
     width: $form-item-label-width;
-    min-width: auto;
     margin-right: $form-item-label-margin-right;
     flex: none !important;
     display: inline-block !important;
     word-wrap: break-word;
     text-align: $form-item-label-text-align;
+    &.nut-cell__title {
+      min-width: auto;
+    }
     &.required {
       &::before {
         content: '*';

package/dist/smartips/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "NutUI",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "contributions": {
     "html": {
       "tags": [
@@ -3968,6 +3968,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "field-names",
+              "default": "`{ text: 'text', value: 'value', children: 'children' }`",
+              "description": "自定义 columns 中的字段",
+              "value": {
+                "type": "object",
+                "kind": "expression"
+              }
+            },
             {
               "name": "title",
               "default": "-",
@@ -3997,7 +4006,7 @@
             },
             {
               "name": "three-dimensional",
-              "default": "`true`",
+              "default": "`false`",
               "description": "是否开启 3D 效果",
               "value": {
                 "type": "boolean",