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

package/es/datePickerV2/datePicker.js

@@ -38,7 +38,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var min = moment(max).subtract(_timeRangeOpen, 'month');
     return current > max || current < min;
   }
-  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')]),
+  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')]),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
@@ -80,6 +80,9 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         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')
+        } : currentType === DatePickerTypes.Unit.minute ? {
+          begin: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD HH'),
+          end: value === null || value === void 0 ? void 0 : value.format('YYYY-MM-DD HH')
         } : {
           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')
@@ -101,11 +104,14 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     popupClassName: "".concat(classPrefix, "-drop"),
     locale: locale,
     showToday: false,
+    showTime: currentType === DatePickerTypes.Unit.minute ? {
+      format: 'HH'
+    } : false,
     placement: "bottomLeft",
     getPopupContainer: function getPopupContainer(trigger) {
       return trigger.parentNode;
     },
-    placeholder: "\u81EA\u5B9A\u4E49",
+    placeholder: "\u81EA\u5B9A\u4E491",
     suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
       type: 'shijian1'
     }),
@@ -113,7 +119,7 @@ var BizDate = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     open: true,
     onChange: function onChange(date) {
       if (date) {
-        setValue(moment(date, 'YYYY-MM-DD'));
+        setValue(currentType === DatePickerTypes.Unit.minute ? moment(date, 'YYYY-MM-DD HH') : moment(date, 'YYYY-MM-DD'));
       }
     }
   })) : (/*#__PURE__*/React.createElement(RangePicker, {

package/es/datePickerV2/demo/day.js

@@ -5,6 +5,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { BizDatePicker } from '@zgfe/business-lib';
+import { DatePickerTypes } from '../types';
 import React, { useState } from 'react';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import { Button, Divider, Space, Switch } from 'antd';
@@ -42,6 +43,7 @@ export default (function () {
     value: time,
     defaultValue: time,
     selectRange: 1,
-    selectRangeUnit: 'weeks'
+    dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month],
+    selectRangeUnit: 'days'
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
 });

package/es/datePickerV2/demo/index.js

@@ -51,14 +51,14 @@ export default (function () {
   console.log(calculateTimeUnits(365, 'days', 'weeks'));
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, {
     direction: "vertical"
-  }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
+  }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D1: ", /*#__PURE__*/React.createElement(Switch, {
     defaultChecked: includeToday,
     onChange: setIncludeToday
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerV2, {
     includeToday: includeToday,
     value: time,
     defaultValue: time,
-    dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter, DatePickerTypes.Unit.custom],
+    dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter, DatePickerTypes.Unit.custom],
     openComparison: true,
     selectRange: 365,
     selectRangeUnit: "days",

package/es/datePickerV2/index.js

@@ -140,7 +140,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
         return item.count == relative[0];
       });
       if (type) {
-        if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
+        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) {
           return type.value;
         }
         return type.count == 0 ? '今天' : '最近' + type.value;
@@ -153,10 +153,13 @@ var BizDatePicker = function BizDatePicker(_ref) {
           }
           return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
         }
+        if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.minute) {
+          return moment().format('YYYY-MM-DD HH');
+        }
         return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
       }
     } else {
-      if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
+      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) {
         return dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin;
       } else {
         return (dateRange === null || dateRange === void 0 ? void 0 : dateRange.begin) + ' 至 ' + (dateRange === null || dateRange === void 0 ? void 0 : dateRange.end);

package/es/datePickerV2/popoverContent.js

@@ -21,7 +21,7 @@ export default (function (props) {
   var ref = useRef(null);
   return /*#__PURE__*/React.createElement(Tabs, {
     defaultActiveKey: relative ? '1' : '2'
-  }, currentType != DatePickerTypes.Unit.custom && (/*#__PURE__*/React.createElement(Tabs.TabPane, {
+  }, currentType != DatePickerTypes.Unit.custom && currentType != DatePickerTypes.Unit.minute && (/*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u6700\u8FD1",
     key: "1"
   }, /*#__PURE__*/React.createElement(PickerShortcut, {
@@ -41,6 +41,7 @@ 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();
+        console.log(dateValue);
         if (dateValue === null || dateValue === void 0 ? void 0 : dateValue.begin) {
           setDateRange(dateValue);
         }

package/es/datePickerV2/utils.js

@@ -47,16 +47,7 @@ export var getTypeList = function getTypeList(currentType, includeToday, shortcu
   var defaultShortcuts = [{
     label: '按分钟',
     value: DatePickerTypes.Unit.minute,
-    children: [{
-      value: '今天',
-      count: 0
-    }, {
-      value: '昨天',
-      count: 1
-    }, {
-      value: '前天',
-      count: 2
-    }]
+    children: []
   }, {
     label: '按小时',
     value: DatePickerTypes.Unit.hour,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.71-hxd.6",
+  "version": "1.2.71-hxd.9",
   "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": "21bcd5a80ec5dd68e89196c9095d69c57a0b7855",
+  "gitHead": "38e33082a26f918938ff22f3804d7cbe255f519a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }