@zgfe/business-lib 1.2.71-hxd.6 → 1.2.71-hxd.8

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.
Files changed (6) hide show
  1. package/es/datePickerV2/datePicker.js +9 -3
  2. package/es/datePickerV2/demo/day.js +3 -1
  3. package/es/datePickerV2/demo/index.js +2 -2
  4. package/es/datePickerV2/index.js +3 -3
  5. package/es/datePickerV2/popoverContent.js +2 -1
  6. package/package.json +2 -2
package/es/datePickerV2/datePicker.js CHANGED
@@ -38,7 +38,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
38
38
  var min = moment(max).subtract(_timeRangeOpen, 'month');
39
39
  return current > max || current < min;
40
40
  }
41
- var _useState = useState(currentType === DatePickerTypes.Unit.hour || currentType === DatePickerTypes.Unit.minute ? 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')]),
41
+ var _useState = useState(currentType === DatePickerTypes.Unit.hour ? moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin, 'YYYY-MM-DD') : currentType === DatePickerTypes.Unit.minute ? moment(dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin, 'YYYY-MM-DD HH') : [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')]),
42
42
  _useState2 = _slicedToArray(_useState, 2),
43
43
  value = _useState2[0],
44
44
  setValue = _useState2[1];
@@ -80,6 +80,9 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
80
80
  return Array.isArray(value) ? {
81
81
  begin: (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.format('YYYY-MM-DD'),
82
82
  end: (_value$2 = value[1]) === null || _value$2 === void 0 ? void 0 : _value$2.format('YYYY-MM-DD')
83
+ } : currentType === DatePickerTypes.Unit.minute ? {
84
+ begin: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD HH'),
85
+ end: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD HH')
83
86
  } : {
84
87
  begin: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD'),
85
88
  end: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD')
@@ -101,11 +104,14 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
101
104
  popupClassName: "".concat(classPrefix, "-drop"),
102
105
  locale: locale,
103
106
  showToday: false,
107
+ showTime: currentType === DatePickerTypes.Unit.minute ? {
108
+ format: 'HH'
109
+ } : false,
104
110
  placement: "bottomLeft",
105
111
  getPopupContainer: function getPopupContainer(trigger) {
106
112
  return trigger.parentNode;
107
113
  },
108
- placeholder: "\u81EA\u5B9A\u4E49",
114
+ placeholder: "\u81EA\u5B9A\u4E491",
109
115
  suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
110
116
  type: 'shijian1'
111
117
  }),
@@ -113,7 +119,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
113
119
  open: true,
114
120
  onChange: function onChange(date) {
115
121
  if (date) {
116
- setValue(moment(date, 'YYYY-MM-DD'));
122
+ setValue(currentType === DatePickerTypes.Unit.minute ? moment(date, 'YYYY-MM-DD HH') : moment(date, 'YYYY-MM-DD'));
117
123
  }
118
124
  }
119
125
  })) : (/*#__PURE__*/React.createElement(RangePicker, {
package/es/datePickerV2/demo/day.js CHANGED
@@ -5,6 +5,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
5
5
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
6
6
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
7
7
  import { BizDatePicker } from '@zgfe/business-lib';
8
+ import { DatePickerTypes } from '../types';
8
9
  import React, { useState } from 'react';
9
10
  import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
10
11
  import { Button, Divider, Space, Switch } from 'antd';
@@ -42,6 +43,7 @@ export default (function () {
42
43
  value: time,
43
44
  defaultValue: time,
44
45
  selectRange: 1,
45
- selectRangeUnit: 'weeks'
46
+ dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month],
47
+ selectRangeUnit: 'days'
46
48
  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
47
49
  });
package/es/datePickerV2/demo/index.js CHANGED
@@ -51,14 +51,14 @@ 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\u300D: ", /*#__PURE__*/React.createElement(Switch, {
54
+ }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D1: ", /*#__PURE__*/React.createElement(Switch, {
55
55
  defaultChecked: includeToday,
56
56
  onChange: setIncludeToday
57
57
  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerV2, {
58
58
  includeToday: includeToday,
59
59
  value: time,
60
60
  defaultValue: time,
61
- dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter, DatePickerTypes.Unit.custom],
61
+ dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter, DatePickerTypes.Unit.custom],
62
62
  openComparison: true,
63
63
  selectRange: 365,
64
64
  selectRangeUnit: "days",
package/es/datePickerV2/index.js CHANGED
@@ -140,13 +140,13 @@ var BizDatePicker = function BizDatePicker(_ref) {
140
140
  return item.count == relative[0];
141
141
  });
142
142
  if (type) {
143
- if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
143
+ if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour || (currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.minute) {
144
144
  return type.value;
145
145
  }
146
146
  return type.count == 0 ? '今天' : '最近' + type.value;
147
147
  } else {
148
148
  if (!includeToday) {
149
- if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
149
+ if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour || (currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.minute) {
150
150
  setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
151
151
  setRelative([1, 1]);
152
152
  return '昨天';
@@ -156,7 +156,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
156
156
  return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
157
157
  }
158
158
  } else {
159
- if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
159
+ if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour || (currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.minute) {
160
160
  return dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin;
161
161
  } else {
162
162
  return (dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin) + ' 至 ' + (dateRange === null || dateRange === void 0 ? void 0 : dateRange.end);
package/es/datePickerV2/popoverContent.js CHANGED
@@ -21,7 +21,7 @@ export default (function (props) {
21
21
  var ref = useRef(null);
22
22
  return /*#__PURE__*/React.createElement(Tabs, {
23
23
  defaultActiveKey: relative ? '1' : '2'
24
- }, currentType != DatePickerTypes.Unit.custom && (/*#__PURE__*/React.createElement(Tabs.TabPane, {
24
+ }, currentType != DatePickerTypes.Unit.custom && currentType != DatePickerTypes.Unit.minute && (/*#__PURE__*/React.createElement(Tabs.TabPane, {
25
25
  tab: "\u6700\u8FD1",
26
26
  key: "1"
27
27
  }, /*#__PURE__*/React.createElement(PickerShortcut, {
@@ -41,6 +41,7 @@ export default (function (props) {
41
41
  if (ref.current) {
42
42
  var _ref$current;
43
43
  var dateValue = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.getDateValue();
44
+ console.log(dateValue);
44
45
  if (dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin) {
45
46
  setDateRange(dateValue);
46
47
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.2.71-hxd.6",
3
+ "version": "1.2.71-hxd.8",
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": "21bcd5a80ec5dd68e89196c9095d69c57a0b7855",
58
+ "gitHead": "b8b8909017a8ca33fbe8250a319d4a13c8b1f548",
59
59
  "gitHooks": {
60
60
  "pre-commit": "lint-staged"
61
61
  }