@zgfe/business-lib 1.2.51-ljy.1 → 1.2.51-ljy.3

package/es/datePickerOld/datePicker.js

@@ -39,7 +39,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var min = moment(max).subtract(_timeRangeOpen, 'month');
     return current > max || current < min;
   }
-  var _useState = useState(),
+  var _useState = useState(currentType === DatePickerTypes.Unit.hour ? moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin, 'YYYY-MM-DD') : [moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin, 'YYYY-MM-DD'), moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.end, 'YYYY-MM-DD')]),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
@@ -68,8 +68,15 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   useImperativeHandle(ref, function () {
     return {
       getDateValue: function getDateValue() {
+        var _value$, _value$2;
         if (setRelative) setRelative(undefined);
-        return value;
+        return Array.isArray(value) ? {
+          begin: (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.format('YYYY-MM-DD'),
+          end: (_value$2 = value[1]) === null || _value$2 === void 0 ? void 0 : _value$2.format('YYYY-MM-DD')
+        } : {
+          begin: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD'),
+          end: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD')
+        };
       }
     };
   });
@@ -81,7 +88,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, currentType === DatePickerTypes.Unit.hour ? /*#__PURE__*/React.createElement(DatePicker, {
-    value: moment(dateRange.begin, 'YYYY-MM-DD'),
+    value: value,
     allowClear: false,
     inputReadOnly: true,
     popupClassName: "".concat(classPrefix, "-drop"),
@@ -99,14 +106,11 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     open: true,
     onChange: function onChange(date) {
       if (date) {
-        setValue({
-          begin: date.format('YYYY-MM-DD'),
-          end: date.format('YYYY-MM-DD')
-        });
+        setValue(moment(date));
       }
     }
   }) : /*#__PURE__*/React.createElement(RangePicker, {
-    value: [moment(dateRange.begin, 'YYYY-MM-DD'), moment(dateRange.end, 'YYYY-MM-DD')],
+    value: value,
     allowClear: false,
     popupClassName: "".concat(classPrefix, "-drop"),
     inputReadOnly: true,
@@ -140,10 +144,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       }
       if (value && value.length === 2) {
         BizDateBeyondRange = false;
-        setValue({
-          begin: value[0].format('YYYY-MM-DD'),
-          end: value[1].format('YYYY-MM-DD')
-        });
+        setValue([moment(value[0], 'YYYY-MM-DD'), moment(value[1], 'YYYY-MM-DD')]);
       }
     }
   }));

package/es/datePickerOld/demo/index.js

