linkmore-design 1.1.6 → 1.1.8
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/LmFilter/utils.d.ts +1 -0
- package/dist/LmTable/hooks/useRowSelectControllableValue.d.ts +2 -0
- package/dist/LmUpload/fns/index.d.ts +1 -0
- package/dist/index.umd.js +337 -222
- package/dist/index.umd.min.js +15 -15
- package/dist/variables.css +10 -3
- package/es/CustomTableOption/index.js +0 -10
- package/es/LmEditTable/style/index.css +3 -0
- package/es/LmEditTable/style/variables.css +3 -0
- package/es/LmFilter/clearFilter/index.js +3 -1
- package/es/LmFilter/complexFilter/index.js +3 -2
- package/es/LmFilter/components/DropdownFIlter.js +8 -6
- package/es/LmFilter/style/index.css +4 -0
- package/es/LmFilter/style/variables.css +4 -0
- package/es/LmFilter/utils.js +18 -0
- package/es/LmFilter/wrapper/Filter.js +6 -2
- package/es/LmTable/Table.js +82 -78
- package/es/LmTable/hooks/useRowSelectControllableValue.js +67 -0
- package/es/LmTable/style/index.css +3 -3
- package/es/LmTable/style/variables.css +3 -3
- package/es/LmUpload/UploadList/ItemPictureCard.js +3 -1
- package/es/LmUpload/UploadList/index.js +2 -2
- package/es/LmUpload/fns/index.d.ts +1 -0
- package/es/LmUpload/fns/index.js +22 -3
- package/es/styles/variables.css +10 -3
- package/lib/CustomTableOption/index.js +0 -9
- package/lib/LmEditTable/style/index.css +3 -0
- package/lib/LmEditTable/style/variables.css +3 -0
- package/lib/LmFilter/clearFilter/index.js +3 -1
- package/lib/LmFilter/complexFilter/index.js +3 -2
- package/lib/LmFilter/components/DropdownFIlter.js +8 -6
- package/lib/LmFilter/style/index.css +4 -0
- package/lib/LmFilter/style/variables.css +4 -0
- package/lib/LmFilter/utils.js +18 -0
- package/lib/LmFilter/wrapper/Filter.js +6 -2
- package/lib/LmTable/Table.js +82 -78
- package/lib/LmTable/hooks/useRowSelectControllableValue.js +67 -0
- package/lib/LmTable/style/index.css +3 -3
- package/lib/LmTable/style/variables.css +3 -3
- package/lib/LmUpload/UploadList/ItemPictureCard.js +3 -1
- package/lib/LmUpload/UploadList/index.js +2 -2
- package/lib/LmUpload/fns/index.d.ts +1 -0
- package/lib/LmUpload/fns/index.js +22 -3
- package/lib/styles/variables.css +10 -3
- package/package.json +1 -1
- package/es/CustomTableOption/assets/option1.png +0 -0
- package/es/CustomTableOption/assets/option2.png +0 -0
- package/es/CustomTableOption/assets/option3.png +0 -0
- package/lib/CustomTableOption/assets/option1.png +0 -0
- package/lib/CustomTableOption/assets/option2.png +0 -0
- package/lib/CustomTableOption/assets/option3.png +0 -0
package/lib/LmTable/Table.js
CHANGED
|
@@ -31,10 +31,14 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
31
31
|
|
|
32
32
|
var _reactResizable = require("react-resizable");
|
|
33
33
|
|
|
34
|
+
var _ahooks = require("ahooks");
|
|
35
|
+
|
|
34
36
|
var _immer = require("immer");
|
|
35
37
|
|
|
36
38
|
var _reactSortableHoc = require("react-sortable-hoc");
|
|
37
39
|
|
|
40
|
+
var _useRowSelectControllableValue = _interopRequireDefault(require("./hooks/useRowSelectControllableValue"));
|
|
41
|
+
|
|
38
42
|
var _ConfigProvider = _interopRequireDefault(require("../ConfigProvider"));
|
|
39
43
|
|
|
40
44
|
var _IconFont = _interopRequireDefault(require("../IconFont"));
|
|
@@ -142,24 +146,31 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
142
146
|
var _React$useContext = _react.default.useContext(ConfigContext),
|
|
143
147
|
locale = _React$useContext.locale;
|
|
144
148
|
|
|
145
|
-
var
|
|
146
|
-
|
|
149
|
+
var transformRowClick = function transformRowClick(data) {
|
|
150
|
+
return rowClick === null || rowClick === void 0 ? void 0 : rowClick(data.selectedRows || data);
|
|
151
|
+
}; // const [useSelectedRows, setSelectedRows] = useState({ selectedRows: [] }) // 复选中的值
|
|
152
|
+
|
|
153
|
+
|
|
154
|
+
var _useControllableValue = (0, _useRowSelectControllableValue.default)({
|
|
155
|
+
value: {
|
|
156
|
+
selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []
|
|
157
|
+
},
|
|
158
|
+
onChange: rowClick ? transformRowClick : undefined
|
|
147
159
|
}),
|
|
160
|
+
_useControllableValue2 = (0, _slicedToArray2.default)(_useControllableValue, 2),
|
|
161
|
+
useSelectedRows = _useControllableValue2[0],
|
|
162
|
+
setSelectedRows = _useControllableValue2[1];
|
|
163
|
+
|
|
164
|
+
var _useState = (0, _react.useState)(''),
|
|
148
165
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
149
|
-
|
|
150
|
-
|
|
166
|
+
useActiveKey = _useState2[0],
|
|
167
|
+
setActiveKey = _useState2[1]; // 行选中
|
|
151
168
|
|
|
152
169
|
|
|
153
|
-
var _useState3 = (0, _react.useState)(
|
|
170
|
+
var _useState3 = (0, _react.useState)([]),
|
|
154
171
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
var _useState5 = (0, _react.useState)([]),
|
|
160
|
-
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
|
|
161
|
-
useColumns = _useState6[0],
|
|
162
|
-
setColumns = _useState6[1];
|
|
172
|
+
useColumns = _useState4[0],
|
|
173
|
+
setColumns = _useState4[1];
|
|
163
174
|
|
|
164
175
|
var tableWarpRef = (0, _react.useRef)(null);
|
|
165
176
|
var dataSourceRef = (0, _react.useRef)(null);
|
|
@@ -169,10 +180,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
169
180
|
var contentMenuRef = (0, _react.useRef)(null);
|
|
170
181
|
/** 当前展开的列 */
|
|
171
182
|
|
|
172
|
-
var
|
|
173
|
-
|
|
174
|
-
expandedRowKeys =
|
|
175
|
-
setExpandedRowKeys =
|
|
183
|
+
var _useState5 = (0, _react.useState)([]),
|
|
184
|
+
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
|
|
185
|
+
expandedRowKeys = _useState6[0],
|
|
186
|
+
setExpandedRowKeys = _useState6[1];
|
|
176
187
|
|
|
177
188
|
var deepDataSourceRef = (0, _react.useRef)([]);
|
|
178
189
|
var deepColumnsRef = (0, _react.useRef)([]); //
|
|
@@ -217,7 +228,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
217
228
|
}, [groupRowKeys, groupColKeys]);
|
|
218
229
|
/** sheel数据的表格 */
|
|
219
230
|
|
|
220
|
-
var
|
|
231
|
+
var _useState7 = (0, _react.useState)({
|
|
221
232
|
// 记录框选的行列坐标信息
|
|
222
233
|
start: {},
|
|
223
234
|
end: {},
|
|
@@ -230,9 +241,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
230
241
|
// 记录右下角小方块的拖动信息
|
|
231
242
|
commiting: {}
|
|
232
243
|
}),
|
|
233
|
-
|
|
234
|
-
sheelStataus =
|
|
235
|
-
setSheelStatus =
|
|
244
|
+
_useState8 = (0, _slicedToArray2.default)(_useState7, 2),
|
|
245
|
+
sheelStataus = _useState8[0],
|
|
246
|
+
setSheelStatus = _useState8[1];
|
|
236
247
|
|
|
237
248
|
var shellStatusRef = (0, _react.useRef)({
|
|
238
249
|
start: {},
|
|
@@ -244,49 +255,49 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
244
255
|
commiting: {}
|
|
245
256
|
});
|
|
246
257
|
|
|
258
|
+
var _useState9 = (0, _react.useState)(false),
|
|
259
|
+
_useState10 = (0, _slicedToArray2.default)(_useState9, 2),
|
|
260
|
+
selectIng = _useState10[0],
|
|
261
|
+
setSelectIng = _useState10[1];
|
|
262
|
+
|
|
247
263
|
var _useState11 = (0, _react.useState)(false),
|
|
248
264
|
_useState12 = (0, _slicedToArray2.default)(_useState11, 2),
|
|
249
|
-
|
|
250
|
-
|
|
265
|
+
editIng = _useState12[0],
|
|
266
|
+
setEditIng = _useState12[1];
|
|
251
267
|
|
|
252
268
|
var _useState13 = (0, _react.useState)(false),
|
|
253
269
|
_useState14 = (0, _slicedToArray2.default)(_useState13, 2),
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
var _useState15 = (0, _react.useState)(false),
|
|
258
|
-
_useState16 = (0, _slicedToArray2.default)(_useState15, 2),
|
|
259
|
-
commitIng = _useState16[0],
|
|
260
|
-
setCommitIng = _useState16[1];
|
|
270
|
+
commitIng = _useState14[0],
|
|
271
|
+
setCommitIng = _useState14[1];
|
|
261
272
|
/** 右键菜单是否显示 */
|
|
262
273
|
|
|
263
274
|
|
|
264
|
-
var
|
|
265
|
-
|
|
266
|
-
contextMenuStatus =
|
|
267
|
-
setContextMenuStatus =
|
|
275
|
+
var _useState15 = (0, _react.useState)(false),
|
|
276
|
+
_useState16 = (0, _slicedToArray2.default)(_useState15, 2),
|
|
277
|
+
contextMenuStatus = _useState16[0],
|
|
278
|
+
setContextMenuStatus = _useState16[1];
|
|
268
279
|
/** 右键按钮的位置 */
|
|
269
280
|
|
|
270
281
|
|
|
271
|
-
var
|
|
282
|
+
var _useState17 = (0, _react.useState)({
|
|
272
283
|
position: 'fixed',
|
|
273
284
|
left: 300,
|
|
274
285
|
top: 200
|
|
275
286
|
}),
|
|
276
|
-
|
|
277
|
-
style =
|
|
278
|
-
setStyle =
|
|
287
|
+
_useState18 = (0, _slicedToArray2.default)(_useState17, 2),
|
|
288
|
+
style = _useState18[0],
|
|
289
|
+
setStyle = _useState18[1];
|
|
279
290
|
|
|
280
|
-
var
|
|
281
|
-
|
|
282
|
-
chartsModalStatus =
|
|
283
|
-
setChartsModalStatus =
|
|
291
|
+
var _useState19 = (0, _react.useState)(null),
|
|
292
|
+
_useState20 = (0, _slicedToArray2.default)(_useState19, 2),
|
|
293
|
+
chartsModalStatus = _useState20[0],
|
|
294
|
+
setChartsModalStatus = _useState20[1]; // 列设置
|
|
284
295
|
|
|
285
296
|
|
|
286
|
-
var
|
|
287
|
-
|
|
288
|
-
columnsStateMap =
|
|
289
|
-
setColumnsStateMap =
|
|
297
|
+
var _useState21 = (0, _react.useState)(false),
|
|
298
|
+
_useState22 = (0, _slicedToArray2.default)(_useState21, 2),
|
|
299
|
+
columnsStateMap = _useState22[0],
|
|
300
|
+
setColumnsStateMap = _useState22[1];
|
|
290
301
|
|
|
291
302
|
var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
|
|
292
303
|
return /*#__PURE__*/_react.default.createElement("tr", props);
|
|
@@ -1031,7 +1042,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1031
1042
|
});
|
|
1032
1043
|
};
|
|
1033
1044
|
|
|
1034
|
-
var innerColumns = (0, _lodash.cloneDeep)(useColumns)
|
|
1045
|
+
var innerColumns = (0, _lodash.cloneDeep)(useColumns.filter(function (item) {
|
|
1046
|
+
return item.show !== false;
|
|
1047
|
+
}));
|
|
1035
1048
|
traverseColumns(innerColumns, null);
|
|
1036
1049
|
|
|
1037
1050
|
if (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) {
|
|
@@ -1064,15 +1077,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1064
1077
|
var selectedRows = useSelectedRows.selectedRows;
|
|
1065
1078
|
|
|
1066
1079
|
if (tableRowType === 'select' || tableRowType === 'default' && selectedRows.length) {
|
|
1067
|
-
var
|
|
1068
|
-
return v[rowKey];
|
|
1080
|
+
var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
|
|
1081
|
+
return (0, _lodash.isObject)(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
|
|
1069
1082
|
});
|
|
1070
|
-
|
|
1071
|
-
Idx >= 0 ? selectedRows.splice(Idx, 1) : selectedRows.push(record);
|
|
1083
|
+
selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push((0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
|
|
1072
1084
|
setSelectedRows({
|
|
1073
|
-
selectedRows: selectedRows
|
|
1074
|
-
});
|
|
1075
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
|
|
1085
|
+
selectedRows: (0, _lodash.cloneDeep)(selectedRows)
|
|
1086
|
+
}); // rowClick?.(selectedRows)
|
|
1076
1087
|
}
|
|
1077
1088
|
} else {
|
|
1078
1089
|
rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
|
|
@@ -1120,13 +1131,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1120
1131
|
showSizeChanger: true,
|
|
1121
1132
|
showQuickJumper: true,
|
|
1122
1133
|
showTotal: function showTotal(total) {
|
|
1123
|
-
return (locale === null || locale === void 0 ? void 0 : locale.locale) === '
|
|
1134
|
+
return (locale === null || locale === void 0 ? void 0 : locale.locale) === 'en' ? "total ".concat(total, " Page") : "\u5171 ".concat(total, " \u6761");
|
|
1124
1135
|
},
|
|
1125
|
-
locale: (locale === null || locale === void 0 ? void 0 : locale.locale) === '
|
|
1136
|
+
locale: (locale === null || locale === void 0 ? void 0 : locale.locale) === 'en' ? (locale === null || locale === void 0 ? void 0 : locale.Pagination) || {} : {
|
|
1126
1137
|
items_per_page: '/条',
|
|
1127
1138
|
jump_to: '前往',
|
|
1128
1139
|
page: '页'
|
|
1129
|
-
}
|
|
1140
|
+
},
|
|
1130
1141
|
size: 'small'
|
|
1131
1142
|
}, pagination),
|
|
1132
1143
|
rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
|
|
@@ -1134,7 +1145,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1134
1145
|
type: 'checkbox',
|
|
1135
1146
|
columnWidth: 36,
|
|
1136
1147
|
selectedRowKeys: useSelectedRows.selectedRows.map(function (v) {
|
|
1137
|
-
return v[rowKey];
|
|
1148
|
+
return (0, _lodash.isObject)(v) ? v[rowKey] : v;
|
|
1138
1149
|
}),
|
|
1139
1150
|
|
|
1140
1151
|
/** 如果开启了行分组,则需要把checkStrictly关闭,变成受控模式 */
|
|
@@ -1142,8 +1153,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1142
1153
|
onChange: !(rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (selectedRowKeys, selectedRows) {
|
|
1143
1154
|
setSelectedRows({
|
|
1144
1155
|
selectedRows: selectedRows
|
|
1145
|
-
});
|
|
1146
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
|
|
1156
|
+
}); // rowClick?.(selectedRows)
|
|
1147
1157
|
} : undefined,
|
|
1148
1158
|
onSelectAll: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (selected, selectedRows, changeRows) {
|
|
1149
1159
|
var changeRowKeys = changeRows === null || changeRows === void 0 ? void 0 : changeRows.map(function (item) {
|
|
@@ -1154,8 +1164,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1154
1164
|
});
|
|
1155
1165
|
setSelectedRows({
|
|
1156
1166
|
selectedRows: reulstSelect
|
|
1157
|
-
});
|
|
1158
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick(reulstSelect);
|
|
1167
|
+
}); // rowClick?.(reulstSelect)
|
|
1159
1168
|
} : undefined,
|
|
1160
1169
|
onSelect: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (record, selected) {
|
|
1161
1170
|
var reulstSelect = selected ? (0, _lodash.uniqBy)([].concat((0, _toConsumableArray2.default)(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
|
|
@@ -1163,8 +1172,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1163
1172
|
});
|
|
1164
1173
|
setSelectedRows({
|
|
1165
1174
|
selectedRows: reulstSelect
|
|
1166
|
-
});
|
|
1167
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick(reulstSelect);
|
|
1175
|
+
}); // rowClick?.(reulstSelect)
|
|
1168
1176
|
} : undefined
|
|
1169
1177
|
}, rowSelection),
|
|
1170
1178
|
onRow: function onRow(record) {
|
|
@@ -1228,14 +1236,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1228
1236
|
clearSelect: function clearSelect() {
|
|
1229
1237
|
setSelectedRows({
|
|
1230
1238
|
selectedRows: []
|
|
1231
|
-
});
|
|
1232
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick([]);
|
|
1239
|
+
}); // rowClick?.([])
|
|
1233
1240
|
},
|
|
1234
1241
|
customSetCheckboxRecords: function customSetCheckboxRecords(value) {
|
|
1235
1242
|
setSelectedRows({
|
|
1236
1243
|
selectedRows: value
|
|
1237
|
-
});
|
|
1238
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick(value);
|
|
1244
|
+
}); // rowClick?.(value)
|
|
1239
1245
|
},
|
|
1240
1246
|
checkboxRecords: useSelectedRows.selectedRows,
|
|
1241
1247
|
columns: useColumns.map(function (item) {
|
|
@@ -1243,14 +1249,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1243
1249
|
})
|
|
1244
1250
|
};
|
|
1245
1251
|
}); // loading触发清空选中状态
|
|
1252
|
+
// useEffect(() => {
|
|
1253
|
+
// console.log(3)
|
|
1254
|
+
// setSelectedRows({ selectedRows: [] })
|
|
1255
|
+
// }, [loading])
|
|
1246
1256
|
|
|
1247
1257
|
|
|
1248
|
-
(0, _react.useEffect)(function () {
|
|
1249
|
-
setSelectedRows({
|
|
1250
|
-
selectedRows: []
|
|
1251
|
-
});
|
|
1252
|
-
}, [loading]);
|
|
1253
|
-
|
|
1254
1258
|
var onTableChange = function onTableChange(pagination, filters, sorter, extra) {
|
|
1255
1259
|
var resultColumns = useColumns.map(function (item) {
|
|
1256
1260
|
var obj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
|
|
@@ -1450,13 +1454,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
1450
1454
|
var _props$autoSizer = props.autoSizer,
|
|
1451
1455
|
autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
|
|
1452
1456
|
|
|
1453
|
-
var
|
|
1457
|
+
var _useState23 = (0, _react.useState)({
|
|
1454
1458
|
width: '100%',
|
|
1455
1459
|
height: '100%'
|
|
1456
1460
|
}),
|
|
1457
|
-
|
|
1458
|
-
tableSize =
|
|
1459
|
-
setTableSize =
|
|
1461
|
+
_useState24 = (0, _slicedToArray2.default)(_useState23, 2),
|
|
1462
|
+
tableSize = _useState24[0],
|
|
1463
|
+
setTableSize = _useState24[1];
|
|
1460
1464
|
|
|
1461
1465
|
var defaultRef = ref || (0, _react.useRef)(null);
|
|
1462
1466
|
var tableWarpRef = (0, _react.useRef)(null);
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = void 0;
|
|
7
|
+
|
|
8
|
+
var _react = require("react");
|
|
9
|
+
|
|
10
|
+
var _utils = require("ahooks/lib/utils");
|
|
11
|
+
|
|
12
|
+
var _ahooks = require("ahooks");
|
|
13
|
+
|
|
14
|
+
function useControllableValue() {
|
|
15
|
+
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
16
|
+
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
17
|
+
var defaultValue = options.defaultValue,
|
|
18
|
+
_options$defaultValue = options.defaultValuePropName,
|
|
19
|
+
defaultValuePropName = _options$defaultValue === void 0 ? 'defaultValue' : _options$defaultValue,
|
|
20
|
+
_options$valuePropNam = options.valuePropName,
|
|
21
|
+
valuePropName = _options$valuePropNam === void 0 ? 'value' : _options$valuePropNam,
|
|
22
|
+
_options$trigger = options.trigger,
|
|
23
|
+
trigger = _options$trigger === void 0 ? 'onChange' : _options$trigger;
|
|
24
|
+
var value = props[valuePropName];
|
|
25
|
+
var isControlled = props === null || props === void 0 ? void 0 : props.hasOwnProperty(valuePropName);
|
|
26
|
+
var isControlledOnChange = props[trigger];
|
|
27
|
+
var initialValue = (0, _react.useMemo)(function () {
|
|
28
|
+
if (isControlled) {
|
|
29
|
+
return value;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
if (props === null || props === void 0 ? void 0 : props.hasOwnProperty(defaultValuePropName)) {
|
|
33
|
+
return props[defaultValuePropName];
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
return defaultValue;
|
|
37
|
+
}, []);
|
|
38
|
+
var stateRef = (0, _react.useRef)(initialValue);
|
|
39
|
+
|
|
40
|
+
if (isControlled && isControlledOnChange) {
|
|
41
|
+
stateRef.current = value;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
var update = (0, _ahooks.useUpdate)();
|
|
45
|
+
|
|
46
|
+
function setState(v) {
|
|
47
|
+
var r = (0, _utils.isFunction)(v) ? v(stateRef.current) : v;
|
|
48
|
+
|
|
49
|
+
if (!isControlledOnChange) {
|
|
50
|
+
stateRef.current = r;
|
|
51
|
+
update();
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
if (props[trigger]) {
|
|
55
|
+
for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
|
|
56
|
+
args[_key - 1] = arguments[_key];
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
props[trigger].apply(props, [r].concat(args));
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
return [stateRef.current, (0, _ahooks.useMemoizedFn)(setState)];
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
var _default = useControllableValue;
|
|
67
|
+
exports.default = _default;
|
|
@@ -1237,6 +1237,9 @@ p {
|
|
|
1237
1237
|
height: 48px;
|
|
1238
1238
|
font-size: 12px;
|
|
1239
1239
|
}
|
|
1240
|
+
#lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
|
|
1241
|
+
padding: 0 !important;
|
|
1242
|
+
}
|
|
1240
1243
|
.row-dragging {
|
|
1241
1244
|
display: flex;
|
|
1242
1245
|
align-items: center;
|
|
@@ -1589,9 +1592,6 @@ button.ant-table-row-expand-icon::before,
|
|
|
1589
1592
|
button.ant-table-row-expand-icon::after {
|
|
1590
1593
|
color: #bfbfbf;
|
|
1591
1594
|
}
|
|
1592
|
-
.ant-table-tbody > tr.ant-table-measure-row > td {
|
|
1593
|
-
padding: 0 !important;
|
|
1594
|
-
}
|
|
1595
1595
|
.react-resizable-handle {
|
|
1596
1596
|
position: absolute;
|
|
1597
1597
|
right: -5px;
|
|
@@ -726,6 +726,9 @@
|
|
|
726
726
|
height: 48px;
|
|
727
727
|
font-size: 12px;
|
|
728
728
|
}
|
|
729
|
+
#lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
|
|
730
|
+
padding: 0 !important;
|
|
731
|
+
}
|
|
729
732
|
.row-dragging {
|
|
730
733
|
display: flex;
|
|
731
734
|
align-items: center;
|
|
@@ -1078,9 +1081,6 @@ button.ant-table-row-expand-icon::before,
|
|
|
1078
1081
|
button.ant-table-row-expand-icon::after {
|
|
1079
1082
|
color: #bfbfbf;
|
|
1080
1083
|
}
|
|
1081
|
-
.ant-table-tbody > tr.ant-table-measure-row > td {
|
|
1082
|
-
padding: 0 !important;
|
|
1083
|
-
}
|
|
1084
1084
|
.react-resizable-handle {
|
|
1085
1085
|
position: absolute;
|
|
1086
1086
|
right: -5px;
|
|
@@ -91,11 +91,13 @@ var PictureItem = function PictureItem(_ref) {
|
|
|
91
91
|
|
|
92
92
|
|
|
93
93
|
var resetFile = (0, _react.useMemo)(function () {
|
|
94
|
+
var _a;
|
|
95
|
+
|
|
94
96
|
var fileParams = getFileFields(file);
|
|
95
97
|
var realFileName = fileParams.realFileName,
|
|
96
98
|
fileName = fileParams.fileName,
|
|
97
99
|
filename = fileParams.filename;
|
|
98
|
-
var fileExtension = (realFileName || fileName || filename).replace(/.*\./, '').toLowerCase();
|
|
100
|
+
var fileExtension = (_a = (realFileName || fileName || filename).replace(/.*\./, '')) === null || _a === void 0 ? void 0 : _a.toLowerCase();
|
|
99
101
|
return Object.assign(Object.assign({}, fileParams), {
|
|
100
102
|
fileExtension: fileExtension
|
|
101
103
|
});
|
|
@@ -18,7 +18,7 @@ var LmUploadList = function LmUploadList(_ref) {
|
|
|
18
18
|
|
|
19
19
|
var _a, _b;
|
|
20
20
|
|
|
21
|
-
var
|
|
21
|
+
var getFileHasValue = instance.getFileHasValue,
|
|
22
22
|
getFileList = instance.getFileList,
|
|
23
23
|
itemRender = instance.itemRender,
|
|
24
24
|
listType = instance.listType,
|
|
@@ -29,7 +29,7 @@ var LmUploadList = function LmUploadList(_ref) {
|
|
|
29
29
|
})) === null || _b === void 0 ? void 0 : _b.map(function (file, idx) {
|
|
30
30
|
return (0, _utils.render)(itemRender || _RenderItem.default, {
|
|
31
31
|
type: listType,
|
|
32
|
-
key: file
|
|
32
|
+
key: getFileHasValue(file) || idx,
|
|
33
33
|
file: file,
|
|
34
34
|
instance: instance
|
|
35
35
|
});
|
|
@@ -5,6 +5,7 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
|
|
|
5
5
|
}) => {
|
|
6
6
|
CoreMethods: {
|
|
7
7
|
getIsMaxCount: () => boolean;
|
|
8
|
+
getFileHasValue: (obj: any) => string;
|
|
8
9
|
getFileFields: (fileParams: any) => {};
|
|
9
10
|
beforeUpload: (e: any) => Promise<void>;
|
|
10
11
|
checkOver: (file: any) => Promise<void>;
|
|
@@ -61,7 +61,25 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
61
61
|
fileAreaSize = props.fileAreaSize,
|
|
62
62
|
enabledOss = props.enabledOss,
|
|
63
63
|
enableCrop = props.enableCrop,
|
|
64
|
-
ossConfig = props.ossConfig; //
|
|
64
|
+
ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
|
|
65
|
+
|
|
66
|
+
var getHasEqual = (0, _react.useCallback)(function (obj1, obj2) {
|
|
67
|
+
var extend = [uid, 'fileName'];
|
|
68
|
+
var flag = false;
|
|
69
|
+
extend.forEach(function (v) {
|
|
70
|
+
if (!flag) flag = obj1[v] === obj2[v];
|
|
71
|
+
});
|
|
72
|
+
return flag;
|
|
73
|
+
}, []); // 从对象中读取存在的指定属性
|
|
74
|
+
|
|
75
|
+
var getFileHasValue = (0, _react.useCallback)(function (obj) {
|
|
76
|
+
var extend = [uid, 'fileName'];
|
|
77
|
+
var val = '';
|
|
78
|
+
extend.forEach(function (v) {
|
|
79
|
+
if (!val) val = obj[v];
|
|
80
|
+
});
|
|
81
|
+
return val;
|
|
82
|
+
}, [uid]); // 获取当前的文件列表
|
|
65
83
|
|
|
66
84
|
var getFileList = (0, _react.useCallback)(function () {
|
|
67
85
|
return props.fileList || state.fileList;
|
|
@@ -429,7 +447,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
429
447
|
|
|
430
448
|
if (res) {
|
|
431
449
|
fileList = (_b = getFileList()) === null || _b === void 0 ? void 0 : _b.filter(function (v) {
|
|
432
|
-
return v
|
|
450
|
+
return !getHasEqual(v, file);
|
|
433
451
|
});
|
|
434
452
|
dispatch({
|
|
435
453
|
type: 'changeFileList',
|
|
@@ -448,7 +466,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
448
466
|
}
|
|
449
467
|
}, _callee4);
|
|
450
468
|
}));
|
|
451
|
-
}, [props.onRemove, getFileList, onChange, dispatch,
|
|
469
|
+
}, [props.onRemove, getFileList, onChange, dispatch, getHasEqual]); // 点击文件链接或预览图标时的回调
|
|
452
470
|
|
|
453
471
|
var preview = (0, _react.useCallback)(function (file) {
|
|
454
472
|
var _a;
|
|
@@ -463,6 +481,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
|
|
|
463
481
|
}, [props.onDownload]);
|
|
464
482
|
var CoreMethods = {
|
|
465
483
|
getIsMaxCount: getIsMaxCount,
|
|
484
|
+
getFileHasValue: getFileHasValue,
|
|
466
485
|
getFileFields: getFileFields,
|
|
467
486
|
beforeUpload: beforeUpload,
|
|
468
487
|
checkOver: checkOver,
|
package/lib/styles/variables.css
CHANGED
|
@@ -9764,6 +9764,9 @@ p {
|
|
|
9764
9764
|
.lm_editTable_warpper .icon_drag:hover {
|
|
9765
9765
|
color: var(--text-color);
|
|
9766
9766
|
}
|
|
9767
|
+
.lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
|
|
9768
|
+
padding: 0 !important;
|
|
9769
|
+
}
|
|
9767
9770
|
.lm_editTable_warpper .ant-picker {
|
|
9768
9771
|
height: 24px !important;
|
|
9769
9772
|
padding: 2px 8px;
|
|
@@ -9844,11 +9847,15 @@ p {
|
|
|
9844
9847
|
background-color: var(--background-color-hover);
|
|
9845
9848
|
}
|
|
9846
9849
|
.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
|
|
9850
|
+
width: 140px;
|
|
9847
9851
|
max-width: 140px;
|
|
9848
9852
|
}
|
|
9849
9853
|
.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
|
|
9850
9854
|
display: inline-flex;
|
|
9851
9855
|
}
|
|
9856
|
+
.lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
|
|
9857
|
+
height: 24px;
|
|
9858
|
+
}
|
|
9852
9859
|
.lm_filter_basic_item {
|
|
9853
9860
|
font-size: 12px;
|
|
9854
9861
|
display: inline-flex;
|
|
@@ -11259,6 +11266,9 @@ p {
|
|
|
11259
11266
|
height: 48px;
|
|
11260
11267
|
font-size: 12px;
|
|
11261
11268
|
}
|
|
11269
|
+
#lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
|
|
11270
|
+
padding: 0 !important;
|
|
11271
|
+
}
|
|
11262
11272
|
.row-dragging {
|
|
11263
11273
|
display: flex;
|
|
11264
11274
|
align-items: center;
|
|
@@ -11611,9 +11621,6 @@ button.ant-table-row-expand-icon::before,
|
|
|
11611
11621
|
button.ant-table-row-expand-icon::after {
|
|
11612
11622
|
color: #bfbfbf;
|
|
11613
11623
|
}
|
|
11614
|
-
.ant-table-tbody > tr.ant-table-measure-row > td {
|
|
11615
|
-
padding: 0 !important;
|
|
11616
|
-
}
|
|
11617
11624
|
.react-resizable-handle {
|
|
11618
11625
|
position: absolute;
|
|
11619
11626
|
right: -5px;
|
package/package.json
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|