@chaoswise/ui 2.3.3 → 2.3.4

package/lib/CWRangePicker/index.js

@@ -71,7 +71,9 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _props$format = props.format,
     format = _props$format === void 0 ? "YYYY/MM/DD HH:mm:ss" : _props$format,
     forceRenderTitle = props.forceRenderTitle,
-    open = props.open;
+    open = props.open,
+    _props$rangePickerFor = props.rangePickerFormat,
+    rangePickerFormat = _props$rangePickerFor === void 0 ? "YYYY/MM/DD" : _props$rangePickerFor;
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
     locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
@@ -228,17 +230,20 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       _judgeType4 = _slicedToArray(_judgeType3, 1),
       isRule = _judgeType4[0];
     var isHasDate = !isRule && !recordDateValue.value ? false : true;
-    var _isAutoRefresh = false;
+    var _isAutoRefresh = enableAutoRefresh;
     if (isHasDate) {
       if (!isRecentlyOpenRefresh) {
         if (!isRule) {
           if (enableAutoRefresh) {
             onAutoRefreshChange(false);
+            _isAutoRefresh = false;
           }
         } else {
           if (isRule && isClickAutoRefresh.current) {
-            onAutoRefreshChange(true);
-            _isAutoRefresh = true;
+            if (!enableAutoRefresh) {
+              onAutoRefreshChange(true);
+              _isAutoRefresh = true;
+            }
           }
         }
         isClickAutoRefresh.current = false;
@@ -251,6 +256,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         } else {
           if (enableAutoRefresh) {
             onAutoRefreshChange(false);
+            _isAutoRefresh = false;
           }
         }
       }
@@ -528,7 +534,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       return getPopupContainerCalendar ? getPopupContainerCalendar(triggerNode) : triggerNode;
     },
     dropdownClassName: classnames(dropdownCalendarClassName),
-    format: format,
+    format: rangePickerFormat,
     allowClear: false,
     onChange: function onChange(_value, mode) {
       setIsCalendar(false);
@@ -613,31 +619,23 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         data0 = _ref2[0],
         data1 = _ref2[1];
       var range = info.range;
-      var _ref3 = rangePickerValue || [],
-        _ref4 = _slicedToArray(_ref3, 2),
-        value0 = _ref4[0],
-        value1 = _ref4[1];
       if (range === "start" && data0) {
-        if (value0) {
-          data0 = moment(data0).set({
-            "hour": 0,
-            "minute": 0,
-            "second": 0,
-            "millisecond": 0
-          });
-        }
+        data0 = moment(data0).set({
+          "hour": 0,
+          "minute": 0,
+          "second": 0,
+          "millisecond": 0
+        });
       }
       if (range === "end" && data1) {
-        if (value1 && !moment(value1).isSame(data1, "day")) {
-          data1 = moment(data1).set({
-            "hour": 23,
-            "minute": 59,
-            "second": 59,
-            "millisecond": 0
-          });
-          if (moment().isSame(data1, "day")) {
-            data1 = moment();
-          }
+        data1 = moment(data1).set({
+          "hour": 23,
+          "minute": 59,
+          "second": 59,
+          "millisecond": 0
+        });
+        if (moment().isSame(data1, "day")) {
+          data1 = moment();
         }
       }
       setRangePickerValue([data0, data1]);
@@ -678,7 +676,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
 CWRangePicker.defaultProps = {
   moreItemDropdownPosition: "left",
   growSize: 3,
-  format: "YYYY/MM/DD HH:mm:ss"
+  format: "YYYY/MM/DD HH:mm:ss",
+  rangePickerFormat: "YYYY/MM/DD"
 };
 CWRangePicker.propTypes = {
   /**
@@ -760,6 +759,10 @@ CWRangePicker.propTypes = {
   /**
    * 下拉菜单日历模式的className属性
    */
-  dropdownCalendarClassName: PropTypes.string
+  dropdownCalendarClassName: PropTypes.string,
+  /**
+   * 日历选择模式format展示
+   */
+  rangePickerFormat: PropTypes.string
 };
 export default CWRangePicker;

package/lib/SearchBar/index.js

@@ -336,7 +336,9 @@ var SearchBar = function SearchBar(props) {
     if (index < showExtraCount) {
       return /*#__PURE__*/React.createElement("div", {
         style: {
-          marginLeft: index === 0 ? 0 : "8px"
+          marginLeft: index === 0 ? 0 : "8px",
+          display: 'flex',
+          alignItems: "center"
         },
         key: value.key ? value.key : index
       }, value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -140,5 +140,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "d4b92c78c796d0e79769112f642e46aaf7453ed5"
+  "gitHead": "72a624e97dab570b1fe67879de3d4d2f757d19a0"
 }