linkmore-design 1.1.27-beta.5 → 1.1.27-beta.7
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/Form/FormItem/index.d.ts +1 -0
- package/dist/index.umd.js +48 -29
- package/dist/index.umd.min.js +3 -3
- package/dist/variables.css +3 -2
- package/es/CardTable/style/index.css +3 -2
- package/es/CardTable/style/variables.css +3 -2
- package/es/Form/FormItem/index.d.ts +1 -0
- package/es/Form/FormItem/index.js +32 -21
- package/es/LmFilter/baseFilter/index.js +3 -2
- package/es/LmFilter/filterFns/index.js +4 -2
- package/es/LmTable/Table.js +8 -2
- package/es/LmUpload/body/UploadCore.js +1 -1
- package/es/LmUpload/fns/index.js +1 -1
- package/es/styles/variables.css +3 -2
- package/lib/CardTable/style/index.css +3 -2
- package/lib/CardTable/style/variables.css +3 -2
- package/lib/Form/FormItem/index.d.ts +1 -0
- package/lib/Form/FormItem/index.js +32 -21
- package/lib/LmFilter/baseFilter/index.js +3 -2
- package/lib/LmFilter/filterFns/index.js +4 -2
- package/lib/LmTable/Table.js +8 -2
- package/lib/LmUpload/body/UploadCore.js +1 -1
- package/lib/LmUpload/fns/index.js +1 -1
- package/lib/styles/variables.css +3 -2
- package/package.json +3 -5
package/dist/variables.css
CHANGED
|
@@ -1403,9 +1403,10 @@ p {
|
|
|
1403
1403
|
.card_PTRO .card_PTRO_container:hover {
|
|
1404
1404
|
background-color: var(--color-6);
|
|
1405
1405
|
}
|
|
1406
|
-
.hasChecked .
|
|
1406
|
+
.hasChecked .lm_card_table_body_cell .card_checkbox,
|
|
1407
1407
|
.hasChecked .card_PTC .card_PTC_container .card_checkbox,
|
|
1408
|
-
.hasChecked .card_PTR .card_PTR_container .
|
|
1408
|
+
.hasChecked .card_PTR .card_PTR_container .card_checkbox,
|
|
1409
|
+
.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
|
|
1409
1410
|
opacity: 1;
|
|
1410
1411
|
}
|
|
1411
1412
|
.lm_cascader.ant-select.ant-select {
|
|
@@ -459,8 +459,9 @@
|
|
|
459
459
|
.card_PTRO .card_PTRO_container:hover {
|
|
460
460
|
background-color: var(--color-6);
|
|
461
461
|
}
|
|
462
|
-
.hasChecked .
|
|
462
|
+
.hasChecked .lm_card_table_body_cell .card_checkbox,
|
|
463
463
|
.hasChecked .card_PTC .card_PTC_container .card_checkbox,
|
|
464
|
-
.hasChecked .card_PTR .card_PTR_container .
|
|
464
|
+
.hasChecked .card_PTR .card_PTR_container .card_checkbox,
|
|
465
|
+
.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
|
|
465
466
|
opacity: 1;
|
|
466
467
|
}
|
|
@@ -459,8 +459,9 @@
|
|
|
459
459
|
.card_PTRO .card_PTRO_container:hover {
|
|
460
460
|
background-color: var(--color-6);
|
|
461
461
|
}
|
|
462
|
-
.hasChecked .
|
|
462
|
+
.hasChecked .lm_card_table_body_cell .card_checkbox,
|
|
463
463
|
.hasChecked .card_PTC .card_PTC_container .card_checkbox,
|
|
464
|
-
.hasChecked .card_PTR .card_PTR_container .
|
|
464
|
+
.hasChecked .card_PTR .card_PTR_container .card_checkbox,
|
|
465
|
+
.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
|
|
465
466
|
opacity: 1;
|
|
466
467
|
}
|
|
@@ -17,6 +17,7 @@ import useFrameState from '../hooks/useFrameState';
|
|
|
17
17
|
import useItemRef from '../hooks/useItemRef';
|
|
18
18
|
import { getFieldId, toArray } from '../util';
|
|
19
19
|
import ItemHolder from './ItemHolder';
|
|
20
|
+
import omit from 'rc-util/lib/omit';
|
|
20
21
|
var NAME_SPLIT = '__SPLIT__';
|
|
21
22
|
var ValidateStatuses = tuple('success', 'warning', 'error', 'validating', '');
|
|
22
23
|
var MemoInput = /*#__PURE__*/React.memo(function (_ref) {
|
|
@@ -74,16 +75,17 @@ function InternalFormItem(props) {
|
|
|
74
75
|
_props$trigger = props.trigger,
|
|
75
76
|
trigger = _props$trigger === void 0 ? 'onChange' : _props$trigger,
|
|
76
77
|
validateTrigger = props.validateTrigger,
|
|
77
|
-
hidden = props.hidden
|
|
78
|
+
hidden = props.hidden,
|
|
79
|
+
ruleTime = props.ruleTime;
|
|
78
80
|
var timerRef = useRef(null);
|
|
79
81
|
var _useState = useState([]),
|
|
80
82
|
_useState2 = _slicedToArray(_useState, 2),
|
|
81
|
-
|
|
82
|
-
|
|
83
|
+
errors = _useState2[0],
|
|
84
|
+
setErrors = _useState2[1];
|
|
83
85
|
var _useState3 = useState([]),
|
|
84
86
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
85
|
-
|
|
86
|
-
|
|
87
|
+
warnings = _useState4[0],
|
|
88
|
+
setWarnings = _useState4[1];
|
|
87
89
|
var _useContext = useContext(ConfigContext),
|
|
88
90
|
getPrefixCls = _useContext.getPrefixCls;
|
|
89
91
|
var _useContext2 = useContext(FormContext),
|
|
@@ -156,26 +158,33 @@ function InternalFormItem(props) {
|
|
|
156
158
|
});
|
|
157
159
|
};
|
|
158
160
|
// >>>>> Get merged errors
|
|
161
|
+
var _React$useMemo = React.useMemo(function () {
|
|
162
|
+
var errorList = _toConsumableArray(meta.errors);
|
|
163
|
+
var warningList = _toConsumableArray(meta.warnings);
|
|
164
|
+
Object.values(subFieldErrors).forEach(function (subFieldError) {
|
|
165
|
+
errorList.push.apply(errorList, _toConsumableArray(subFieldError.errors || []));
|
|
166
|
+
warningList.push.apply(warningList, _toConsumableArray(subFieldError.warnings || []));
|
|
167
|
+
});
|
|
168
|
+
return [errorList.slice(0, 1), warningList.slice(0, 1)];
|
|
169
|
+
}, [subFieldErrors, meta.errors, meta.warnings]),
|
|
170
|
+
_React$useMemo2 = _slicedToArray(_React$useMemo, 2),
|
|
171
|
+
mergedErrors = _React$useMemo2[0],
|
|
172
|
+
mergedWarnings = _React$useMemo2[1];
|
|
159
173
|
useEffect(function () {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
errorList.push.apply(errorList, _toConsumableArray(subFieldError.errors || []));
|
|
164
|
-
warningList.push.apply(warningList, _toConsumableArray(subFieldError.warnings || []));
|
|
165
|
-
});
|
|
166
|
-
setMergedErrors(errorList);
|
|
167
|
-
setMergedWarnings(warningList);
|
|
168
|
-
var time = getRuleTime(rules);
|
|
174
|
+
setErrors(mergedErrors);
|
|
175
|
+
setWarnings(mergedWarnings);
|
|
176
|
+
var time = ruleTime || getRuleTime(rules);
|
|
169
177
|
if (time) {
|
|
170
178
|
clearTimeout(timerRef.current);
|
|
171
179
|
timerRef.current = setTimeout(function () {
|
|
172
|
-
|
|
173
|
-
|
|
180
|
+
setErrors([]);
|
|
181
|
+
setWarnings([]);
|
|
174
182
|
}, time);
|
|
175
183
|
}
|
|
176
|
-
}, [
|
|
184
|
+
}, [mergedErrors, mergedWarnings]);
|
|
177
185
|
// ===================== Children Ref =====================
|
|
178
186
|
var getItemRef = useItemRef();
|
|
187
|
+
var _props = omit(props, ['ruleTime']);
|
|
179
188
|
// ======================== Render ========================
|
|
180
189
|
function renderLayout(baseChildren, fieldId, isRequired) {
|
|
181
190
|
if (noStyle && !hidden) {
|
|
@@ -183,12 +192,14 @@ function InternalFormItem(props) {
|
|
|
183
192
|
}
|
|
184
193
|
return /*#__PURE__*/React.createElement(ItemHolder, Object.assign({
|
|
185
194
|
key: "row"
|
|
186
|
-
},
|
|
195
|
+
}, _props, {
|
|
187
196
|
prefixCls: prefixCls,
|
|
188
197
|
fieldId: fieldId,
|
|
189
198
|
isRequired: isRequired,
|
|
190
|
-
errors
|
|
191
|
-
warnings
|
|
199
|
+
// errors={mergedErrors}
|
|
200
|
+
// warnings={mergedWarnings}
|
|
201
|
+
errors: errors,
|
|
202
|
+
warnings: warnings,
|
|
192
203
|
meta: meta,
|
|
193
204
|
onSubItemMetaChange: onSubItemMetaChange
|
|
194
205
|
}), baseChildren);
|
|
@@ -206,7 +217,7 @@ function InternalFormItem(props) {
|
|
|
206
217
|
variables = Object.assign(Object.assign({}, variables), messageVariables);
|
|
207
218
|
}
|
|
208
219
|
// >>>>> With Field
|
|
209
|
-
return /*#__PURE__*/React.createElement(Field, Object.assign({},
|
|
220
|
+
return /*#__PURE__*/React.createElement(Field, Object.assign({}, _props, {
|
|
210
221
|
messageVariables: variables,
|
|
211
222
|
trigger: trigger,
|
|
212
223
|
validateTrigger: mergedValidateTrigger,
|
|
@@ -12,8 +12,9 @@ var _components = _interopRequireDefault(require("../components"));
|
|
|
12
12
|
|
|
13
13
|
var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
14
14
|
var instance = _ref.instance;
|
|
15
|
-
var dataSource = instance.dataSource
|
|
16
|
-
|
|
15
|
+
var dataSource = instance.dataSource,
|
|
16
|
+
enableSearch = instance.enableSearch;
|
|
17
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, enableSearch && /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
|
|
17
18
|
instance: instance
|
|
18
19
|
}), dataSource.map(function (v, index) {
|
|
19
20
|
var isHidden = !v.show && typeof v.show === 'boolean';
|
|
@@ -143,6 +143,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
143
143
|
var itemValue = obj[cur].value;
|
|
144
144
|
if (getIsHas(itemValue) && !!item) {
|
|
145
145
|
return [].concat(_toConsumableArray(pre), [{
|
|
146
|
+
relation: obj[cur].mode || 'and',
|
|
146
147
|
fieldName: cur,
|
|
147
148
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
148
149
|
type: item.type,
|
|
@@ -151,7 +152,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
151
152
|
* and 等同于逻辑关系contains: 选中的值包含所有值
|
|
152
153
|
* or 等同于逻辑关系in: 选中的值存在于所有值之中
|
|
153
154
|
*/
|
|
154
|
-
operator:
|
|
155
|
+
operator: 'in'
|
|
155
156
|
}]);
|
|
156
157
|
}
|
|
157
158
|
return pre;
|
|
@@ -303,11 +304,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
303
304
|
if (getIsHas(itemValue) && !!item) {
|
|
304
305
|
// eslint-disable-next-line no-param-reassign
|
|
305
306
|
pre[cur] = {
|
|
307
|
+
relation: complexFilter[cur].mode || 'and',
|
|
306
308
|
fieldName: cur,
|
|
307
309
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
308
310
|
type: item.type,
|
|
309
311
|
value: Array.isArray(itemValue) ? itemValue : [itemValue],
|
|
310
|
-
operator:
|
|
312
|
+
operator: 'in'
|
|
311
313
|
};
|
|
312
314
|
}
|
|
313
315
|
return pre;
|
package/es/LmTable/Table.js
CHANGED
|
@@ -36,7 +36,7 @@ var _useGroupDataSource3 = _interopRequireDefault(require("./hooks/useGroupDataS
|
|
|
36
36
|
var _useDndItems2 = _interopRequireDefault(require("./hooks/useDndItems"));
|
|
37
37
|
var _HeaderCol = _interopRequireDefault(require("./components/HeaderCol"));
|
|
38
38
|
var _index = require("./common/index");
|
|
39
|
-
var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "groupRowKeys", "groupColKeys", "onGroupChange", "emptyProps"],
|
|
39
|
+
var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "groupRowKeys", "groupColKeys", "onGroupChange", "rowStyle", "emptyProps"],
|
|
40
40
|
_excluded2 = ["className", "style"],
|
|
41
41
|
_excluded3 = ["onResize", "width", "dataIndex", "onResizeStop"];
|
|
42
42
|
var Summary = _proTable.default.Summary;
|
|
@@ -115,6 +115,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
115
115
|
customizeGroupColKeys = props.groupColKeys,
|
|
116
116
|
_props$onGroupChange = props.onGroupChange,
|
|
117
117
|
onGroupChange = _props$onGroupChange === void 0 ? function () {} : _props$onGroupChange,
|
|
118
|
+
rowStyle = props.rowStyle,
|
|
118
119
|
emptyProps = props.emptyProps,
|
|
119
120
|
resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
120
121
|
if (!Array.isArray(customizeColumns) || !customizeColumns.length) {
|
|
@@ -1257,7 +1258,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1257
1258
|
}, [sortOpen, resizeable, components, colSortOpen, customizeDataSource, columns, openRowGroup]);
|
|
1258
1259
|
(0, _react.useEffect)(function () {
|
|
1259
1260
|
if (autoSize && autoSize.height !== '100%') {
|
|
1260
|
-
document.querySelector('.lm_protable .ant-table-body').style.height = autoSize.height
|
|
1261
|
+
document.querySelector('.lm_protable .ant-table-body').style.height = "".concat(autoSize.height, "px");
|
|
1261
1262
|
}
|
|
1262
1263
|
}, [autoSize]);
|
|
1263
1264
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -1306,6 +1307,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1306
1307
|
tableClassName: (0, _classnames.default)('lm_protable', resizeable && 'lm_resizeable'),
|
|
1307
1308
|
summary: function summary(pageData) {
|
|
1308
1309
|
return _summary && _summary(pageData, resultColumns);
|
|
1310
|
+
},
|
|
1311
|
+
onRow: function onRow() {
|
|
1312
|
+
return {
|
|
1313
|
+
style: rowStyle || {}
|
|
1314
|
+
};
|
|
1309
1315
|
}
|
|
1310
1316
|
}))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
|
|
1311
1317
|
loading: loading,
|
|
@@ -21,7 +21,7 @@ var UploadCore = function UploadCore(_ref) {
|
|
|
21
21
|
var isUploading = getUploadStatus().uploading;
|
|
22
22
|
if (isUploading) return;
|
|
23
23
|
(_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.click();
|
|
24
|
-
}, [getUploadStatus]);
|
|
24
|
+
}, [disabled, getUploadStatus]);
|
|
25
25
|
// 上传触发事件
|
|
26
26
|
var uploadChange = useCallback(function (e) {
|
|
27
27
|
var _a;
|
package/es/LmUpload/fns/index.js
CHANGED
|
@@ -333,7 +333,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
333
333
|
// 文件循环校验,返回校验后的文件数组
|
|
334
334
|
var filesLoopCheck = useCallback(function (files) {
|
|
335
335
|
return Promise.all(files.map(fileCheckAsync));
|
|
336
|
-
}, []);
|
|
336
|
+
}, [fileCheckAsync]);
|
|
337
337
|
/*
|
|
338
338
|
* 上传前: 先校验 => 全部校验通过后开始上传
|
|
339
339
|
* 事件执行顺序:
|
package/es/styles/variables.css
CHANGED
|
@@ -1403,9 +1403,10 @@ p {
|
|
|
1403
1403
|
.card_PTRO .card_PTRO_container:hover {
|
|
1404
1404
|
background-color: var(--color-6);
|
|
1405
1405
|
}
|
|
1406
|
-
.hasChecked .
|
|
1406
|
+
.hasChecked .lm_card_table_body_cell .card_checkbox,
|
|
1407
1407
|
.hasChecked .card_PTC .card_PTC_container .card_checkbox,
|
|
1408
|
-
.hasChecked .card_PTR .card_PTR_container .
|
|
1408
|
+
.hasChecked .card_PTR .card_PTR_container .card_checkbox,
|
|
1409
|
+
.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
|
|
1409
1410
|
opacity: 1;
|
|
1410
1411
|
}
|
|
1411
1412
|
.lm_cascader.ant-select.ant-select {
|
|
@@ -459,8 +459,9 @@
|
|
|
459
459
|
.card_PTRO .card_PTRO_container:hover {
|
|
460
460
|
background-color: var(--color-6);
|
|
461
461
|
}
|
|
462
|
-
.hasChecked .
|
|
462
|
+
.hasChecked .lm_card_table_body_cell .card_checkbox,
|
|
463
463
|
.hasChecked .card_PTC .card_PTC_container .card_checkbox,
|
|
464
|
-
.hasChecked .card_PTR .card_PTR_container .
|
|
464
|
+
.hasChecked .card_PTR .card_PTR_container .card_checkbox,
|
|
465
|
+
.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
|
|
465
466
|
opacity: 1;
|
|
466
467
|
}
|
|
@@ -459,8 +459,9 @@
|
|
|
459
459
|
.card_PTRO .card_PTRO_container:hover {
|
|
460
460
|
background-color: var(--color-6);
|
|
461
461
|
}
|
|
462
|
-
.hasChecked .
|
|
462
|
+
.hasChecked .lm_card_table_body_cell .card_checkbox,
|
|
463
463
|
.hasChecked .card_PTC .card_PTC_container .card_checkbox,
|
|
464
|
-
.hasChecked .card_PTR .card_PTR_container .
|
|
464
|
+
.hasChecked .card_PTR .card_PTR_container .card_checkbox,
|
|
465
|
+
.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
|
|
465
466
|
opacity: 1;
|
|
466
467
|
}
|
|
@@ -24,6 +24,7 @@ var _useFrameState3 = _interopRequireDefault(require("../hooks/useFrameState"));
|
|
|
24
24
|
var _useItemRef = _interopRequireDefault(require("../hooks/useItemRef"));
|
|
25
25
|
var _util = require("../util");
|
|
26
26
|
var _ItemHolder = _interopRequireDefault(require("./ItemHolder"));
|
|
27
|
+
var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
|
|
27
28
|
var NAME_SPLIT = '__SPLIT__';
|
|
28
29
|
var ValidateStatuses = (0, _type.tuple)('success', 'warning', 'error', 'validating', '');
|
|
29
30
|
var MemoInput = /*#__PURE__*/React.memo(function (_ref) {
|
|
@@ -81,16 +82,17 @@ function InternalFormItem(props) {
|
|
|
81
82
|
_props$trigger = props.trigger,
|
|
82
83
|
trigger = _props$trigger === void 0 ? 'onChange' : _props$trigger,
|
|
83
84
|
validateTrigger = props.validateTrigger,
|
|
84
|
-
hidden = props.hidden
|
|
85
|
+
hidden = props.hidden,
|
|
86
|
+
ruleTime = props.ruleTime;
|
|
85
87
|
var timerRef = (0, React.useRef)(null);
|
|
86
88
|
var _useState = (0, _useState7.default)([]),
|
|
87
89
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
88
|
-
|
|
89
|
-
|
|
90
|
+
errors = _useState2[0],
|
|
91
|
+
setErrors = _useState2[1];
|
|
90
92
|
var _useState3 = (0, _useState7.default)([]),
|
|
91
93
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
92
|
-
|
|
93
|
-
|
|
94
|
+
warnings = _useState4[0],
|
|
95
|
+
setWarnings = _useState4[1];
|
|
94
96
|
var _useContext = (0, React.useContext)(_ConfigProvider.ConfigContext),
|
|
95
97
|
getPrefixCls = _useContext.getPrefixCls;
|
|
96
98
|
var _useContext2 = (0, React.useContext)(_context.FormContext),
|
|
@@ -163,26 +165,33 @@ function InternalFormItem(props) {
|
|
|
163
165
|
});
|
|
164
166
|
};
|
|
165
167
|
// >>>>> Get merged errors
|
|
168
|
+
var _React$useMemo = React.useMemo(function () {
|
|
169
|
+
var errorList = (0, _toConsumableArray2.default)(meta.errors);
|
|
170
|
+
var warningList = (0, _toConsumableArray2.default)(meta.warnings);
|
|
171
|
+
Object.values(subFieldErrors).forEach(function (subFieldError) {
|
|
172
|
+
errorList.push.apply(errorList, (0, _toConsumableArray2.default)(subFieldError.errors || []));
|
|
173
|
+
warningList.push.apply(warningList, (0, _toConsumableArray2.default)(subFieldError.warnings || []));
|
|
174
|
+
});
|
|
175
|
+
return [errorList.slice(0, 1), warningList.slice(0, 1)];
|
|
176
|
+
}, [subFieldErrors, meta.errors, meta.warnings]),
|
|
177
|
+
_React$useMemo2 = (0, _slicedToArray2.default)(_React$useMemo, 2),
|
|
178
|
+
mergedErrors = _React$useMemo2[0],
|
|
179
|
+
mergedWarnings = _React$useMemo2[1];
|
|
166
180
|
(0, React.useEffect)(function () {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
errorList.push.apply(errorList, (0, _toConsumableArray2.default)(subFieldError.errors || []));
|
|
171
|
-
warningList.push.apply(warningList, (0, _toConsumableArray2.default)(subFieldError.warnings || []));
|
|
172
|
-
});
|
|
173
|
-
setMergedErrors(errorList);
|
|
174
|
-
setMergedWarnings(warningList);
|
|
175
|
-
var time = getRuleTime(rules);
|
|
181
|
+
setErrors(mergedErrors);
|
|
182
|
+
setWarnings(mergedWarnings);
|
|
183
|
+
var time = ruleTime || getRuleTime(rules);
|
|
176
184
|
if (time) {
|
|
177
185
|
clearTimeout(timerRef.current);
|
|
178
186
|
timerRef.current = setTimeout(function () {
|
|
179
|
-
|
|
180
|
-
|
|
187
|
+
setErrors([]);
|
|
188
|
+
setWarnings([]);
|
|
181
189
|
}, time);
|
|
182
190
|
}
|
|
183
|
-
}, [
|
|
191
|
+
}, [mergedErrors, mergedWarnings]);
|
|
184
192
|
// ===================== Children Ref =====================
|
|
185
193
|
var getItemRef = (0, _useItemRef.default)();
|
|
194
|
+
var _props = (0, _omit.default)(props, ['ruleTime']);
|
|
186
195
|
// ======================== Render ========================
|
|
187
196
|
function renderLayout(baseChildren, fieldId, isRequired) {
|
|
188
197
|
if (noStyle && !hidden) {
|
|
@@ -190,12 +199,14 @@ function InternalFormItem(props) {
|
|
|
190
199
|
}
|
|
191
200
|
return /*#__PURE__*/React.createElement(_ItemHolder.default, Object.assign({
|
|
192
201
|
key: "row"
|
|
193
|
-
},
|
|
202
|
+
}, _props, {
|
|
194
203
|
prefixCls: prefixCls,
|
|
195
204
|
fieldId: fieldId,
|
|
196
205
|
isRequired: isRequired,
|
|
197
|
-
errors
|
|
198
|
-
warnings
|
|
206
|
+
// errors={mergedErrors}
|
|
207
|
+
// warnings={mergedWarnings}
|
|
208
|
+
errors: errors,
|
|
209
|
+
warnings: warnings,
|
|
199
210
|
meta: meta,
|
|
200
211
|
onSubItemMetaChange: onSubItemMetaChange
|
|
201
212
|
}), baseChildren);
|
|
@@ -213,7 +224,7 @@ function InternalFormItem(props) {
|
|
|
213
224
|
variables = Object.assign(Object.assign({}, variables), messageVariables);
|
|
214
225
|
}
|
|
215
226
|
// >>>>> With Field
|
|
216
|
-
return /*#__PURE__*/React.createElement(_rcFieldForm.Field, Object.assign({},
|
|
227
|
+
return /*#__PURE__*/React.createElement(_rcFieldForm.Field, Object.assign({}, _props, {
|
|
217
228
|
messageVariables: variables,
|
|
218
229
|
trigger: trigger,
|
|
219
230
|
validateTrigger: mergedValidateTrigger,
|
|
@@ -12,8 +12,9 @@ var _components = _interopRequireDefault(require("../components"));
|
|
|
12
12
|
|
|
13
13
|
var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
14
14
|
var instance = _ref.instance;
|
|
15
|
-
var dataSource = instance.dataSource
|
|
16
|
-
|
|
15
|
+
var dataSource = instance.dataSource,
|
|
16
|
+
enableSearch = instance.enableSearch;
|
|
17
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, enableSearch && /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
|
|
17
18
|
instance: instance
|
|
18
19
|
}), dataSource.map(function (v, index) {
|
|
19
20
|
var isHidden = !v.show && typeof v.show === 'boolean';
|
|
@@ -151,6 +151,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
151
151
|
var itemValue = obj[cur].value;
|
|
152
152
|
if ((0, _utils.getIsHas)(itemValue) && !!item) {
|
|
153
153
|
return [].concat((0, _toConsumableArray2.default)(pre), [{
|
|
154
|
+
relation: obj[cur].mode || 'and',
|
|
154
155
|
fieldName: cur,
|
|
155
156
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
156
157
|
type: item.type,
|
|
@@ -159,7 +160,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
159
160
|
* and 等同于逻辑关系contains: 选中的值包含所有值
|
|
160
161
|
* or 等同于逻辑关系in: 选中的值存在于所有值之中
|
|
161
162
|
*/
|
|
162
|
-
operator:
|
|
163
|
+
operator: 'in'
|
|
163
164
|
}]);
|
|
164
165
|
}
|
|
165
166
|
return pre;
|
|
@@ -311,11 +312,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
311
312
|
if ((0, _utils.getIsHas)(itemValue) && !!item) {
|
|
312
313
|
// eslint-disable-next-line no-param-reassign
|
|
313
314
|
pre[cur] = {
|
|
315
|
+
relation: complexFilter[cur].mode || 'and',
|
|
314
316
|
fieldName: cur,
|
|
315
317
|
fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
|
|
316
318
|
type: item.type,
|
|
317
319
|
value: Array.isArray(itemValue) ? itemValue : [itemValue],
|
|
318
|
-
operator:
|
|
320
|
+
operator: 'in'
|
|
319
321
|
};
|
|
320
322
|
}
|
|
321
323
|
return pre;
|
package/lib/LmTable/Table.js
CHANGED
|
@@ -36,7 +36,7 @@ var _useGroupDataSource3 = _interopRequireDefault(require("./hooks/useGroupDataS
|
|
|
36
36
|
var _useDndItems2 = _interopRequireDefault(require("./hooks/useDndItems"));
|
|
37
37
|
var _HeaderCol = _interopRequireDefault(require("./components/HeaderCol"));
|
|
38
38
|
var _index = require("./common/index");
|
|
39
|
-
var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "groupRowKeys", "groupColKeys", "onGroupChange", "emptyProps"],
|
|
39
|
+
var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "groupRowKeys", "groupColKeys", "onGroupChange", "rowStyle", "emptyProps"],
|
|
40
40
|
_excluded2 = ["className", "style"],
|
|
41
41
|
_excluded3 = ["onResize", "width", "dataIndex", "onResizeStop"];
|
|
42
42
|
var Summary = _proTable.default.Summary;
|
|
@@ -115,6 +115,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
115
115
|
customizeGroupColKeys = props.groupColKeys,
|
|
116
116
|
_props$onGroupChange = props.onGroupChange,
|
|
117
117
|
onGroupChange = _props$onGroupChange === void 0 ? function () {} : _props$onGroupChange,
|
|
118
|
+
rowStyle = props.rowStyle,
|
|
118
119
|
emptyProps = props.emptyProps,
|
|
119
120
|
resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
120
121
|
if (!Array.isArray(customizeColumns) || !customizeColumns.length) {
|
|
@@ -1257,7 +1258,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1257
1258
|
}, [sortOpen, resizeable, components, colSortOpen, customizeDataSource, columns, openRowGroup]);
|
|
1258
1259
|
(0, _react.useEffect)(function () {
|
|
1259
1260
|
if (autoSize && autoSize.height !== '100%') {
|
|
1260
|
-
document.querySelector('.lm_protable .ant-table-body').style.height = autoSize.height
|
|
1261
|
+
document.querySelector('.lm_protable .ant-table-body').style.height = "".concat(autoSize.height, "px");
|
|
1261
1262
|
}
|
|
1262
1263
|
}, [autoSize]);
|
|
1263
1264
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -1306,6 +1307,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1306
1307
|
tableClassName: (0, _classnames.default)('lm_protable', resizeable && 'lm_resizeable'),
|
|
1307
1308
|
summary: function summary(pageData) {
|
|
1308
1309
|
return _summary && _summary(pageData, resultColumns);
|
|
1310
|
+
},
|
|
1311
|
+
onRow: function onRow() {
|
|
1312
|
+
return {
|
|
1313
|
+
style: rowStyle || {}
|
|
1314
|
+
};
|
|
1309
1315
|
}
|
|
1310
1316
|
}))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
|
|
1311
1317
|
loading: loading,
|
|
@@ -29,7 +29,7 @@ var UploadCore = function UploadCore(_ref) {
|
|
|
29
29
|
var isUploading = getUploadStatus().uploading;
|
|
30
30
|
if (isUploading) return;
|
|
31
31
|
(_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.click();
|
|
32
|
-
}, [getUploadStatus]);
|
|
32
|
+
}, [disabled, getUploadStatus]);
|
|
33
33
|
// 上传触发事件
|
|
34
34
|
var uploadChange = (0, _react.useCallback)(function (e) {
|
|
35
35
|
var _a;
|
|
@@ -340,7 +340,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
340
340
|
// 文件循环校验,返回校验后的文件数组
|
|
341
341
|
var filesLoopCheck = (0, _react.useCallback)(function (files) {
|
|
342
342
|
return Promise.all(files.map(fileCheckAsync));
|
|
343
|
-
}, []);
|
|
343
|
+
}, [fileCheckAsync]);
|
|
344
344
|
/*
|
|
345
345
|
* 上传前: 先校验 => 全部校验通过后开始上传
|
|
346
346
|
* 事件执行顺序:
|
package/lib/styles/variables.css
CHANGED
|
@@ -1403,9 +1403,10 @@ p {
|
|
|
1403
1403
|
.card_PTRO .card_PTRO_container:hover {
|
|
1404
1404
|
background-color: var(--color-6);
|
|
1405
1405
|
}
|
|
1406
|
-
.hasChecked .
|
|
1406
|
+
.hasChecked .lm_card_table_body_cell .card_checkbox,
|
|
1407
1407
|
.hasChecked .card_PTC .card_PTC_container .card_checkbox,
|
|
1408
|
-
.hasChecked .card_PTR .card_PTR_container .
|
|
1408
|
+
.hasChecked .card_PTR .card_PTR_container .card_checkbox,
|
|
1409
|
+
.hasChecked .card_PTRO .card_PTRO_container .card_checkbox {
|
|
1409
1410
|
opacity: 1;
|
|
1410
1411
|
}
|
|
1411
1412
|
.lm_cascader.ant-select.ant-select {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "linkmore-design",
|
|
3
|
-
"version": "1.1.27-beta.
|
|
3
|
+
"version": "1.1.27-beta.7",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "nowthen",
|
|
6
6
|
"email": "rnlvwyx@gmail.com"
|
|
@@ -59,18 +59,14 @@
|
|
|
59
59
|
]
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@ant-design/charts": "^1.4.2",
|
|
63
62
|
"@ant-design/compatible": "1.0.8",
|
|
64
63
|
"@ant-design/icons": "^4.3.0",
|
|
65
|
-
"@ant-design/plots": "^1.2.2",
|
|
66
64
|
"@ant-design/pro-table": "2.77.0",
|
|
67
65
|
"@babel/runtime": "^7.17.9",
|
|
68
66
|
"@dnd-kit/core": "^5.0.3",
|
|
69
67
|
"@dnd-kit/modifiers": "^5.0.0",
|
|
70
68
|
"@dnd-kit/sortable": "^6.0.1",
|
|
71
69
|
"@react-hook/resize-observer": "^1.2.6",
|
|
72
|
-
"@typescript-eslint/eslint-plugin": "^5.28.0",
|
|
73
|
-
"@typescript-eslint/parser": "^5.28.0",
|
|
74
70
|
"ahooks": "^3.6.2",
|
|
75
71
|
"ali-oss": "^6.17.1",
|
|
76
72
|
"antd": "4.22.8",
|
|
@@ -111,6 +107,8 @@
|
|
|
111
107
|
"node": ">=10.0.0"
|
|
112
108
|
},
|
|
113
109
|
"devDependencies": {
|
|
110
|
+
"@typescript-eslint/eslint-plugin": "^5.28.0",
|
|
111
|
+
"@typescript-eslint/parser": "^5.28.0",
|
|
114
112
|
"@babel/plugin-transform-runtime": "^7.12.1",
|
|
115
113
|
"@babel/preset-typescript": "^7.17.12",
|
|
116
114
|
"@commitlint/cli": "^11.0.0",
|