assui 2.1.4 → 2.1.5

package/es/index.d.ts

@@ -57,5 +57,3 @@ export { default as LabelCustomizeRangePicker } from './label-customize-range-pi
 export type { RichTextEditorProps } from './rich-text-editor';
 export { default as RichTextEditor } from './rich-text-editor';
 export { default as beautifulDnd } from './beautiful-dnd';
-export type { CustomizeRangePickerProps } from './customize-range-picker';
-export { default as CustomizeRangePicker } from './customize-range-picker';

package/es/index.js

@@ -28,5 +28,4 @@ export { default as LabelConditionInput } from './label-condition-input';
 export { default as LabelTreeSelect } from './label-tree-select';
 export { default as LabelCustomizeRangePicker } from './label-customize-range-picker';
 export { default as RichTextEditor } from './rich-text-editor';
-export { default as beautifulDnd } from './beautiful-dnd';
-export { default as CustomizeRangePicker } from './customize-range-picker';
+export { default as beautifulDnd } from './beautiful-dnd';

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { Moment } from 'moment';
 import type { dateTypeEnum } from './defaultRadioList';
 import type { LabelRangePickerProps } from '../label-range-picker';
@@ -6,9 +7,11 @@ export declare type RadioListType = {
     text: string;
     value: [Moment, Moment];
 };
-export interface LabelCustomizeRangePickerProps extends LabelRangePickerProps {
+export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerProps, 'label'> {
     radioList?: RadioListType[];
     customizeTimeList?: dateTypeEnum[];
+    rangePickerType?: 'label' | 'origin';
+    label?: React.ReactNode;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

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

@@ -57,26 +57,35 @@ var __read = this && this.__read || function (o, n) {
 import React, { useState, useEffect } from 'react';
 import Radio from 'antd/lib/radio';
 import Checkbox from 'antd/lib/checkbox';
+import DatePicker from 'antd/lib/date-picker';
 import useControllableValue from 'ahooks/lib/useControllableValue';
 import defaultRadioList from './defaultRadioList';
 import LabelRangePicker from '../label-range-picker';
+var RangePicker = DatePicker.RangePicker;
 
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var customizeTimeList = props.customizeTimeList,
       radioList = props.radioList,
-      options = __rest(props, ["customizeTimeList", "radioList"]);
+      _a = props.rangePickerType,
+      rangePickerType = _a === void 0 ? 'label' : _a,
+      label = props.label,
+      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label"]);
 
-  var _a = __read(useControllableValue(props), 2),
-      date = _a[0],
-      setDate = _a[1];
+  var _b = __read(useControllableValue(props), 2),
+      date = _b[0],
+      setDate = _b[1];
 
-  var _b = __read(useState(false), 2),
-      isVisiblePanel = _b[0],
-      setIsVisiblePanel = _b[1];
+  var _c = __read(useState(false), 2),
+      isVisiblePanel = _c[0],
+      setIsVisiblePanel = _c[1];
 
-  var _c = __read(useState(), 2),
-      radioKey = _c[0],
-      setRadioKey = _c[1];
+  var _d = __read(useState(), 2),
+      radioKey = _d[0],
+      setRadioKey = _d[1];
+
+  var _e = __read(useState(false), 2),
+      open = _e[0],
+      setOpen = _e[1];
 
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList;
   useEffect(function () {
@@ -117,6 +126,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       return item.key === value;
     });
     setDate(selectRadioInfo === null || selectRadioInfo === void 0 ? void 0 : selectRadioInfo.value);
+    setOpen(false);
   };
 
   var list = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList.filter(function (item) {
@@ -152,11 +162,21 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }))));
   };
 
-  return /*#__PURE__*/React.createElement(LabelRangePicker, __assign({
+  var onOpenChange = function onOpenChange(nextOpen) {
+    setOpen(nextOpen);
+  };
+
+  var baseOptions = {
     value: date,
     onChange: onDateChange,
-    panelRender: panelRender
-  }, options));
+    open: open,
+    onOpenChange: onOpenChange,
+    panelRender: panelRender,
+    allowClear: false
+  };
+  return rangePickerType === 'label' ? /*#__PURE__*/React.createElement(LabelRangePicker, __assign({
+    label: label
+  }, baseOptions, options)) : /*#__PURE__*/React.createElement(RangePicker, __assign({}, baseOptions, options));
 };
 
 export default LabelCustomizeRangePicker;

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

@@ -1,4 +1,5 @@
 import 'antd/lib/date-picker/style';
 import 'antd/lib/checkbox/style';
+import 'antd/lib/radio/style';
 import './index.less';
 import '../../label-range-picker/style/index';

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

@@ -1,4 +1,5 @@
 import 'antd/lib/date-picker/style';
 import 'antd/lib/checkbox/style';
+import 'antd/lib/radio/style';
 import './index.less';
 import '../../label-range-picker/style/index';

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

@@ -45,6 +45,7 @@ import React from 'react';
 import useControllableValue from 'ahooks/lib/useControllableValue';
 import DatePicker from 'antd/lib/date-picker';
 import classNames from 'classnames';
+import omit from 'lodash/omit';
 import CalendarOutlined from 'a-icons/lib/CalendarOutlined';
 var RangePicker = DatePicker.RangePicker;
 
@@ -55,10 +56,10 @@ var LabelDatePicker = function LabelDatePicker(props) {
 
   var _a = __read(useControllableValue(props, {
     valuePropName: 'open',
-    trigger: 'setOpen'
+    trigger: 'onOpenChange'
   }), 2),
       open = _a[0],
-      setOpen = _a[1];
+      onOpenChange = _a[1];
 
   var _b = __read(useControllableValue(props), 2),
       value = _b[0],
@@ -72,18 +73,14 @@ var LabelDatePicker = function LabelDatePicker(props) {
     var _a;
 
     if (!open) {
-      setOpen(!open);
+      onOpenChange(!open);
     }
 
     (_a = datePickerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
   };
 
-  var onBlur = function onBlur() {
-    setOpen(false);
-  };
-
-  var onOpenChange = function onOpenChange(nextOpen) {
-    setOpen(nextOpen);
+  var handleOpenChange = function handleOpenChange(nextOpen) {
+    onOpenChange(nextOpen);
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -94,13 +91,12 @@ var LabelDatePicker = function LabelDatePicker(props) {
   }, /*#__PURE__*/React.createElement(RangePicker, __assign({
     format: "YYYY.MM.DD",
     allowEmpty: [true, true]
-  }, props, {
+  }, omit(props, 'onOpenChange'), {
     separator: "\u2013",
     open: open,
     onChange: handleChange,
     ref: datePickerRef,
-    onOpenChange: onOpenChange,
-    onBlur: onBlur,
+    onOpenChange: handleOpenChange,
     suffixIcon: /*#__PURE__*/React.createElement(CalendarOutlined, null)
   })), /*#__PURE__*/React.createElement("label", {
     className: "label-range-picker-text",

package/lib/index.d.ts

@@ -57,5 +57,3 @@ export { default as LabelCustomizeRangePicker } from './label-customize-range-pi
 export type { RichTextEditorProps } from './rich-text-editor';
 export { default as RichTextEditor } from './rich-text-editor';
 export { default as beautifulDnd } from './beautiful-dnd';
-export type { CustomizeRangePickerProps } from './customize-range-picker';
-export { default as CustomizeRangePicker } from './customize-range-picker';

package/lib/index.js

@@ -9,7 +9,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CustomizeRangePicker = exports.beautifulDnd = exports.RichTextEditor = exports.LabelCustomizeRangePicker = exports.LabelTreeSelect = exports.LabelConditionInput = exports.LabelNumberInput = exports.LabelAutoComplete = exports.LabelDatePicker = exports.LabelRangePicker = exports.LabelTextArea = exports.LabelSelect = exports.LabelInput = exports.TextInput = exports.TextArea = exports.SplitPane = exports.sortableHoc = exports.SingleImgUpload = exports.RcTransitionGroup = exports.RcQRcode = exports.RcEcharts = exports.StepNumberInput = exports.NumberInput = exports.RcMotion = exports.KeepTab = exports.ImgCrop = exports.HighlightWords = exports.HighlightTextarea = exports.CopyToClipboard = exports.ConditionInput = exports.ButtonModal = exports.ButtonDrawer = void 0;
+exports.beautifulDnd = exports.RichTextEditor = exports.LabelCustomizeRangePicker = exports.LabelTreeSelect = exports.LabelConditionInput = exports.LabelNumberInput = exports.LabelAutoComplete = exports.LabelDatePicker = exports.LabelRangePicker = exports.LabelTextArea = exports.LabelSelect = exports.LabelInput = exports.TextInput = exports.TextArea = exports.SplitPane = exports.sortableHoc = exports.SingleImgUpload = exports.RcTransitionGroup = exports.RcQRcode = exports.RcEcharts = exports.StepNumberInput = exports.NumberInput = exports.RcMotion = exports.KeepTab = exports.ImgCrop = exports.HighlightWords = exports.HighlightTextarea = exports.CopyToClipboard = exports.ConditionInput = exports.ButtonModal = exports.ButtonDrawer = void 0;
 
 var button_drawer_1 = require("./button-drawer");
 
@@ -288,13 +288,4 @@ Object.defineProperty(exports, "beautifulDnd", {
   get: function get() {
     return __importDefault(beautiful_dnd_1)["default"];
   }
-});
-
-var customize_range_picker_1 = require("./customize-range-picker");
-
-Object.defineProperty(exports, "CustomizeRangePicker", {
-  enumerable: true,
-  get: function get() {
-    return __importDefault(customize_range_picker_1)["default"];
-  }
 });

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { Moment } from 'moment';
 import type { dateTypeEnum } from './defaultRadioList';
 import type { LabelRangePickerProps } from '../label-range-picker';
@@ -6,9 +7,11 @@ export declare type RadioListType = {
     text: string;
     value: [Moment, Moment];
 };
-export interface LabelCustomizeRangePickerProps extends LabelRangePickerProps {
+export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerProps, 'label'> {
     radioList?: RadioListType[];
     customizeTimeList?: dateTypeEnum[];
+    rangePickerType?: 'label' | 'origin';
+    label?: React.ReactNode;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

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

@@ -112,28 +112,39 @@ var radio_1 = __importDefault(require("antd/lib/radio"));
 
 var checkbox_1 = __importDefault(require("antd/lib/checkbox"));
 
+var date_picker_1 = __importDefault(require("antd/lib/date-picker"));
+
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 
 var defaultRadioList_1 = __importDefault(require("./defaultRadioList"));
 
 var label_range_picker_1 = __importDefault(require("../label-range-picker"));
 
+var RangePicker = date_picker_1["default"].RangePicker;
+
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var customizeTimeList = props.customizeTimeList,
       radioList = props.radioList,
-      options = __rest(props, ["customizeTimeList", "radioList"]);
+      _a = props.rangePickerType,
+      rangePickerType = _a === void 0 ? 'label' : _a,
+      label = props.label,
+      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label"]);
+
+  var _b = __read((0, useControllableValue_1["default"])(props), 2),
+      date = _b[0],
+      setDate = _b[1];
 
-  var _a = __read((0, useControllableValue_1["default"])(props), 2),
-      date = _a[0],
-      setDate = _a[1];
+  var _c = __read((0, react_1.useState)(false), 2),
+      isVisiblePanel = _c[0],
+      setIsVisiblePanel = _c[1];
 
-  var _b = __read((0, react_1.useState)(false), 2),
-      isVisiblePanel = _b[0],
-      setIsVisiblePanel = _b[1];
+  var _d = __read((0, react_1.useState)(), 2),
+      radioKey = _d[0],
+      setRadioKey = _d[1];
 
-  var _c = __read((0, react_1.useState)(), 2),
-      radioKey = _c[0],
-      setRadioKey = _c[1];
+  var _e = __read((0, react_1.useState)(false), 2),
+      open = _e[0],
+      setOpen = _e[1];
 
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList_1["default"];
   (0, react_1.useEffect)(function () {
@@ -174,6 +185,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       return item.key === value;
     });
     setDate(selectRadioInfo === null || selectRadioInfo === void 0 ? void 0 : selectRadioInfo.value);
+    setOpen(false);
   };
 
   var list = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList_1["default"].filter(function (item) {
@@ -209,11 +221,21 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }))));
   };
 
-  return react_1["default"].createElement(label_range_picker_1["default"], __assign({
+  var onOpenChange = function onOpenChange(nextOpen) {
+    setOpen(nextOpen);
+  };
+
+  var baseOptions = {
     value: date,
     onChange: onDateChange,
-    panelRender: panelRender
-  }, options));
+    open: open,
+    onOpenChange: onOpenChange,
+    panelRender: panelRender,
+    allowClear: false
+  };
+  return rangePickerType === 'label' ? react_1["default"].createElement(label_range_picker_1["default"], __assign({
+    label: label
+  }, baseOptions, options)) : react_1["default"].createElement(RangePicker, __assign({}, baseOptions, options));
 };
 
 exports["default"] = LabelCustomizeRangePicker;

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

@@ -1,4 +1,5 @@
 import 'antd/lib/date-picker/style';
 import 'antd/lib/checkbox/style';
+import 'antd/lib/radio/style';
 import './index.less';
 import '../../label-range-picker/style/index';

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

@@ -8,6 +8,8 @@ require("antd/lib/date-picker/style");
 
 require("antd/lib/checkbox/style");
 
+require("antd/lib/radio/style");
+
 require("./index.less");
 
 require("../../label-range-picker/style/index");

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

@@ -61,6 +61,8 @@ var date_picker_1 = __importDefault(require("antd/lib/date-picker"));
 
 var classnames_1 = __importDefault(require("classnames"));
 
+var omit_1 = __importDefault(require("lodash/omit"));
+
 var CalendarOutlined_1 = __importDefault(require("a-icons/lib/CalendarOutlined"));
 
 var RangePicker = date_picker_1["default"].RangePicker;
@@ -72,10 +74,10 @@ var LabelDatePicker = function LabelDatePicker(props) {
 
   var _a = __read((0, useControllableValue_1["default"])(props, {
     valuePropName: 'open',
-    trigger: 'setOpen'
+    trigger: 'onOpenChange'
   }), 2),
       open = _a[0],
-      setOpen = _a[1];
+      onOpenChange = _a[1];
 
   var _b = __read((0, useControllableValue_1["default"])(props), 2),
       value = _b[0],
@@ -89,18 +91,14 @@ var LabelDatePicker = function LabelDatePicker(props) {
     var _a;
 
     if (!open) {
-      setOpen(!open);
+      onOpenChange(!open);
     }
 
     (_a = datePickerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
   };
 
-  var onBlur = function onBlur() {
-    setOpen(false);
-  };
-
-  var onOpenChange = function onOpenChange(nextOpen) {
-    setOpen(nextOpen);
+  var handleOpenChange = function handleOpenChange(nextOpen) {
+    onOpenChange(nextOpen);
   };
 
   return react_1["default"].createElement("div", {
@@ -111,13 +109,12 @@ var LabelDatePicker = function LabelDatePicker(props) {
   }, react_1["default"].createElement(RangePicker, __assign({
     format: "YYYY.MM.DD",
     allowEmpty: [true, true]
-  }, props, {
+  }, (0, omit_1["default"])(props, 'onOpenChange'), {
     separator: "\u2013",
     open: open,
     onChange: handleChange,
     ref: datePickerRef,
-    onOpenChange: onOpenChange,
-    onBlur: onBlur,
+    onOpenChange: handleOpenChange,
     suffixIcon: react_1["default"].createElement(CalendarOutlined_1["default"], null)
   })), react_1["default"].createElement("label", {
     className: "label-range-picker-text",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -70,5 +70,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "270208fe8e8edd0adc05ecba50925a62205d8d98"
+  "gitHead": "33a1e9aa74e410550cbbeaee666f48426a7dfad1"
 }

package/es/customize-range-picker/defaultRadioList.d.ts

@@ -1,24 +0,0 @@
-import type { Moment } from 'moment';
-export declare enum dateTypeEnum {
-    TODAY = 1,
-    YESTERDAY = 2,
-    WEEK = 3,
-    LAST_WEEK = 4,
-    MONTH = 5,
-    LAST_MONTH = 6,
-    QUARTER = 7,
-    LAST_QUARTER = 8,
-    BEFORE_7_DAY = 9,
-    BEFORE_14_DAY = 10,
-    BEFORE_30_DAY = 11,
-    BEFORE_90_DAY = 12,
-    BEFORE_180_DAY = 13,
-    BEFORE_365_DAY = 14
-}
-export declare type RadioListType = {
-    key: string | number | dateTypeEnum;
-    text: string;
-    value: [Moment, Moment];
-};
-declare const defaultRadioList: RadioListType[];
-export default defaultRadioList;

package/es/customize-range-picker/defaultRadioList.js

@@ -1,79 +0,0 @@
-import moment from 'moment';
-var now = moment();
-export var dateTypeEnum;
-
-(function (dateTypeEnum) {
-  dateTypeEnum[dateTypeEnum["TODAY"] = 1] = "TODAY";
-  dateTypeEnum[dateTypeEnum["YESTERDAY"] = 2] = "YESTERDAY";
-  dateTypeEnum[dateTypeEnum["WEEK"] = 3] = "WEEK";
-  dateTypeEnum[dateTypeEnum["LAST_WEEK"] = 4] = "LAST_WEEK";
-  dateTypeEnum[dateTypeEnum["MONTH"] = 5] = "MONTH";
-  dateTypeEnum[dateTypeEnum["LAST_MONTH"] = 6] = "LAST_MONTH";
-  dateTypeEnum[dateTypeEnum["QUARTER"] = 7] = "QUARTER";
-  dateTypeEnum[dateTypeEnum["LAST_QUARTER"] = 8] = "LAST_QUARTER";
-  dateTypeEnum[dateTypeEnum["BEFORE_7_DAY"] = 9] = "BEFORE_7_DAY";
-  dateTypeEnum[dateTypeEnum["BEFORE_14_DAY"] = 10] = "BEFORE_14_DAY";
-  dateTypeEnum[dateTypeEnum["BEFORE_30_DAY"] = 11] = "BEFORE_30_DAY";
-  dateTypeEnum[dateTypeEnum["BEFORE_90_DAY"] = 12] = "BEFORE_90_DAY";
-  dateTypeEnum[dateTypeEnum["BEFORE_180_DAY"] = 13] = "BEFORE_180_DAY";
-  dateTypeEnum[dateTypeEnum["BEFORE_365_DAY"] = 14] = "BEFORE_365_DAY";
-})(dateTypeEnum || (dateTypeEnum = {}));
-
-var defaultRadioList = [{
-  key: dateTypeEnum.TODAY,
-  text: '今日',
-  value: [now.clone().startOf('day'), now.clone().endOf('day')]
-}, {
-  key: dateTypeEnum.YESTERDAY,
-  text: '昨日',
-  value: [now.clone().subtract(1, 'day').startOf('day'), now.clone().subtract(1, 'day').endOf('day')]
-}, {
-  key: dateTypeEnum.WEEK,
-  text: '本周',
-  value: [now.clone().startOf('week'), now.clone().endOf('week')]
-}, {
-  key: dateTypeEnum.LAST_WEEK,
-  text: '上周',
-  value: [now.clone().subtract(1, 'week').startOf('week'), now.clone().subtract(1, 'week').endOf('week')]
-}, {
-  key: dateTypeEnum.MONTH,
-  text: '本月',
-  value: [now.clone().startOf('month'), now.clone().endOf('month')]
-}, {
-  key: dateTypeEnum.LAST_MONTH,
-  text: '上月',
-  value: [now.clone().subtract(1, 'month').startOf('month'), now.clone().subtract(1, 'month').endOf('month')]
-}, {
-  key: dateTypeEnum.QUARTER,
-  text: '本季度',
-  value: [now.clone().startOf('quarter'), now.clone().endOf('quarter')]
-}, {
-  key: dateTypeEnum.LAST_QUARTER,
-  text: '上季度',
-  value: [now.clone().subtract(1, 'quarter').startOf('quarter'), now.clone().subtract(1, 'quarter').endOf('quarter')]
-}, {
-  key: dateTypeEnum.BEFORE_7_DAY,
-  text: '最近7天',
-  value: [now.clone().subtract(6, 'day').startOf('day'), now.endOf('day')]
-}, {
-  key: dateTypeEnum.BEFORE_14_DAY,
-  text: '最近14天',
-  value: [now.clone().subtract(13, 'day').startOf('day'), now.endOf('day')]
-}, {
-  key: dateTypeEnum.BEFORE_30_DAY,
-  text: '最近30天',
-  value: [now.clone().subtract(29, 'day').startOf('day'), now.endOf('day')]
-}, {
-  key: dateTypeEnum.BEFORE_90_DAY,
-  text: '最近90天',
-  value: [now.clone().subtract(89, 'day').startOf('day'), now.endOf('day')]
-}, {
-  key: dateTypeEnum.BEFORE_180_DAY,
-  text: '最近180天',
-  value: [now.clone().subtract(179, 'day').startOf('day'), now.endOf('day')]
-}, {
-  key: dateTypeEnum.BEFORE_365_DAY,
-  text: '最近365天',
-  value: [now.clone().subtract(364, 'day').startOf('day'), now.endOf('day')]
-}];
-export default defaultRadioList;

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

@@ -1,15 +0,0 @@
-import React from 'react';
-import type { Moment } from 'moment';
-import type { RangePickerProps } from 'antd/lib/date-picker';
-import type { dateTypeEnum } from './defaultRadioList';
-export declare type RadioListType = {
-    key: string | number | dateTypeEnum;
-    text: string;
-    value: [Moment, Moment];
-};
-export interface CustomizeRangePickerProps extends Omit<RangePickerProps, ''> {
-    customizeTimeList?: dateTypeEnum[];
-    radioList?: RadioListType[];
-}
-declare const CustomizeRangePicker: React.FC<CustomizeRangePickerProps>;
-export default CustomizeRangePicker;