assui 2.1.43 → 2.1.46

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

@@ -65,6 +65,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';
 var RangePicker = DatePicker.RangePicker;
 
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
@@ -73,8 +74,10 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       _a = props.rangePickerType,
       rangePickerType = _a === void 0 ? 'label' : _a,
       label = props.label,
+      showTime = props.showTime,
       maxScope = props.maxScope,
-      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
+      onOpenChange = props.onOpenChange,
+      restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope", "onOpenChange"]);
 
   var _b = __read(useControllableValue(props), 2),
       date = _b[0],
@@ -128,6 +131,11 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       setRadioKey(item.key);
     }
   }, [date]);
+  useEffect(function () {
+    if (maxScope) {
+      setDate(formatMaxScope(date, maxScope));
+    }
+  }, [maxScope]);
 
   var onDiyTimeChange = function onDiyTimeChange(event) {
     var checked = event.target.checked;
@@ -141,8 +149,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
         start = _c[0],
         end = _c[1];
 
-    var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
-    var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+    var nextStartDate = (_a = showTime ? start === null || start === void 0 ? void 0 : start.clone() : start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+    var nextEndDate = (_b = showTime ? end === null || end === void 0 ? void 0 : end.clone() : end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
 
     if (!nextStartDate && !nextEndDate) {
       return setDate(undefined);
@@ -229,21 +237,25 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }))));
   };
 
-  var onOpenChange = function onOpenChange(nextOpen) {
+  var handleOpenChange = function handleOpenChange(nextOpen) {
     setOpen(nextOpen);
+    onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(nextOpen);
   };
 
   var baseOptions = {
     value: date,
     onChange: onDateChange,
     open: open,
-    onOpenChange: onOpenChange,
+    onOpenChange: handleOpenChange,
     panelRender: panelRender,
     allowClear: false
   };
   return rangePickerType === 'label' ? /*#__PURE__*/React.createElement(LabelRangePicker, __assign({
+    showTime: showTime,
     label: label
-  }, baseOptions, omit(options, 'onChange'))) : /*#__PURE__*/React.createElement(RangePicker, __assign({}, baseOptions, omit(options, 'onChange')));
+  }, omit(restProps, 'onChange', 'value', 'open'), baseOptions)) : /*#__PURE__*/React.createElement(RangePicker, __assign({
+    showTime: showTime
+  }, baseOptions, omit(restProps, 'onChange')));
 };
 
 export default LabelCustomizeRangePicker;

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

@@ -0,0 +1,2 @@
+import type { RangeValue } from 'rc-picker/lib/interface';
+export declare const formatMaxScope: (dateStampTuple: RangeValue<moment.Moment>, maxScope: number) => (import("moment").Moment | null)[];

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

@@ -0,0 +1,57 @@
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
+import dateUtils from "aa-utils/es/dateUtils";
+var now = dateUtils.getToday().endOf('day');
+export var formatMaxScope = function formatMaxScope(dateStampTuple, maxScope) {
+  var _a, _b;
+
+  var _c = __read(dateStampTuple || [], 2),
+      start = _c[0],
+      end = _c[1];
+
+  var startStamp = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+  var endStamp = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+
+  if (startStamp && endStamp) {
+    if (endStamp.diff(startStamp, 'day') > maxScope) {
+      startStamp = endStamp.clone().subtract(maxScope - 1, 'day').startOf('day');
+    }
+  }
+
+  if (!startStamp && !endStamp) {
+    startStamp = now.clone().subtract(maxScope - 1, 'day').startOf('day');
+    endStamp = now.clone().endOf('day');
+  }
+
+  if (startStamp || endStamp) {
+    startStamp = startStamp !== null && startStamp !== void 0 ? startStamp : endStamp.clone().subtract(maxScope - 1, 'day').startOf('day');
+    endStamp = endStamp !== null && endStamp !== void 0 ? endStamp : startStamp.clone().add(maxScope - 1, 'day').endOf('day');
+  }
+
+  return [startStamp, endStamp];
+};

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

@@ -2,6 +2,7 @@ import React from 'react';
 import type { RangePickerProps } from 'antd/lib/date-picker';
 export interface LabelRangePickerProps extends Omit<RangePickerProps, 'label'> {
     label: React.ReactNode;
+    showTime?: any;
 }
 declare const LabelDatePicker: React.FC<LabelRangePickerProps>;
 export default LabelDatePicker;

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

@@ -80,7 +80,6 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleOpenChange = function handleOpenChange(nextOpen) {
-    console.log('--');
     onOpenChange(nextOpen);
   };
 

package/es/label-text-area/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur'> {
+export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur' | 'style'> {
     /** 自定义class */
     className?: string;
     /** label 标签的文本 */

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

@@ -128,6 +128,8 @@ var context_1 = __importDefault(require("../config-provider/context"));
 
 var messages_1 = __importDefault(require("../messages"));
 
+var utils_1 = require("./utils");
+
 var RangePicker = date_picker_1["default"].RangePicker;
 
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
@@ -136,8 +138,10 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       _a = props.rangePickerType,
       rangePickerType = _a === void 0 ? 'label' : _a,
       label = props.label,
+      showTime = props.showTime,
       maxScope = props.maxScope,
