Skip to content

update Button UI #87

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

Open
gzcqqqqqqqq1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update Button UI #87

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
1 change: 0 additions & 1 deletion src/assets/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
}

.sql-query-plugin .sql-input-container .query-sql-button {
height: 40px;
margin-left: 16px;
}

Expand Down
5 changes: 3 additions & 2 deletions src/components/dialog/new-table-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React, { useCallback, useEffect, useRef, useState } from 'react';
import PropTypes from 'prop-types';
import intl from 'react-intl-universal';
import { Modal, ModalHeader, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Alert, Button } from 'reactstrap';
import { Modal, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Alert, Button } from 'reactstrap';
import isHotkey from 'is-hotkey';
import { DTableModalHeader } from 'dtable-ui-component';

const NewTableDialog = (props) => {
const { tableName: defaultName, getTables, onNewTableConfirm, onNewTableCancel } = props;
Expand Down Expand Up @@ -63,7 +64,7 @@ const NewTableDialog = (props) => {

return (
<Modal isOpen toggle={toggle} autoFocus={false}>
<ModalHeader toggle={toggle}>{intl.get('New_table')}</ModalHeader>
<DTableModalHeader toggle={toggle}>{intl.get('New_table')}</DTableModalHeader>
<ModalBody>
<Form>
<FormGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/components/dialog/new-view-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Modal, ModalHeader, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Alert, Button } from 'reactstrap';
import { Modal, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Alert, Button } from 'reactstrap';
import intl from 'react-intl-universal';
import isHotkey from 'is-hotkey';
import { DTableModalHeader } from 'dtable-ui-component';

class NewViewDialog extends React.Component {

Expand Down Expand Up @@ -65,7 +66,7 @@ class NewViewDialog extends React.Component {

return (
<Modal isOpen={true} toggle={this.toggle} autoFocus={false}>
<ModalHeader toggle={this.toggle}>{intl.get('New_view')}</ModalHeader>
<DTableModalHeader toggle={this.toggle}>{intl.get('New_view')}</DTableModalHeader>
<ModalBody>
<Form>
<FormGroup>
Expand Down
7 changes: 4 additions & 3 deletions src/components/dialog/rename-view-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { Component } from 'react';
import { Modal, ModalHeader, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Button, Alert } from 'reactstrap';
import { Modal, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Button, Alert } from 'reactstrap';
import PropTypes from 'prop-types';
import intl from 'react-intl-universal';
import { DTableModalHeader } from 'dtable-ui-component';

class RenameViewDialog extends Component {
constructor(props) {
Expand Down Expand Up @@ -50,9 +51,9 @@ class RenameViewDialog extends Component {

return (
<Modal isOpen={true} toggle={this.toggle} autoFocus={false}>
<ModalHeader toggle={this.toggle}>
<DTableModalHeader toggle={this.toggle}>
{intl.get('Rename_view')}
</ModalHeader>
</DTableModalHeader>
<ModalBody>
<Form>
<FormGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/body/widgets/export-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { UncontrolledTooltip } from 'reactstrap';
import { DTableToolTip } from 'dtable-ui-component';
import intl from 'react-intl-universal';

class ExportButton extends Component {
Expand All @@ -20,9 +20,9 @@ class ExportButton extends Component {
>
<i className="dtable-font dtable-icon-export-to-new-table"></i>
</div>
<UncontrolledTooltip placement="bottom" target={this.exportButtonRef} fade={false}>
<DTableToolTip placement="bottom" target={this.exportButtonRef} >
{intl.get('Export_to_a_new_table')}
</UncontrolledTooltip>
</DTableToolTip>
</Fragment>
);
}
Expand Down
17 changes: 11 additions & 6 deletions src/pages/header/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import intl from 'react-intl-universal';
import LOGO from '../../assets/images/sql-query.png';
import Views from './views';
import { NewViewDialog } from '../../components';
import { IconButton } from 'dtable-ui-component';

import '../../assets/css/header.css';

Expand Down Expand Up @@ -42,13 +43,17 @@ class Header extends Component {
</div>
<div className="sql-query-plugin-header-center mr-9">
<Views {...this.props} ref={ref => this.viewsRef = ref}/>
<div className="sql-query-plugin-header-view-add" onClick={this.openNewViewDialog}>
<i className="dtable-font dtable-icon-add-table"></i>
</div>
</div>
<div className="sql-query-plugin-header-right" onClick={this.props.onCloseToggle}>
<i title={intl.get('Close')} className="dtable-font dtable-icon-x"></i>
<IconButton
icon='add-table'
title={intl.get('New_view')}
onClick={this.openNewViewDialog}
/>
</div>
<IconButton
icon='x'
title={intl.get('Close')}
onClick={this.props.onCloseToggle}
/>
</div>
{isNewViewDialogDisplay && (
<NewViewDialog
Expand Down