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

console: fix handle long column names during update event trigger cre… #4210

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
Mar 30, 2020
Merged

console: fix handle long column names during update event trigger cre… #4210

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
fd0a7ed
console: fix handle long column names during update event trigger cre…
kawamataryo Mar 26, 2020
46e742a
console: Modified to use common column style elements
kawamataryo Mar 27, 2020
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
5 changes: 5 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 @@ -1395,6 +1395,11 @@ code {
width: 300px;
}

.columnListElement {
float: left;
margin-right: 50px !important;
}

/* container height subtracting top header and bottom scroll bar */
$mainContainerHeight: calc(100vh - 50px - 25px);

Expand Down
7 changes: 1 addition & 6 deletions console/src/components/Common/Permissions/PermissionStyles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@ width: 85%;
padding: 10px;
word-wrap: break-word;

.columnListElement {
float: left;
margin-right: 50px;
}

.form_permission_insert_set_wrapper {
.permission_insert_set_wrapper {
.configure_insert_set_checkbox {
Expand Down Expand Up @@ -176,4 +171,4 @@ color: firebrick;
.bulkSelectCell {
border-left: 4px double #ddd;
width: 10%;
}
}
9 changes: 2 additions & 7 deletions console/src/components/Services/Data/TablePermissions/Permissions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
// TODO: make common with Roles page
.clickableCell {
cursor: pointer;

.editPermsIcon {
font-size: 12px;
position: absolute;
Expand Down Expand Up @@ -117,11 +117,6 @@
padding: 10px;
word-wrap: break-word;

.columnListElement {
float: left;
margin-right: 50px;
}

.form_permission_insert_set_wrapper {
.permission_insert_set_wrapper {
.configure_insert_set_checkbox {
Expand Down Expand Up @@ -165,4 +160,4 @@
}
}
}
}
}
5 changes: 4 additions & 1 deletion console/src/components/Services/EventTrigger/Add/AddTrigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,10 @@ class AddTrigger extends Component {
/>
);
return (
<div key={i} className={styles.padd_remove + ' col-md-4'}>
<div
key={i}
className={`${styles.padd_remove} ${styles.columnListElement}`}
>
<div className={'checkbox '}>
<label>
{inputHtml}
Expand Down
12 changes: 3 additions & 9 deletions console/src/components/Services/EventTrigger/Modify/OperationEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ class OperationEditor extends React.Component {
{definition.update ? (
allTableColumns.map((col, i) => (
<div
className={`${styles.opsCheckboxWrapper} col-md-4 ${
styles.padd_remove
}`}
className={`${styles.opsCheckboxWrapper} ${styles.columnListElement} ${styles.padd_remove}`}
key={i}
>
<input
Expand Down Expand Up @@ -139,9 +137,7 @@ class OperationEditor extends React.Component {
<div className={'col-md-12 ' + styles.padd_remove}>
{operationTypes.map((qt, i) => (
<div
className={`${styles.opsCheckboxWrapper} col-md-2 ${
styles.padd_remove
} ${styles.cursorPointer}`}
className={`${styles.opsCheckboxWrapper} col-md-2 ${styles.padd_remove} ${styles.cursorPointer}`}
key={i}
onClick={() => {
dispatch(
Expand Down Expand Up @@ -173,9 +169,7 @@ class OperationEditor extends React.Component {
{modifyTrigger.definition.update ? (
allTableColumns.map((col, i) => (
<div
className={`${styles.opsCheckboxWrapper} col-md-4 ${
styles.padd_remove
} ${styles.cursorPointer}`}
className={`${styles.opsCheckboxWrapper} ${styles.columnListElement} ${styles.padd_remove} ${styles.cursorPointer}`}
key={i}
onClick={() => dispatch(toggleColumn('update', col.name))}
>
Expand Down