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

create table, modify table ui alignment fix #249

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 1 commit into from
Aug 3, 2018
Merged

create table, modify table ui alignment fix #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions console/src/components/Common/Common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ table thead tr th
.fontAwosomeClose
{
margin-left: 10px;
width: 15px;
min-width: 15px;
}
.display_flex
{
Expand Down
12 changes: 7 additions & 5 deletions console/src/components/Services/Data/Add/AddTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ import { primaryKeyAlreadyPresentMsg, fieldRepeatedMsg } from './AddWarning';

import {
listDulplicate,
convertListToDictUsingKV,
// convertListToDictUsingKV,
} from '../../../../utils/data';

import gqlPattern, {
gqlTableErrorNotif,
gqlColumnErrorNotif,
} from '../Common/GraphQLValidation';

/*
const typeDescriptionDict = convertListToDictUsingKV(
'value',
'description',
dataTypes
);

*/
class AddTable extends Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -242,7 +242,7 @@ class AddTable extends Component {
const cols = columns.map((column, i) => {
let removeIcon;
if (i + 1 === columns.length) {
removeIcon = null;
removeIcon = <i className={`${styles.fontAwosomeClose}`} />;
} else {
removeIcon = (
<i
Expand Down Expand Up @@ -308,7 +308,7 @@ class AddTable extends Component {
</option>
))}
</select>
{removeIcon}
{/*
{typeDescriptionDict && typeDescriptionDict[column.type] ? (
<span>
&nbsp; &nbsp;
Expand All @@ -323,6 +323,7 @@ class AddTable extends Component {
&nbsp; &nbsp;
</span>
) : null}
*/}
<input
className={`${styles.inputCheckbox} form-control `}
checked={columns[i].nullable}
Expand Down Expand Up @@ -364,6 +365,7 @@ class AddTable extends Component {
data-test={`col-default-${i}`}
/>{' '}
<label>Default</label>
{removeIcon}
</div>
);
});
Expand Down
5 changes: 4 additions & 1 deletion console/src/components/Services/Data/TableModify/Modify.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
.select {
margin-right: 10px;
}

.modifyMinWidth
{
min-width: 735px;
}
.leftIndent {
padding-left: 0;
margin-left: 0 !important;
Expand Down
8 changes: 7 additions & 1 deletion console/src/components/Services/Data/TableModify/ModifyTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,13 @@ class ModifyTable extends Component {
/>
<br />
<div className={`container-fluid ${styles.padd_left_remove}`}>
<div className={`col-xs-9 ${styles.padd_left_remove}`}>
<div
className={
`col-xs-9 ${styles.padd_left_remove}` +
' ' +
styles.modifyMinWidth
}
>
{commentHtml}
<h4 className={styles.subheading_text}>Columns</h4>
{columnEditors}
Expand Down