@zgfe/business-lib 1.2.51-ljy.13 → 1.2.51-ljy.14

package/es/datePickerOld/datePicker.js

@@ -116,7 +116,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     open: true,
     onChange: function onChange(date) {
       if (date) {
-        setValue(moment(date));
+        setValue(moment(date, 'YYYY-MM-DD'));
       }
     }
   }) : /*#__PURE__*/React.createElement(RangePicker, {

package/es/datePickerOld/demo/index.js

@@ -33,7 +33,7 @@ export default (function () {
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
     key: "".concat(includeToday, "--2"),
     value: time,
-    selectRange: 30,
+    selectRange: 360,
     selectRangeUnit: "days",
     onChange: handleChange
   }), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time))));

package/es/datePickerOld/index.js

@@ -231,7 +231,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "rili-2",
     size: 14
-  }), /*#__PURE__*/React.createElement("span", null, relative ? label : (dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin) + ' 至 ' + (dateRange === null || dateRange === void 0 ? void 0 : dateRange.end))), /*#__PURE__*/React.createElement(IconFont, {
+  }), /*#__PURE__*/React.createElement("span", null, currentType.value == DatePickerTypes.Unit.hour ? label : relative ? label : (dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin) + ' 至 ' + (dateRange === null || dateRange === void 0 ? void 0 : dateRange.end))), /*#__PURE__*/React.createElement(IconFont, {
     type: "xiangxia",
     size: 14
   })))));

package/es/datePickerOld/shortcut.js

@@ -13,8 +13,8 @@ import { Button, InputNumber } from 'antd';
 var DateOptionMap = {
   day: '天',
   week: '周',
-  month: '月',
-  quarter: '季度'
+  month: '个月',
+  quarter: '个季度'
 };
 var DateMaxMap = {
   day: 365,
@@ -50,10 +50,8 @@ var PickerShortcut = function PickerShortcut(_ref) {
   useEffect(function () {
     list = getTypeList(currentType, includeToday);
     if (relative) {
-      var temp = list.find(function (item) {
-        return item.count == relative[0];
-      });
-      setActive(temp === null || temp === void 0 ? void 0 : temp.count);
+      setActive(relative[0]);
+      setNumbers(relative[0]);
     }
   }, [currentType, includeToday]);
   var max = selectRange ? Math.floor(selectRange / Reflect.get(DateSingleMap, currentType)) : Reflect.get(DateMaxMap, currentType);
@@ -94,6 +92,8 @@ var PickerShortcut = function PickerShortcut(_ref) {
     onClick: function onClick() {
       if (!setDateRange) return;
       setDateRange(getDateRange(currentType, numbers, includeToday));
+      setRelative === null || setRelative === void 0 ? void 0 : setRelative([numbers, includeToday ? 0 : 1]);
+      setLabel === null || setLabel === void 0 ? void 0 : setLabel('最近' + numbers + Reflect.get(DateOptionMap, currentType));
       setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
     }
   }, "\u786E\u8BA4")));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.13",
+    "version": "1.2.51-ljy.14",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "b784e41c49a818e87fb69460e11b6f90983f7605",
+    "gitHead": "d0bd8ad9b723ad086adea8d1dbe6687846678d9a",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }