linkmore-design 1.1.25 → 1.1.26
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/dist/index.umd.js +35 -10
- package/dist/index.umd.min.js +8 -8
- package/es/Input/index.js +27 -2
- package/es/LmFilter/filterFns/index.js +1 -1
- package/es/LmUpload/LmUpload.js +4 -2
- package/lib/Input/index.js +29 -2
- package/lib/LmFilter/filterFns/index.js +1 -1
- package/lib/LmUpload/LmUpload.js +7 -2
- package/package.json +5 -1
package/es/Input/index.js
CHANGED
|
@@ -47,19 +47,44 @@ LmInput.Search = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
47
47
|
var _props$allowClear2 = props.allowClear,
|
|
48
48
|
allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
|
|
49
49
|
className = props.className,
|
|
50
|
-
|
|
50
|
+
customSize = props.size,
|
|
51
|
+
customDisabled = props.disabled,
|
|
52
|
+
rest = __rest(props // ===================== Size =====================
|
|
53
|
+
, ["allowClear", "className", "size", "disabled"]); // ===================== Size =====================
|
|
54
|
+
|
|
51
55
|
|
|
56
|
+
var size = customSize || React.useContext(SizeContext) || 'middle'; // ===================== Disabled =====================
|
|
57
|
+
|
|
58
|
+
var disabled = React.useContext(DisabledContext);
|
|
59
|
+
var mergedDisabled = customDisabled || disabled;
|
|
52
60
|
return /*#__PURE__*/React.createElement(_Input.Search, Object.assign({
|
|
53
61
|
enterButton: /*#__PURE__*/React.createElement(IconFont, {
|
|
54
62
|
type: "lmweb-search"
|
|
55
63
|
})
|
|
56
64
|
}, rest, {
|
|
57
65
|
ref: ref,
|
|
66
|
+
disabled: mergedDisabled || undefined,
|
|
58
67
|
allowClear: allowClear,
|
|
68
|
+
size: size,
|
|
59
69
|
className: cn('lm_input_search', className)
|
|
60
70
|
}));
|
|
61
71
|
});
|
|
62
|
-
LmInput.TextArea =
|
|
72
|
+
LmInput.TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
73
|
+
var customSize = props.size,
|
|
74
|
+
customDisabled = props.disabled,
|
|
75
|
+
rest = __rest(props // ===================== Size =====================
|
|
76
|
+
, ["size", "disabled"]); // ===================== Size =====================
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
var size = customSize || React.useContext(SizeContext) || 'middle'; // ===================== Disabled =====================
|
|
80
|
+
|
|
81
|
+
var disabled = React.useContext(DisabledContext);
|
|
82
|
+
var mergedDisabled = customDisabled || disabled;
|
|
83
|
+
return /*#__PURE__*/React.createElement(_Input.TextArea, Object.assign({
|
|
84
|
+
size: size,
|
|
85
|
+
disabled: mergedDisabled || undefined
|
|
86
|
+
}, rest));
|
|
87
|
+
});
|
|
63
88
|
|
|
64
89
|
LmInput.Password = function (props) {
|
|
65
90
|
var _props$allowClear3 = props.allowClear,
|
|
@@ -172,7 +172,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
172
172
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
173
173
|
type: item.type,
|
|
174
174
|
value: Array.isArray(itemValue) ? itemValue : [itemValue],
|
|
175
|
-
operator: obj[cur].mode === 'and' ? 'equal' : 'contains'
|
|
175
|
+
operator: (item === null || item === void 0 ? void 0 : item.operator) || obj[cur].mode === 'and' ? 'equal' : 'contains'
|
|
176
176
|
}]);
|
|
177
177
|
}
|
|
178
178
|
|
package/es/LmUpload/LmUpload.js
CHANGED
|
@@ -13,6 +13,7 @@ var __rest = this && this.__rest || function (s, e) {
|
|
|
13
13
|
|
|
14
14
|
import React, { useRef, useMemo, forwardRef } from 'react';
|
|
15
15
|
import LmFilterRoot from './wrapper/UploadRoot';
|
|
16
|
+
import DisabledContext from '../ConfigProvider/DisabledContext';
|
|
16
17
|
|
|
17
18
|
var LmUpload = function LmUpload(_a, ref) {
|
|
18
19
|
var _fileConfig = _a.fileConfig,
|
|
@@ -21,7 +22,8 @@ var LmUpload = function LmUpload(_a, ref) {
|
|
|
21
22
|
_ossConfig = _a.ossConfig,
|
|
22
23
|
resetProps = __rest(_a, ["fileConfig", "fileNames", "components", "ossConfig"]);
|
|
23
24
|
|
|
24
|
-
var defaultRef = useRef(null);
|
|
25
|
+
var defaultRef = useRef(null);
|
|
26
|
+
var disabled = React.useContext(DisabledContext); // 仅在初始化触发一次
|
|
25
27
|
|
|
26
28
|
var initConfig = useMemo(function () {
|
|
27
29
|
return {
|
|
@@ -78,7 +80,7 @@ var LmUpload = function LmUpload(_a, ref) {
|
|
|
78
80
|
type: ['jpg', 'jpeg', 'png'],
|
|
79
81
|
listType: 'card',
|
|
80
82
|
readOnly: false,
|
|
81
|
-
disabled: false,
|
|
83
|
+
disabled: disabled || false,
|
|
82
84
|
showUploadList: true,
|
|
83
85
|
fileList: null,
|
|
84
86
|
defaultFileList: [],
|
package/lib/Input/index.js
CHANGED
|
@@ -65,19 +65,46 @@ LmInput.Search = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
65
65
|
var _props$allowClear2 = props.allowClear,
|
|
66
66
|
allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
|
|
67
67
|
className = props.className,
|
|
68
|
-
|
|
68
|
+
customSize = props.size,
|
|
69
|
+
customDisabled = props.disabled,
|
|
70
|
+
rest = __rest(props // ===================== Size =====================
|
|
71
|
+
, ["allowClear", "className", "size", "disabled"]); // ===================== Size =====================
|
|
72
|
+
|
|
69
73
|
|
|
74
|
+
var size = customSize || _react.default.useContext(_SizeContext.default) || 'middle'; // ===================== Disabled =====================
|
|
75
|
+
|
|
76
|
+
var disabled = _react.default.useContext(_DisabledContext.default);
|
|
77
|
+
|
|
78
|
+
var mergedDisabled = customDisabled || disabled;
|
|
70
79
|
return /*#__PURE__*/_react.default.createElement(_input.default.Search, Object.assign({
|
|
71
80
|
enterButton: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
72
81
|
type: "lmweb-search"
|
|
73
82
|
})
|
|
74
83
|
}, rest, {
|
|
75
84
|
ref: ref,
|
|
85
|
+
disabled: mergedDisabled || undefined,
|
|
76
86
|
allowClear: allowClear,
|
|
87
|
+
size: size,
|
|
77
88
|
className: (0, _classnames.default)('lm_input_search', className)
|
|
78
89
|
}));
|
|
79
90
|
});
|
|
80
|
-
LmInput.TextArea =
|
|
91
|
+
LmInput.TextArea = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
92
|
+
var customSize = props.size,
|
|
93
|
+
customDisabled = props.disabled,
|
|
94
|
+
rest = __rest(props // ===================== Size =====================
|
|
95
|
+
, ["size", "disabled"]); // ===================== Size =====================
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
var size = customSize || _react.default.useContext(_SizeContext.default) || 'middle'; // ===================== Disabled =====================
|
|
99
|
+
|
|
100
|
+
var disabled = _react.default.useContext(_DisabledContext.default);
|
|
101
|
+
|
|
102
|
+
var mergedDisabled = customDisabled || disabled;
|
|
103
|
+
return /*#__PURE__*/_react.default.createElement(_input.default.TextArea, Object.assign({
|
|
104
|
+
size: size,
|
|
105
|
+
disabled: mergedDisabled || undefined
|
|
106
|
+
}, rest));
|
|
107
|
+
});
|
|
81
108
|
|
|
82
109
|
LmInput.Password = function (props) {
|
|
83
110
|
var _props$allowClear3 = props.allowClear,
|
|
@@ -188,7 +188,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
188
188
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
189
189
|
type: item.type,
|
|
190
190
|
value: Array.isArray(itemValue) ? itemValue : [itemValue],
|
|
191
|
-
operator: obj[cur].mode === 'and' ? 'equal' : 'contains'
|
|
191
|
+
operator: (item === null || item === void 0 ? void 0 : item.operator) || obj[cur].mode === 'and' ? 'equal' : 'contains'
|
|
192
192
|
}]);
|
|
193
193
|
}
|
|
194
194
|
|
package/lib/LmUpload/LmUpload.js
CHANGED
|
@@ -13,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
13
13
|
|
|
14
14
|
var _UploadRoot = _interopRequireDefault(require("./wrapper/UploadRoot"));
|
|
15
15
|
|
|
16
|
+
var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
|
|
17
|
+
|
|
16
18
|
var __rest = void 0 && (void 0).__rest || function (s, e) {
|
|
17
19
|
var t = {};
|
|
18
20
|
|
|
@@ -33,7 +35,10 @@ var LmUpload = function LmUpload(_a, ref) {
|
|
|
33
35
|
_ossConfig = _a.ossConfig,
|
|
34
36
|
resetProps = __rest(_a, ["fileConfig", "fileNames", "components", "ossConfig"]);
|
|
35
37
|
|
|
36
|
-
var defaultRef = (0, _react.useRef)(null);
|
|
38
|
+
var defaultRef = (0, _react.useRef)(null);
|
|
39
|
+
|
|
40
|
+
var disabled = _react.default.useContext(_DisabledContext.default); // 仅在初始化触发一次
|
|
41
|
+
|
|
37
42
|
|
|
38
43
|
var initConfig = (0, _react.useMemo)(function () {
|
|
39
44
|
return {
|
|
@@ -90,7 +95,7 @@ var LmUpload = function LmUpload(_a, ref) {
|
|
|
90
95
|
type: ['jpg', 'jpeg', 'png'],
|
|
91
96
|
listType: 'card',
|
|
92
97
|
readOnly: false,
|
|
93
|
-
disabled: false,
|
|
98
|
+
disabled: disabled || false,
|
|
94
99
|
showUploadList: true,
|
|
95
100
|
fileList: null,
|
|
96
101
|
defaultFileList: [],
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "linkmore-design",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.26",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "nowthen",
|
|
6
6
|
"email": "rnlvwyx@gmail.com"
|
|
@@ -27,6 +27,10 @@
|
|
|
27
27
|
"react-template",
|
|
28
28
|
"nowthen"
|
|
29
29
|
],
|
|
30
|
+
"publishConfig": {
|
|
31
|
+
"registry": "https://registry.npmjs.org/",
|
|
32
|
+
"access": "public"
|
|
33
|
+
},
|
|
30
34
|
"license": "MIT",
|
|
31
35
|
"scripts": {
|
|
32
36
|
"prettier": "prettier --write src/**/*.{js,jsx,tsx,ts,less,md,json}",
|