@zgfe/business-lib 1.2.51-ljy.2 → 1.2.51-ljy.5

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/index.js

@@ -168,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",
@@ -177,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, {
@@ -205,12 +208,15 @@ var BizDatePicker = function BizDatePicker(_ref) {
     open: open,
     placement: "bottomLeft",
     trigger: "click",
+    destroyTooltipOnHide: true,
     content: /*#__PURE__*/React.createElement(PopoverContent, {
       setDateRange: setDateRange,
       setOpen: setOpen,
+      setLabel: setLabel,
       selectRange: selectRange,
       timeRangeOpen: timeRangeOpen,
-      currentType: currentType.value
+      currentType: currentType.value,
+      relative: relative
     }),
     onOpenChange: function onOpenChange() {
       return setOpen(!open);

package/es/datePickerOld/popoverContent.d.ts

@@ -6,6 +6,8 @@ interface PopoverContent {
     timeRangeOpen?: number;
     selectRange?: number;
     currentType?: DatePickerTypes.Unit;
+    relative?: any[];
+    setLabel?: any;
 }
 declare const _default: (props: PopoverContent) => React.JSX.Element;
 export default _default;

package/es/datePickerOld/popoverContent.js

@@ -9,14 +9,17 @@ import React, { useRef } from 'react';
 import PickerShortcut from './shortcut';
 import BizDate from './datePicker';
 import { classPrefix } from '.';
+import { DatePickerTypes } from './types';
 export default (function (props) {
   var selectRange = props.selectRange,
     setDateRange = props.setDateRange,
     setOpen = props.setOpen,
-    currentType = props.currentType;
+    currentType = props.currentType,
+    relative = props.relative,
+    setLabel = props.setLabel;
   var ref = useRef();
   return /*#__PURE__*/React.createElement(Tabs, {
-    defaultActiveKey: "1"
+    defaultActiveKey: relative ? '1' : '2'
   }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u6700\u8FD1",
     key: "1"
@@ -40,6 +43,9 @@ export default (function (props) {
       if (ref.current) {
         var _ref$current;
         var dateValue = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.getDateValue();
+        if (currentType == DatePickerTypes.Unit.hour) {
+          setLabel(dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin);
+        }
         setDateRange(dateValue);
         setOpen(false);
       }

package/es/datePickerOld/shortcut.js

@@ -8,7 +8,6 @@ import React, { useContext, useEffect, useState } from 'react';
 import { DatePickerTypes } from './types';
 import { classPrefix } from '.';
 import DatePickerContext from './context';
-import moment from 'moment';
 import { getDateRange, getTypeList } from './utils';
 import { Button, InputNumber } from 'antd';
 var DateOptionMap = {
@@ -23,7 +22,6 @@ var PickerShortcut = function PickerShortcut(_ref) {
     currentType = _useContext.currentType,
     mode = _useContext.mode,
     includeToday = _useContext.includeToday,
-    dateRange = _useContext.dateRange,
     relative = _useContext.relative,
     setDateRange = _useContext.setDateRange,
     setRelative = _useContext.setRelative,
@@ -40,50 +38,18 @@ var PickerShortcut = function PickerShortcut(_ref) {
     setNumbers = _useState4[1];
   useEffect(function () {
     list = getTypeList(currentType, mode, includeToday);
-    if (!relative && !dateRange) {
-      var _active = list[0];
-      setActive(_active === null || _active === void 0 ? void 0 : _active.count);
-      setLabel === null || setLabel === void 0 ? void 0 : setLabel(_active === null || _active === void 0 ? void 0 : _active.value);
-      if (_active && setRelative) {
-        setRelative([_active === null || _active === void 0 ? void 0 : _active.count, includeToday ? 0 : 1]);
-      }
+    if (relative) {
+      var temp = list.find(function (item) {
+        return item.count == relative[0];
+      });
+      setActive(temp === null || temp === void 0 ? void 0 : temp.count);
     }
   }, [currentType, mode, includeToday]);
-  useEffect(function () {
-    if (!dateRange || !dateRange.begin || !dateRange.end) return;
-    var begin = dateRange.begin,
-      end = dateRange.end;
-    var item = list.find(function (item) {
-      var match = getDateRange(currentType, item.count, includeToday);
-      return moment(begin).isSame(match.begin) && moment(end).isSame(match.end);
-    });
-    setActive(item === null || item === void 0 ? void 0 : item.count);
-    setLabel === null || setLabel === void 0 ? void 0 : setLabel(item === null || item === void 0 ? void 0 : item.value);
-    if (relative && (!item || item.count !== relative[0]) && setRelative) {
-      setRelative(undefined);
-    }
-  }, [dateRange]);
-  useEffect(function () {
-    if (active === undefined || !setDateRange) return;
-    setDateRange(getDateRange(currentType, active, includeToday));
-    setNumbers(active);
-  }, [active]);
-  useEffect(function () {
-    if (!relative || !setDateRange) return;
-    var _relative = _slicedToArray(relative, 1),
-      count = _relative[0];
-    var item = list.find(function (item) {
-      return item.count === count;
-    });
-    setActive(item === null || item === void 0 ? void 0 : item.count);
-    setLabel === null || setLabel === void 0 ? void 0 : setLabel(item === null || item === void 0 ? void 0 : item.value);
-    setDateRange(getDateRange(currentType, count, includeToday));
-  }, [relative]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-shortcut")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list")
-  }, mode !== 'superSimple' && /*#__PURE__*/React.createElement(React.Fragment, null, list.map(function (item, index) {
+  }, list.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       className: "".concat(classPrefix, "-item ").concat(active === item.count ? 'active' : ''),
@@ -91,10 +57,11 @@ 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]);
+        setDateRange === null || setDateRange === void 0 ? void 0 : setDateRange(getDateRange(currentType, item.count, includeToday));
         setOpen === null || setOpen === void 0 ? void 0 : setOpen(false);
       }
     }, item.value);
-  }))), currentType !== DatePickerTypes.Unit.hour && /*#__PURE__*/React.createElement("div", {
+  })), currentType !== DatePickerTypes.Unit.hour && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-relative")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-relative-content")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.51-ljy.2",
+    "version": "1.2.51-ljy.5",
     "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": "4ec2943a33bb54f7b6035e846dea5cc65dc4e275",
+    "gitHead": "05372b15649d59b0e96217f30d3e4e3e3212a397",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }