@nutui/nutui-react 2.0.0-alpha.16 → 2.0.0-alpha.17

package/dist/nutui.react.es.js

@@ -6,7 +6,7 @@ var __publicField = (obj, key, value) => {
 };
 var _a;
 /*!
-* @nutui/nutui-react v2.0.0-alpha.16 Fri Jun 09 2023 18:29:35 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v2.0.0-alpha.17 Wed Jun 14 2023 16:27:27 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -2402,6 +2402,7 @@ const defaultProps$1r = {
   disabled: false,
   block: false,
   icon: null,
+  nativeType: "button",
   onClick: (e) => {
   }
 };
@@ -2421,6 +2422,7 @@ const Button = React__default.forwardRef(
       onClick,
       className,
       style,
+      nativeType,
       ...rest
     } = {
       ...defaultProps$1r,
@@ -2454,6 +2456,7 @@ const Button = React__default.forwardRef(
         {
           ...rest,
           ref,
+          type: nativeType,
           className: classNames(
             prefixCls,
             className,
@@ -11162,6 +11165,7 @@ const Popup = (props) => {
     }
   };
   const onHandleClickOverlay = (e) => {
+    e.stopPropagation();
     if (closeOnOverlayClick) {
       const closed = onClickOverlay && onClickOverlay(e);
       closed && close();
@@ -13816,7 +13820,7 @@ const Cascader = React__default.forwardRef(InternalCascader);
 Cascader.defaultProps = defaultProps$Z;
 Cascader.displayName = "NutCascader";
 const CheckboxGroupContext = createContext(null);
-const Context = CheckboxGroupContext;
+const Context$1 = CheckboxGroupContext;
 const defaultProps$Y = {
   max: void 0,
   labelPosition: "right",
@@ -13887,7 +13891,7 @@ const CheckboxGroup = React__default.forwardRef(
       });
     }, [options2, max]);
     return /* @__PURE__ */ React__default.createElement(
-      Context.Provider,
+      Context$1.Provider,
       {
         value: {
           labelPosition: labelPosition || "right",
@@ -13950,7 +13954,7 @@ const Checkbox = (props) => {
     ...others
   } = props;
   let { labelPosition, ...rest } = others;
-  const ctx2 = useContext(Context);
+  const ctx2 = useContext(Context$1);
   let [innerChecked, setChecked] = usePropsValue({
     value: props.checked,
     defaultValue: props.defaultChecked,
@@ -14331,7 +14335,6 @@ function useRefs() {
 }
 const defaultProps$W = {
   ...ComponentDefaults,
-  visible: false,
   title: "",
   options: [],
   value: [],
@@ -14368,12 +14371,26 @@ const InternalPicker = (props, ref) => {
       (_a2 = props.onConfirm) == null ? void 0 : _a2.call(props, setSelectedOptions(), val);
     }
   });
+  const [innerVisible, setInnerVisible] = usePropsValue({
+    value: props.visible,
+    defaultValue: false,
+    finalValue: false
+  });
   const [innerValue, setInnerValue] = useState(selectedValue);
   const [columnIndex, setColumnIndex] = useState(0);
   const pickerRef = useRef(null);
   const [refs, setRefs] = useRefs();
   const [columnsList, setColumnsList] = useState([]);
   const isConfirmEvent = useRef(false);
+  const actions = {
+    open: () => {
+      setInnerVisible(true);
+    },
+    close: () => {
+      setInnerVisible(false);
+    }
+  };
+  useImperativeHandle(ref, () => actions);
   const formatCascade = (columns, values) => {
     const formatted = [];
     let columnOptions = {
@@ -14435,12 +14452,12 @@ const InternalPicker = (props, ref) => {
   };
   useEffect(() => {
     setInnerValue(innerValue !== selectedValue ? selectedValue : innerValue);
-  }, [visible]);
+  }, [innerVisible]);
   useEffect(() => {
-    if (visible) {
+    if (innerVisible) {
       init();
     }
-  }, [options2, visible]);
+  }, [options2, innerVisible]);
   useEffect(() => {
     onChange && onChange(setSelectedOptions(), innerValue, columnIndex);
   }, [innerValue, columnsList]);
@@ -14513,6 +14530,7 @@ const InternalPicker = (props, ref) => {
     }, 0);
   };
   const closePicker = () => {
+    setInnerVisible(false);
     onClose && onClose(setSelectedOptions(), innerValue);
     afterClose && afterClose(setSelectedOptions(), innerValue, pickerRef);
   };
@@ -14521,21 +14539,34 @@ const InternalPicker = (props, ref) => {
       "span",
       {
         className: `${classPrefix2}__cancel-btn`,
-        onClick: () => closePicker()
+        onClick: (e) => {
+          e.stopPropagation();
+          closePicker();
+        }
       },
       locale.cancel
-    ), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__title` }, title || ""), /* @__PURE__ */ React__default.createElement("span", { className: `${classPrefix2}__confirm-btn`, onClick: confirm2 }, locale.confirm));
+    ), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__title` }, title || ""), /* @__PURE__ */ React__default.createElement(
+      "span",
+      {
+        className: `${classPrefix2}__confirm-btn`,
+        onClick: (e) => {
+          e.stopPropagation();
+          confirm2();
+        }
+      },
+      locale.confirm
+    ));
   };
