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

fix

Browse Source
This commit is contained in:
Jan Prochazka
2020-06-27 10:33:51 +02:00
parent d754896f88
commit f78b1adefa
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/web/src/datagrid/DataGridRow.js
View File

@@ -6,6 +6,7 @@ import styled from 'styled-components';
import { findExistingChangeSetItem } from '@dbgate/datalib'; import { findExistingChangeSetItem } from '@dbgate/datalib';
import InplaceEditor from './InplaceEditor'; import InplaceEditor from './InplaceEditor';
import { cellIsSelected } from './gridutil'; import { cellIsSelected } from './gridutil';
import { isTypeLogical } from '@dbgate/tools';
const TableBodyCell = styled.td` const TableBodyCell = styled.td`
font-weight: normal; font-weight: normal;
@@ -137,7 +138,7 @@ function highlightSpecialCharacters(value) {
const dateTimeRegex = /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d\d\d)?Z?$/; const dateTimeRegex = /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d\d\d)?Z?$/;
function CellFormattedValue({ value }) { function CellFormattedValue({ value, dataType }) {
if (value == null) return <NullSpan>(NULL)</NullSpan>; if (value == null) return <NullSpan>(NULL)</NullSpan>;
if (_.isDate(value)) return moment(value).format('YYYY-MM-DD HH:mm:ss'); if (_.isDate(value)) return moment(value).format('YYYY-MM-DD HH:mm:ss');
if (value === true) return '1'; if (value === true) return '1';
@@ -153,7 +154,10 @@ function CellFormattedValue({ value }) {
return highlightSpecialCharacters(value); return highlightSpecialCharacters(value);
} }
if (_.isPlainObject(value)) { if (_.isPlainObject(value)) {
if (_.isArray(value.data)) return <NullSpan>({value.data.length} bytes)</NullSpan>; if (_.isArray(value.data)) {
if (value.data.length == 1 && isTypeLogical(dataType)) return value.data[0];
return <NullSpan>({value.data.length} bytes)</NullSpan>;
}
return <NullSpan>(RAW)</NullSpan>; return <NullSpan>(RAW)</NullSpan>;
} }
return value.toString(); return value.toString();
@@ -245,7 +249,7 @@ function DataGridRow({
/> />
) : ( ) : (
<> <>
<CellFormattedValue value={rowUpdated[col.uniqueName]} /> <CellFormattedValue value={rowUpdated[col.uniqueName]} dataType={col.dataType} />
{hintFieldsAllowed.includes(col.uniqueName) && <HintSpan>{row[col.hintColumnName]}</HintSpan>} {hintFieldsAllowed.includes(col.uniqueName) && <HintSpan>{row[col.hintColumnName]}</HintSpan>}
</> </>
)} )}