update resources-front-end

FederatedAI · Aug 27, 2021 · 8191641 · 8191641
1 parent 751fd4f
commit 8191641
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/resources-front-end/build/webpack.dev.conf.js b/resources-front-end/build/webpack.dev.conf.js
@@ -32,6 +32,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     clientLogLevel: 'warning',
     historyApiFallback: true,
     hot: true,
+    https: !!config.dev.httpsProxy,
     compress: true,
     host: HOST || config.dev.host,
     port: PORT || config.dev.port,
@@ -79,7 +80,7 @@ module.exports = new Promise((resolve, reject) => {
           compilationSuccessInfo: {
             messages: [
               `Your application is running here: http://${
-                devWebpackConfig.devServer.host
+              devWebpackConfig.devServer.host
               }:${port}`
             ]
           },

diff --git a/resources-front-end/config/index.js b/resources-front-end/config/index.js
@@ -7,13 +7,10 @@ const path = require('path')
 module.exports = {
   dev: {
     // Paths
+    httpsProxy: false,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {
-      '/': {
-        changeOrigin: true
-      }
-    },
+    proxyTable: {},
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST

diff --git a/resources-front-end/package.json b/resources-front-end/package.json
@@ -14,14 +14,14 @@
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
   },
   "dependencies": {
-    "axios": "0.21.1",
+    "axios": "^0.21.1",
     "babel-polyfill": "^6.26.0",
-    "clipboard": "^2.0.6",
+    "clipboard": "^2.0.8",
     "echarts": "^4.2.1",
     "element-ui": "2.8.2",
     "file-saver": "^2.0.1",
     "js-cookie": "2.2.0",
-    "jszip": "^3.5.0",
+    "jszip": "^3.7.1",
     "lodash": "^4.17.15",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",

diff --git a/resources-front-end/src/components/TableComponent/OriginTable/mixins/DataFormat.js b/resources-front-end/src/components/TableComponent/OriginTable/mixins/DataFormat.js
@@ -84,7 +84,7 @@ const dataFormat = {
               val[key] = nearBy(val[key], this.range)
             }
             const toNum = parseFloat(val[key])
-            if (typeof val[key] === 'number' && val[key].toString().match(/[0-9]+e/)) {
+            if (typeof val[key] === 'number' || val[key].toString().match(/[0-9]+e/)) {
               continue
             }
             if (toNum && toNum.toString() === val[key].toString()) {

diff --git a/resources-front-end/src/router/index.js b/resources-front-end/src/router/index.js
@@ -145,13 +145,17 @@ router.beforeEach((to, from, next) => {
       next()
     }
   } else if (to.name !== 'login') {
-    preUrl = Object.assign({}, to)
+    if (!preUrl) {
+      preUrl = Object.assign({}, to)
+    }
     next({
       name: 'login'
     })
   } else {
     if (from.name !== 'login') {
-      preUrl = Object.assign({}, from)
+      if (!preUrl) {
+        preUrl = Object.assign({}, from)
+      }
     }
     next()
   }

diff --git a/resources-front-end/src/utils/ReconnectingWebSocket.js b/resources-front-end/src/utils/ReconnectingWebSocket.js
@@ -61,12 +61,17 @@ function getHeartCheckObj(ws) {
   }
 }
 
+function isHttps() {
+  return window.location.protocol === 'https:'
+}
+
 export default class ReconnectingWebSocket {
   static CONNECTING = WebSocket.CONNECTING
   static OPEN = WebSocket.OPEN
   static CLOSING = WebSocket.CLOSING
   static CLOSE = WebSocket.CLOSE
-  static baseUrl = `ws://${location.host}`
+  static PROTOCOL = isHttps() ? 'wss://' : 'ws://'
+  static baseUrl = `${ReconnectingWebSocket.PROTOCOL}${location.host}`
   constructor(url, protocols, options = {}) {
     this.url = url
     this.protocols = protocols