mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-04-22 06:26:00 +00:00
fix
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import React from 'react';
|
||||
import styled from 'styled-components';
|
||||
import { FontIcon } from './icons';
|
||||
import useTheme from './theme/useTheme';
|
||||
|
||||
const TargetStyled = styled.div`
|
||||
position: fixed;
|
||||
@@ -9,7 +10,7 @@ const TargetStyled = styled.div`
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: #aaaaff;
|
||||
background: ${(props) => props.theme.main_background_blue[3]};
|
||||
align-items: center;
|
||||
justify-content: space-around;
|
||||
z-index: 1000;
|
||||
@@ -37,9 +38,10 @@ const TitleWrapper = styled.div`
|
||||
`;
|
||||
|
||||
export default function DragAndDropFileTarget({ isDragActive, inputProps }) {
|
||||
const theme = useTheme();
|
||||
return (
|
||||
!!isDragActive && (
|
||||
<TargetStyled>
|
||||
<TargetStyled theme={theme}>
|
||||
<InfoBox>
|
||||
<IconWrapper>
|
||||
<FontIcon icon="icon cloud-upload" />
|
||||
|
||||
@@ -86,9 +86,9 @@ function getFileFilters(storageType) {
|
||||
return res;
|
||||
}
|
||||
|
||||
async function addFilesToSourceList(files, values, setFieldValue) {
|
||||
async function addFilesToSourceList(files, values, setFieldValue, preferedStorageType) {
|
||||
const newSources = [];
|
||||
const storage = values.sourceStorageType;
|
||||
const storage = preferedStorageType || values.sourceStorageType;
|
||||
for (const file of getAsArray(files)) {
|
||||
if (isFileStorage(storage)) {
|
||||
if (storage == 'excel') {
|
||||
@@ -113,6 +113,9 @@ async function addFilesToSourceList(files, values, setFieldValue) {
|
||||
}
|
||||
}
|
||||
setFieldValue('sourceList', [...(values.sourceList || []).filter((x) => !newSources.includes(x)), ...newSources]);
|
||||
if (preferedStorageType && preferedStorageType != values.sourceStorageType) {
|
||||
setFieldValue('sourceStorageType', preferedStorageType);
|
||||
}
|
||||
}
|
||||
|
||||
function ElectronFilesInput() {
|
||||
@@ -311,7 +314,7 @@ export default function ImportExportConfigurator({ uploadedFile = undefined }) {
|
||||
const sourceConnectionInfo = useConnectionInfo({ conid: values.sourceConnectionId });
|
||||
const { engine: sourceEngine } = sourceConnectionInfo || {};
|
||||
const { sourceList } = values;
|
||||
const { uploadListener, setUploadListener } = useUploadsProvider();
|
||||
const { setUploadListener } = useUploadsProvider();
|
||||
const theme = useTheme();
|
||||
|
||||
const handleUpload = React.useCallback(
|
||||
@@ -324,11 +327,12 @@ export default function ImportExportConfigurator({ uploadedFile = undefined }) {
|
||||
},
|
||||
],
|
||||
values,
|
||||
setFieldValue
|
||||
setFieldValue,
|
||||
!sourceList || sourceList.length == 0 ? file.storageType : null
|
||||
);
|
||||
// setFieldValue('sourceList', [...(sourceList || []), file.originalName]);
|
||||
},
|
||||
[setFieldValue, sourceList]
|
||||
[setFieldValue, sourceList, values]
|
||||
);
|
||||
|
||||
React.useEffect(() => {
|
||||
|
||||
Reference in New Issue
Block a user