dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-24 02:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

support blob values #211

Browse Source
This commit is contained in:
Jan Prochazka
2022-02-03 14:29:46 +01:00
parent 1d52e02107
commit 7297976843
12 changed files with 112 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/web/src/celldata/PictureCellView.svelte Normal file
View File

@@ -0,0 +1,35 @@
<script lang="ts">
import _ from 'lodash';
import ErrorInfo from '../elements/ErrorInfo.svelte';
export let selection;
function extractPicture(values) {
const value = values;
if (value?.type == 'Buffer' && _.isArray(value?.data)) {
return 'data:image/png;base64, ' + btoa(String.fromCharCode.apply(null, value?.data));
}
return null;
}
$: picture = extractPicture(selection[0]?.value);
</script>
{#if picture}
<div class="wrapper">
<img src={picture} />
</div>
{:else}
<ErrorInfo message="Error showing picture" alignTop />
{/if}
<style>
.wrapper {
overflow: auto;
/* position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0; */
}
</style>

2
packages/web/src/datagrid/DataGridCell.svelte
View File

@@ -120,7 +120,7 @@
{/if}
{:else if value?.type == 'Buffer' && _.isArray(value.data)}
{#if value.data.length <= 16}
<span class="value">{arrayToHexString(value.data)}</span>
<span class="value">{'0x' + arrayToHexString(value.data)}</span>
{:else}
<span class="null">({value.data.length} bytes)</span>
{/if}

4
packages/web/src/datagrid/DataGridCore.svelte
View File

@@ -235,7 +235,7 @@
<script lang="ts">
import { GridDisplay } from 'dbgate-datalib';
import { driverBase } from 'dbgate-tools';
import { driverBase, parseCellValue } from 'dbgate-tools';
import { getContext } from 'svelte';
import _ from 'lodash';
import registerCommand from '../commands/registerCommand';
@@ -1176,7 +1176,7 @@
}
let colIndex = startCol;
for (const cell of rowData) {
setCellValue([rowIndex, colIndex], cell == '(NULL)' ? null : cell);
setCellValue([rowIndex, colIndex], parseCellValue(cell));
colIndex += 1;
}
rowIndex += 1;

29
packages/web/src/datagrid/InplaceEditor.svelte
View File

@@ -1,27 +1,10 @@
<script lang="ts" context="module">
function getEditedValue(value) {
if (value?.type == 'Buffer' && _.isArray(value.data)) return arrayToHexString(value.data);
if (value?.type == 'Buffer' && _.isArray(value.data)) return '0x' + arrayToHexString(value.data);
if (value?.$oid) return `ObjectId("${value?.$oid}")`;
if (_.isPlainObject(value) || _.isArray(value)) return JSON.stringify(value);
return value;
}
function getStoredValue(originalValue, newString) {
if (originalValue?.type == 'Buffer' && _.isArray(originalValue?.data)) {
return {
type: 'Buffer',
data: hexStringToArray(newString),
};
}
if (_.isString(newString)) {
const m = newString.match(/ObjectId\("([0-9a-f]{24})"\)/);
if (m) {
return { $oid: m[1] };
}
}
return newString;
}
</script>
<script lang="ts">
@@ -29,7 +12,7 @@
import { onMount } from 'svelte';
import createRef from '../utility/createRef';
import _ from 'lodash';
import { arrayToHexString, hexStringToArray } from 'dbgate-tools';
import { arrayToHexString, parseCellValue, stringifyCellValue } from 'dbgate-tools';
export let inplaceEditorState;
export let dispatchInsplaceEditor;
@@ -53,7 +36,7 @@
case keycodes.enter:
if (isChangedRef.get()) {
// grider.setCellValue(rowIndex, uniqueName, editor.value);
onSetValue(getStoredValue(cellValue, domEditor.value));
onSetValue(parseCellValue(domEditor.value));
isChangedRef.set(false);
}
domEditor.blur();
@@ -62,7 +45,7 @@
case keycodes.s:
if (event.ctrlKey) {
if (isChangedRef.get()) {
onSetValue(getStoredValue(cellValue, domEditor.value));
onSetValue(parseCellValue(domEditor.value));
// grider.setCellValue(rowIndex, uniqueName, editor.value);
isChangedRef.set(false);
}
@@ -75,7 +58,7 @@
function handleBlur() {
if (isChangedRef.get()) {
onSetValue(getStoredValue(cellValue, domEditor.value));
onSetValue(parseCellValue(domEditor.value));
// grider.setCellValue(rowIndex, uniqueName, editor.value);
isChangedRef.set(false);
}
@@ -83,7 +66,7 @@
}
onMount(() => {
domEditor.value = inplaceEditorState.text || getEditedValue(cellValue);
domEditor.value = inplaceEditorState.text || stringifyCellValue(cellValue);
domEditor.focus();
if (inplaceEditorState.selectAll) {
domEditor.select();

9
packages/web/src/utility/clipboard.ts
View File

@@ -1,5 +1,5 @@
import _ from 'lodash';
import { arrayToHexString } from 'dbgate-tools';
import { arrayToHexString, stringifyCellValue } from 'dbgate-tools';
import yaml from 'js-yaml';
export function copyTextToClipboard(text) {
@@ -69,12 +69,7 @@ export function copyTextToClipboard(text) {
export function extractRowCopiedValue(row, col) {
let value = row[col];
if (value === undefined) value = _.get(row, col);
if (value === null) return '(NULL)';
if (value === undefined) return '(NoField)';
if (value && value.$oid) return `ObjectId("${value.$oid}")`;
if (value && value.type == 'Buffer' && _.isArray(value.data)) return arrayToHexString(value.data);
if (_.isPlainObject(value) || _.isArray(value)) return JSON.stringify(value);
return value;
return stringifyCellValue(value);
}
const clipboardTextFormatter = (delimiter, headers) => (columns, rows) => {

8
packages/web/src/widgets/CellDataWidget.svelte
View File

@@ -24,6 +24,12 @@
component: JsonRowView,
single: false,
},
{
type: 'picture',
title: 'Picture',
component: PictureCellView,
single: true,
},
];
function autodetect(selection) {
@@ -51,6 +57,7 @@
import JsonCellView from '../celldata/JsonCellView.svelte';
import JsonRowView from '../celldata/JsonRowView.svelte';
import PictureCellView from '../celldata/PictureCellView.svelte';
import TextCellViewNoWrap from '../celldata/TextCellViewNoWrap.svelte';
import TextCellViewWrap from '../celldata/TextCellViewWrap.svelte';
import ErrorInfo from '../elements/ErrorInfo.svelte';
@@ -124,5 +131,6 @@
.data {
display: flex;
flex: 1;
position: relative;
}
</style>