@@ -10,10 +10,10 @@ import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import { Divider, Space, Switch } from 'antd';
 export default (function () {
   var _useState = useState({
-      begin: '2024-07-23',
+      begin: '2024-07-11',
       end: '2024-08-05',
-      relative: [14, 1],
-      unit: 'day'
+      relative: [4, 1],
+      unit: 'week'
     }),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],

package/es/datePickerOld/index.js

@@ -17,9 +17,10 @@ import './styles/index.less';
 import { Popover, Skeleton } from 'antd';
 import DatePickerContext from './context';
 import _ from 'lodash';
-import { getDateRange } from './utils';
+import { getDateRange, getTypeList } from './utils';
 import PopoverContent from './popoverContent';
 import IconFont from '../icon/iconFont';
+import moment from 'moment';
 export var classPrefix = 'biz-date-picker-old-wrap';
 var typeMap = {
   hour: '按小时',
@@ -99,10 +100,29 @@ var BizDatePicker = function BizDatePicker(_ref) {
           break;
       }
     }
-    setDateRange({
-      begin: initValue.begin,
-      end: initValue.end
+    var typeList = getTypeList(currentType === null || currentType === void 0 ? void 0 : currentType.value, mode, includeToday);
+    var begin = initValue.begin,
+      end = initValue.end;
+    var item = typeList.find(function (item) {
+      var match = getDateRange(currentType === null || currentType === void 0 ? void 0 : currentType.value, item.count, includeToday);
+      return moment(begin).isSame(match.begin) && moment(end).isSame(match.end);
     });
+    var active = item === null || item === void 0 ? void 0 : item.count;
+    if (active) {
+      setDateRange({
+        begin: initValue.begin,
+        end: initValue.end
+      });
+    } else {
+      if (initValue.relative) {
+        setDateRange(getDateRange(currentType === null || currentType === void 0 ? void 0 : currentType.value, initValue.relative[0], includeToday));
+      } else {
+        setDateRange({
+          begin: initValue.begin,
+          end: initValue.end
+        });
+      }
+    }
     setReady(true);
   }
   useEffect(function () {
@@ -148,7 +168,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
       setOpen: setOpen,
       setLabel: setLabel
     }
-  }, mode == 'general' && /*#__PURE__*/React.createElement(BizSelect, {
+  }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-type"),
     theme: "secondary",
     keyField: "value",
@@ -157,27 +177,30 @@ var BizDatePicker = function BizDatePicker(_ref) {
     options: typeList,
     onChange: function onChange(type) {
       setCurrentType(type);
-      if (type.value === 'custom') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
-      }
       if (type.value === 'hour') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
+        setRelative([1, 1]);
+        setLabel('昨天');
       }
       if (type.value === 'day') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
         setRelative([7, includeToday ? 0 : 1]);
+        setLabel('7天');
       }
       if (type.value === 'week') {
         setDateRange(getDateRange(DatePickerTypes.Unit.week, 4, includeToday));
         setRelative([4, includeToday ? 0 : 1]);
+        setLabel('4周');
       }
       if (type.value === 'month') {
         setDateRange(getDateRange(DatePickerTypes.Unit.month, 1, includeToday));
         setRelative([1, includeToday ? 0 : 1]);
+        setLabel('1个月');
       }
       if (type.value === 'quarter') {
         setDateRange(getDateRange(DatePickerTypes.Unit.quarter, 1, includeToday));
         setRelative([1, includeToday ? 0 : 1]);
+        setLabel('1个季度');
       }
     }
   }), /*#__PURE__*/React.createElement(Popover, {
@@ -185,6 +208,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
     open: open,
     placement: "bottomLeft",
     trigger: "click",
+    destroyTooltipOnHide: true,
     content: /*#__PURE__*/React.createElement(PopoverContent, {
       setDateRange: setDateRange,
       setOpen: setOpen,

package/es/datePickerOld/shortcut.js

@@ -9,90 +9,8 @@ import { DatePickerTypes } from './types';
 import { classPrefix } from '.';
 import DatePickerContext from './context';
 import moment from 'moment';
-import { getDateRange } from './utils';
+import { getDateRange, getTypeList } from './utils';
 import { Button, InputNumber } from 'antd';
-var getTypeList = function getTypeList(currentType, mode, includeToday) {
-  var _shortcuts$find;
-  var shortcuts = [{
-    label: '按小时',
-    value: DatePickerTypes.Unit.hour,
-    children: [{
-      value: '昨天',
-      count: 1
-    }, {
-      value: '前天',
-      count: 2
-    }]
-  }, {
-    label: '按天',
-    value: DatePickerTypes.Unit.day,
-    children: [{
-      value: '今天',
-      count: 0
-    }, {
-      value: '昨天',
-      count: 1
-    }, {
-      value: '7天',
-      count: 7
-    }, {
-      value: '14天',
-      count: 14
-    }, {
-      value: '30天',
-      count: 30
-    }]
-  }, {
-    label: '按周',
-    value: DatePickerTypes.Unit.week,
-    children: [{
-      value: '4周',
-      count: 4
-    }, {
-      value: '8周',
-      count: 8
-    }, {
-      value: '12周',
-      count: 12
-    }]
-  }, {
-    label: '按月',
-    value: DatePickerTypes.Unit.month,
-    children: [{
-      value: '1个月',
-      count: 1
-    }, {
-      value: '2个月',
-      count: 2
-    }, {
-      value: '3个月',
-      count: 3
-    }]
-  }, {
-    label: '按季度',
-    value: DatePickerTypes.Unit.quarter,
-    children: [{
-      value: '1季度',
-      count: 1
-    }, {
-      value: '2季度',
-      count: 2
-    }, {
-      value: '4季度',
-      count: 4
-    }]
-  }];
-  var list = (((_shortcuts$find = shortcuts.find(function (item) {
-    return item.value === currentType;
-  })) === null || _shortcuts$find === void 0 ? void 0 : _shortcuts$find.children) || []).filter(function (item) {
-    if (currentType === 'day') {
-      if ((mode === 'general' || !includeToday) && (item.count === 0 || item.count === 1)) return false;
-      return true;
-    }
-    return true;
-  });
-  return list;
-};
 var DateOptionMap = {
   day: '天',
   week: '周',
@@ -111,7 +29,8 @@ var PickerShortcut = function PickerShortcut(_ref) {
     setRelative = _useContext.setRelative,
     setLabel = _useContext.setLabel,
     setOpen = _useContext.setOpen;
-  var _useState = useState(),
+  var list = getTypeList(currentType, mode, includeToday);
+  var _useState = useState(list[0].count),
     _useState2 = _slicedToArray(_useState, 2),
     active = _useState2[0],
     setActive = _useState2[1];
@@ -119,7 +38,6 @@ var PickerShortcut = function PickerShortcut(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     numbers = _useState4[0],
     setNumbers = _useState4[1];
-  var list = getTypeList(currentType, mode, includeToday);
   useEffect(function () {
     list = getTypeList(currentType, mode, includeToday);
     if (!relative && !dateRange) {
@@ -173,6 +91,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
         setActive(item.count);
         setLabel === null || setLabel === void 0 ? void 0 : setLabel(item === null || item === void 0 ? void 0 : item.value);
         if (setRelative) setRelative([item.count, includeToday ? 0 : 1]);
+        setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
       }
     }, item.value);
   }))), currentType !== DatePickerTypes.Unit.hour && /*#__PURE__*/React.createElement("div", {

package/es/datePickerOld/utils.d.ts

@@ -1,7 +1,9 @@
 import moment from 'moment';
 import { DatePickerTypes } from './types';
+import { DatePickerContextProps } from './context';
 export declare const getDateRange: (type: DatePickerTypes.Unit, count: number, includeToday: boolean) => {
     begin: string;
     end: string;
 };
 export declare const isTodayInRange: (_startDate: moment.Moment, _endDate: moment.Moment) => boolean;
+export declare const getTypeList: (currentType: DatePickerTypes.Unit, mode: DatePickerContextProps['mode'], includeToday: boolean) => DatePickerTypes.ListOption[];

package/es/datePickerOld/utils.js

@@ -44,4 +44,86 @@ export var isTodayInRange = function isTodayInRange(_startDate, _endDate) {
   var endDate = moment(_endDate).add(1, 'days').format('x');
   var dateToCheck = moment(new Date()).format('x');
   return dateToCheck >= startDate && dateToCheck <= endDate;
+};
+export var getTypeList = function getTypeList(currentType, mode, includeToday) {
+  var _shortcuts$find;
+  var shortcuts = [{
+    label: '按小时',
+    value: DatePickerTypes.Unit.hour,
+    children: [{
+      value: '昨天',
+      count: 1
+    }, {
+      value: '前天',
+      count: 2
+    }]
+  }, {
+    label: '按天',
+    value: DatePickerTypes.Unit.day,
+    children: [{
+      value: '今天',
+      count: 0
+    }, {
+      value: '昨天',
+      count: 1
+    }, {
+      value: '7天',
+      count: 7
+    }, {
+      value: '14天',
+      count: 14
+    }, {
+      value: '30天',
+      count: 30
+    }]
+  }, {
+    label: '按周',
+    value: DatePickerTypes.Unit.week,
+    children: [{
+      value: '4周',
+      count: 4
+    }, {
+      value: '8周',
+      count: 8
+    }, {
+      value: '12周',
+      count: 12
+    }]
+  }, {
+    label: '按月',
+    value: DatePickerTypes.Unit.month,
+    children: [{
+      value: '1个月',
+      count: 1
+    }, {
+      value: '2个月',
+      count: 2
+    }, {
+      value: '3个月',
+      count: 3
+    }]
+  }, {
+    label: '按季度',
+    value: DatePickerTypes.Unit.quarter,
+    children: [{
+      value: '1季度',
+      count: 1
+    }, {
+      value: '2季度',
+      count: 2
+    }, {
+      value: '4季度',
+      count: 4
+    }]
+  }];
+  var list = (((_shortcuts$find = shortcuts.find(function (item) {
+    return item.value === currentType;
+  })) === null || _shortcuts$find === void 0 ? void 0 : _shortcuts$find.children) || []).filter(function (item) {
+    if (currentType === 'day') {
+      if ((mode === 'general' || !includeToday) && (item.count === 0 || item.count === 1)) return false;
+      return true;
+    }
+    return true;
+  });
+  return list;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.1",
+    "version": "1.2.51-ljy.3",
     "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": "9a7a09c57f1d248349441367e54a637f97d8f4f5",
+    "gitHead": "f56b0e62717eec4410197d7e63af6e75f8393b20",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }