Merge pull request #106 from FederatedAI/develop-1.7.2

Merge pull request

RELEASE.md

@@ -1,3 +1,13 @@
+# Release 1.7.2
+
+#### Major Features and Improvements
+**Major Features**
+
+* Confusion matrix data display upgrade
+* Component port bug fixed
+* No data prompt upgrade
+
+
 # Release 1.7.1
 
 #### Major Features and Improvements

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>1.7.1</version>
+    <version>1.7.2</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

resources-front-end/package.json

@@ -31,7 +31,7 @@
     "vue-observe-visibility": "^0.4.6",
     "vue-router": "3.0.1",
     "vuex": "3.0.1",
-    "xlsx": "^0.17.0"
+    "xlsx": "^0.14.2"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",

resources-front-end/src/components/CanvasComponent/canvas/extra/flowDiagram.js

@@ -409,7 +409,7 @@ class CompExpression {
     if (this.belone.toLowerCase().match(/evaluation|union/i)) {
       this.input[0].mult = ports.get('MULT_DATA_PORT')
     }
-    if (!this.belone.toLowerCase().match(/(evaluation|upload|download|pearson|datasplit|statistics|psi|kmeans|modelloader|cacheloader)/i)) {
+    if (!this.belone.toLowerCase().match(/(evaluation|upload|download|pearson|datasplit|psi|kmeans|modelloader|cacheloader)/i)) {
       this.output.push(DATAOUTPUT)
     }
     if (this.belone.toLowerCase().match(/(kmeans)/i)) {

resources-front-end/src/components/CanvasComponent/canvas/extra/modules.js

@@ -129,7 +129,7 @@ const progressComp = {
     },
     linkChoose(point, afterChoose, ...props) {
       const lay = this
-      if (lay.$here(point)) {
+      if (lay.$here(point) && lay.$visiable) {
         lay.setCus('choose', () => {
           if (afterChoose && typeof afterChoose === 'function') afterChoose(lay.$parent.text, lay.$here(point), true)
         })

resources-front-end/src/transform/metricFn/confusionMat.js

@@ -80,26 +80,22 @@ function handler(confusionMat, f1Score) {
       const arr2 = []
       const arr3 = []
       let step = 0
-      let i = thresholds.length - 1
       while (step <= 100) {
         const key = step / 100
-        if (thresholds[i] >= key || i === 0) {
-          const _fn = fn[i]
-          const _fp = fp[i]
-          const _tn = tn[i]
-          const _tp = tp[i]
-          f1score.push([key, originF1score[i]])
-          arr0.push([key, `${_tn}(${(_tn / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
-          arr1.push([key, `${_fp}(${(_fp / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
-          arr2.push([key, `${_fn}(${(_fn / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
-          arr3.push([key, `${_tp}(${(_tp / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
-        } else {
-          i -= 1
-          continue
-        }
+        const i = thresholds.findIndex((val) => val === key)
+        // if (thresholds[i] === key || i === 0) {
+        const _fn = fn[i]
+        const _fp = fp[i]
+        const _tn = tn[i]
+        const _tp = tp[i]
+        f1score.push([key, originF1score[i]])
+        arr0.push([key, `${_tn}(${(_tn / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
+        arr1.push([key, `${_fp}(${(_fp / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
+        arr2.push([key, `${_fn}(${(_fn / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
+        arr3.push([key, `${_tp}(${(_tp / sum(_fn, _fp, _tn, _tp) * 100).toFixed(4)}%)`])
+        // }
         step += 1
       }
-
       tableData.push(Object.assign({
         labels: '0',
         0: arr0,

resources-front-end/src/views/job-details/dialog/component/DataOutput.vue

@@ -90,7 +90,9 @@ export default {
             })
             body.push(newRow)
           })
-          header.unshift({ type: 'index', label: 'index' })
+          if (header.length && header.length > 0) {
+            header.unshift({ type: 'index', label: 'index' })
+          }
           tableHeader[this.data.meta.names[i]] = header
           if (this.data.meta.header.length === 1) {
             tableBody = body

src/main/resources/static/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>FATE Board</title><link rel="shortcut icon" href=./FATE_logo.png></head><body><div id=app></div><script>!function(e){function n(n){for(var u,f,o=n[0],a=n[1],h=n[2],i=0,k=[];i<o.length;i++)f=o[i],t[f]&&k.push(t[f][0]),t[f]=0;for(u in a)Object.prototype.hasOwnProperty.call(a,u)&&(e[u]=a[u]);for(d&&d(n);k.length;)k.shift()();return r.push.apply(r,h||[]),c()}function c(){for(var e,n=0;n<r.length;n++){for(var c=r[n],u=!0,o=1;o<c.length;o++){var a=c[o];0!==t[a]&&(u=!1)}u&&(r.splice(n--,1),e=f(f.s=c[0]))}return e}var u={},t={runtime:0},r=[];function f(n){if(u[n])return u[n].exports;var c=u[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var n=[],c=t[e];if(0!==c)if(c)n.push(c[2]);else{var u=new Promise(function(n,u){c=t[e]=[n,u]});n.push(c[2]=u);var r,o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.charset="utf-8",a.timeout=120,f.nc&&a.setAttribute("nonce",f.nc),a.src=function(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-0d5e":"50e765da","chunk-31ee":"b49f2b60","chunk-3500":"b1030cfc","chunk-cfad":"b4e30454","chunk-2933":"100f2ca9","chunk-c314":"51a593c5","chunk-8e04":"2f036bf9","chunk-0dbc":"73ebe113","chunk-1b98":"4ade5597","chunk-d8f4":"d46c2cfc","chunk-e1df":"abe6bbaa","chunk-ee39":"71612ce6","chunk-09f6":"38655b28","chunk-0b97":"502dcc42","chunk-0de5":"a234757c","chunk-2d2d":"d3fe24c5","chunk-3243":"d1f43b2e","chunk-385e":"778d989a","chunk-446d":"2d34539f","chunk-4d44":"dc1609c7","chunk-5834":"e7ceeeb8","chunk-6795":"5aa760fb","chunk-ffb3":"e6a48212","chunk-61f4":"cc58782f","chunk-7222":"2bf14a30","chunk-7e1c":"c02069f1","chunk-03b2":"9b36a1f1","chunk-083c":"03418451","chunk-0ca6":"4fda98a6","chunk-0ce1":"9ec44dca","chunk-0f35":"4c008445","chunk-0fff":"18ac0e3a","chunk-40cf":"16f55a3a","chunk-4764":"a7c13f7e","chunk-4f45":"085835f9","chunk-6778":"6d7897dc","chunk-67ff":"6463695e","chunk-75cf":"276139f3","chunk-8a60":"802997cd","chunk-d66f":"fe4e503f","chunk-f45b":"21319003","chunk-f565":"36e3920d","chunk-de31":"e1f693de","chunk-9513":"3303b1f7","chunk-1e00":"c5d22254","chunk-7429":"0b71ecda"}[e]+".js"}(e),r=function(n){a.onerror=a.onload=null,clearTimeout(h);var c=t[e];if(0!==c){if(c){var u=n&&("load"===n.type?"missing":n.type),r=n&&n.target&&n.target.src,f=new Error("Loading chunk "+e+" failed.\n("+u+": "+r+")");f.type=u,f.request=r,c[1](f)}t[e]=void 0}};var h=setTimeout(function(){r({type:"timeout",target:a})},12e4);a.onerror=a.onload=r,o.appendChild(a)}return Promise.all(n)},f.m=e,f.c=u,f.d=function(e,n,c){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(f.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var u in e)f.d(c,u,function(n){return e[n]}.bind(null,u));return c},f.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="./",f.oe=function(e){throw console.error(e),e};var o=window.webpackJsonp=window.webpackJsonp||[],a=o.push.bind(o);o.push=n,o=o.slice();for(var h=0;h<o.length;h++)n(o[h]);var d=a;c()}([]);</script><script src=./static/js/chunk-elementUI.d215448d.js></script><script src=./static/js/chunk-libs.fb071939.js></script><script src=./static/js/app.20ebea74.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>FATE Board</title><link rel="shortcut icon" href=./FATE_logo.png></head><body><div id=app></div><script>!function(e){function n(n){for(var u,f,o=n[0],a=n[1],h=n[2],i=0,k=[];i<o.length;i++)f=o[i],t[f]&&k.push(t[f][0]),t[f]=0;for(u in a)Object.prototype.hasOwnProperty.call(a,u)&&(e[u]=a[u]);for(d&&d(n);k.length;)k.shift()();return r.push.apply(r,h||[]),c()}function c(){for(var e,n=0;n<r.length;n++){for(var c=r[n],u=!0,o=1;o<c.length;o++){var a=c[o];0!==t[a]&&(u=!1)}u&&(r.splice(n--,1),e=f(f.s=c[0]))}return e}var u={},t={runtime:0},r=[];function f(n){if(u[n])return u[n].exports;var c=u[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var n=[],c=t[e];if(0!==c)if(c)n.push(c[2]);else{var u=new Promise(function(n,u){c=t[e]=[n,u]});n.push(c[2]=u);var r,o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.charset="utf-8",a.timeout=120,f.nc&&a.setAttribute("nonce",f.nc),a.src=function(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-0d5e":"50e765da","chunk-31ee":"b49f2b60","chunk-3500":"b1030cfc","chunk-cfad":"b4e30454","chunk-2933":"ed2a82a0","chunk-c314":"51a593c5","chunk-8e04":"2f036bf9","chunk-7502":"6b635c93","chunk-1b98":"4ade5597","chunk-d8f4":"d46c2cfc","chunk-e1df":"abe6bbaa","chunk-ee39":"71612ce6","chunk-09f6":"38655b28","chunk-0b97":"502dcc42","chunk-0de5":"a234757c","chunk-2d2d":"d3fe24c5","chunk-3243":"d1f43b2e","chunk-385e":"778d989a","chunk-446d":"2d34539f","chunk-4d44":"dc1609c7","chunk-5834":"e7ceeeb8","chunk-6795":"5aa760fb","chunk-ffb3":"e6a48212","chunk-61f4":"cc58782f","chunk-7222":"2bf14a30","chunk-7e1c":"c02069f1","chunk-03b2":"9b36a1f1","chunk-083c":"03418451","chunk-0ca6":"4fda98a6","chunk-0ce1":"9ec44dca","chunk-0f35":"4c008445","chunk-0fff":"18ac0e3a","chunk-40cf":"16f55a3a","chunk-4764":"a7c13f7e","chunk-4f45":"085835f9","chunk-6778":"6d7897dc","chunk-67ff":"6463695e","chunk-75cf":"276139f3","chunk-8a60":"802997cd","chunk-d66f":"fe4e503f","chunk-f45b":"21319003","chunk-f565":"36e3920d","chunk-de31":"e1f693de","chunk-9513":"3303b1f7","chunk-1e00":"c5d22254","chunk-7429":"0b71ecda"}[e]+".js"}(e),r=function(n){a.onerror=a.onload=null,clearTimeout(h);var c=t[e];if(0!==c){if(c){var u=n&&("load"===n.type?"missing":n.type),r=n&&n.target&&n.target.src,f=new Error("Loading chunk "+e+" failed.\n("+u+": "+r+")");f.type=u,f.request=r,c[1](f)}t[e]=void 0}};var h=setTimeout(function(){r({type:"timeout",target:a})},12e4);a.onerror=a.onload=r,o.appendChild(a)}return Promise.all(n)},f.m=e,f.c=u,f.d=function(e,n,c){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(f.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var u in e)f.d(c,u,function(n){return e[n]}.bind(null,u));return c},f.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="./",f.oe=function(e){throw console.error(e),e};var o=window.webpackJsonp=window.webpackJsonp||[],a=o.push.bind(o);o.push=n,o=o.slice();for(var h=0;h<o.length;h++)n(o[h]);var d=a;c()}([]);</script><script src=./static/js/chunk-elementUI.d215448d.js></script><script src=./static/js/chunk-libs.fb071939.js></script><script src=./static/js/app.1cbbad7b.js></script></body></html>