assui 2.1.31 → 2.1.34

package/es/label-customize-range-picker/index.d.ts

@@ -12,6 +12,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     customizeTimeList?: dateTypeEnum[];
     rangePickerType?: 'label' | 'origin';
     label?: React.ReactNode;
+    /** 最大时间范围 */
+    maxScope?: number;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

package/es/label-customize-range-picker/index.js

@@ -59,6 +59,8 @@ import Radio from 'antd/lib/radio';
 import Checkbox from 'antd/lib/checkbox';
 import DatePicker from 'antd/lib/date-picker';
 import useControllableValue from 'ahooks/lib/useControllableValue';
+import moment from 'moment';
+import omit from 'lodash/omit';
 import getDefaultRadioList from './defaultRadioList';
 import LabelRangePicker from '../label-range-picker';
 import LocaleContext from '../config-provider/context';
@@ -71,7 +73,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       _a = props.rangePickerType,
       rangePickerType = _a === void 0 ? 'label' : _a,
       label = props.label,
-      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label"]);
+      maxScope = props.maxScope,
+      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
 
   var _b = __read(useControllableValue(props), 2),
       date = _b[0],
@@ -92,7 +95,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var messages = useContext(LocaleContext);
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : getDefaultRadioList(messages);
   useEffect(function () {
-    var foundItem = dataSource.find(function (item) {
+    var filterItemList = dataSource.filter(function (item) {
       if (!date) return false;
 
       var _a = __read(item.value, 2),
@@ -109,8 +112,21 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
 
       return false;
     });
-    var data = foundItem ? foundItem.key : null;
-    setRadioKey(data);
+
+    if (filterItemList.length === 0) {
+      setRadioKey(null);
+    } else if (filterItemList.length > 1) {
+      var findItem = filterItemList.find(function (item) {
+        return item.key === radioKey;
+      });
+      var resutRadioKey = findItem ? findItem.key : filterItemList[0].key;
+      setRadioKey(resutRadioKey);
+    } else {
+      var _a = __read(filterItemList, 1),
+          item = _a[0];
+
+      setRadioKey(item.key);
+    }
   }, [date]);
 
   var onDiyTimeChange = function onDiyTimeChange(event) {
@@ -119,7 +135,47 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
 
   var onDateChange = function onDateChange(nextValue) {
-    setDate(nextValue);
+    var _a, _b;
+
+    var _c = __read(nextValue || [], 2),
+        start = _c[0],
+        end = _c[1];
+
+    var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+    var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+
+    if (!nextStartDate && !nextEndDate) {
+      return setDate(undefined);
+    }
+
+    if (!maxScope) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    var _d = __read(date || [], 1),
+        startDate = _d[0];
+
+    if (nextStartDate && nextEndDate) {
+      var isChangeStartData = !(startDate === null || startDate === void 0 ? void 0 : startDate.clone().isSame(nextStartDate, 'day'));
+
+      if (isChangeStartData) {
+        if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+          nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+        }
+      } else if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+        nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+      }
+    } else if (!nextStartDate && nextEndDate) {
+      nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+    } else if (nextStartDate && !nextEndDate) {
+      nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+    }
+
+    if (nextStartDate && nextEndDate) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    return setDate([nextStartDate, nextEndDate]);
   };
 
   var onRadioChange = function onRadioChange(event) {
@@ -135,6 +191,14 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var list = radioList !== null && radioList !== void 0 ? radioList : getDefaultRadioList(messages).filter(function (item) {
     return customizeTimeList ? customizeTimeList.includes(item.key) : true;
   });
+  var resultList = maxScope ? list.filter(function (item) {
+    var _a = __read(item.value, 2),
+        startTime = _a[0],
+        entTime = _a[1];
+
+    var space = moment.duration(entTime.diff(startTime)).asDays();
+    return space <= maxScope;
+  }) : list;
 
   var panelRender = function panelRender(panel) {
     return /*#__PURE__*/React.createElement("div", {
@@ -154,7 +218,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }, /*#__PURE__*/React.createElement(Radio.Group, {
       onChange: onRadioChange,
       value: radioKey
-    }, list.map(function (_a) {
+    }, resultList.map(function (_a) {
       var key = _a.key,
           text = _a.text;
       return /*#__PURE__*/React.createElement(Radio, {
@@ -179,7 +243,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
   return rangePickerType === 'label' ? /*#__PURE__*/React.createElement(LabelRangePicker, __assign({
     label: label
-  }, baseOptions, options)) : /*#__PURE__*/React.createElement(RangePicker, __assign({}, baseOptions, options));
+  }, baseOptions, omit(options, 'onChange'))) : /*#__PURE__*/React.createElement(RangePicker, __assign({}, baseOptions, omit(options, 'onChange')));
 };
 
 export default LabelCustomizeRangePicker;

package/es/label-customize-range-picker/style/index.css

@@ -1793,6 +1793,12 @@ html {
   padding: 8px 11px 6px;
   border-bottom: 1px solid #f5f6fa;
 }
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-wrapper {
+  pointer-events: none;
+}
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-input {
+  pointer-events: auto;
+}
 .label-customize-range-picker-panel .pick-box {
   display: flex;
   justify-content: space-between;

package/es/label-customize-range-picker/style/index.less

@@ -8,6 +8,14 @@
   .check-wrapper {
     padding: 8px 11px 6px;
     border-bottom: 1px solid #f5f6fa;
+
+    .@{ant-prefix}-checkbox-wrapper {
+      pointer-events: none;
+    }
+
+    .@{ant-prefix}-checkbox-input {
+      pointer-events: auto;
+    }
   }
 
   .pick-box {

package/es/label-range-picker/index.js

@@ -80,6 +80,7 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleOpenChange = function handleOpenChange(nextOpen) {
+    console.log('--');
     onOpenChange(nextOpen);
   };
 

package/lib/label-customize-range-picker/index.d.ts

@@ -12,6 +12,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     customizeTimeList?: dateTypeEnum[];
     rangePickerType?: 'label' | 'origin';
     label?: React.ReactNode;
+    /** 最大时间范围 */
+    maxScope?: number;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

package/lib/label-customize-range-picker/index.js

@@ -116,6 +116,10 @@ var date_picker_1 = __importDefault(require("antd/lib/date-picker"));
 
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 
+var moment_1 = __importDefault(require("moment"));
+
+var omit_1 = __importDefault(require("lodash/omit"));
+
 var defaultRadioList_1 = __importDefault(require("./defaultRadioList"));
 
 var label_range_picker_1 = __importDefault(require("../label-range-picker"));
@@ -132,7 +136,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       _a = props.rangePickerType,
       rangePickerType = _a === void 0 ? 'label' : _a,
       label = props.label,
-      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label"]);
+      maxScope = props.maxScope,
+      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
 
   var _b = __read((0, useControllableValue_1["default"])(props), 2),
       date = _b[0],
@@ -153,7 +158,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var messages = (0, react_1.useContext)(context_1["default"]);
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : (0, defaultRadioList_1["default"])(messages);
   (0, react_1.useEffect)(function () {
-    var foundItem = dataSource.find(function (item) {
+    var filterItemList = dataSource.filter(function (item) {
       if (!date) return false;
 
       var _a = __read(item.value, 2),
@@ -170,8 +175,21 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
 
       return false;
     });
-    var data = foundItem ? foundItem.key : null;
-    setRadioKey(data);
+
+    if (filterItemList.length === 0) {
+      setRadioKey(null);
+    } else if (filterItemList.length > 1) {
+      var findItem = filterItemList.find(function (item) {
+        return item.key === radioKey;
+      });
+      var resutRadioKey = findItem ? findItem.key : filterItemList[0].key;
+      setRadioKey(resutRadioKey);
+    } else {
+      var _a = __read(filterItemList, 1),
+          item = _a[0];
+
+      setRadioKey(item.key);
+    }
   }, [date]);
 
   var onDiyTimeChange = function onDiyTimeChange(event) {
@@ -180,7 +198,47 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
 
   var onDateChange = function onDateChange(nextValue) {
-    setDate(nextValue);
+    var _a, _b;
+
+    var _c = __read(nextValue || [], 2),
+        start = _c[0],
+        end = _c[1];
+
+    var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+    var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+
+    if (!nextStartDate && !nextEndDate) {
+      return setDate(undefined);
+    }
+
+    if (!maxScope) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    var _d = __read(date || [], 1),
+        startDate = _d[0];
+
+    if (nextStartDate && nextEndDate) {
+      var isChangeStartData = !(startDate === null || startDate === void 0 ? void 0 : startDate.clone().isSame(nextStartDate, 'day'));
+
+      if (isChangeStartData) {
+        if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+          nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+        }
+      } else if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+        nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+      }
+    } else if (!nextStartDate && nextEndDate) {
+      nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+    } else if (nextStartDate && !nextEndDate) {
+      nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+    }
+
+    if (nextStartDate && nextEndDate) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    return setDate([nextStartDate, nextEndDate]);
   };
 
   var onRadioChange = function onRadioChange(event) {
@@ -196,6 +254,14 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var list = radioList !== null && radioList !== void 0 ? radioList : (0, defaultRadioList_1["default"])(messages).filter(function (item) {
     return customizeTimeList ? customizeTimeList.includes(item.key) : true;
   });
+  var resultList = maxScope ? list.filter(function (item) {
+    var _a = __read(item.value, 2),
+        startTime = _a[0],
+        entTime = _a[1];
+
+    var space = moment_1["default"].duration(entTime.diff(startTime)).asDays();
+    return space <= maxScope;
+  }) : list;
 
   var panelRender = function panelRender(panel) {
     return react_1["default"].createElement("div", {
@@ -215,7 +281,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }, react_1["default"].createElement(radio_1["default"].Group, {
       onChange: onRadioChange,
       value: radioKey
-    }, list.map(function (_a) {
+    }, resultList.map(function (_a) {
       var key = _a.key,
           text = _a.text;
       return react_1["default"].createElement(radio_1["default"], {
@@ -240,7 +306,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
   return rangePickerType === 'label' ? react_1["default"].createElement(label_range_picker_1["default"], __assign({
     label: label
-  }, baseOptions, options)) : react_1["default"].createElement(RangePicker, __assign({}, baseOptions, options));
+  }, baseOptions, (0, omit_1["default"])(options, 'onChange'))) : react_1["default"].createElement(RangePicker, __assign({}, baseOptions, (0, omit_1["default"])(options, 'onChange')));
 };
 
 exports["default"] = LabelCustomizeRangePicker;

package/lib/label-customize-range-picker/style/index.css

@@ -1793,6 +1793,12 @@ html {
   padding: 8px 11px 6px;
   border-bottom: 1px solid #f5f6fa;
 }
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-wrapper {
+  pointer-events: none;
+}
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-input {
+  pointer-events: auto;
+}
 .label-customize-range-picker-panel .pick-box {
   display: flex;
   justify-content: space-between;

package/lib/label-customize-range-picker/style/index.less

@@ -8,6 +8,14 @@
   .check-wrapper {
     padding: 8px 11px 6px;
     border-bottom: 1px solid #f5f6fa;
+
+    .@{ant-prefix}-checkbox-wrapper {
+      pointer-events: none;
+    }
+
+    .@{ant-prefix}-checkbox-input {
+      pointer-events: auto;
+    }
   }
 
   .pick-box {

package/lib/label-range-picker/index.js

@@ -98,6 +98,7 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleOpenChange = function handleOpenChange(nextOpen) {
+    console.log('--');
     onOpenChange(nextOpen);
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.1.31",
+  "version": "2.1.34",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -30,7 +30,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@ahooksjs/use-url-state": "^2.5.8",
+    "@ahooksjs/use-url-state": "^3.1.9",
     "@tinymce/tinymce-react": "^4.0.0",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-resizable": "^3.0.0",
@@ -54,7 +54,7 @@
     "tinymce": "^6.0.2"
   },
   "peerDependencies": {
-    "antd": "^4.16.11",
+    "antd": "^4.21.6",
     "react": "^16.8.6 || ^17.0 || ^18.0"
   },
   "devDependencies": {
@@ -72,5 +72,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "308bb75f7d010780720d9e318424c4886a2ef4be"
+  "gitHead": "eb926e3a81ebd83d37c2ace39c832ba69e0f9bb6"
 }