@arim-aisdc/public-components 2.3.45 → 2.3.47
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/components/BaseInfo/BaseInfo.d.ts +1 -1
- package/dist/components/ConfigProvider/context.d.ts +1 -0
- package/dist/components/CustomForm/UploadImg/index.js +5 -4
- package/dist/components/TableMax/TableMax.js +5 -4
- package/dist/components/TableMax/components/Export/index.js +0 -1
- package/package.json +1 -1
|
@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
|
|
|
17
17
|
value: any;
|
|
18
18
|
field: string;
|
|
19
19
|
label?: string;
|
|
20
|
-
text: string |
|
|
20
|
+
text: string | Element | JSX.Element;
|
|
21
21
|
units?: string;
|
|
22
22
|
width?: string;
|
|
23
23
|
labelWidth?: string;
|
|
@@ -232,11 +232,12 @@ var UploadImg = function UploadImg(_ref) {
|
|
|
232
232
|
message.success('上传成功');
|
|
233
233
|
if (item !== null && item !== void 0 && item.multiple) {
|
|
234
234
|
onChange === null || onChange === void 0 || onChange(fileList.map(function (item) {
|
|
235
|
-
|
|
235
|
+
var _item$response;
|
|
236
|
+
return (item === null || item === void 0 || (_item$response = item.response) === null || _item$response === void 0 ? void 0 : _item$response.fileId) || item.response.id;
|
|
236
237
|
}));
|
|
237
238
|
} else {
|
|
238
|
-
var _file$response;
|
|
239
|
-
onChange === null || onChange === void 0 || onChange(file === null || file === void 0 || (_file$response = file.response) === null || _file$response === void 0 ? void 0 : _file$response.id);
|
|
239
|
+
var _file$response, _file$response2;
|
|
240
|
+
onChange === null || onChange === void 0 || onChange((file === null || file === void 0 || (_file$response = file.response) === null || _file$response === void 0 ? void 0 : _file$response.fileId) || (file === null || file === void 0 || (_file$response2 = file.response) === null || _file$response2 === void 0 ? void 0 : _file$response2.id));
|
|
240
241
|
}
|
|
241
242
|
break;
|
|
242
243
|
case 'error':
|
|
@@ -245,7 +246,7 @@ var UploadImg = function UploadImg(_ref) {
|
|
|
245
246
|
case 'removed':
|
|
246
247
|
if (item !== null && item !== void 0 && item.multiple) {
|
|
247
248
|
onChange === null || onChange === void 0 || onChange(fileList.map(function (item) {
|
|
248
|
-
return item.response.id;
|
|
249
|
+
return item.response.fileId || item.response.id;
|
|
249
250
|
}));
|
|
250
251
|
} else {
|
|
251
252
|
onChange === null || onChange === void 0 || onChange('');
|
|
@@ -107,8 +107,7 @@ var TableMax = function TableMax(_ref) {
|
|
|
107
107
|
canSetting = _ref$canSetting === void 0 ? true : _ref$canSetting,
|
|
108
108
|
_ref$canFilter = _ref.canFilter,
|
|
109
109
|
canFilter = _ref$canFilter === void 0 ? true : _ref$canFilter,
|
|
110
|
-
|
|
111
|
-
canExport = _ref$canExport === void 0 ? true : _ref$canExport,
|
|
110
|
+
canExport = _ref.canExport,
|
|
112
111
|
_ref$defaultEnableFil = _ref.defaultEnableFilters,
|
|
113
112
|
defaultEnableFilters = _ref$defaultEnableFil === void 0 ? false : _ref$defaultEnableFil,
|
|
114
113
|
_ref$defaultHeaderRow = _ref.defaultHeaderRowNum,
|
|
@@ -223,8 +222,10 @@ var TableMax = function TableMax(_ref) {
|
|
|
223
222
|
var _ref2 = tableMax || {},
|
|
224
223
|
globalPageSizeOptions = _ref2.pageSizeOptions,
|
|
225
224
|
cacheMaxAge = _ref2.cacheMaxAge,
|
|
226
|
-
openMemo = _ref2.openMemo
|
|
225
|
+
openMemo = _ref2.openMemo,
|
|
226
|
+
globalCanExport = _ref2.canExport;
|
|
227
227
|
return {
|
|
228
|
+
globalCanExport: globalCanExport,
|
|
228
229
|
globalPageSizeOptions: globalPageSizeOptions,
|
|
229
230
|
cacheMaxAge: cacheMaxAge,
|
|
230
231
|
openMemo: openMemo
|
|
@@ -1173,7 +1174,7 @@ var TableMax = function TableMax(_ref) {
|
|
|
1173
1174
|
})
|
|
1174
1175
|
}), /*#__PURE__*/_jsx(ExportTableData, {
|
|
1175
1176
|
tableTitle: tableTitle,
|
|
1176
|
-
canExport: canExport,
|
|
1177
|
+
canExport: canExport !== null && canExport !== void 0 ? canExport : tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.globalCanExport,
|
|
1177
1178
|
hasTotalRow: hasTotalRow,
|
|
1178
1179
|
totalDatas: totalDatas,
|
|
1179
1180
|
columns: tableColumns,
|
|
@@ -24,7 +24,6 @@ var ExportComp = function ExportComp(_ref) {
|
|
|
24
24
|
var _useTableExport = useTableExport(),
|
|
25
25
|
exporting = _useTableExport.exporting,
|
|
26
26
|
exportTableData = _useTableExport.exportTableData;
|
|
27
|
-
console.log(columns, datas, '4444555555');
|
|
28
27
|
var handleExport = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
29
28
|
var _ref3, _exportConfig$fileNam;
|
|
30
29
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|