这是indexloc提供的服务，不要输入任何密码
Skip to content

show default values as placeholder during insert row #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2019
Merged

show default values as placeholder during insert row #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73ae4b5
show default values as placeholder during insert row
rikinsk Apr 10, 2019
d825b13
Merge branch 'master' into console-defaults
rikinsk Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions console/src/components/Services/Data/TableInsertItem/InsertItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,18 @@ class InsertItem extends Component {
};

const colType = col.data_type;

const placeHolder = hasDefault
? col.column_default
: getPlaceholder(colType);

let typedInput = (
<input {...standardInputProps} placeholder={getPlaceholder(colType)} />
<input {...standardInputProps} placeholder={placeHolder} />
);

if (isAutoIncrement) {
typedInput = (
<input
{...standardInputProps}
readOnly
placeholder={getPlaceholder(colType)}
/>
<input {...standardInputProps} readOnly placeholder={placeHolder} />
);
}

Expand All @@ -134,7 +135,7 @@ class InsertItem extends Component {
typedInput = (
<input
{...standardInputProps}
placeholder={getPlaceholder(colType)}
placeholder={placeHolder}
defaultValue={
clone && colName in clone ? JSON.stringify(clone[colName]) : ''
}
Expand All @@ -151,8 +152,11 @@ class InsertItem extends Component {
e.target.parentNode.parentNode.click();
e.target.focus();
}}
defaultValue={placeHolder}
>
<option value="" disabled>-- bool --</option>
<option value="" disabled>
-- bool --
</option>
<option value="true">True</option>
<option value="false">False</option>
</select>
Expand Down
2 changes: 2 additions & 0 deletions console/src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ export const getPlaceholder = type => {
return '{"name": "foo"} or [12, "bar"]';
case 'jsonb':
return '{"name": "foo"} or [12, "bar"]';
case 'boolean':
return '';
default:
return 'text';
}
Expand Down