-  return /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, typeof children === "function" && children(selectedValue), /* @__PURE__ */ React__default.createElement(
     Popup,
     {
-      visible,
+      visible: innerVisible,
       position: "bottom",
       afterClose: () => {
         closePicker();
       }
     },
-    /* @__PURE__ */ React__default.createElement("div", { className: classes, style, ...rest }, renderTitleBar(), children, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__panel`, ref: pickerRef }, columnsList == null ? void 0 : columnsList.map((item, index) => {
+    /* @__PURE__ */ React__default.createElement("div", { className: classes, style, ...rest }, renderTitleBar(), typeof children !== "function" && children, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__panel`, ref: pickerRef }, columnsList == null ? void 0 : columnsList.map((item, index) => {
       return /* @__PURE__ */ React__default.createElement(
         PickerPanel$1,
         {
@@ -14550,7 +14581,7 @@ const InternalPicker = (props, ref) => {
         }
       );
     })))
-  );
+  ));
 };
 const Picker = React__default.forwardRef(InternalPicker);
 const Picker$1 = Picker;
@@ -14854,7 +14885,7 @@ const DatePicker = (props) => {
 };
 DatePicker.defaultProps = defaultProps$V;
 DatePicker.displayName = "NutDatePicker";
-const FormItemContext = createContext({});
+const Context = createContext({});
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function(target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -15910,13 +15941,15 @@ Schema.messages = messages;
 Schema.validators = validators;
 class FormStore {
   constructor() {
-    __publicField(this, "store", {});
+    // 初始化数据
+    __publicField(this, "initialValues", {});
     // 存放表单中所有的数据 eg. {password: "ddd",username: "123"}
-    __publicField(this, "fieldEntities", []);
+    __publicField(this, "store", {});
     // 所有的组件实例
-    // 成功和失败的回调
+    __publicField(this, "fieldEntities", []);
+    // 校验成功或失败的回调，onFinish、onFinishFailed
     __publicField(this, "callbacks", {});
-    __publicField(this, "errList", []);
+    __publicField(this, "errors", []);
     /**
      * 注册组件实例
      * @param field
@@ -15925,11 +15958,29 @@ class FormStore {
       this.fieldEntities.push(field);
       return () => {
         this.fieldEntities = this.fieldEntities.filter((item) => item != field);
-        delete this.store[field.props.name];
+        if (this.store) {
+          delete this.store[field.props.name];
+        }
       };
     });
+    /**
+     * 获取 formItem 的值
+     * @param name
+     */
     __publicField(this, "getFieldValue", (name) => {
-      return this.store[name];
+      var _a2;
+      return (_a2 = this.store) == null ? void 0 : _a2[name];
+    });
+    /**
+     * 设置 form 的初始值，之后在 reset 的时候使用
+     * @param values
+     * @param init
+     */
+    __publicField(this, "setInitialValues", (values, init) => {
+      if (init) {
+        this.initialValues = values;
+        this.store = values;
+      }
     });
     /**
      * 存储组件数据
@@ -15944,34 +15995,28 @@ class FormStore {
         const { name } = enetity.props;
         Object.keys(newStore).forEach((key) => {
           if (key === name) {
-            enetity.onStoreChange();
+            enetity.onStoreChange("update");
           }
         });
       });
     });
-    /**
-     * 表单校验
-     * rules: { required: true, message: '' }
-     * descriptor: {
-     *    username: {
-     *      type: 'string',
-     *      required: true,
-     *      validator: (rule, value) => {
-     *        return /^[a-zA-Z0-9]+$/.test(value)
-     *      },
-     *    },
-     *  }
-     */
+    __publicField(this, "setCallback", (callback) => {
+      this.callbacks = {
+        ...this.callbacks,
+        ...callback
+      };
+    });
     __publicField(this, "validate", () => {
       const err = [];
-      this.errList.length = 0;
+      this.errors.length = 0;
       this.fieldEntities.forEach((entity) => {
+        var _a2;
         const { name, rules: rules2 = [] } = entity.props;
         const descriptor = {};
         if (rules2.length) {
           if (rules2.length > 1) {
             descriptor[name] = [];
-            rules2.map((v) => {
+            rules2.forEach((v) => {
               descriptor[name].push(v);
             });
           } else {
@@ -15979,39 +16024,36 @@ class FormStore {
           }
         }
         const validator = new Schema(descriptor);
-        validator.validate({ [name]: this.store[name] }, (errors) => {
+        validator.messages();
+        validator.validate({ [name]: (_a2 = this.store) == null ? void 0 : _a2[name] }, (errors) => {
           if (errors) {
             err.push(...errors);
-            this.errList.push(...errors);
+            this.errors.push(...errors);
           }
-          entity.onStoreChange();
+          entity.onStoreChange("validate");
         });
       });
       return err;
     });
-    __publicField(this, "setCallback", (callback) => {
-      this.callbacks = {
-        ...this.callbacks,
-        ...callback
-      };
-    });
     __publicField(this, "submit", () => {
       var _a2, _b, _c, _d;
-      const err = this.validate();
-      if (err.length === 0) {
+      const errors = this.validate();
+      if (errors.length === 0) {
         (_b = (_a2 = this.callbacks).onFinish) == null ? void 0 : _b.call(_a2, this.store);
-      } else if (err.length > 0) {
-        (_d = (_c = this.callbacks).onFinishFailed) == null ? void 0 : _d.call(_c, err);
+      } else if (errors.length > 0) {
+        (_d = (_c = this.callbacks).onFinishFailed) == null ? void 0 : _d.call(_c, this.store, errors);
       }
     });
     __publicField(this, "resetFields", () => {
-      this.errList.length = 0;
-      this.fieldEntities.forEach((enetity) => {
-        enetity.onStoreChange();
+      this.errors.length = 0;
+      this.store = this.initialValues;
+      this.fieldEntities.forEach((entity) => {
+        entity.onStoreChange("reset");
       });
     });
     __publicField(this, "getForm", () => {
       return {
+        setInitialValues: this.setInitialValues,
         setCallback: this.setCallback,
         registerField: this.registerField,
         getFieldValue: this.getFieldValue,
@@ -16019,12 +16061,12 @@ class FormStore {
         resetFields: this.resetFields,
         submit: this.submit,
         store: this.store,
-        errList: this.errList,
+        errors: this.errors,
         fieldEntities: this.fieldEntities
       };
     });
     this.callbacks = {
-      onFinish: (value) => {
+      onFinish: () => {
       },
       onFinishFailed: () => {
       }
@@ -16043,98 +16085,113 @@ const useForm = (form) => {
   }
   return [formRef.current];
 };
+function isForwardRefComponent(component) {
+  return component.type && component.type.$$typeof && // eslint-disable-next-line react/display-name
+  React__default.forwardRef(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    () => {
+    }
+  ).$$typeof === component.type.$$typeof;
+}
 const defaultProps$U = {
   ...ComponentDefaults,
+  required: false,
   name: "",
   label: "",
-  className: "",
   rules: [{ required: false, message: "" }],
-  disabled: false,
-  labelWidth: 90,
-  errorMessageAlign: "left",
-  showErrorLine: true,
-  showErrorMessage: true,
-  initialValue: ""
+  errorMessageAlign: "left"
 };
 class FormItem extends React__default.Component {
-  constructor() {
-    super(...arguments);
+  constructor(props) {
+    super(props);
     __publicField(this, "cancelRegister");
-    __publicField(this, "isInitialValue", false);
+    __publicField(this, "componentRef");
     // children添加value属性和onChange事件
     __publicField(this, "getControlled", (children) => {
-      var _a2, _b;
-      const { getFieldValue, setFieldsValue } = this.context;
+      var _a2;
+      const { setFieldsValue, getFieldValue } = this.context;
       const { name } = this.props;
-      const type4 = children.type.NAME;
-      const defaultvalue = this.props.initialValue || ((_a2 = children.props) == null ? void 0 : _a2.defaultValue) || ((_b = children.props) == null ? void 0 : _b.value);
-      if (defaultvalue && !this.isInitialValue) {
-        setFieldsValue({ [name]: defaultvalue });
-        this.isInitialValue = true;
-      }
-      return {
-        value: getFieldValue(name),
-        defaultValue: getFieldValue(name),
-        onChange: (event) => {
-          const originOnChange = children.props.onChange;
+      if ((_a2 = children == null ? void 0 : children.props) == null ? void 0 : _a2.defaultValue) {
+        console.warn("通过 initialValue 设置初始值");
+      }
+      const controlled = {
+        ...children.props,
+        [this.props.valuePropName || "value"]: getFieldValue(name) || this.props.initialValue,
+        [this.props.trigger || "onChange"]: (...args) => {
+          const originOnChange = children.props[this.props.trigger || "onChange"];
           if (originOnChange) {
-            originOnChange(event);
+            originOnChange(...args);
           }
-          let newValue = event;
-          switch (type4) {
-            case "checkbox":
-              newValue = event.target.value;
-              break;
+          let [next] = args;
+          if (this.props.getValueFromEvent) {
+            next = this.props.getValueFromEvent(...args);
           }
-          setFieldsValue({ [name]: newValue });
+          setFieldsValue({ [name]: next });
         }
       };
+      if (isForwardRefComponent(children)) {
+        controlled.ref = (componentInstance) => {
+          const originRef = children.ref;
+          if (originRef) {
+            if (typeof originRef === "function") {
+              originRef(componentInstance);
+            }
+            if ("current" in originRef) {
+              originRef.current = componentInstance;
+            }
+          }
+          this.componentRef = componentInstance;
+        };
+      }
+      return controlled;
+    });
+    __publicField(this, "refresh", () => {
+      this.setState(({ resetCount }) => ({
+        resetCount: resetCount + 1
+      }));
     });
-    __publicField(this, "onStoreChange", () => {
-      this.forceUpdate();
+    __publicField(this, "onStoreChange", (type4) => {
+      if (type4 === "reset") {
+        this.refresh();
+      } else {
+        this.forceUpdate();
+      }
     });
     __publicField(this, "renderLayout", (childNode) => {
       var _a2, _b;
-      const {
-        label,
-        name,
-        rules: rules2 = [{ required: false, message: "" }],
-        className,
-        labelWidth,
-        errorMessageAlign,
-        showErrorLine,
-        showErrorMessage
-      } = {
+      const { label, name, required: required4, className, style, errorMessageAlign } = {
         ...defaultProps$U,
         ...this.props
       };
-      const item = ((_a2 = this.context.errList) == null ? void 0 : _a2.length) > 0 && ((_b = this.context.errList) == null ? void 0 : _b.filter((item2) => {
+      const item = ((_a2 = this.context.errors) == null ? void 0 : _a2.length) > 0 && ((_b = this.context.errors) == null ? void 0 : _b.filter((item2) => {
         return item2.field === name;
       }));
-      const { starPositon } = this.context;
-      const renderStar = rules2.length > 0 && rules2[0].required && /* @__PURE__ */ React__default.createElement("i", { className: "required" });
-      const renderLabel = starPositon === "Right" ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, label, renderStar) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, renderStar, label);
-      return /* @__PURE__ */ React__default.createElement(Cell, { className: `nut-form-item ${className}` }, label ? /* @__PURE__ */ React__default.createElement(
-        "div",
-        {
-          className: "nut-cell__title nut-form-item__label",
-          style: {
-            width: this.pxCheck(labelWidth)
-          }
-        },
-        renderLabel
-      ) : null, /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-form-item__body__slots" }, childNode), item.length > 0 && /* @__PURE__ */ React__default.createElement(
-        "div",
+      const { starPosition } = this.context;
+      const renderStar = required4 && /* @__PURE__ */ React__default.createElement("i", { className: "required" });
+      const renderLabel = /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, starPosition === "left" ? renderStar : null, label, starPosition === "right" ? renderStar : null);
+      return /* @__PURE__ */ React__default.createElement(
+        Cell,
         {
-          className: "nut-form-item__body__tips",
-          style: { textAlign: errorMessageAlign }
+          className: `nut-form-item ${className}`,
+          style,
+          onClick: (e) => this.props.onClick && this.props.onClick(e, this.componentRef)
         },
-        item[0].message
-      )));
-    });
-    __publicField(this, "pxCheck", (value) => {
-      return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
+        label ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell__title nut-form-item__label" }, renderLabel) : null,
+        /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-form-item__body__slots" }, childNode), item.length > 0 && /* @__PURE__ */ React__default.createElement(
+          "div",
+          {
+            className: "nut-form-item__body__tips",
+            style: { textAlign: errorMessageAlign }
+          },
+          item[0].message
+        ))
+      );
     });
+    this.componentRef = React__default.createRef();
+    this.state = {
+      resetCount: 1
+    };
   }
   componentDidMount() {
     this.cancelRegister = this.context.registerField(this);
@@ -16145,81 +16202,86 @@ class FormItem extends React__default.Component {
     }
   }
   render() {
-    const { children, initialValue } = this.props;
-    const c = Array.isArray(children) ? children[0] : children;
-    let restCNode = c;
-    if (initialValue) {
-      restCNode = React__default.cloneElement(c, {
-        defaultValue: initialValue
-      });
-    }
+    const { children } = this.props;
+    const child = Array.isArray(children) ? children[0] : children;
     const returnChildNode = React__default.cloneElement(
-      restCNode,
-      this.getControlled(restCNode)
+      child,
+      this.getControlled(child)
     );
-    return this.renderLayout(returnChildNode);
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, { key: this.state.resetCount }, this.renderLayout(returnChildNode));
   }
 }
 __publicField(FormItem, "defaultProps", defaultProps$U);
-__publicField(FormItem, "contextType", FormItemContext);
+__publicField(FormItem, "contextType", Context);
 const defaultProps$T = {
   ...ComponentDefaults,
-  className: "",
-  style: void 0,
-  form: {},
-  labelPosition: "Right",
-  formGroupTitle: "",
-  onFinish: (obj) => {
-  },
-  onFinishFailed: (value) => {
+  labelPosition: "right",
+  starPosition: "left",
+  onFinish: (values) => {
   },
-  starPositon: "Left"
+  onFinishFailed: (values, errorFields) => {
+  }
 };
 const PositionInfo = {
-  Top: "form-layout-top",
-  Left: "form-layout-left",
-  Right: "form-layout-right"
+  top: "form-layout-top",
+  left: "form-layout-left",
+  right: "form-layout-right"
 };
 const Form = (props) => {
+  const classPrefix2 = "nut-form";
   const {
+    className,
+    style,
+    footer,
     children,
+    initialValues,
     onFinish,
     onFinishFailed,
     labelPosition,
-    starPositon,
-    form,
-    ...rest
+    starPosition,
+    form
   } = {
     ...defaultProps$T,
     ...props
   };
-  let formInstance = {};
-  if (Object.keys(form).length !== 0) {
+  let formInstance;
+  if (form !== void 0) {
     formInstance = form;
   } else {
     [formInstance] = useForm();
   }
-  formInstance.starPositon = starPositon;
-  const { setCallback, submit, resetFields } = formInstance;
+  formInstance.starPosition = starPosition;
+  const { setCallback, submit, resetFields, setInitialValues } = formInstance;
   setCallback({
     onFinish,
     onFinishFailed
   });
+  const mountRef = React__default.useRef(false);
+  setInitialValues(initialValues, !mountRef.current);
+  if (!mountRef.current) {
+    mountRef.current = true;
+  }
   return /* @__PURE__ */ React__default.createElement(
     "form",
     {
-      className: `nut-form ${PositionInfo[labelPosition]} ${props.className}`,
-      style: props.style,
+      className: classNames(
+        classPrefix2,
+        className,
+        PositionInfo[labelPosition]
+      ),
+      style,
       onSubmit: (e) => {
         e.preventDefault();
+        e.stopPropagation();
         submit();
       },
       onReset: (e) => {
         e.preventDefault();
+        e.stopPropagation();
         resetFields();
       }
     },
-    /* @__PURE__ */ React__default.createElement(CellGroup, null, /* @__PURE__ */ React__default.createElement(FormItemContext.Provider, { value: formInstance }, children))
+    /* @__PURE__ */ React__default.createElement(CellGroup, null, /* @__PURE__ */ React__default.createElement(Context.Provider, { value: formInstance }, children), footer ? /* @__PURE__ */ React__default.createElement(Cell, null, footer) : null)
   );
 };
 Form.defaultProps = defaultProps$T;
@@ -16435,7 +16497,7 @@ const defaultProps$R = {
   disabled: false,
   min: 1,
   max: 9999,
-  readonly: false,
+  readOnly: false,
   allowEmpty: false,
   defaultValue: 0,
   step: 1,
@@ -16449,7 +16511,7 @@ const InputNumber = (props) => {
     disabled,
     min,
     max,
-    readonly,
+    readOnly,
     value,
     defaultValue,
     allowEmpty,
@@ -16608,14 +16670,14 @@ const InputNumber = (props) => {
   const focusValue = (e) => {
     if (disabled)
       return;
-    if (readonly)
+    if (readOnly)
       return;
     onFocus && onFocus(e);
   };
   const burValue = (e) => {
     if (disabled)
       return;
-    if (readonly)
+    if (readOnly)
       return;
     const input = e.target;
     let value2 = input.valueAsNumber;
@@ -16643,7 +16705,7 @@ const InputNumber = (props) => {
       min,
       max,
       disabled,
-      readOnly: readonly,
+      readOnly,
       value: _checked,
       onInput: changeFormatValue,
       onBlur: burFormatValue,
@@ -16656,7 +16718,7 @@ const InputNumber = (props) => {
       min,
       max,
       disabled,
-      readOnly: readonly,
+      readOnly,
       value: _checked,
       onInput: changeValue,
       onBlur: burValue,
@@ -17848,7 +17910,7 @@ const SearchBar = (props) => {
     return /* @__PURE__ */ React__default.createElement(
       "input",
       {
-        className: `${classPrefix2}__input ${shape === "round" ? `${classPrefix2}__round` : ""} ${clearable ? `${classPrefix2}__input-clear` : ""}`,
+        className: `${classPrefix2}__input ${clearable ? `${classPrefix2}__input-clear` : ""}`,
         ref: searchRef,
         style: { ...props.style },
         value: value || "",
@@ -17921,7 +17983,16 @@ const SearchBar = (props) => {
       style: { ...props.style }
     },
     renderLeft(),
-    /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__content` }, renderLeftIn(), renderField(), renderRightIn(), clearable && value && handleClear()),
+    /* @__PURE__ */ React__default.createElement(
+      "div",
+      {
+        className: `${classPrefix2}__content ${shape === "round" ? `${classPrefix2}__round` : ""}`
+      },
+      renderLeftIn(),
+      renderField(),
+      renderRightIn(),
+      clearable && value && handleClear()
+    ),
     renderRight()
   );
 };
@@ -20329,7 +20400,7 @@ const Popover = (props) => {
     return styles;
   };
   const getRootPosition = () => {
-    let styles = {};
+    const styles = {};
     if (!rootPosition)
       return {};
     const contentWidth = elWidth;
@@ -20339,34 +20410,34 @@ const Popover = (props) => {
     const skew = location.split("-")[1];
     let cross = 0;
     let parallel = 0;
-    if (Array.isArray(offset) && offset.length == 2) {
+    if (Array.isArray(offset) && offset.length === 2) {
       cross += +offset[1];
       parallel += +offset[0];
     }
     if (width) {
       if (["bottom", "top"].includes(direction)) {
-        const h = direction == "bottom" ? height + cross : -(contentHeight + cross);
+        const h = direction === "bottom" ? height + cross : -(contentHeight + cross);
         styles.top = `${top + h}px`;
         if (!skew) {
           styles.left = `${-(contentWidth - width) / 2 + left + parallel}px`;
         }
-        if (skew == "start") {
+        if (skew === "start") {
           styles.left = `${left + parallel}px`;
         }
-        if (skew == "end") {
+        if (skew === "end") {
           styles.left = `${right + parallel}px`;
         }
       }
       if (["left", "right"].includes(direction)) {
-        const contentW = direction == "left" ? -(contentWidth + cross) : width + cross;
+        const contentW = direction === "left" ? -(contentWidth + cross) : width + cross;
         styles.left = `${left + contentW}px`;
         if (!skew) {
           styles.top = `${top - contentHeight / 2 + height / 2 - 4 + parallel}px`;
         }
-        if (skew == "start") {
+        if (skew === "start") {
           styles.top = `${top + parallel}px`;
         }
-        if (skew == "end") {
+        if (skew === "end") {
           styles.top = `${top + height + parallel}px`;
         }
       }
@@ -20818,7 +20889,7 @@ const defaultProps$s = {
   name: ""
 };
 const Swipe = forwardRef((props, instanceRef) => {
-  const swipeBem = cn("swipe");
+  const classPrefix2 = "nut-swipe";
   const touch = useTouch();
   const { children, className, style } = { ...defaultProps$s, ...props };
   const root2 = useRef();
@@ -20939,7 +21010,7 @@ const Swipe = forwardRef((props, instanceRef) => {
         "div",
         {
           ref: measuredRef,
-          className: `${swipeBem(side)}`,
+          className: `${classPrefix2}__${side}`,
           onClick: (e) => handleOperate(e, side)
         },
         props[`${side}Action`]
@@ -20979,13 +21050,13 @@ const Swipe = forwardRef((props, instanceRef) => {
     "div",
     {
       ref: root2,
-      className: classNames(swipeBem(), className),
+      className: classNames(classPrefix2, className),
       onTouchStart: (e) => onTouchStart(e),
       onTouchMove: (e) => onTouchMove(e),
       onTouchEnd: (e) => onTouchEnd(e),
       style
     },
-    /* @__PURE__ */ React__default.createElement("div", { className: `${swipeBem("wrapper")}`, style: wrapperStyle }, renderActionContent("left", leftRef), children, renderActionContent("right", rightRef))
+    /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__wrapper`, style: wrapperStyle }, renderActionContent("left", leftRef), children, renderActionContent("right", rightRef))
   );
 });
 Swipe.defaultProps = defaultProps$s;