-      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
+      onOpenChange = props.onOpenChange,
+      restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope", "onOpenChange"]);
 
   var _b = __read((0, useControllableValue_1["default"])(props), 2),
       date = _b[0],
@@ -191,6 +195,11 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       setRadioKey(item.key);
     }
   }, [date]);
+  (0, react_1.useEffect)(function () {
+    if (maxScope) {
+      setDate((0, utils_1.formatMaxScope)(date, maxScope));
+    }
+  }, [maxScope]);
 
   var onDiyTimeChange = function onDiyTimeChange(event) {
     var checked = event.target.checked;
@@ -204,8 +213,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
         start = _c[0],
         end = _c[1];
 
-    var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
-    var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+    var nextStartDate = (_a = showTime ? start === null || start === void 0 ? void 0 : start.clone() : start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+    var nextEndDate = (_b = showTime ? end === null || end === void 0 ? void 0 : end.clone() : end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
 
     if (!nextStartDate && !nextEndDate) {
       return setDate(undefined);
@@ -292,21 +301,25 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }))));
   };
 
-  var onOpenChange = function onOpenChange(nextOpen) {
+  var handleOpenChange = function handleOpenChange(nextOpen) {
     setOpen(nextOpen);
+    onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(nextOpen);
   };
 
   var baseOptions = {
     value: date,
     onChange: onDateChange,
     open: open,
-    onOpenChange: onOpenChange,
+    onOpenChange: handleOpenChange,
     panelRender: panelRender,
     allowClear: false
   };
   return rangePickerType === 'label' ? react_1["default"].createElement(label_range_picker_1["default"], __assign({
+    showTime: showTime,
     label: label
-  }, baseOptions, (0, omit_1["default"])(options, 'onChange'))) : react_1["default"].createElement(RangePicker, __assign({}, baseOptions, (0, omit_1["default"])(options, 'onChange')));
+  }, (0, omit_1["default"])(restProps, 'onChange', 'value', 'open'), baseOptions)) : react_1["default"].createElement(RangePicker, __assign({
+    showTime: showTime
+  }, baseOptions, (0, omit_1["default"])(restProps, 'onChange')));
 };
 
 exports["default"] = LabelCustomizeRangePicker;

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

@@ -0,0 +1,2 @@
+import type { RangeValue } from 'rc-picker/lib/interface';
+export declare const formatMaxScope: (dateStampTuple: RangeValue<moment.Moment>, maxScope: number) => (import("moment").Moment | null)[];

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

@@ -0,0 +1,74 @@
+"use strict";
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatMaxScope = void 0;
+
+var dateUtils_1 = __importDefault(require("aa-utils/lib/dateUtils"));
+
+var now = dateUtils_1["default"].getToday().endOf('day');
+
+var formatMaxScope = function formatMaxScope(dateStampTuple, maxScope) {
+  var _a, _b;
+
+  var _c = __read(dateStampTuple || [], 2),
+      start = _c[0],
+      end = _c[1];
+
+  var startStamp = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+  var endStamp = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+
+  if (startStamp && endStamp) {
+    if (endStamp.diff(startStamp, 'day') > maxScope) {
+      startStamp = endStamp.clone().subtract(maxScope - 1, 'day').startOf('day');
+    }
+  }
+
+  if (!startStamp && !endStamp) {
+    startStamp = now.clone().subtract(maxScope - 1, 'day').startOf('day');
+    endStamp = now.clone().endOf('day');
+  }
+
+  if (startStamp || endStamp) {
+    startStamp = startStamp !== null && startStamp !== void 0 ? startStamp : endStamp.clone().subtract(maxScope - 1, 'day').startOf('day');
+    endStamp = endStamp !== null && endStamp !== void 0 ? endStamp : startStamp.clone().add(maxScope - 1, 'day').endOf('day');
+  }
+
+  return [startStamp, endStamp];
+};
+
+exports.formatMaxScope = formatMaxScope;

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

@@ -2,6 +2,7 @@ import React from 'react';
 import type { RangePickerProps } from 'antd/lib/date-picker';
 export interface LabelRangePickerProps extends Omit<RangePickerProps, 'label'> {
     label: React.ReactNode;
+    showTime?: any;
 }
 declare const LabelDatePicker: React.FC<LabelRangePickerProps>;
 export default LabelDatePicker;

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

@@ -98,7 +98,6 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleOpenChange = function handleOpenChange(nextOpen) {
-    console.log('--');
     onOpenChange(nextOpen);
   };
 

package/lib/label-text-area/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur'> {
+export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur' | 'style'> {
     /** 自定义class */
     className?: string;
     /** label 标签的文本 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.1.43",
+  "version": "2.1.46",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -34,7 +34,7 @@
     "@tinymce/tinymce-react": "^4.0.0",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-resizable": "^3.0.0",
-    "a-icons": "^1.0.81",
+    "a-icons": "^1.0.82",
     "aa-utils": "^2.0.35",
     "ahooks": "^3.0.8",
     "bignumber.js": "^9.0.1",
@@ -73,5 +73,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "b0a0e42e40dc05d01770b43640169dd051bd60f3"
+  "gitHead": "7f685e43c5bb7cc5246187e32e93c45ca088e954"
 }