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

package/es/datePickerOld/index.js

@@ -212,9 +212,11 @@ var BizDatePicker = function BizDatePicker(_ref) {
     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,14 +22,13 @@ 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,
     setLabel = _useContext.setLabel,
     setOpen = _useContext.setOpen;
   var list = getTypeList(currentType, mode, includeToday);
-  var _useState = useState(list[0].count),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     active = _useState2[0],
     setActive = _useState2[1];
@@ -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.3",
+    "version": "1.2.51-ljy.6",
     "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": "f56b0e62717eec4410197d7e63af6e75f8393b20",
+    "gitHead": "70b132f3ca7259361cec312d9f7aca5557dd4b90",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }