assui 2.1.42 → 2.1.45
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.
- package/es/label-customize-range-picker/index.js +8 -4
- package/es/label-range-picker/index.d.ts +1 -0
- package/es/label-range-picker/index.js +0 -1
- package/es/label-text-area/index.d.ts +1 -1
- package/lib/label-customize-range-picker/index.js +8 -4
- package/lib/label-range-picker/index.d.ts +1 -0
- package/lib/label-range-picker/index.js +0 -1
- package/lib/label-text-area/index.d.ts +1 -1
- package/package.json +3 -3
|
@@ -73,8 +73,9 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
|
|
|
73
73
|
_a = props.rangePickerType,
|
|
74
74
|
rangePickerType = _a === void 0 ? 'label' : _a,
|
|
75
75
|
label = props.label,
|
|
76
|
+
showTime = props.showTime,
|
|
76
77
|
maxScope = props.maxScope,
|
|
77
|
-
options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
|
|
78
|
+
options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope"]);
|
|
78
79
|
|
|
79
80
|
var _b = __read(useControllableValue(props), 2),
|
|
80
81
|
date = _b[0],
|
|
@@ -141,8 +142,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
|
|
|
141
142
|
start = _c[0],
|
|
142
143
|
end = _c[1];
|
|
143
144
|
|
|
144
|
-
var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
|
|
145
|
-
var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
|
|
145
|
+
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;
|
|
146
|
+
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;
|
|
146
147
|
|
|
147
148
|
if (!nextStartDate && !nextEndDate) {
|
|
148
149
|
return setDate(undefined);
|
|
@@ -242,8 +243,11 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
|
|
|
242
243
|
allowClear: false
|
|
243
244
|
};
|
|
244
245
|
return rangePickerType === 'label' ? /*#__PURE__*/React.createElement(LabelRangePicker, __assign({
|
|
246
|
+
showTime: showTime,
|
|
245
247
|
label: label
|
|
246
|
-
}, baseOptions, omit(options, 'onChange'))) : /*#__PURE__*/React.createElement(RangePicker, __assign({
|
|
248
|
+
}, baseOptions, omit(options, 'onChange'))) : /*#__PURE__*/React.createElement(RangePicker, __assign({
|
|
249
|
+
showTime: showTime
|
|
250
|
+
}, baseOptions, omit(options, 'onChange')));
|
|
247
251
|
};
|
|
248
252
|
|
|
249
253
|
export default LabelCustomizeRangePicker;
|
|
@@ -2,6 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import type { RangePickerProps } from 'antd/lib/date-picker';
|
|
3
3
|
export interface LabelRangePickerProps extends Omit<RangePickerProps, 'label'> {
|
|
4
4
|
label: React.ReactNode;
|
|
5
|
+
showTime?: any;
|
|
5
6
|
}
|
|
6
7
|
declare const LabelDatePicker: React.FC<LabelRangePickerProps>;
|
|
7
8
|
export default LabelDatePicker;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur'> {
|
|
2
|
+
export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur' | 'style'> {
|
|
3
3
|
/** 自定义class */
|
|
4
4
|
className?: string;
|
|
5
5
|
/** label 标签的文本 */
|
|
@@ -136,8 +136,9 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
|
|
|
136
136
|
_a = props.rangePickerType,
|
|
137
137
|
rangePickerType = _a === void 0 ? 'label' : _a,
|
|
138
138
|
label = props.label,
|
|
139
|
+
showTime = props.showTime,
|
|
139
140
|
maxScope = props.maxScope,
|
|
140
|
-
options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
|
|
141
|
+
options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope"]);
|
|
141
142
|
|
|
142
143
|
var _b = __read((0, useControllableValue_1["default"])(props), 2),
|
|
143
144
|
date = _b[0],
|
|
@@ -204,8 +205,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
|
|
|
204
205
|
start = _c[0],
|
|
205
206
|
end = _c[1];
|
|
206
207
|
|
|
207
|
-
var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
|
|
208
|
-
var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
|
|
208
|
+
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;
|
|
209
|
+
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;
|
|
209
210
|
|
|
210
211
|
if (!nextStartDate && !nextEndDate) {
|
|
211
212
|
return setDate(undefined);
|
|
@@ -305,8 +306,11 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
|
|
|
305
306
|
allowClear: false
|
|
306
307
|
};
|
|
307
308
|
return rangePickerType === 'label' ? react_1["default"].createElement(label_range_picker_1["default"], __assign({
|
|
309
|
+
showTime: showTime,
|
|
308
310
|
label: label
|
|
309
|
-
}, baseOptions, (0, omit_1["default"])(options, 'onChange'))) : react_1["default"].createElement(RangePicker, __assign({
|
|
311
|
+
}, baseOptions, (0, omit_1["default"])(options, 'onChange'))) : react_1["default"].createElement(RangePicker, __assign({
|
|
312
|
+
showTime: showTime
|
|
313
|
+
}, baseOptions, (0, omit_1["default"])(options, 'onChange')));
|
|
310
314
|
};
|
|
311
315
|
|
|
312
316
|
exports["default"] = LabelCustomizeRangePicker;
|
|
@@ -2,6 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import type { RangePickerProps } from 'antd/lib/date-picker';
|
|
3
3
|
export interface LabelRangePickerProps extends Omit<RangePickerProps, 'label'> {
|
|
4
4
|
label: React.ReactNode;
|
|
5
|
+
showTime?: any;
|
|
5
6
|
}
|
|
6
7
|
declare const LabelDatePicker: React.FC<LabelRangePickerProps>;
|
|
7
8
|
export default LabelDatePicker;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur'> {
|
|
2
|
+
export interface LabelTextAreaProps extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'size' | 'type' | 'onChange' | 'onFocus' | 'onBlur' | 'style'> {
|
|
3
3
|
/** 自定义class */
|
|
4
4
|
className?: string;
|
|
5
5
|
/** label 标签的文本 */
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "assui",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.45",
|
|
4
4
|
"description": "react ui library",
|
|
5
5
|
"author": "jason <usochen@gmail.com>",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@tinymce/tinymce-react": "^4.0.0",
|
|
35
35
|
"@types/react-beautiful-dnd": "^13.1.2",
|
|
36
36
|
"@types/react-resizable": "^3.0.0",
|
|
37
|
-
"a-icons": "^1.0.
|
|
37
|
+
"a-icons": "^1.0.82",
|
|
38
38
|
"aa-utils": "^2.0.35",
|
|
39
39
|
"ahooks": "^3.0.8",
|
|
40
40
|
"bignumber.js": "^9.0.1",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"node": ">=10.0.0"
|
|
74
74
|
},
|
|
75
75
|
"license": "MIT",
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "dcc8d61e3d045d6249fef1c539e084b164fbc804"
|
|
77
77
|
}
|