You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by bz...@apache.org on 2022/11/06 06:47:39 UTC
[apisix-dashboard] branch master updated: fix: ant-table unable to request (#2641)
This is an automated email from the ASF dual-hosted git repository.
bzp2010 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new b5672b64d fix: ant-table unable to request (#2641)
b5672b64d is described below
commit b5672b64def099a7b337a5778e76d8aaa8df9d63
Author: 黄困困 <50...@qq.com>
AuthorDate: Sun Nov 6 14:47:32 2022 +0800
fix: ant-table unable to request (#2641)
Co-authored-by: 黄海婷 <oh...@gmail.com>
---
web/cypress/e2e/plugin/plugin-schema.cy.js | 2 +-
...mplate-create-edit-delete-plugin-template.cy.js | 1 +
...emplate-create-plugin-template-with-route.cy.js | 1 +
...am-create_and_edit_upstream_with_no_nodes.cy.js | 3 +-
web/package.json | 2 +-
web/yarn.lock | 62 ++++++++++------------
6 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/web/cypress/e2e/plugin/plugin-schema.cy.js b/web/cypress/e2e/plugin/plugin-schema.cy.js
index 37929adc7..161941384 100644
--- a/web/cypress/e2e/plugin/plugin-schema.cy.js
+++ b/web/cypress/e2e/plugin/plugin-schema.cy.js
@@ -38,7 +38,7 @@ describe('Plugin Schema Test', () => {
cy.get('#root > div > section > aside > div > div:nth-child(1) > ul', { timeout })
.contains('Plugin')
.click();
- cy.get('#ant-design-pro-table > div > div > div.ant-pro-table-list-toolbar', { timeout })
+ cy.get('.ant-pro-table > div > div > div.ant-pro-table-list-toolbar', { timeout })
.contains('Enable')
.click();
cy.url().should('include', '/plugin/market');
diff --git a/web/cypress/e2e/rest/pluginTemplate-create-edit-delete-plugin-template.cy.js b/web/cypress/e2e/rest/pluginTemplate-create-edit-delete-plugin-template.cy.js
index 8bdf05200..8cda4a74e 100644
--- a/web/cypress/e2e/rest/pluginTemplate-create-edit-delete-plugin-template.cy.js
+++ b/web/cypress/e2e/rest/pluginTemplate-create-edit-delete-plugin-template.cy.js
@@ -49,6 +49,7 @@ context('Create Configure and Delete PluginTemplate', () => {
cy.contains('Route').click();
cy.get(selector.empty).should('be.visible');
cy.contains('Advanced').should('be.visible').click();
+ cy.contains('Advanced').trigger('mouseover');
cy.contains('Plugin Template Config').should('be.visible').click();
cy.get(selector.empty).should('be.visible');
cy.contains('Create').click();
diff --git a/web/cypress/e2e/rest/pluginTemplate-create-plugin-template-with-route.cy.js b/web/cypress/e2e/rest/pluginTemplate-create-plugin-template-with-route.cy.js
index e7d240384..dc3662f35 100644
--- a/web/cypress/e2e/rest/pluginTemplate-create-plugin-template-with-route.cy.js
+++ b/web/cypress/e2e/rest/pluginTemplate-create-plugin-template-with-route.cy.js
@@ -57,6 +57,7 @@ context('Create PluginTemplate Binding To Route', () => {
cy.contains('Route').click();
cy.get(selector.empty).should('be.visible');
cy.contains('Advanced').should('be.visible').click();
+ cy.contains('Advanced').trigger('mouseover');
cy.contains('Plugin Template Config').should('be.visible').click();
cy.get(selector.empty).should('be.visible');
cy.contains('Create').click();
diff --git a/web/cypress/e2e/rest/upstream-create_and_edit_upstream_with_no_nodes.cy.js b/web/cypress/e2e/rest/upstream-create_and_edit_upstream_with_no_nodes.cy.js
index ce1555679..8acc30bd3 100644
--- a/web/cypress/e2e/rest/upstream-create_and_edit_upstream_with_no_nodes.cy.js
+++ b/web/cypress/e2e/rest/upstream-create_and_edit_upstream_with_no_nodes.cy.js
@@ -61,9 +61,8 @@ context('Create and Delete Upstream', () => {
cy.get(selector.nameSelector).type(data.upstreamName);
cy.contains('Search').click();
cy.contains(data.upstreamName).siblings().contains('Configure').click();
-
cy.get(selector.upstreamNodeMinus0).should('not.exist');
- cy.contains('button', 'Next').should('not.be.disabled').click();
+ cy.contains('button', 'Next').should('not.be.disabled').trigger('mouseover').click();
cy.contains('Submit').click({
force: true,
});
diff --git a/web/package.json b/web/package.json
index 43efd0d62..fc5029173 100644
--- a/web/package.json
+++ b/web/package.json
@@ -53,7 +53,7 @@
"dependencies": {
"@ant-design/icons": "^4.0.0",
"@ant-design/pro-layout": "^6.0.0",
- "@ant-design/pro-table": "2.30.1",
+ "@ant-design/pro-table": "2.30.8",
"@antv/x6": "^1.18.5",
"@antv/x6-react-components": "^1.1.7",
"@monaco-editor/react": "^4.3.1",
diff --git a/web/yarn.lock b/web/yarn.lock
index 63dfc20fc..fe721ab68 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -72,30 +72,31 @@
umi-utils "^1.5.1"
yargs-parser "^20.0.0"
-"@ant-design/pro-field@1.10.1":
- version "1.10.1"
- resolved "https://registry.yarnpkg.com/@ant-design/pro-field/-/pro-field-1.10.1.tgz#4d957812d0cffaef42ca753c147f34f56b6e0f7c"
- integrity sha512-tcOJ7zfFfcwHhqoxYCFNhaEpWfKnVSU9mLOd+kwnew9yX3Eg/UQpaAjjWlOJbkWDTRlhimcCBbUKxF8l2oYXeQ==
+"@ant-design/pro-field@1.11.3":
+ version "1.11.3"
+ resolved "https://registry.yarnpkg.com/@ant-design/pro-field/-/pro-field-1.11.3.tgz#511fe9ecc277628b99a5fcedc391b714fe25ffa6"
+ integrity sha512-lU9pigreZ8fRv3I9/lFozOTplexX15o3dEdhok+knjVQUNiqgMkPop8yzJmaER1MMPqinnykWYMnaPOFWimheQ==
dependencies:
"@ant-design/icons" "^4.2.1"
- "@ant-design/pro-provider" "1.4.5"
- "@ant-design/pro-utils" "1.13.0"
+ "@ant-design/pro-provider" "1.4.8"
+ "@ant-design/pro-utils" "1.14.3"
classnames "^2.2.6"
lodash.tonumber "^4.0.3"
moment "^2.27.0"
omit.js "^2.0.2"
rc-util "^5.4.0"
+ react-color "2.19.3"
swr "^0.3.6"
-"@ant-design/pro-form@1.16.1":
- version "1.16.1"
- resolved "https://registry.yarnpkg.com/@ant-design/pro-form/-/pro-form-1.16.1.tgz#ac7aa6c36929894fcb1f534906f4295dff785e42"
- integrity sha512-zRtomirisczllCntMAXcxhV1DfsaNp0lNL0TukFBOkUPGuMELisYs2FesRLPXXkyeAshdgMWTeQdnDWrPq7AtQ==
+"@ant-design/pro-form@1.18.3":
+ version "1.18.3"
+ resolved "https://registry.yarnpkg.com/@ant-design/pro-form/-/pro-form-1.18.3.tgz#1871fc9fd97ce25ad70a4215724b41204fc81604"
+ integrity sha512-Yr4DLz1t+ONi58X7SdnKee/odCVMQKjND9Iig3la7RvOYvEELUuVPGTggm875VlcTRyZXFrxMx9ASyM2RuCthw==
dependencies:
"@ant-design/icons" "^4.2.1"
- "@ant-design/pro-field" "1.10.1"
- "@ant-design/pro-provider" "1.4.5"
- "@ant-design/pro-utils" "1.13.0"
+ "@ant-design/pro-field" "1.11.3"
+ "@ant-design/pro-provider" "1.4.8"
+ "@ant-design/pro-utils" "1.14.3"
"@umijs/use-params" "^1.0.2"
classnames "^2.2.6"
omit.js "^2.0.2"
@@ -123,13 +124,6 @@
use-media-antd-query "^1.0.6"
warning "^4.0.3"
-"@ant-design/pro-provider@1.4.5":
- version "1.4.5"
- resolved "https://registry.yarnpkg.com/@ant-design/pro-provider/-/pro-provider-1.4.5.tgz#2e928017b26942f202d594c25c2a419510181504"
- integrity sha512-LXoSFjvrCJ/Dw6WgmcSgPszO8HC4gDiQywf+Q4JK9Q1JBU4FMPVKEVhpumN113/+SsHUp2ciEl5xhWH0TXZA3A==
- dependencies:
- rc-util "^5.0.1"
-
"@ant-design/pro-provider@1.4.8":
version "1.4.8"
resolved "https://registry.yarnpkg.com/@ant-design/pro-provider/-/pro-provider-1.4.8.tgz#6dd5c293f1f4ae79a12c75a8a99356220c69f3de"
@@ -137,16 +131,16 @@
dependencies:
rc-util "^5.0.1"
-"@ant-design/pro-table@2.30.1":
- version "2.30.1"
- resolved "https://registry.yarnpkg.com/@ant-design/pro-table/-/pro-table-2.30.1.tgz#cd4dccadf95c7dadfe4aaaad39f8d59550b999b4"
- integrity sha512-PDOJBvofptnAjs1WABiFKcxYDfoIsPvjrLruUPa0l0lzM0yZ6br7AIemW2GnOvw40MbeH9ePdh06Hwe9vaaPvA==
+"@ant-design/pro-table@2.30.8":
+ version "2.30.8"
+ resolved "https://registry.yarnpkg.com/@ant-design/pro-table/-/pro-table-2.30.8.tgz#44c3f11b05dbe8079974a4762ceb9f4a7ce14976"
+ integrity sha512-cPy1cw65SBEpB36Sow1Z3cyPbcK0wqt9cESDMVsHo5jEReaGaJNSoJ9cY8nwK9+IPicLkEsrGMrtn7cqk2cDpA==
dependencies:
"@ant-design/icons" "^4.1.0"
- "@ant-design/pro-field" "1.10.1"
- "@ant-design/pro-form" "1.16.1"
- "@ant-design/pro-provider" "1.4.5"
- "@ant-design/pro-utils" "1.13.0"
+ "@ant-design/pro-field" "1.11.3"
+ "@ant-design/pro-form" "1.18.3"
+ "@ant-design/pro-provider" "1.4.8"
+ "@ant-design/pro-utils" "1.14.3"
classnames "^2.2.6"
moment "^2.24.0"
omit.js "^2.0.2"
@@ -155,13 +149,13 @@
use-json-comparison "^1.0.5"
use-media-antd-query "1.0.6"
-"@ant-design/pro-utils@1.13.0":
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/@ant-design/pro-utils/-/pro-utils-1.13.0.tgz#f0862de5f59b585a4d9641354805db5c75d11d34"
- integrity sha512-vxBzKllP6z13VpgjoqqzesuQlqkzLPa0ntvYahCTgcYpiIBC6dRA2+w1wehMsgv72tlvRt9fePnRnkvRiG6hJA==
+"@ant-design/pro-utils@1.14.3":
+ version "1.14.3"
+ resolved "https://registry.yarnpkg.com/@ant-design/pro-utils/-/pro-utils-1.14.3.tgz#bdb8d5166c68e265f74790fa582129ed449b1bd6"
+ integrity sha512-kJxx0PYAFmNPtpu6ZItTHvMoaEbTZDtc39AOZmsq4NHjtgF4MAxnCFczDc9Eswq0xfKqv9mOzuALCYztCF3F0A==
dependencies:
"@ant-design/icons" "^4.3.0"
- "@ant-design/pro-provider" "1.4.5"
+ "@ant-design/pro-provider" "1.4.8"
classnames "^2.2.6"
fast-deep-equal "^3.1.3"
moment "^2.27.0"
@@ -14045,7 +14039,7 @@ react-app-polyfill@^1.0.4:
regenerator-runtime "^0.13.3"
whatwg-fetch "^3.0.0"
-react-color@^2.17.3:
+react-color@2.19.3, react-color@^2.17.3:
version "2.19.3"
resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.19.3.tgz#ec6c6b4568312a3c6a18420ab0472e146aa5683d"
integrity sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==