Skip to content
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

fix Verification code bug #245

Merged
merged 11 commits into from
Oct 5, 2022
Merged

fix Verification code bug #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
27fb485
update SiderMenu
QinZiWeiS Aug 29, 2022
8cb127b
Merge branch 'master' of https://github.com/apache/shenyu-dashboard
QinZiWeiS Sep 6, 2022
2f4f4a6
Optimized the verification code function
QinZiWeiS Sep 6, 2022
1037bb1
HomePage update
QinZiWeiS Sep 16, 2022
34eb10e
Optimize the style of HomePage
QinZiWeiS Sep 16, 2022
31fa7b7
fix error
QinZiWeiS Sep 16, 2022
ad0d089
Merge branch 'master' of https://github.com/apache/shenyu-dashboard
QinZiWeiS Sep 26, 2022
4b5ada5
BasicConfig Auth styles update
QinZiWeiS Sep 28, 2022
532da15
SearchList search display exception resolved
QinZiWeiS Sep 28, 2022
922948f
fix Verification code bug
QinZiWeiS Oct 4, 2022
6c5f557
fix Verfication code bug
QinZiWeiS Oct 4, 2022
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
19 changes: 15 additions & 4 deletions src/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,16 @@ body,
.plug-content-wrap {
padding: 24px
}
.open{

.open {
color: #14c974;
}
.close{

.close {
color: #ff586d;
}
.ant-btn-danger{

.ant-btn-danger {
background: #f5222d !important;
color: #fff !important;
}
Expand All @@ -57,13 +60,15 @@ ol {
:global(.edit) {
cursor: pointer;
color: @primary-color;

&:hover {
color: @primary-color;
}
}

:global(.searchblock) {
display: flex !important;

button {
margin-left: 30px;
}
Expand All @@ -84,12 +89,16 @@ ol {
justify-content: space-between;
line-height: 40px;
padding: 0 20px;
border-radius: 5px;
box-shadow: 1px 2px 2px rgba(191, 189, 189, 0.5);
height: 40px;
background: #fff;

h3 {
font-size: 16px;
overflow: hidden;
}

button {
margin-top: 4px;
}
Expand All @@ -109,7 +118,9 @@ body {
:global {
.ant-spin-container {
overflow: visible !important;
box-shadow: 1px 2px 2px rgba(191, 189, 189, 0.5);
}

.global-spin {
width: 100%;
margin: 40px 0 !important;
Expand All @@ -135,4 +146,4 @@ body {
.ant-modal {
max-width: calc(100vw - 32px);
}
}
}
56 changes: 28 additions & 28 deletions src/routes/Plugin/Common/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ export default class Common extends Component {

componentDidMount() {
const { dispatch, plugins } = this.props;
const { selectorPage,selectorPageSize} = this.state;
const { selectorPage, selectorPageSize } = this.state;
if (plugins && plugins.length > 0) {
this.getAllSelectors(selectorPage,selectorPageSize, plugins);
this.getAllSelectors(selectorPage, selectorPageSize, plugins);
} else {
dispatch({
type: "global/fetchPlugins",
payload: {
callback: pluginList => {
this.getAllSelectors(selectorPage,selectorPageSize, pluginList);
this.getAllSelectors(selectorPage, selectorPageSize, pluginList);
}
}
});
Expand All @@ -66,21 +66,21 @@ export default class Common extends Component {
componentDidUpdate(prevProps) {
const preId = prevProps.match.params.id;
const newId = this.props.match.params.id;
const {selectorPage,selectorPageSize} = this.state;
const { selectorPage, selectorPageSize } = this.state;
if (newId !== preId) {
const { dispatch } = this.props;
dispatch({
type: "common/resetData"
});

if (prevProps.plugins && prevProps.plugins.length > 0) {
this.getAllSelectors(selectorPage,selectorPageSize, prevProps.plugins);
this.getAllSelectors(selectorPage, selectorPageSize, prevProps.plugins);
} else {
dispatch({
type: "global/fetchPlugins",
payload: {
callback: pluginList => {
this.getAllSelectors(selectorPage,selectorPageSize, pluginList);
this.getAllSelectors(selectorPage, selectorPageSize, pluginList);
}
}
});
Expand Down Expand Up @@ -112,7 +112,7 @@ export default class Common extends Component {
});
};

getAllRules = (page,pageSize) => {
getAllRules = (page, pageSize) => {
const { dispatch, currentSelector } = this.props;
const { ruleName } = this.state;
const selectorId = currentSelector ? currentSelector.id : "";
Expand Down Expand Up @@ -163,12 +163,12 @@ export default class Common extends Component {

searchSelector = () => {
const { plugins } = this.props;
const {selectorPage,selectorPageSize} = this.state;
this.getAllSelectors(selectorPage,selectorPageSize, plugins);
const { selectorPage, selectorPageSize } = this.state;
this.getAllSelectors(selectorPage, selectorPageSize, plugins);
};

addSelector = () => {
const { selectorPage,selectorPageSize } = this.state;
const { selectorPage, selectorPageSize } = this.state;
const { dispatch, plugins } = this.props;
let name = this.props.match.params ? this.props.match.params.id : "";
const plugin = this.getPlugin(plugins, name);
Expand Down Expand Up @@ -203,12 +203,12 @@ export default class Common extends Component {

searchRule = () => {
this.setState({ rulePage: 1 });
const {rulePageSize } = this.state;
this.getAllRules(1,rulePageSize);
const { rulePageSize } = this.state;
this.getAllRules(1, rulePageSize);
};

addRule = () => {
const { rulePage,rulePageSize, pluginId } = this.state;
const { rulePage, rulePageSize, pluginId } = this.state;
const { dispatch, currentSelector, plugins } = this.props;
let name = this.props.match.params ? this.props.match.params.id : "";
const plugin = this.getPlugin(plugins, name);
Expand Down Expand Up @@ -249,7 +249,7 @@ export default class Common extends Component {

editSelector = record => {
const { dispatch, plugins } = this.props;
const { selectorPage,selectorPageSize } = this.state;
const { selectorPage, selectorPageSize } = this.state;
let name = this.props.match.params ? this.props.match.params.id : "";
const plugin = this.getPlugin(plugins, name);
const { id: pluginId, config } = plugin;
Expand Down Expand Up @@ -295,7 +295,7 @@ export default class Common extends Component {

deleteSelector = record => {
const { dispatch, plugins } = this.props;
const { selectorPage,selectorPageSize } = this.state;
const { selectorPage, selectorPageSize } = this.state;
let name = this.props.match.params ? this.props.match.params.id : "";
const pluginId = this.getPluginId(plugins, name);
dispatch({
Expand All @@ -314,25 +314,25 @@ export default class Common extends Component {
pageSelectorChange = page => {
this.setState({ selectorPage: page });
const { plugins } = this.props;
const {selectorPageSize} = this.state;
this.getAllSelectors(page,selectorPageSize, plugins);
const { selectorPageSize } = this.state;
this.getAllSelectors(page, selectorPageSize, plugins);
};

pageSelectorChangeSize = (currentPage,pageSize) => {
pageSelectorChangeSize = (currentPage, pageSize) => {
const { plugins } = this.props;
this.setState({ selectorPage: 1, selectorPageSize: pageSize});
this.setState({ selectorPage: 1, selectorPageSize: pageSize });
this.getAllSelectors(1, pageSize, plugins);
};

pageRuleChange = page => {
this.setState({ rulePage: page});
this.setState({ rulePage: page });
const { rulePageSize } = this.state;
this.getAllRules(page,rulePageSize);
this.getAllRules(page, rulePageSize);
};

pageRuleChangeSize = (currentPage,pageSize) => {
this.setState({rulePage: 1, rulePageSize: pageSize});
this.getAllRules(1,pageSize);
pageRuleChangeSize = (currentPage, pageSize) => {
this.setState({ rulePage: 1, rulePageSize: pageSize });
this.getAllRules(1, pageSize);
};

// select
Expand All @@ -358,7 +358,7 @@ export default class Common extends Component {

editRule = record => {
const { dispatch, currentSelector, plugins } = this.props;
const { rulePage,rulePageSize, pluginId } = this.state;
const { rulePage, rulePageSize, pluginId } = this.state;
let name = this.props.match.params ? this.props.match.params.id : "";
const plugin = this.getPlugin(plugins, name);
const { config } = plugin;
Expand Down Expand Up @@ -407,7 +407,7 @@ export default class Common extends Component {

deleteRule = record => {
const { dispatch, currentSelector, ruleList } = this.props;
const { rulePage,rulePageSize } = this.state;
const { rulePage, rulePageSize } = this.state;
const currentPage =
rulePage > 1 && ruleList.length === 1 ? rulePage - 1 : rulePage;
dispatch({
Expand Down Expand Up @@ -616,12 +616,12 @@ export default class Common extends Component {
<Row gutter={20}>
<Col span={8}>
<div className="table-header">
<h3>{getIntlContent("SHENYU.PLUGIN.SELECTOR.LIST.TITLE")}</h3>
<h3 style={{ overflow: "visible" }}>{getIntlContent("SHENYU.PLUGIN.SELECTOR.LIST.TITLE")}</h3>
<div className={styles.headerSearch}>
<AuthButton perms={`plugin:${name}Selector:query`}>
<Search
className={styles.search}
style={{ maxWidth: "50%" }}
style={{ width: "130px" }}
placeholder={getIntlContent(
"SHENYU.PLUGIN.SEARCH.SELECTOR.NAME"
)}
Expand Down
Loading