@titaui/pc 1.12.13 → 1.12.16

package/lib/components/picker/components/panels/year-panel/index.js

@@ -40,7 +40,7 @@ var YearPanel = function YearPanel(props) {
 
   var onDecadeYearChange = function onDecadeYearChange(diff) {
     if (onViewDateChange) {
-      onViewDateChange((0, _moment["default"])(viewDate).add(diff, 'y'));
+      onViewDateChange((0, _moment["default"])(viewDate).add(diff, "y"));
     }
   };
 

package/lib/components/picker/components/panels/year-panel/year-body.js

@@ -36,15 +36,8 @@ var YearPanelBody = function YearPanelBody(props) {
       endYear = props.endYear;
 
   var _useContext = (0, _react.useContext)(_context["default"]),
-      format = _useContext.format,
       value = _useContext.value,
-      settingType = _useContext.settingType;
-
-  var date = (0, _utils.getPickerDateBySettingType)({
-    format: format,
-    settingType: settingType,
-    values: value
-  });
+      mode = _useContext.mode;
 
   var getCells = function getCells(baseYear) {
     var cols = [];
@@ -54,14 +47,14 @@ var YearPanelBody = function YearPanelBody(props) {
 
       var year = baseYear + col;
       cols.push( /*#__PURE__*/_react["default"].createElement("td", {
-        className: (0, _classnames["default"])(_utils.PickerCellClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--this-year"), year === (0, _moment["default"])().year()), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--in-view"), year >= startYear && year <= endYear), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--selected"), year === (0, _moment["default"])(date).year()), _classNames)),
+        className: (0, _classnames["default"])(_utils.PickerCellClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--this-year"), year === (0, _moment["default"])().year()), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--in-view"), year >= startYear && year <= endYear), _defineProperty(_classNames, "".concat(_utils.PickerCellClass, "--selected"), year === (0, _moment["default"])(value).year() && mode === "year"), _classNames)),
         key: year
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])("".concat(_utils.PickerCellClass, "__inner")),
         title: year,
         onClick: function onClick() {
           if (onSelect) {
-            onSelect((0, _moment["default"])(viewDate).year(year), 'year');
+            onSelect((0, _moment["default"])(viewDate).year(year), "year");
           }
         }
       }, year)));

package/lib/components/picker/components/picker-trigger/index.css

@@ -12,14 +12,10 @@
   align-items: center;
 }
 
-.tita-ui__picker-trigger:hover, .tita-ui__picker-trigger--focused {
+.tita-ui__picker-trigger:hover {
   border-color: #2879ff;
 }
 
-.tita-ui__picker-trigger--focused .tita-ui__picker-trigger__operation .tu-icon-caret-down::before {
-  transform: scale(0.5) rotate(-180deg);
-}
-
 .tita-ui__picker-trigger__input {
   flex: 1;
   margin-right: 12px;
@@ -45,7 +41,6 @@
 
 .tita-ui__picker-trigger__operation .tu-icon-caret-down::before {
   transform: scale(0.5);
-  transition: all 0.3s ease;
   display: inline-block;
 }
 

package/lib/components/picker/components/picker-trigger/index.js

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 var _utils = require("../../utils");
 
 var _context = _interopRequireDefault(require("../../context"));
@@ -28,10 +26,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var PickerTrigger = function PickerTrigger(props) {
-  var _classNames;
-
   var children = props.children,
-      focused = props.focused,
       viewDate = props.viewDate,
       _props$disabled = props.disabled,
       disabled = _props$disabled === void 0 ? false : _props$disabled,
@@ -41,23 +36,23 @@ var PickerTrigger = function PickerTrigger(props) {
       _onClick = props.onClick;
 
   var _useContext = (0, _react.useContext)(_context["default"]),
-      picker = _useContext.picker,
+      mode = _useContext.mode,
       format = _useContext.format,
       value = _useContext.value;
 
   var currFormat = format;
 
-  switch (picker) {
-    case 'date':
-      currFormat = 'YYYY/MM/DD';
+  switch (mode) {
+    case "date":
+      currFormat = "YYYY/MM/DD";
       break;
 
-    case 'month':
-      currFormat = 'YYYY/MM';
+    case "month":
+      currFormat = "YYYY/MM";
       break;
 
-    case 'year':
-      currFormat = 'YYYY';
+    case "year":
+      currFormat = "YYYY";
       break;
 
     default:
@@ -73,13 +68,13 @@ var PickerTrigger = function PickerTrigger(props) {
         return !disabled && _onClick();
       }
     }, children) : /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])(_utils.PickerTriggerClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerTriggerClass, "--disabled"), disabled), _defineProperty(_classNames, "".concat(_utils.PickerTriggerClass, "--focused"), focused), _classNames)),
