diff --git a/mindinsight/ui/src/components/multiselectGroup.vue b/mindinsight/ui/src/components/multiselectGroup.vue index ab54c3e2d9eff7e78817d07d6819a8730bf3990d..b23973fc557cb65bb2fb0bd1d204c56038b8f4c6 100644 --- a/mindinsight/ui/src/components/multiselectGroup.vue +++ b/mindinsight/ui/src/components/multiselectGroup.vue @@ -171,7 +171,7 @@ export default { break; } const listItem = this.checkListArr[i]; - if (listItem.show) { + if (listItem.show && !listItem.checked) { listItem.checked = true; this.multiSelectedItemNames[listItem.label] = true; this.selectedNumber++; @@ -309,23 +309,24 @@ export default { const loopCount = this.checkListArr.length; for (let i = 0; i < loopCount; i++) { const listItem = this.checkListArr[i]; - if (reg.test(listItem.label)) { - listItem.show = true; + if (listItem.checked) { if (this.selectedNumber >= this.limitNum) { listItem.checked = false; - itemSelectAll = false; - } else if (listItem.checked) { + } else { this.multiSelectedItemNames[listItem.label] = true; this.selectedNumber++; - } else { - itemSelectAll = false; } + } + if (reg.test(listItem.label)) { + listItem.show = true; } else { listItem.show = false; } } - if (!itemSelectAll && this.selectedNumber >= this.limitNum) { + if (this.selectedNumber >= this.limitNum) { itemSelectAll = true; + } else { + itemSelectAll = false; } } else { this.checkListArr.forEach((listItem) => { diff --git a/mindinsight/ui/src/store.js b/mindinsight/ui/src/store.js index c503c300b8d45f39527356c8d5f2cd04d2ad1164..4d990f2b25a29caf26bae381e36fb0864ec128b0 100644 --- a/mindinsight/ui/src/store.js +++ b/mindinsight/ui/src/store.js @@ -32,6 +32,7 @@ export default new Vuex.Store({ : 3, // multiSelevtGroup component count multiSelectedGroupCount: 0, + tableId: 0, }, mutations: { // set cancelTokenArr @@ -72,6 +73,9 @@ export default new Vuex.Store({ multiSelectedGroupComponentNum(state) { state.multiSelectedGroupCount++; }, + increaseTableId(state) { + state.tableId++; + }, }, actions: {}, }); diff --git a/mindinsight/ui/src/views/train-manage/data-traceback.vue b/mindinsight/ui/src/views/train-manage/data-traceback.vue index db0b552e91b505372894f1bc8b77a1d2f7b1a0f4..1105558024ff2b58fabf6f4fd8502a48647c0c54 100644 --- a/mindinsight/ui/src/views/train-manage/data-traceback.vue +++ b/mindinsight/ui/src/views/train-manage/data-traceback.vue @@ -24,11 +24,12 @@ limitations under the License. type="primary" size="mini" plain - v-show="(summaryDirList&&!summaryDirList.length)||(totalSeries&&totalSeries.length)"> + v-show="(summaryDirList && !summaryDirList.length)||(totalSeries && totalSeries.length)"> {{ $t('modelTraceback.showAllData') }}
+ v-show="!summaryDirList || (summaryDirList && summaryDirList.length) && !lineagedata.serData"> {{ $t('public.noData') }}
-{{ $t('dataTraceback.noDataFound') }}
{{ $t('dataTraceback.noDataFound') }}
{{ $t('dataTraceback.click') }} @@ -494,7 +497,7 @@ export default { obj.iconAdd = require('@/assets/images/icon' + obj.number + '.svg'); this.imageList.push(obj); } - document.title = this.$t('summaryManage.dataTraceback') + '-MindInsight'; + document.title = `${this.$t('summaryManage.dataTraceback')}-MindInsight`; document.addEventListener('click', this.blurFloat, true); this.$nextTick(() => { this.init(); @@ -527,8 +530,8 @@ export default { return; } row.showIcon = true; - const e = window.event; - document.getElementById('icon-dialog').style.top = e.clientY + 'px'; + document.getElementById('icon-dialog').style.top = + window.event.clientY + 'px'; }, iconValueChange(row, num, event) { @@ -575,6 +578,13 @@ export default { */ clearIcon(row) { + const classWrap = event.path.find((item) => { + return item.className === 'icon-dialog'; + }); + const classArr = classWrap.querySelectorAll('.icon-border'); + classArr.forEach((item) => { + item.classList.remove('icon-border'); + }); row.showIcon = false; this.iconValue = 0; row.tag = 0; @@ -848,7 +858,7 @@ export default { } this.initChart(); const list = []; - this.checkOptions.forEach((item) => { + this.basearr.forEach((item) => { this.selectArrayValue.forEach((i) => { if (i === item.value) { list.push(i); @@ -917,7 +927,7 @@ export default { }); } const list = []; - this.checkOptions.forEach((item) => { + this.basearr.forEach((item) => { this.selectArrayValue.forEach((i) => { if (i === item.value) { const obj = {}; @@ -1061,6 +1071,9 @@ export default { this.showTable = false; this.echartNoData = true; } else { + const echartLength = this.echart.brushData.length; + this.recordsNumber = echartLength; + this.showNumber = echartLength; this.echart.showData = this.echart.brushData; this.initChart(); this.pagination.currentPage = 1; @@ -1431,6 +1444,7 @@ export default { this.initOver = false; this.echartNoData = false; this.showEchartPic = true; + this.selectCheckAll = true; // checkOptions initializate to an empty array this.checkOptions = []; this.selectArrayValue = []; @@ -1733,7 +1747,9 @@ export default { const item = {}; item.key = k; item.value = dataObj[key][k]; - item.id = (index + 1) * 10 + 1 + j; + item.id = + `${new Date().getTime()}` + `${this.$store.state.tableId}`; + this.$store.commit('increaseTableId'); tempData.children.push(item); }); } @@ -1775,14 +1791,15 @@ export default {