@zgfe/business-lib 1.2.71-hxd.20 → 1.2.71-hxd.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -51,7 +51,7 @@ export default (function () {
51
51
  console.log(calculateTimeUnits(365, 'days', 'weeks'));
52
52
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, {
53
53
  direction: "vertical"
54
- }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D1: ", /*#__PURE__*/React.createElement(Switch, {
54
+ }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D2: ", /*#__PURE__*/React.createElement(Switch, {
55
55
  defaultChecked: includeToday,
56
56
  onChange: setIncludeToday
57
57
  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerV2, {
@@ -258,6 +258,6 @@ var BizDatePicker = function BizDatePicker(_ref) {
258
258
  };
259
259
  BizDatePicker.defaultProps = {
260
260
  includeToday: true,
261
- dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month]
261
+ dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month]
262
262
  };
263
263
  export default BizDatePicker;
@@ -27,7 +27,7 @@ export default (function (props) {
27
27
  }, /*#__PURE__*/React.createElement(PickerShortcut, {
28
28
  shortcuts: shortcuts,
29
29
  selectRange: selectRange,
30
- selectRangeUnit: selectRangeUnit
30
+ selectRangeUnit: selectRangeUnit || currentType
31
31
  }))), /*#__PURE__*/React.createElement(Tabs.TabPane, {
32
32
  tab: "\u81EA\u5B9A\u4E49",
33
33
  key: "2"
@@ -49,7 +49,12 @@ var PickerShortcut = function PickerShortcut(_ref) {
49
49
  function getMax() {
50
50
  var _timeRangeOpen = timeRangeOpen || 12;
51
51
  if (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) {
52
- _timeRangeOpen = typeof (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) === 'boolean' ? (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) ? 200 : 12 : envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen;
52
+ if (typeof (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) === 'boolean') {
53
+ _timeRangeOpen = (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) === true ? 200 : 12;
54
+ }
55
+ if (typeof (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) === 'number') {
56
+ _timeRangeOpen = envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen;
57
+ }
53
58
  }
54
59
  _timeRangeOpen = moment.duration(_timeRangeOpen, 'months').asDays();
55
60
  var selectRangeCount = moment.duration(selectRange, selectRangeUnit).asDays();
@@ -9,7 +9,8 @@
9
9
  display: flex;
10
10
  flex-direction: column;
11
11
  max-height: 240px;
12
- overflow-y: auto .__select-panel();
12
+ overflow-y: auto;
13
+ .__select-panel();
13
14
  }
14
15
 
15
16
  &-list-panel {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.2.71-hxd.20",
3
+ "version": "1.2.71-hxd.22",
4
4
  "module": "es/index.js",
5
5
  "typings": "es/index.d.ts",
6
6
  "files": [
@@ -55,7 +55,7 @@
55
55
  "react": "^16.12.0 || ^17.0.0",
56
56
  "yorkie": "^2.0.0"
57
57
  },
58
- "gitHead": "6992141134a84155fe50d40f11a26ac909bfe66b",
58
+ "gitHead": "b9166f478462464a293f3f0d95f7cf4bde95be1d",
59
59
  "gitHooks": {
60
60
  "pre-commit": "lint-staged"
61
61
  }