+      className: (0, _classnames["default"])(_utils.PickerTriggerClass, _defineProperty({}, "".concat(_utils.PickerTriggerClass, "--disabled"), disabled)),
       onClick: function onClick() {
         return !disabled && _onClick();
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(_utils.PickerTriggerClass, "__input"), _defineProperty({}, "".concat(_utils.PickerTriggerClass, "__input--placeholder"), !value && placeholder))
-    }, value ? (0, _moment["default"])(viewDate).format(currFormat) : placeholder), /*#__PURE__*/_react["default"].createElement("div", {
+    }, value ? viewDate.format(currFormat) : placeholder), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(_utils.PickerTriggerClass, "__operation"))
     }, !disabled && /*#__PURE__*/_react["default"].createElement("span", {
       className: "tu-icon-caret-down"
@@ -93,7 +88,7 @@ PickerTrigger.defaultProps = {
   children: null,
   disabled: false,
   allowClear: false,
-  placeholder: '请选择'
+  placeholder: "请选择"
 };
 var _default = PickerTrigger;
 exports["default"] = _default;

package/lib/components/picker/context.js

@@ -3,28 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.RangePickerContext = void 0;
+exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var PickerContext = /*#__PURE__*/_react["default"].createContext({
-  format: 'YYYY/MM/DD',
-  picker: 'date',
-  settingType: 'startDate',
-  value: [(0, _moment["default"])()]
-});
-
-var RangePickerContext = /*#__PURE__*/_react["default"].createContext({
-  format: 'YYYY/MM/DD',
-  picker: 'date',
-  settingType: 'startDate',
-  values: [(0, _moment["default"])(), (0, _moment["default"])()]
-});
+var PickerContext = /*#__PURE__*/_react["default"].createContext({});
 
-exports.RangePickerContext = RangePickerContext;
 var _default = PickerContext;
 exports["default"] = _default;

package/lib/components/picker/index.css

@@ -27,7 +27,7 @@
   color: #141c28;
 }
 
-.tita-ui__picker-cell--today .tita-ui__picker-cell__inner, .tita-ui__picker-cell:hover .tita-ui__picker-cell__inner {
+.tita-ui__picker-cell--tody .tita-ui__picker-cell__inner, .tita-ui__picker-cell:hover .tita-ui__picker-cell__inner {
   background-color: #f0f4fa;
   color: #2879ff;
 }
@@ -37,34 +37,6 @@
   color: #ffffff;
 }
 
-.tita-ui__picker-cell--selected:hover .tita-ui__picker-cell__inner {
-  background-color: #5c8eff;
-  color: #ffffff;
-}
-
-.tita-ui__picker-cell--in-ranges {
-  position: relative;
-}
-
-.tita-ui__picker-cell--in-ranges::after {
-  content: '';
-  background-color: rgba(40, 121, 255, 0.1);
-  pointer-events: none;
-  position: absolute;
-  top: 4px;
-  right: 0;
-  bottom: 4px;
-  left: 0;
-}
-
-.tita-ui__picker-cell--in-ranges--start.tita-ui__picker-cell--selected::after {
-  left: 10px;
-}
-
-.tita-ui__picker-cell--in-ranges--end.tita-ui__picker-cell--selected::after {
-  right: 10px;
-}
-
 .tita-ui__picker-cell__inner {
   width: 100%;
   height: 100%;

package/lib/components/picker/index.js

@@ -7,10 +7,7 @@ exports["default"] = void 0;
 
 var _picker = _interopRequireDefault(require("./picker"));
 
-var _rangePicker = _interopRequireDefault(require("./range-picker"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-_picker["default"]['Range'] = _rangePicker["default"];
 var _default = _picker["default"];
 exports["default"] = _default;

package/lib/components/picker/picker-panels.js

@@ -17,8 +17,6 @@ var _monthPanel = _interopRequireDefault(require("./components/panels/month-pane
 
 var _yearPanel = _interopRequireDefault(require("./components/panels/year-panel"));
 
-var _context = _interopRequireDefault(require("./context"));
-
 var _utils = require("./utils");
 
 require("./index.css");
@@ -42,37 +40,26 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var PickerPanels = function PickerPanels(props) {
-  var _props$picker = props.picker,
-      picker = _props$picker === void 0 ? 'date' : _props$picker,
+  var _props$mode = props.mode,
+      mode = _props$mode === void 0 ? "date" : _props$mode,
       onChange = props.onChange,
       onClose = props.onClose,
-      settingType = props.settingType,
       _props$value = props.value,
-      value = _props$value === void 0 ? [(0, _moment["default"])()] : _props$value;
-
-  var _useContext = (0, _react.useContext)(_context["default"]),
-      format = _useContext.format;
+      value = _props$value === void 0 ? (0, _moment["default"])() : _props$value;
 
-  var _useState = (0, _react.useState)(picker),
+  var _useState = (0, _react.useState)(mode),
       _useState2 = _slicedToArray(_useState, 2),
       pickerMode = _useState2[0],
       setPickerMode = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(value),
+  var _useState3 = (0, _react.useState)(value ? (0, _moment["default"])(value) : (0, _moment["default"])()),
       _useState4 = _slicedToArray(_useState3, 2),
       viewDate = _useState4[0],
-      setViewDate = _useState4[1]; // const getNewDate = useCallback((date) => {
-  //   return setPickerDateBySettingType({
-  //     newDate: date,
-  //     settingType,
-  //     values: viewDate,
-  //   })
-  // }, [settingType, viewDate])
-
+      setViewDate = _useState4[1];
 
   var onViewDateChange = function onViewDateChange(date) {
     setViewDate(function () {
-      return [date];
+      return date;
     });
   };
 
@@ -83,14 +70,16 @@ var PickerPanels = function PickerPanels(props) {
   };
 
   var onCloseHandler = function onCloseHandler() {
-    if (pickerMode === picker && onClose) {
-      onClose();
+    if (pickerMode === mode) {
+      if (onClose) {
+        onClose();
+      }
     }
   };
 
   var onDateSelect = function onDateSelect(date) {
     if (onChange) {
-      onChange([date]);
+      onChange(date);
     }
 
     onCloseHandler();
@@ -98,13 +87,15 @@ var PickerPanels = function PickerPanels(props) {
 
   var onMonthSelect = function onMonthSelect(date) {
     setViewDate(function () {
-      return [date];
+      return date;
     });
 
-    if (picker !== 'month') {
-      onPanelChange(date, 'date');
-    } else if (onChange) {
-      onChange([date]);
+    if (mode !== "month") {
+      onPanelChange(date, "date");
+    }
+
+    if (onChange) {
+      onChange(date);
     }
 
     onCloseHandler();
@@ -112,13 +103,15 @@ var PickerPanels = function PickerPanels(props) {
 
   var onYearSelect = function onYearSelect(date) {
     setViewDate(function () {
-      return [date];
+      return date;
     });
 
-    if (picker !== 'year') {
-      onPanelChange(date, 'month');
-    } else if (onChange) {
-      onChange([date]);
+    if (mode !== "year") {
+      onPanelChange(date, "month");
+    }
+
+    if (onChange) {
+      onChange(date);
     }
 
     onCloseHandler();
@@ -126,15 +119,15 @@ var PickerPanels = function PickerPanels(props) {
 
   var onSelectChange = function onSelectChange(date, type) {
     switch (type) {
-      case 'date':
+      case "date":
         onDateSelect(date);
         break;
 
-      case 'month':
+      case "month":
         onMonthSelect(date);
         break;
 
-      case 'year':
+      case "year":
         onYearSelect(date);
         break;
 
@@ -143,55 +136,47 @@ var PickerPanels = function PickerPanels(props) {
     }
   };
 
-  var renderPanels = (0, _react.useCallback)(function () {
-    var panel;
-    var date = (0, _utils.getPickerDateBySettingType)({
-      format: format,
-      settingType: settingType,
-      values: viewDate
-    });
-
-    switch (pickerMode) {
-      case 'date':
-        panel = /*#__PURE__*/_react["default"].createElement(_datePanel["default"], {
-          viewDate: date,
-          onSelect: onSelectChange,
-          onViewDateChange: onViewDateChange,
-          onPanelChange: onPanelChange
-        });
-        break;
-
-      case 'month':
-        panel = /*#__PURE__*/_react["default"].createElement(_monthPanel["default"], {
-          viewDate: date,
-          onSelect: onSelectChange,
-          onViewDateChange: onViewDateChange,
-          onPanelChange: onPanelChange
-        });
-        break;
-
-      case 'year':
-        panel = /*#__PURE__*/_react["default"].createElement(_yearPanel["default"], {
-          viewDate: date,
-          onSelect: onSelectChange,
-          onViewDateChange: onViewDateChange
-        });
-        break;
-
-      default:
-        break;
-    }
+  var panel;
+
+  switch (pickerMode) {
+    case "date":
+      panel = /*#__PURE__*/_react["default"].createElement(_datePanel["default"], {
+        viewDate: viewDate,
+        onSelect: onSelectChange,
+        onViewDateChange: onViewDateChange,
+        onPanelChange: onPanelChange
+      });
+      break;
+
+    case "month":
+      panel = /*#__PURE__*/_react["default"].createElement(_monthPanel["default"], {
+        viewDate: viewDate,
+        onSelect: onSelectChange,
+        onViewDateChange: onViewDateChange,
+        onPanelChange: onPanelChange
+      });
+      break;
+
+    case "year":
+      panel = /*#__PURE__*/_react["default"].createElement(_yearPanel["default"], {
+        viewDate: viewDate,
+        onSelect: onSelectChange,
+        onViewDateChange: onViewDateChange
+      });
+      break;
+
+    default:
+      break;
+  }
 
-    return panel;
-  }, [pickerMode, viewDate]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _utils.PickerClass
-  }, renderPanels());
+  }, panel);
 };
 
 PickerPanels.defaultProps = {
-  picker: 'date',
-  value: [(0, _moment["default"])()]
+  mode: "date",
+  value: (0, _moment["default"])()
 };
 var _default = PickerPanels;
 exports["default"] = _default;

package/lib/components/picker/picker.js

@@ -25,7 +25,7 @@ var _utils = require("./utils");
 
 require("./index.css");
 
-var _excluded = ["children", "direction", "displayMode", "format", "picker", "popupPlacement", "settingType", "value", "visible", "onChange", "onPopupVisibleChange"];
+var _excluded = ["onChange", "format", "value", "mode", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -52,17 +52,16 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 var Picker = function Picker(props) {
-  var children = props.children,
-      direction = props.direction,
-      displayMode = props.displayMode,
+  var onChange = props.onChange,
       format = props.format,
-      picker = props.picker,
-      popupPlacement = props.popupPlacement,
-      settingType = props.settingType,
       value = props.value,
-      visible = props.visible,
-      onChange = props.onChange,
+      mode = props.mode,
+      children = props.children,
+      popupPlacement = props.popupPlacement,
+      direction = props.direction,
       onPopupVisibleChange = props.onPopupVisibleChange,
+      _props$visible = props.visible,
+      visible = _props$visible === void 0 ? false : _props$visible,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _useState = (0, _react.useState)(visible),
@@ -75,23 +74,17 @@ var Picker = function Picker(props) {
       return popupPlacement;
     }
 
-    return direction === 'rtl' ? 'bottomRight' : 'bottomLeft';
+    return direction === "rtl" ? "bottomRight" : "bottomLeft";
   };
 
   var onChangeHandler = function onChangeHandler(date) {
-    var result = onChange(date);
-
-    if (result && result instanceof Promise) {
-      result.then(function (res) {
-        res && onCloseHandler();
-      });
-    } else if (result !== false) {
-      onCloseHandler();
+    if (onChange) {
+      onChange(date);
     }
   };
 
   var onCloseHandler = function onCloseHandler() {
-    return setPopupVisible(false);
+    setPopupVisible(false);
   };
 
   var handlePopupVisibleChange = function handlePopupVisibleChange(visible) {
@@ -99,47 +92,40 @@ var Picker = function Picker(props) {
     onPopupVisibleChange === null || onPopupVisibleChange === void 0 ? void 0 : onPopupVisibleChange(visible);
   };
 
-  var popContent = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react["default"].createElement(_pickerPanels["default"], _extends({
-      value: value,
-      picker: picker,
-      onChange: onChangeHandler,
-      onClose: onCloseHandler,
-      settingType: settingType
-    }, restProps));
-  }, [settingType, value]);
   return /*#__PURE__*/_react["default"].createElement(_context["default"].Provider, {
     value: {
-      picker: picker,
-      format: format,
-      settingType: settingType,
-      value: value
+      value: value,
+      mode: mode || "date",
+      format: format
     }
-  }, displayMode === 'layer' && /*#__PURE__*/_react["default"].createElement(_popup["default"], _extends({
+  }, /*#__PURE__*/_react["default"].createElement(_popup["default"], _extends({
     extraClass: (0, _classnames["default"])(_utils.PickerDropdownClass),
-    popup: popContent,
+    popup: /*#__PURE__*/_react["default"].createElement(_pickerPanels["default"], _extends({
+      value: value,
+      mode: mode
+    }, restProps, {
+      onChange: onChangeHandler,
+      onClose: onCloseHandler
+    })),
     popupVisible: popupVisible,
     popupPlacement: getPopupPlacement(),
     onPopupVisibleChange: handlePopupVisibleChange
   }, restProps), /*#__PURE__*/_react["default"].createElement(_pickerTrigger["default"], _extends({
-    focused: popupVisible,
-    viewDate: (0, _moment["default"])(value[0]),
+    viewDate: (0, _moment["default"])(value),
     onClick: function onClick() {
       return setPopupVisible(true);
     }
-  }, restProps), children)), displayMode === 'tiled' && popContent);
+  }, restProps), children)));
 };
 
 Picker.defaultProps = {
   children: null,
-  value: [(0, _moment["default"])()],
-  picker: 'date',
-  format: 'YYYY/MM/DD',
+  value: (0, _moment["default"])(),
+  mode: "date",
+  format: "YYYY/MM/DD",
   popupStyle: {},
-  popupPlacement: 'bottomLeft',
-  direction: 'ltr',
-  displayMode: 'layer',
-  settingType: 'startDate',
+  popupPlacement: "bottomLeft",
+  direction: "ltr",
   visible: false
 };
 var _default = Picker;