linkmore-design 1.1.27 → 1.1.28
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 +8 -5
- package/dist/index.umd.min.js +2 -2
- package/es/LmFilter/baseFilter/index.js +3 -2
- package/es/LmFilter/filterFns/index.js +4 -2
- package/es/LmUpload/body/UploadCore.js +1 -1
- package/lib/LmFilter/baseFilter/index.js +3 -2
- package/lib/LmFilter/filterFns/index.js +4 -2
- package/lib/LmUpload/body/UploadCore.js +1 -1
- package/package.json +1 -1
|
@@ -16,8 +16,9 @@ var _components = _interopRequireDefault(require("../components"));
|
|
|
16
16
|
// 二级过滤 => 基础过滤组件
|
|
17
17
|
var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
18
18
|
var instance = _ref.instance;
|
|
19
|
-
var dataSource = instance.dataSource
|
|
20
|
-
|
|
19
|
+
var dataSource = instance.dataSource,
|
|
20
|
+
enableSearch = instance.enableSearch;
|
|
21
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, enableSearch && /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
|
|
21
22
|
instance: instance
|
|
22
23
|
}), dataSource.map(function (v, index) {
|
|
23
24
|
var isHidden = !v.show && typeof v.show === 'boolean';
|
|
@@ -168,6 +168,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
168
168
|
|
|
169
169
|
if (getIsHas(itemValue) && !!item) {
|
|
170
170
|
return [].concat(_toConsumableArray(pre), [{
|
|
171
|
+
relation: obj[cur].mode || 'and',
|
|
171
172
|
fieldName: cur,
|
|
172
173
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
173
174
|
type: item.type,
|
|
@@ -177,7 +178,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
177
178
|
* and 等同于逻辑关系contains: 选中的值包含所有值
|
|
178
179
|
* or 等同于逻辑关系in: 选中的值存在于所有值之中
|
|
179
180
|
*/
|
|
180
|
-
operator:
|
|
181
|
+
operator: 'in'
|
|
181
182
|
}]);
|
|
182
183
|
}
|
|
183
184
|
|
|
@@ -344,11 +345,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
344
345
|
if (getIsHas(itemValue) && !!item) {
|
|
345
346
|
// eslint-disable-next-line no-param-reassign
|
|
346
347
|
pre[cur] = {
|
|
348
|
+
relation: complexFilter[cur].mode || 'and',
|
|
347
349
|
fieldName: cur,
|
|
348
350
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
349
351
|
type: item.type,
|
|
350
352
|
value: Array.isArray(itemValue) ? itemValue : [itemValue],
|
|
351
|
-
operator:
|
|
353
|
+
operator: 'in'
|
|
352
354
|
};
|
|
353
355
|
}
|
|
354
356
|
|
|
@@ -24,7 +24,7 @@ var UploadCore = function UploadCore(_ref) {
|
|
|
24
24
|
var isUploading = getUploadStatus().uploading;
|
|
25
25
|
if (isUploading) return;
|
|
26
26
|
(_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.click();
|
|
27
|
-
}, [getUploadStatus]); // 上传触发事件
|
|
27
|
+
}, [disabled, getUploadStatus]); // 上传触发事件
|
|
28
28
|
|
|
29
29
|
var uploadChange = useCallback(function (e) {
|
|
30
30
|
var _a;
|
|
@@ -16,8 +16,9 @@ var _components = _interopRequireDefault(require("../components"));
|
|
|
16
16
|
// 二级过滤 => 基础过滤组件
|
|
17
17
|
var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
18
18
|
var instance = _ref.instance;
|
|
19
|
-
var dataSource = instance.dataSource
|
|
20
|
-
|
|
19
|
+
var dataSource = instance.dataSource,
|
|
20
|
+
enableSearch = instance.enableSearch;
|
|
21
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, enableSearch && /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
|
|
21
22
|
instance: instance
|
|
22
23
|
}), dataSource.map(function (v, index) {
|
|
23
24
|
var isHidden = !v.show && typeof v.show === 'boolean';
|
|
@@ -184,6 +184,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
184
184
|
|
|
185
185
|
if ((0, _utils.getIsHas)(itemValue) && !!item) {
|
|
186
186
|
return [].concat((0, _toConsumableArray2.default)(pre), [{
|
|
187
|
+
relation: obj[cur].mode || 'and',
|
|
187
188
|
fieldName: cur,
|
|
188
189
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
189
190
|
type: item.type,
|
|
@@ -193,7 +194,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
193
194
|
* and 等同于逻辑关系contains: 选中的值包含所有值
|
|
194
195
|
* or 等同于逻辑关系in: 选中的值存在于所有值之中
|
|
195
196
|
*/
|
|
196
|
-
operator:
|
|
197
|
+
operator: 'in'
|
|
197
198
|
}]);
|
|
198
199
|
}
|
|
199
200
|
|
|
@@ -360,11 +361,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
360
361
|
if ((0, _utils.getIsHas)(itemValue) && !!item) {
|
|
361
362
|
// eslint-disable-next-line no-param-reassign
|
|
362
363
|
pre[cur] = {
|
|
364
|
+
relation: complexFilter[cur].mode || 'and',
|
|
363
365
|
fieldName: cur,
|
|
364
366
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
365
367
|
type: item.type,
|
|
366
368
|
value: Array.isArray(itemValue) ? itemValue : [itemValue],
|
|
367
|
-
operator:
|
|
369
|
+
operator: 'in'
|
|
368
370
|
};
|
|
369
371
|
}
|
|
370
372
|
|
|
@@ -39,7 +39,7 @@ var UploadCore = function UploadCore(_ref) {
|
|
|
39
39
|
var isUploading = getUploadStatus().uploading;
|
|
40
40
|
if (isUploading) return;
|
|
41
41
|
(_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.click();
|
|
42
|
-
}, [getUploadStatus]); // 上传触发事件
|
|
42
|
+
}, [disabled, getUploadStatus]); // 上传触发事件
|
|
43
43
|
|
|
44
44
|
var uploadChange = (0, _react.useCallback)(function (e) {
|
|
45
45
|
var _a;
|