@nutui/nutui-react 2.0.0-alpha.1 → 2.0.0-alpha.10

package/dist/esm/Cascader.js

@@ -47,12 +47,11 @@ import React__default, { isValidElement, useState, useEffect } from "react";
 import classNames from "classnames";
 import Popup from "./Popup.js";
 import { T as Tabs } from "./tabs2.js";
-import { T as TabPane } from "./tabpane2.js";
 import { Loading, Checklist } from "@nutui/icons-react";
-import { c as cn } from "./bem.js";
-import "./typings.js";
+import { C as ComponentDefaults } from "./typings.js";
+import { u as usePropsValue } from "./use-props-value.js";
 import "./TabPane.js";
-import "@bem-react/classname";
+import "./raf.js";
 var defaultProps$1 = {
   data: {
     text: "",
@@ -64,25 +63,25 @@ var defaultProps$1 = {
   },
   activeColor: "",
   checked: false,
-  checkedIcon: "checklist",
+  activeIcon: "checklist",
   chooseItem: function chooseItem() {
   }
 };
 var InternalCascaderItem = function InternalCascaderItem2(props, ref) {
-  var _defaultProps$1$props = _objectSpread(_objectSpread({}, defaultProps$1), props), data = _defaultProps$1$props.data, checked = _defaultProps$1$props.checked, checkedIcon = _defaultProps$1$props.checkedIcon, chooseItem2 = _defaultProps$1$props.chooseItem, activeColor = _defaultProps$1$props.activeColor;
-  var b = cn("cascader-item");
+  var _defaultProps$1$props = _objectSpread(_objectSpread({}, defaultProps$1), props), data = _defaultProps$1$props.data, checked = _defaultProps$1$props.checked, activeIcon = _defaultProps$1$props.activeIcon, chooseItem2 = _defaultProps$1$props.chooseItem, activeColor = _defaultProps$1$props.activeColor;
+  var classPrefix = "nut-cascader-item";
   var classes = classNames({
     active: checked,
     disabled: data.disabled
-  }, b(""));
-  var classesTitle = classNames(_defineProperty({}, "".concat(b(""), "__title"), true));
+  }, classPrefix);
+  var classesTitle = classNames(_defineProperty({}, "".concat(classPrefix, "__title"), true));
   var renderIcon = function renderIcon2() {
     if (checked) {
-      if (isValidElement(checkedIcon)) {
-        return checkedIcon;
+      if (isValidElement(activeIcon)) {
+        return activeIcon;
       }
       return React__default.createElement(Checklist, {
-        className: "".concat(checked ? b("icon-check") : "")
+        className: "".concat(checked ? "".concat(classPrefix, "__icon-check") : "")
       });
     }
     return null;
@@ -242,26 +241,24 @@ var Tree = /* @__PURE__ */ function() {
   return Tree2;
 }();
 var Tree$1 = Tree;
-var defaultProps = _objectSpread({
-  className: "",
-  style: {},
+var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   activeColor: "",
-  checkedIcon: "checklist",
-  tabsColor: "",
-  poppable: true,
+  activeIcon: "checklist",
+  popup: true,
   visible: false,
   options: [],
-  value: [],
   title: "",
-  textKey: "text",
-  valueKey: "value",
-  childrenKey: "children",
-  convertConfig: {},
+  optionKey: {
+    textKey: "text",
+    valueKey: "value",
+    childrenKey: "children"
+  },
+  format: {},
   closeable: false,
   closeIconPosition: "top-right",
   closeIcon: "close",
   lazy: false,
-  lazyLoad: function lazyLoad() {
+  onLoad: function onLoad() {
   },
   onClose: function onClose() {
   },
@@ -269,14 +266,23 @@ var defaultProps = _objectSpread({
   },
   onPathChange: function onPathChange() {
   }
-}, Popup.defaultProps);
+});
 var InternalCascader = function InternalCascader2(props, ref) {
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, style = _defaultProps$props.style, tabsColor = _defaultProps$props.tabsColor, poppable = _defaultProps$props.poppable, visible = _defaultProps$props.visible, options = _defaultProps$props.options, value = _defaultProps$props.value, title = _defaultProps$props.title, textKey = _defaultProps$props.textKey, valueKey = _defaultProps$props.valueKey, childrenKey = _defaultProps$props.childrenKey, convertConfig = _defaultProps$props.convertConfig, closeable = _defaultProps$props.closeable, closeIconPosition = _defaultProps$props.closeIconPosition, closeIcon = _defaultProps$props.closeIcon, lazy = _defaultProps$props.lazy, lazyLoad2 = _defaultProps$props.lazyLoad, onClose2 = _defaultProps$props.onClose, onChange2 = _defaultProps$props.onChange, onPathChange2 = _defaultProps$props.onPathChange;
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, style = _defaultProps$props.style, popup = _defaultProps$props.popup, visible = _defaultProps$props.visible, options = _defaultProps$props.options, value = _defaultProps$props.value, defaultValue = _defaultProps$props.defaultValue, title = _defaultProps$props.title, optionKey = _defaultProps$props.optionKey, format = _defaultProps$props.format, closeable = _defaultProps$props.closeable, closeIconPosition = _defaultProps$props.closeIconPosition, closeIcon = _defaultProps$props.closeIcon, lazy = _defaultProps$props.lazy, onLoad2 = _defaultProps$props.onLoad, onClose2 = _defaultProps$props.onClose, onChange2 = _defaultProps$props.onChange, onPathChange2 = _defaultProps$props.onPathChange;
   var _useState = useState("c1"), _useState2 = _slicedToArray(_useState, 2), tabvalue = _useState2[0], setTabvalue = _useState2[1];
   var _useState3 = useState([]), _useState4 = _slicedToArray(_useState3, 2), optionsData = _useState4[0], setOptionsData = _useState4[1];
   var isLazy = function isLazy2() {
-    return state.configs.lazy && Boolean(state.configs.lazyLoad);
+    return state.configs.lazy && Boolean(state.configs.onLoad);
   };
+  var _usePropsValue = usePropsValue({
+    value,
+    defaultValue,
+    finalValue: defaultValue,
+    onChange: function onChange3(val) {
+      var _props$onChange;
+      (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, val);
+    }
+  }), _usePropsValue2 = _slicedToArray(_usePropsValue, 2), innerValue = _usePropsValue2[0], setInnerValue = _usePropsValue2[1];
   var _useState5 = useState({
     optionsData: [],
     panes: [{
@@ -284,35 +290,28 @@ var InternalCascader = function InternalCascader2(props, ref) {
       selectedNode: [],
       paneKey: ""
     }],
-    innerValue: value,
     tree: new Tree$1([], {}),
     tabsCursor: 0,
     initLoading: false,
     currentProcessNode: [],
     configs: {
       lazy,
-      lazyLoad: lazyLoad2,
-      valueKey,
-      textKey,
-      childrenKey,
-      convertConfig
+      onLoad: onLoad2,
+      optionKey,
+      format
     },
     lazyLoadMap: /* @__PURE__ */ new Map()
   }), _useState6 = _slicedToArray(_useState5, 1), state = _useState6[0];
-  var b = cn("cascader");
-  var classes = classNames(b(""));
-  var classesPane = classNames(_defineProperty({}, "".concat(b(""), "-pane"), true));
+  var classPrefix = classNames("nut-cascader");
+  var classesPane = classNames(_defineProperty({}, "".concat(classPrefix, "-pane"), true));
   useEffect(function() {
     initData();
-  }, []);
+  }, [options, format]);
   useEffect(function() {
-    if (value !== state.innerValue) {
-      state.innerValue = value;
+    if (defaultValue && defaultValue !== innerValue) {
+      setInnerValue(defaultValue);
     }
-  }, [value]);
-  useEffect(function() {
-    initData();
-  }, [options]);
+  }, [defaultValue]);
   var initData = /* @__PURE__ */ function() {
     var _ref = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime.mark(function _callee() {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -320,15 +319,15 @@ var InternalCascader = function InternalCascader2(props, ref) {
           switch (_context.prev = _context.next) {
             case 0:
               state.lazyLoadMap.clear();
-              if (convertConfig && Object.keys(convertConfig).length > 0) {
-                state.optionsData = convertListToOptions(options, convertConfig);
+              if (format && Object.keys(format).length > 0) {
+                state.optionsData = convertListToOptions(options, format);
               } else {
                 state.optionsData = options;
               }
               state.tree = new Tree$1(state.optionsData, {
-                value: state.configs.valueKey,
-                text: state.configs.textKey,
-                children: state.configs.childrenKey
+                value: state.configs.optionKey.valueKey,
+                text: state.configs.optionKey.textKey,
+                children: state.configs.optionKey.childrenKey
               });
               if (!(isLazy() && !state.tree.nodes.length)) {
                 _context.next = 6;
@@ -366,8 +365,8 @@ var InternalCascader = function InternalCascader2(props, ref) {
         while (1)
           switch (_context3.prev = _context3.next) {
             case 0:
-              currentValue = state.innerValue;
-              if (!(currentValue === void 0 || !state.tree.nodes.length)) {
+              currentValue = innerValue;
+              if (!(currentValue === void 0 || currentValue !== defaultValue || !state.tree.nodes.length)) {
                 _context3.next = 3;
                 break;
               }
@@ -435,7 +434,7 @@ var InternalCascader = function InternalCascader2(props, ref) {
             case 18:
               state.initLoading = false;
             case 19:
-              if (needToSync.length && currentValue === value) {
+              if (needToSync.length && currentValue === defaultValue) {
                 pathNodes = state.tree.getPathNodesByValue(needToSync);
                 pathNodes.forEach(function(node, index) {
                   state.tabsCursor = index;
@@ -465,7 +464,7 @@ var InternalCascader = function InternalCascader2(props, ref) {
               }
               return _context4.abrupt("return");
             case 2:
-              if (state.configs.lazyLoad) {
+              if (state.configs.onLoad) {
                 _context4.next = 5;
                 break;
               }
@@ -483,8 +482,8 @@ var InternalCascader = function InternalCascader2(props, ref) {
               lazyLoadPromise = state.lazyLoadMap.get(node);
               if (!lazyLoadPromise) {
                 lazyLoadPromise = new Promise(function(resolve) {
-                  var _state$configs$lazyLo, _state$configs;
-                  (_state$configs$lazyLo = (_state$configs = state.configs).lazyLoad) === null || _state$configs$lazyLo === void 0 ? void 0 : _state$configs$lazyLo.call(_state$configs, node, resolve);
+                  var _state$configs$onLoad, _state$configs;
+                  (_state$configs$onLoad = (_state$configs = state.configs).onLoad) === null || _state$configs$onLoad === void 0 ? void 0 : _state$configs$onLoad.call(_state$configs, node, resolve);
                 });
                 state.lazyLoadMap.set(node, lazyLoadPromise);
               }
@@ -544,6 +543,7 @@ var InternalCascader = function InternalCascader2(props, ref) {
                 });
                 onChange2(optionParams, pathNodes);
                 onPathChange2(optionParams, pathNodes);
+                setInnerValue(optionParams);
               }
               setOptionsData(state.panes);
               close();
@@ -562,8 +562,8 @@ var InternalCascader = function InternalCascader2(props, ref) {
                 selectedNode: null,
                 paneKey: "c".concat(state.tabsCursor + 1)
               });
-              setTabvalue("c".concat(state.tabsCursor + 1));
               setOptionsData(state.panes);
+              setTabvalue("c".concat(state.tabsCursor + 1));
               if (!type) {
                 _pathNodes = state.panes.map(function(item) {
                   return item.selectedNode;
@@ -602,13 +602,13 @@ var InternalCascader = function InternalCascader2(props, ref) {
   }();
   var renderItem = function renderItem2() {
     return React__default.createElement("div", {
-      className: "".concat(classes, " ").concat(className),
+      className: "".concat(classPrefix, " ").concat(className),
       style
-    }, poppable && React__default.createElement("div", {
-      className: b("title")
+    }, popup && React__default.createElement("div", {
+      className: "nut-cascader__title"
     }, title), React__default.createElement(Tabs, {
       value: tabvalue,
-      titleNode: function titleNode() {
+      title: function title2() {
         return optionsData.map(function(pane, index) {
           var _pane$selectedNode, _pane$selectedNode2;
           return React__default.createElement("div", {
@@ -616,22 +616,19 @@ var InternalCascader = function InternalCascader2(props, ref) {
               setTabvalue(pane.paneKey);
               state.tabsCursor = index;
             },
-            className: "nut-tabs__titles-item ".concat(tabvalue === pane.paneKey ? "active" : ""),
+            className: "nut-tabs__titles-item ".concat(tabvalue === pane.paneKey ? "nut-tabs__titles-item--active" : ""),
             key: pane.paneKey
           }, React__default.createElement("span", {
             className: "nut-tabs__titles-item__text"
           }, !state.initLoading && state.panes.length && (pane === null || pane === void 0 ? void 0 : (_pane$selectedNode = pane.selectedNode) === null || _pane$selectedNode === void 0 ? void 0 : _pane$selectedNode.text), !state.initLoading && state.panes.length && !(pane !== null && pane !== void 0 && (_pane$selectedNode2 = pane.selectedNode) !== null && _pane$selectedNode2 !== void 0 && _pane$selectedNode2.text) && "请选择", !(!state.initLoading && state.panes.length) && "Loading..."), React__default.createElement("span", {
-            className: "nut-tabs__titles-item__line",
-            style: {
-              background: tabsColor
-            }
+            className: "nut-tabs__titles-item__line"
           }));
         });
       }
     }, !state.initLoading && state.panes.length ? optionsData.map(function(pane) {
-      return React__default.createElement(TabPane, {
+      return React__default.createElement(Tabs.TabPane, {
         key: pane.paneKey,
-        paneKey: pane.paneKey
+        value: pane.paneKey
       }, React__default.createElement("div", {
         className: classesPane
       }, pane.nodes && pane.nodes.map(function(node, index) {
@@ -646,18 +643,19 @@ var InternalCascader = function InternalCascader2(props, ref) {
           }
         }));
       })));
-    }) : React__default.createElement(TabPane, null, React__default.createElement("div", {
+    }) : React__default.createElement(Tabs.TabPane, null, React__default.createElement("div", {
       className: classesPane
     }))));
   };
-  return React__default.createElement(React__default.Fragment, null, poppable ? React__default.createElement(Popup, {
-    className: "cascadar-popup",
+  return React__default.createElement(React__default.Fragment, null, popup ? React__default.createElement(Popup, {
+    // className="nut-cascadar-popup"
     visible,
     position: "bottom",
     round: true,
     closeIcon,
     closeable,
     closeIconPosition,
+    // todo 只关闭，不处理逻辑。和popup的逻辑不一致。关闭时需要增加是否要处理回调
     onClickOverlay: closePopup,
     onClickCloseIcon: closePopup
   }, renderItem()) : renderItem());

package/dist/esm/Checkbox.js

@@ -1,9 +1,8 @@
 import { C as Checkbox } from "./checkbox2.js";
 import "react";
 import "@nutui/icons-react";
+import "classnames";
 import "./CheckboxGroup.js";
-import "./bem.js";
-import "@bem-react/classname";
 import "./typings.js";
 import "./use-props-value.js";
 export {

package/dist/esm/CheckboxGroup.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["className", "disabled", "onChange", "value", "defaultValue", "max", "textPosition", "direction", "options"], _excluded2 = ["label", "value", "disabled", "onChange"];
+var _excluded = ["className", "disabled", "onChange", "value", "defaultValue", "max", "labelPosition", "direction", "options"], _excluded2 = ["label", "value", "disabled", "onChange"];
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
   if (Object.getOwnPropertySymbols) {
@@ -25,52 +25,51 @@ function _objectSpread(target) {
   return target;
 }
 import React__default, { useImperativeHandle, useCallback } from "react";
-import { c as cn } from "./bem.js";
+import classNames from "classnames";
 import { C as Checkbox, a as Context } from "./checkbox2.js";
 import { u as usePropsValue } from "./use-props-value.js";
-import "@bem-react/classname";
 import "@nutui/icons-react";
 import "./CheckboxGroup.js";
 import "./typings.js";
 var defaultProps = {
-  disabled: false,
   max: void 0,
-  textPosition: "right",
+  labelPosition: "right",
   direction: "vertical",
   onChange: function onChange(value) {
   },
   options: []
 };
+var classPrefix = "nut-checkboxgroup";
 var CheckboxGroup = React__default.forwardRef(function(props, ref) {
+  var _classNames;
   var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children;
-  var b = cn("checkboxgroup");
-  var className = props.className, disabled = props.disabled, onChange2 = props.onChange, value = props.value, defaultValue = props.defaultValue, max = props.max, textPosition = props.textPosition, direction = props.direction, options = props.options, rest = _objectWithoutProperties(props, _excluded);
+  var className = props.className, disabled = props.disabled, onChange2 = props.onChange, value = props.value, defaultValue = props.defaultValue, max = props.max, labelPosition = props.labelPosition, direction = props.direction, options = props.options, rest = _objectWithoutProperties(props, _excluded);
   useImperativeHandle(ref, function() {
     return {
-      toggleAll: function toggleAll(state) {
+      toggle: function toggle(state) {
         if (state === false) {
           setValue([]);
         } else {
           var childrenLabel = [];
           React__default.Children.map(children, function(child) {
             var childProps = child.props;
-            childrenLabel.push(childProps.label || child.children);
+            childrenLabel.push(childProps.value);
           });
           setValue(childrenLabel);
         }
       },
-      toggleReverse: function toggleReverse() {
+      reverse: function reverse() {
         var childrenLabel = [];
         React__default.Children.map(children, function(child) {
           var childProps = child.props;
-          childrenLabel.push(childProps.label || child.children);
+          childrenLabel.push(childProps.value);
         });
-        var reverse = childrenLabel.filter(function(c) {
+        var reverse2 = childrenLabel.filter(function(c) {
           return (_value === null || _value === void 0 ? void 0 : _value.findIndex(function(v) {
             return v === c;
           })) === -1;
         });
-        setValue(reverse);
+        setValue(reverse2);
       }
     };
   });
@@ -85,32 +84,31 @@ var CheckboxGroup = React__default.forwardRef(function(props, ref) {
       var label = _ref.label, value2 = _ref.value, disabled2 = _ref.disabled, onChange22 = _ref.onChange, rest2 = _objectWithoutProperties(_ref, _excluded2);
       return React__default.createElement(Checkbox, _objectSpread({
         key: value2 === null || value2 === void 0 ? void 0 : value2.toString(),
-        children: label,
-        label: value2
+        label,
+        disabled: disabled2,
+        value: value2
       }, rest2));
     });
   }, [options, max]);
   return React__default.createElement(Context.Provider, {
     value: {
-      textPosition: textPosition || "left",
+      labelPosition: labelPosition || "right",
       disabled,
       max,
-      checkedValue: _value,
+      value: _value,
       check: function check(value2) {
         var combined = [].concat(_toConsumableArray(_value), [value2]);
         setValue(combined);
-        onChange2 && onChange2(combined);
       },
       uncheck: function uncheck(value2) {
         var reduced = _value.filter(function(item) {
           return item !== value2;
         });
         setValue(reduced);
-        onChange2 && onChange2(reduced);
       }
     }
   }, React__default.createElement("div", _objectSpread({
-    className: "".concat(b(), " nut-checkboxgroup--").concat(props.direction, " ").concat(className || "")
+    className: classNames(classPrefix, (_classNames = {}, _defineProperty(_classNames, "nut-checkboxgroup--".concat(props.direction), props.direction), _defineProperty(_classNames, "className", className), _classNames))
   }, rest), options !== null && options !== void 0 && options.length ? renderOptions() : children));
 });
 CheckboxGroup.defaultProps = defaultProps;

package/dist/esm/CircleProgress.js

@@ -1,6 +1,6 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "progress", "className", "radius", "pathColor", "clockwise", "circleColor", "strokeWidth", "style", "strokeLinecap"];
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["children", "percent", "className", "radius", "clockwise", "strokeWidth", "color", "background", "style", "strokeLinecap"];
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
   if (Object.getOwnPropertySymbols) {
@@ -25,34 +25,33 @@ function _objectSpread(target) {
 import React__default from "react";
 import classNames from "classnames";
 import { a as isObject } from "./index.js";
-import { c as cn } from "./bem.js";
-import "@bem-react/classname";
-var defaultProps = {
+import { C as ComponentDefaults } from "./typings.js";
+var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   strokeWidth: 5,
   radius: 50,
   strokeLinecap: "round",
-  circleColor: "",
-  pathColor: "",
+  color: "#fa2c19",
+  background: "#e5e9f2",
   clockwise: true
-};
+});
+var classPrefix = "nut-circleprogress";
 var CircleProgress = function CircleProgress2(props) {
   var _stop;
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, progress = _defaultProps$props.progress, className = _defaultProps$props.className, radius = _defaultProps$props.radius, pathColor = _defaultProps$props.pathColor, clockwise = _defaultProps$props.clockwise, circleColor = _defaultProps$props.circleColor, strokeWidth = _defaultProps$props.strokeWidth, style = _defaultProps$props.style, strokeLinecap = _defaultProps$props.strokeLinecap, restProps = _objectWithoutProperties(_defaultProps$props, _excluded);
-  var b = cn("circleprogress");
-  var classes = classNames(className, b(""));
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, percent = _defaultProps$props.percent, className = _defaultProps$props.className, radius = _defaultProps$props.radius, clockwise = _defaultProps$props.clockwise, strokeWidth = _defaultProps$props.strokeWidth, color = _defaultProps$props.color, background = _defaultProps$props.background, style = _defaultProps$props.style, strokeLinecap = _defaultProps$props.strokeLinecap, restProps = _objectWithoutProperties(_defaultProps$props, _excluded);
+  var classes = classNames(className, classPrefix);
   var refRandomId = Math.random().toString(36).slice(-8);
   var styles = _objectSpread({
     height: "".concat(Number(radius) * 2, "px"),
     width: "".concat(Number(radius) * 2, "px")
   }, style);
   var pathStyle = {
-    stroke: pathColor
+    stroke: background
   };
   var hoverStyle = function hoverStyle2() {
     var perimeter = 283;
-    var offset = perimeter * Number(progress) / 100;
+    var offset = perimeter * Number(percent) / 100;
     return {
-      stroke: isObject(circleColor) ? "url(#".concat(refRandomId, ")") : circleColor,
+      stroke: isObject(color) ? "url(#".concat(refRandomId, ")") : color,
       strokeDasharray: "".concat(offset, "px ").concat(perimeter, "px")
     };
   };
@@ -60,16 +59,13 @@ var CircleProgress = function CircleProgress2(props) {
     var isWise = clockwise ? 1 : 0;
     return "M 50 50 m -45 0 a 45 45 0 1 ".concat(isWise, " 90 0  a 45 45 0 1 ").concat(isWise, " -90 0");
   };
-  var hoverColor = function hoverColor2() {
-    return isObject(circleColor) ? "url(#".concat(refRandomId, ")") : circleColor;
-  };
   var stop = function stop2() {
-    if (!isObject(circleColor)) {
+    if (!isObject(props.color)) {
       return;
     }
-    var color = circleColor;
-    var colorArr = Object.keys(color).sort(function(a, b2) {
-      return parseFloat(a) - parseFloat(b2);
+    var color2 = props.color;
+    var colorArr = Object.keys(color2).sort(function(a, b) {
+      return parseFloat(a) - parseFloat(b);
     });
     var stopArr = [];
     colorArr.map(function(item) {
@@ -78,7 +74,7 @@ var CircleProgress = function CircleProgress2(props) {
         value: ""
       };
       obj.key = item;
-      obj.value = color[item];
+      obj.value = color2[item];
       stopArr.push(obj);
     });
     return stopArr;
@@ -102,8 +98,8 @@ var CircleProgress = function CircleProgress2(props) {
     });
   }))), React__default.createElement("path", {
     className: "nut-circleprogress-path",
-    style: pathStyle,
     d: path(),
+    style: pathStyle,
     fill: "none",
     strokeWidth
   }), React__default.createElement("path", {
@@ -111,13 +107,12 @@ var CircleProgress = function CircleProgress2(props) {
     style: hoverStyle(),
     d: path(),
     fill: "none",
-    stroke: hoverColor(),
     strokeLinecap,
     transform: "rotate(90,50,50)",
     strokeWidth
   })), React__default.createElement("div", {
     className: "nut-circleprogress-text"
-  }, children || React__default.createElement("div", null, progress, "%")));
+  }, children));
 };
 CircleProgress.defaultProps = defaultProps;
 CircleProgress.displayName = "NutCircleProgress";

package/dist/esm/DatePicker.js

@@ -45,7 +45,7 @@ var DatePicker = function DatePicker2(props) {
   var _useState = useState(false), _useState2 = _slicedToArray(_useState, 2), show = _useState2[0], setShow = _useState2[1];
   var _useState3 = useState(modelValue), _useState4 = _slicedToArray(_useState3, 2), currentDate = _useState4[0], setCurrentDate = _useState4[1];
   var _useState5 = useState([]), _useState6 = _slicedToArray(_useState5, 2), defaultValue = _useState6[0], setDefaultValue = _useState6[1];
-  var _useState7 = useState([]), _useState8 = _slicedToArray(_useState7, 2), listData = _useState8[0], setListData = _useState8[1];
+  var _useState7 = useState([]), _useState8 = _slicedToArray(_useState7, 2), options = _useState8[0], setListData = _useState8[1];
   var pickerRef = useRef(null);
   var isDate = function isDate2(val) {
     return Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
@@ -150,7 +150,7 @@ var DatePicker = function DatePicker2(props) {
     }
     return result;
   };
-  var updateChooseValueCustmer = function updateChooseValueCustmer2(index, selectedValue, cacheValueData) {
+  var updateChooseValueCustmer = function updateChooseValueCustmer2(cacheValueData, selectedValue, index) {
     if (["date", "datetime", "datehour", "month-day", "year-month"].includes(type.toLocaleLowerCase())) {
       var _date;
       var formatDate = [];
@@ -177,7 +177,7 @@ var DatePicker = function DatePicker2(props) {
       var isEqual = (currentDate === null || currentDate === void 0 ? void 0 : currentDate.getTime()) === ((_date = date) === null || _date === void 0 ? void 0 : _date.getTime());
       date && isDate(date) && !isEqual && setCurrentDate(formatValue(date));
     }
-    props.onChange && props.onChange(index, selectedValue, cacheValueData);
+    props.onChange && props.onChange(cacheValueData, selectedValue, index);
   };
   var padZero = function padZero2(num) {
     var targetLength = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 2;
@@ -268,17 +268,17 @@ var DatePicker = function DatePicker2(props) {
   return React__default.createElement("div", _objectSpread({
     className: "nut-datepicker ".concat(className || ""),
     style
-  }, rest), listData.length > 0 && React__default.createElement(Picker, {
+  }, rest), options.length > 0 && React__default.createElement(Picker, {
     title,
     visible: show,
-    listData,
+    options,
     onClose: onCloseDatePicker,
-    defaultValueData: defaultValue,
-    onConfirm: function onConfirm(values, options) {
-      return onConfirmDatePicker && onConfirmDatePicker(values, options);
+    defaultValue,
+    onConfirm: function onConfirm(options2, values) {
+      return onConfirmDatePicker && onConfirmDatePicker(options2, values);
     },
-    onChange: function onChange2(index, value, list) {
-      return updateChooseValueCustmer(index, value, list);
+    onChange: function onChange2(list, value, index) {
+      return updateChooseValueCustmer(list, value, index);
     },
     threeDimensional,
     ref: pickerRef