assui 3.1.62 → 3.1.64

package/es/label-customize-range-picker/index.js

@@ -54,11 +54,7 @@ import getDefaultRadioList from './defaultRadioList';
 import LabelRangePicker from '../label-range-picker';
 import LocaleContext from '../config-provider/context';
 import formatMessage from '../messages';
-import { formatMaxScope } from './utils';
-/** 1整天的毫秒数 */
-var ONE_DAY_MILLISECOND = 1000 * 60 * 60 * 24;
-/** 1分钟的毫秒数 */
-var ONE_MINUTE_MILLISECOND = 1000 * 60;
+import { formatMaxScope, getDateDiffScope, ONE_DAY_MILLISECOND, getTimeDiffOfShowTime } from './utils';
 var RangePicker = DatePicker.RangePicker;
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var customizeTimeList = props.customizeTimeList,
@@ -152,7 +148,6 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
   var onDateChange = function onDateChange(nextValue) {
     var _a, _b;
-    console.log('nextValue', nextValue);
     var _c = __read(nextValue || [], 2),
       start = _c[0],
       end = _c[1];
@@ -164,7 +159,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     if (!maxScope) {
       return setDate([nextStartDate, nextEndDate]);
     }
-    var timeDiffOfShowTime = maxScope * ONE_DAY_MILLISECOND - ONE_MINUTE_MILLISECOND;
+    var timeDiffOfShowTime = getTimeDiffOfShowTime(maxScope);
     var _d = __read(date || [], 1),
       startDate = _d[0];
     // 1. start和end都存在时
@@ -184,10 +179,12 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       }
       // 2. 仅end存在时，自动填入start
     } else if (!nextStartDate && nextEndDate) {
-      nextStartDate = showTime ? nextEndDate.clone().subtract(timeDiffOfShowTime, 'milliseconds').startOf('minute') : nextEndDate.clone().subtract(maxScope - 1, 'day').startOf('day');
+      var scope = getDateDiffScope(date, maxScope);
+      nextStartDate = showTime ? nextEndDate.clone().subtract(getTimeDiffOfShowTime(scope), 'milliseconds').startOf('minute') : nextEndDate.clone().subtract(scope - 1, 'day').startOf('day');
       // 3. 仅start存在时，自动填入end
     } else if (nextStartDate && !nextEndDate) {
-      nextEndDate = showTime ? nextStartDate.clone().add(timeDiffOfShowTime, 'milliseconds').endOf('minute') : nextStartDate.clone().add(maxScope - 1, 'day').endOf('day');
+      var scope = getDateDiffScope(date, maxScope);
+      nextEndDate = showTime ? nextStartDate.clone().add(getTimeDiffOfShowTime(scope), 'milliseconds').endOf('minute') : nextStartDate.clone().add(scope - 1, 'day').endOf('day');
     }
     if (nextStartDate && nextEndDate) {
       return setDate([nextStartDate, nextEndDate]);

package/es/label-customize-range-picker/utils/index.d.ts

@@ -1,3 +1,11 @@
 import type { RangeValue } from 'rc-picker/lib/interface';
 import type { Moment } from 'moment';
+/** 1整天的毫秒数 */
+export declare const ONE_DAY_MILLISECOND: number;
+/** 1分钟的毫秒数 */
+export declare const ONE_MINUTE_MILLISECOND: number;
 export declare const formatMaxScope: (dateStampTuple: RangeValue<Moment>, maxScope: number) => (Moment | null)[];
+/** 开始时间和结束时间相差的天数 */
+export declare const getDateDiffScope: (date: [Moment, Moment], maxScope: number) => number;
+/** showTime下的所需的时间撮 */
+export declare const getTimeDiffOfShowTime: (scope: number) => number;

package/es/label-customize-range-picker/utils/index.js

@@ -23,6 +23,10 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 import dateUtils from "aa-utils/es/dateUtils";
+/** 1整天的毫秒数 */
+export var ONE_DAY_MILLISECOND = 1000 * 60 * 60 * 24;
+/** 1分钟的毫秒数 */
+export var ONE_MINUTE_MILLISECOND = 1000 * 60;
 export var formatMaxScope = function formatMaxScope(dateStampTuple, maxScope) {
   var _a, _b;
   var now = dateUtils.getToday().endOf('day');
@@ -45,4 +49,14 @@ export var formatMaxScope = function formatMaxScope(dateStampTuple, maxScope) {
     endStamp = endStamp !== null && endStamp !== void 0 ? endStamp : startStamp.clone().add(maxScope - 1, 'day').endOf('day');
   }
   return [startStamp, endStamp];
+};
+/** 开始时间和结束时间相差的天数 */
+export var getDateDiffScope = function getDateDiffScope(date, maxScope) {
+  var momentDiffDay = (date[1].diff(date[0]) + 1) / ONE_DAY_MILLISECOND;
+  var finalScope = momentDiffDay < maxScope ? momentDiffDay : maxScope;
+  return finalScope;
+};
+/** showTime下的所需的时间撮 */
+export var getTimeDiffOfShowTime = function getTimeDiffOfShowTime(scope) {
+  return scope * ONE_DAY_MILLISECOND - ONE_MINUTE_MILLISECOND;
 };

package/lib/label-customize-range-picker/index.js

@@ -98,10 +98,6 @@ var label_range_picker_1 = __importDefault(require("../label-range-picker"));
 var context_1 = __importDefault(require("../config-provider/context"));
 var messages_1 = __importDefault(require("../messages"));
 var utils_1 = require("./utils");
-/** 1整天的毫秒数 */
-var ONE_DAY_MILLISECOND = 1000 * 60 * 60 * 24;
-/** 1分钟的毫秒数 */
-var ONE_MINUTE_MILLISECOND = 1000 * 60;
 var RangePicker = date_picker_1["default"].RangePicker;
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var customizeTimeList = props.customizeTimeList,
@@ -195,7 +191,6 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
   var onDateChange = function onDateChange(nextValue) {
     var _a, _b;
-    console.log('nextValue', nextValue);
     var _c = __read(nextValue || [], 2),
       start = _c[0],
       end = _c[1];
@@ -207,13 +202,13 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     if (!maxScope) {
       return setDate([nextStartDate, nextEndDate]);
     }
-    var timeDiffOfShowTime = maxScope * ONE_DAY_MILLISECOND - ONE_MINUTE_MILLISECOND;
+    var timeDiffOfShowTime = (0, utils_1.getTimeDiffOfShowTime)(maxScope);
     var _d = __read(date || [], 1),
       startDate = _d[0];
     // 1. start和end都存在时
     if (nextStartDate && nextEndDate) {
       var isChangeStartData = !(startDate === null || startDate === void 0 ? void 0 : startDate.clone().isSame(nextStartDate));
-      var momentDiffDay = nextEndDate.diff(nextStartDate) / ONE_DAY_MILLISECOND;
+      var momentDiffDay = nextEndDate.diff(nextStartDate) / utils_1.ONE_DAY_MILLISECOND;
       // 更改start
       if (isChangeStartData) {
         // 时间差大于maxScope，则将end调整到期望范围
@@ -227,10 +222,12 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       }
       // 2. 仅end存在时，自动填入start
     } else if (!nextStartDate && nextEndDate) {
-      nextStartDate = showTime ? nextEndDate.clone().subtract(timeDiffOfShowTime, 'milliseconds').startOf('minute') : nextEndDate.clone().subtract(maxScope - 1, 'day').startOf('day');
+      var scope = (0, utils_1.getDateDiffScope)(date, maxScope);
+      nextStartDate = showTime ? nextEndDate.clone().subtract((0, utils_1.getTimeDiffOfShowTime)(scope), 'milliseconds').startOf('minute') : nextEndDate.clone().subtract(scope - 1, 'day').startOf('day');
       // 3. 仅start存在时，自动填入end
     } else if (nextStartDate && !nextEndDate) {
-      nextEndDate = showTime ? nextStartDate.clone().add(timeDiffOfShowTime, 'milliseconds').endOf('minute') : nextStartDate.clone().add(maxScope - 1, 'day').endOf('day');
+      var scope = (0, utils_1.getDateDiffScope)(date, maxScope);
+      nextEndDate = showTime ? nextStartDate.clone().add((0, utils_1.getTimeDiffOfShowTime)(scope), 'milliseconds').endOf('minute') : nextStartDate.clone().add(scope - 1, 'day').endOf('day');
     }
     if (nextStartDate && nextEndDate) {
       return setDate([nextStartDate, nextEndDate]);
@@ -250,7 +247,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     var _a = __read(item.value, 2),
       startTime = _a[0],
       entTime = _a[1];
-    var space = entTime.diff(startTime) / ONE_DAY_MILLISECOND;
+    var space = entTime.diff(startTime) / utils_1.ONE_DAY_MILLISECOND;
     return space <= maxScope;
   }) : dataSource;
   var panelRender = function panelRender(panel) {

package/lib/label-customize-range-picker/utils/index.d.ts

@@ -1,3 +1,11 @@
 import type { RangeValue } from 'rc-picker/lib/interface';
 import type { Moment } from 'moment';
+/** 1整天的毫秒数 */
+export declare const ONE_DAY_MILLISECOND: number;
+/** 1分钟的毫秒数 */
+export declare const ONE_MINUTE_MILLISECOND: number;
 export declare const formatMaxScope: (dateStampTuple: RangeValue<Moment>, maxScope: number) => (Moment | null)[];
+/** 开始时间和结束时间相差的天数 */
+export declare const getDateDiffScope: (date: [Moment, Moment], maxScope: number) => number;
+/** showTime下的所需的时间撮 */
+export declare const getTimeDiffOfShowTime: (scope: number) => number;

package/lib/label-customize-range-picker/utils/index.js

@@ -32,8 +32,12 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatMaxScope = void 0;
+exports.getTimeDiffOfShowTime = exports.getDateDiffScope = exports.formatMaxScope = exports.ONE_MINUTE_MILLISECOND = exports.ONE_DAY_MILLISECOND = void 0;
 var dateUtils_1 = __importDefault(require("aa-utils/lib/dateUtils"));
+/** 1整天的毫秒数 */
+exports.ONE_DAY_MILLISECOND = 1000 * 60 * 60 * 24;
+/** 1分钟的毫秒数 */
+exports.ONE_MINUTE_MILLISECOND = 1000 * 60;
 var formatMaxScope = function formatMaxScope(dateStampTuple, maxScope) {
   var _a, _b;
   var now = dateUtils_1["default"].getToday().endOf('day');
@@ -57,4 +61,16 @@ var formatMaxScope = function formatMaxScope(dateStampTuple, maxScope) {
   }
   return [startStamp, endStamp];
 };
-exports.formatMaxScope = formatMaxScope;
+exports.formatMaxScope = formatMaxScope;
+/** 开始时间和结束时间相差的天数 */
+var getDateDiffScope = function getDateDiffScope(date, maxScope) {
+  var momentDiffDay = (date[1].diff(date[0]) + 1) / exports.ONE_DAY_MILLISECOND;
+  var finalScope = momentDiffDay < maxScope ? momentDiffDay : maxScope;
+  return finalScope;
+};
+exports.getDateDiffScope = getDateDiffScope;
+/** showTime下的所需的时间撮 */
+var getTimeDiffOfShowTime = function getTimeDiffOfShowTime(scope) {
+  return scope * exports.ONE_DAY_MILLISECOND - exports.ONE_MINUTE_MILLISECOND;
+};
+exports.getTimeDiffOfShowTime = getTimeDiffOfShowTime;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.62",
+  "version": "3.1.64",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -35,7 +35,7 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-color": "^3.0.6",
     "@types/react-resizable": "^3.0.0",
-    "a-icons": "^1.1.63",
+    "a-icons": "^1.1.64",
     "aa-utils": "^2.1.25",
     "ahooks": "^3.0.8",
     "bignumber.js": "^9.0.1",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "56e7a89245c64bb2f5d960cd4272e5a1cc778f4d"
+  "gitHead": "b459c0a791927a8c6add47e05225a65ce048b873"
 }