From 1f280cc47cabbad77f1dd1dfc505f819fb4832d3 Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Fri, 11 Feb 2022 15:09:47 +0800 Subject: [PATCH] build: upgrade packages --- dist/LICENSE | 3 +- dist/licenses/LICENSE-ctrl-tinycolor | 21 +++++ package-lock.json | 81 ++++++++++------- package.json | 2 +- src/assets/icons/all_inbox.svg | 1 - src/assets/icons/chevron-left.svg | 2 +- src/assets/icons/device_hub.svg | 1 - src/assets/icons/folder_open.svg | 1 - src/assets/icons/insert_image.svg | 1 - src/assets/icons/playlist_add.svg | 1 - src/assets/icons/save.svg | 1 - src/assets/icons/save_alt.svg | 1 - src/assets/icons/settings.svg | 1 - src/components/Selector.vue | 2 +- src/styles/lib.scss | 5 +- src/views/dashboard/Edit.vue | 2 +- .../dashboard/configuration/MetricOptions.vue | 5 +- .../configuration/StandardOptions.vue | 20 ++-- .../dashboard/configuration/WidgetOptions.vue | 4 +- .../configuration/graph-styles/Table.vue | 4 +- .../configuration/graph-styles/TopList.vue | 2 +- src/views/dashboard/panel/Tool.vue | 29 +++--- .../dashboard/related/topology/Graph.vue | 91 +++++++++++++++---- .../dashboard/related/topology/Settings.vue | 43 +++++++++ 24 files changed, 225 insertions(+), 99 deletions(-) create mode 100644 dist/licenses/LICENSE-ctrl-tinycolor create mode 100644 src/views/dashboard/related/topology/Settings.vue diff --git a/dist/LICENSE b/dist/LICENSE index f0498da2..0f966877 100644 --- a/dist/LICENSE +++ b/dist/LICENSE @@ -18,7 +18,7 @@ three-orbit-controls 82.1.0: https://github.com/mattdesl/three-orbit-controls MI vue-demi 0.12.1: https://github.com/antfu/vue-demi MIT vueuse/core 6.8.0: https://github.com/vueuse/vueuse MIT vue/devtools-api 6.0.0-beta.20.1: https://github.com/vuejs/vue-devtools MIT -element-plus 1.2.0-beta.3: https://github.com/element-plus/element-plus MIT +element-plus 2.0.1: https://github.com/element-plus/element-plus MIT vue-types 4.1.1: https://github.com/dwightjack/vue-types MIT is-plain-object 5.0.0: https://github.com/jonschlinkert/is-plain-object MIT vue-grid-layout 3.0.0-beta1: https://github.com/jbaysolutions/vue-grid-layout MIT @@ -31,3 +31,4 @@ zrender 5.2.1: https://github.com/ecomfe/zrender BSD-3-Clause License tslib 2.3.0: https://github.com/Microsoft/tslib 0BSD License d3-tip 0.9.1: https: //github.com/Caged/d3-tip MIT Licensee d3 7.3.0: https://github.com/d3/d3 ISC License +ctrl/tinycolor 3.4.0: https: //github.com/scttcper/tinycolor MIT Licensee diff --git a/dist/licenses/LICENSE-ctrl-tinycolor b/dist/licenses/LICENSE-ctrl-tinycolor new file mode 100644 index 00000000..4ef6d01e --- /dev/null +++ b/dist/licenses/LICENSE-ctrl-tinycolor @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015-present Evan You + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/package-lock.json b/package-lock.json index 8cf07d72..4bfc2717 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "d3": "^7.3.0", "d3-tip": "^0.9.1", "echarts": "^5.2.2", - "element-plus": "^1.2.0-beta.3", + "element-plus": "^2.0.1", "pinia": "^2.0.5", "three": "^0.131.3", "three-orbit-controls": "^82.1.0", @@ -1702,6 +1702,14 @@ "node": ">=0.1.95" } }, + "node_modules/@ctrl/tinycolor": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz", + "integrity": "sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/@cypress/listr-verbose-renderer": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz", @@ -1792,9 +1800,9 @@ } }, "node_modules/@element-plus/icons-vue": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-0.2.4.tgz", - "integrity": "sha512-RsJNyL58rwxtsjeMy34o8txkL6UlME1stWsUlRpTac6UE9Bx9gdJvnDXbIKhOJqBLX17fBjmposdrn6VTqim2w==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-0.2.7.tgz", + "integrity": "sha512-S8kDbfVaWkQvbUYQE1ui448tzaHfUvyESCep9J6uPRlViyQPXjdIfwLBhV6AmQSOfFS8rL+xehJGhvzPXLrSBg==", "peerDependencies": { "vue": "^3.2.0" } @@ -5278,11 +5286,11 @@ "dev": true }, "node_modules/@vueuse/core": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.5.3.tgz", - "integrity": "sha512-D9j5ymHFMFRXQqCp0yZJkf/bvBGiz0MrKUa364p+L8dMyd5zyq2K1JmHyvoBd4xbTFRfmQ1h878u6YE5LCkDVQ==", + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.6.1.tgz", + "integrity": "sha512-492y7R9HRu6TXzcGBMVG5qg5o9CHjrWLfOHh+TEknJeLe3LIYHsIBi1IlUN5s/yP3OHlBynjrzMMUm4gEyBmQg==", "dependencies": { - "@vueuse/shared": "7.5.3", + "@vueuse/shared": "7.6.1", "vue-demi": "*" }, "funding": { @@ -5302,9 +5310,9 @@ } }, "node_modules/@vueuse/core/node_modules/@vueuse/shared": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.5.3.tgz", - "integrity": "sha512-BJ71cxHN5VByW1S58Gl85NFJaQu93F7Vs7K/MuAKsIIuHm9PBbkR5Vxkg9ko9cBdiKVt+FNoo13BhdbA+Vwycg==", + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.6.1.tgz", + "integrity": "sha512-VhURBjuyELYLW94TLqwyM+tUZ0uyWAOjp8zDnJts5wwyHZlGt/yabLbuEl70cKmt0zR9psVyAyHC+LTgRrA1Zw==", "dependencies": { "vue-demi": "*" }, @@ -10315,13 +10323,14 @@ } }, "node_modules/element-plus": { - "version": "1.2.0-beta.6", - "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.2.0-beta.6.tgz", - "integrity": "sha512-8EdSIR/5/FHcSB8w1diAh+gJMHgxIvxuZoayY99k6taAR1QyEFHuPTgFccZLopJ1+iP4UEsZFz49l57qS08Utw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.0.1.tgz", + "integrity": "sha512-Cdx3JhbMNGwVsU12DUewIltJ1hUYVSgx2iBB8AuNzzOxAqcxSA9e7p2lfNp8oCBQeh4ThRSaOkdLnJyO4mS3qQ==", "dependencies": { - "@element-plus/icons-vue": "^0.2.2", - "@popperjs/core": "^2.10.2", - "@vueuse/core": "^7.0.0", + "@ctrl/tinycolor": "^3.4.0", + "@element-plus/icons-vue": "^0.2.6", + "@popperjs/core": "^2.11.2", + "@vueuse/core": "^7.5.5", "async-validator": "^4.0.7", "dayjs": "^1.10.7", "lodash": "^4.17.21", @@ -29882,6 +29891,11 @@ "minimist": "^1.2.0" } }, + "@ctrl/tinycolor": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz", + "integrity": "sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==" + }, "@cypress/listr-verbose-renderer": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz", @@ -29958,9 +29972,9 @@ } }, "@element-plus/icons-vue": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-0.2.4.tgz", - "integrity": "sha512-RsJNyL58rwxtsjeMy34o8txkL6UlME1stWsUlRpTac6UE9Bx9gdJvnDXbIKhOJqBLX17fBjmposdrn6VTqim2w==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-0.2.7.tgz", + "integrity": "sha512-S8kDbfVaWkQvbUYQE1ui448tzaHfUvyESCep9J6uPRlViyQPXjdIfwLBhV6AmQSOfFS8rL+xehJGhvzPXLrSBg==", "requires": {} }, "@hapi/address": { @@ -32826,18 +32840,18 @@ "dev": true }, "@vueuse/core": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.5.3.tgz", - "integrity": "sha512-D9j5ymHFMFRXQqCp0yZJkf/bvBGiz0MrKUa364p+L8dMyd5zyq2K1JmHyvoBd4xbTFRfmQ1h878u6YE5LCkDVQ==", + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.6.1.tgz", + "integrity": "sha512-492y7R9HRu6TXzcGBMVG5qg5o9CHjrWLfOHh+TEknJeLe3LIYHsIBi1IlUN5s/yP3OHlBynjrzMMUm4gEyBmQg==", "requires": { - "@vueuse/shared": "7.5.3", + "@vueuse/shared": "7.6.1", "vue-demi": "*" }, "dependencies": { "@vueuse/shared": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.5.3.tgz", - "integrity": "sha512-BJ71cxHN5VByW1S58Gl85NFJaQu93F7Vs7K/MuAKsIIuHm9PBbkR5Vxkg9ko9cBdiKVt+FNoo13BhdbA+Vwycg==", + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.6.1.tgz", + "integrity": "sha512-VhURBjuyELYLW94TLqwyM+tUZ0uyWAOjp8zDnJts5wwyHZlGt/yabLbuEl70cKmt0zR9psVyAyHC+LTgRrA1Zw==", "requires": { "vue-demi": "*" } @@ -36863,13 +36877,14 @@ "dev": true }, "element-plus": { - "version": "1.2.0-beta.6", - "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.2.0-beta.6.tgz", - "integrity": "sha512-8EdSIR/5/FHcSB8w1diAh+gJMHgxIvxuZoayY99k6taAR1QyEFHuPTgFccZLopJ1+iP4UEsZFz49l57qS08Utw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.0.1.tgz", + "integrity": "sha512-Cdx3JhbMNGwVsU12DUewIltJ1hUYVSgx2iBB8AuNzzOxAqcxSA9e7p2lfNp8oCBQeh4ThRSaOkdLnJyO4mS3qQ==", "requires": { - "@element-plus/icons-vue": "^0.2.2", - "@popperjs/core": "^2.10.2", - "@vueuse/core": "^7.0.0", + "@ctrl/tinycolor": "^3.4.0", + "@element-plus/icons-vue": "^0.2.6", + "@popperjs/core": "^2.11.2", + "@vueuse/core": "^7.5.5", "async-validator": "^4.0.7", "dayjs": "^1.10.7", "lodash": "^4.17.21", diff --git a/package.json b/package.json index d91f030b..06908a5f 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "d3": "^7.3.0", "d3-tip": "^0.9.1", "echarts": "^5.2.2", - "element-plus": "^1.2.0-beta.3", + "element-plus": "^2.0.1", "pinia": "^2.0.5", "three": "^0.131.3", "three-orbit-controls": "^82.1.0", diff --git a/src/assets/icons/all_inbox.svg b/src/assets/icons/all_inbox.svg index bcf2fa84..cf38fc98 100644 --- a/src/assets/icons/all_inbox.svg +++ b/src/assets/icons/all_inbox.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -all_inbox diff --git a/src/assets/icons/chevron-left.svg b/src/assets/icons/chevron-left.svg index 67158a0d..a2463274 100755 --- a/src/assets/icons/chevron-left.svg +++ b/src/assets/icons/chevron-left.svg @@ -13,4 +13,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -icn/chevron-left \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/device_hub.svg b/src/assets/icons/device_hub.svg index db4932c4..26054c38 100644 --- a/src/assets/icons/device_hub.svg +++ b/src/assets/icons/device_hub.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -device_hub diff --git a/src/assets/icons/folder_open.svg b/src/assets/icons/folder_open.svg index 86892377..1c19c9b9 100644 --- a/src/assets/icons/folder_open.svg +++ b/src/assets/icons/folder_open.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -folder_open diff --git a/src/assets/icons/insert_image.svg b/src/assets/icons/insert_image.svg index b3643964..5aea97ca 100644 --- a/src/assets/icons/insert_image.svg +++ b/src/assets/icons/insert_image.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -insert_image diff --git a/src/assets/icons/playlist_add.svg b/src/assets/icons/playlist_add.svg index 58440236..82b905f5 100644 --- a/src/assets/icons/playlist_add.svg +++ b/src/assets/icons/playlist_add.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -playlist_add diff --git a/src/assets/icons/save.svg b/src/assets/icons/save.svg index b6457af0..5a8f3b04 100644 --- a/src/assets/icons/save.svg +++ b/src/assets/icons/save.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -save diff --git a/src/assets/icons/save_alt.svg b/src/assets/icons/save_alt.svg index e99ade2c..59d6e879 100644 --- a/src/assets/icons/save_alt.svg +++ b/src/assets/icons/save_alt.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -save_alt diff --git a/src/assets/icons/settings.svg b/src/assets/icons/settings.svg index 6dac1694..f394ff29 100644 --- a/src/assets/icons/settings.svg +++ b/src/assets/icons/settings.svg @@ -13,6 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -settings diff --git a/src/components/Selector.vue b/src/components/Selector.vue index 0aa35528..3b5407cc 100644 --- a/src/components/Selector.vue +++ b/src/components/Selector.vue @@ -77,7 +77,7 @@ watch( } ); - diff --git a/src/views/dashboard/related/topology/Settings.vue b/src/views/dashboard/related/topology/Settings.vue new file mode 100644 index 00000000..df98030c --- /dev/null +++ b/src/views/dashboard/related/topology/Settings.vue @@ -0,0 +1,43 @@ + + + +