opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into devel

Browse Source
This commit is contained in:
Serge Rider
2020-10-13 18:28:06 +03:00
parent aa5f9a238a aa5b82ba9b
commit c8aead2949
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core-blocks/src/PropertiesTable/PropertyValueSelector.tsx
+2 -3
View File
@@ -7,7 +7,7 @@
*/
import { observer } from 'mobx-react';
import { useCallback, useLayoutEffect } from 'react';
import { useCallback } from 'react';
import {
useMenuState,
Menu,
@@ -79,11 +79,10 @@ export const PropertyValueSelector = observer(function PropertyValueSelector({
},
[menu, onSelect]
);
useLayoutEffect(() => onSwitch(menu.visible), [menu.visible]);
return styled(useStyles(styles))(
<>
<MenuButton {...menu}>{children}</MenuButton>
<MenuButton {...menu} onClick={() => onSwitch(!menu.visible)}>{children}</MenuButton>
<Menu {...menu} aria-label={propertyName}>
{values.map(value => (
<MenuItem key={value} type='button' {...menu} onClick={() => handleMenuSelect(value)}>
webapp/packages/plugin-data-export/src/locales/en.ts
+1 -1
View File
@@ -4,7 +4,7 @@ export default [
['data_transfer_dialog_configuration_title', 'Export configuration'],
['data_transfer_dialog_preparation', 'We prepare your file for export. Please wait...'],
['data_transfer_notification_preparation', 'We prepare your file for download. Please wait...'],
['data_transfer_notification_ready', 'File ready to download'],
['data_transfer_notification_ready', 'File is ready to download'],
['data_transfer_notification_error', 'Preparation failed or canceled'],
['data_transfer_notification_download', 'Download'],
['data_transfer_notification_delete', 'Delete'],
webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts
+2 -2
View File
@@ -45,7 +45,7 @@ interface CellKeyDownEvent extends AgGridEvent{
}
const EVENT_KEY_CODE = {
C: 67,
C: 'KeyC',
};
interface TemporarySelectionRange {
@@ -103,7 +103,7 @@ export class RangeController implements IRangeController {
}
private handleDocumentCopy(event: KeyboardEvent) {
if (event.keyCode === EVENT_KEY_CODE.C && event.ctrlKey) {
if (event.code === EVENT_KEY_CODE.C && (event.ctrlKey || event.metaKey)) {
this.copySelectedData();
}
}