提交 e33b56d9 编写于 作者: N Nicky Chan 提交者: daminglu

Pull available / selected runs option for each component into menu bar (#486)

上级 61385f9d
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<ui-audio-container <ui-audio-container
:expand="true" :expand="true"
:config="filteredConfig" :config="filteredConfig"
:runs-items="runsItems"
:tag-list="filteredTagsList" :tag-list="filteredTagsList"
:title="'Tags matching ' + config.groupNameReg" :title="'Tags matching ' + config.groupNameReg"
/> />
...@@ -12,7 +11,6 @@ ...@@ -12,7 +11,6 @@
v-for="item in groupedTags" v-for="item in groupedTags"
:key="item.group" :key="item.group"
:config="filteredConfig" :config="filteredConfig"
:runs-items="runsItems"
:tag-list="item.tags" :tag-list="item.tags"
:title="item.group" :title="item.group"
/> />
...@@ -20,7 +18,6 @@ ...@@ -20,7 +18,6 @@
<div class="visual-dl-page-right"> <div class="visual-dl-page-right">
<div class="visual-dl-page-config-container"> <div class="visual-dl-page-config-container">
<ui-config <ui-config
:runs-items="runsItems"
:config="config" :config="config"
/> />
</div> </div>
...@@ -30,7 +27,7 @@ ...@@ -30,7 +27,7 @@
<script> <script>
import {getPluginAudioTags, getRuns} from '../service'; import {getPluginAudioTags} from '../service';
import {flatten, uniq} from 'lodash'; import {flatten, uniq} from 'lodash';
import autoAdjustHeight from '../common/util/autoAdjustHeight'; import autoAdjustHeight from '../common/util/autoAdjustHeight';
...@@ -38,14 +35,19 @@ import Config from './ui/Config'; ...@@ -38,14 +35,19 @@ import Config from './ui/Config';
import AudioPanelContainer from './ui/AudioPanelContainer'; import AudioPanelContainer from './ui/AudioPanelContainer';
export default { export default {
name: 'Images', name: 'Audio',
components: { components: {
'ui-config': Config, 'ui-config': Config,
'ui-audio-container': AudioPanelContainer, 'ui-audio-container': AudioPanelContainer,
}, },
props: {
runs: {
type: Array,
required: true,
},
},
data() { data() {
return { return {
runsArray: [],
tags: [], tags: [],
config: { config: {
groupNameReg: '.*', groupNameReg: '.*',
...@@ -57,15 +59,6 @@ export default { ...@@ -57,15 +59,6 @@ export default {
}; };
}, },
computed: { computed: {
runsItems() {
let runsArray = this.runsArray || [];
return runsArray.map((item) => {
return {
name: item,
value: item,
};
});
},
tagsList() { tagsList() {
let tags = this.tags; let tags = this.tags;
...@@ -129,11 +122,7 @@ export default { ...@@ -129,11 +122,7 @@ export default {
let groupNameReg = this.config.groupNameReg; let groupNameReg = this.config.groupNameReg;
this.filterTagsList(groupNameReg); this.filterTagsList(groupNameReg);
}); });
this.config.runs = this.runs;
getRuns().then(({errno, data}) => {
this.runsArray = data;
this.config.runs = data;
});
}, },
mounted() { mounted() {
autoAdjustHeight(); autoAdjustHeight();
...@@ -142,6 +131,9 @@ export default { ...@@ -142,6 +131,9 @@ export default {
'config.groupNameReg': function(val) { 'config.groupNameReg': function(val) {
this.throttledFilterTagsList(); this.throttledFilterTagsList();
}, },
runs: function(val) {
this.config.runs = val;
}
}, },
methods: { methods: {
filterTagsList(groupNameReg) { filterTagsList(groupNameReg) {
......
...@@ -32,10 +32,6 @@ const intervalTime = 30; ...@@ -32,10 +32,6 @@ const intervalTime = 30;
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
tagInfo: { tagInfo: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
:tag-info="tagInfo" :tag-info="tagInfo"
:runs="config.runs" :runs="config.runs"
:running="config.running" :running="config.running"
:runs-items="runsItems"
/> />
<v-pagination <v-pagination
...@@ -30,10 +29,6 @@ import {cloneDeep, flatten} from 'lodash'; ...@@ -30,10 +29,6 @@ import {cloneDeep, flatten} from 'lodash';
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -7,16 +7,6 @@ ...@@ -7,16 +7,6 @@
dark dark
/> />
<label class="visual-dl-page-checkbox-group-label">Runs</label>
<v-checkbox
v-for="item in runsItems"
:key="item.name"
:label="item.name"
:value="item.value"
v-model="config.runs"
dark
/>
<v-btn <v-btn
:color="config.running ? 'primary' : 'error'" :color="config.running ? 'primary' : 'error'"
v-model="config.running" v-model="config.running"
...@@ -34,10 +24,6 @@ ...@@ -34,10 +24,6 @@
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -5,6 +5,30 @@ ...@@ -5,6 +5,30 @@
color="primary" color="primary"
dark> dark>
<v-toolbar-title class="appbar-menu-title"/> <v-toolbar-title class="appbar-menu-title"/>
<v-menu :close-on-content-click="false">
<v-btn
slot="activator"
dark
flat
> Runs: {{ runs }}
</v-btn>
<v-list dense>
<v-list-tile
v-for="(item, index) in availableRuns"
:key="index"
@click=""
>
<v-list-tile-action>
<v-checkbox
:value="item"
:key="item"
:label="item"
v-model="runs"
/>
</v-list-tile-action>
</v-list-tile>
</v-list>
</v-menu>
<v-toolbar-items> <v-toolbar-items>
<v-btn <v-btn
v-for="item in items" v-for="item in items"
...@@ -21,6 +45,8 @@ ...@@ -21,6 +45,8 @@
</template> </template>
<script> <script>
import {getRuns} from '../../service';
export default { export default {
props: { props: {
initialRoute: { initialRoute: {
...@@ -31,6 +57,8 @@ export default { ...@@ -31,6 +57,8 @@ export default {
name: 'AppMenu', name: 'AppMenu',
data() { data() {
return { return {
availableRuns: [],
runs: [],
selected: this.initialRoute, selected: this.initialRoute,
items: [ items: [
{ {
...@@ -71,10 +99,21 @@ export default { ...@@ -71,10 +99,21 @@ export default {
], ],
}; };
}, },
created() {
getRuns().then(({errno, data}) => {
this.availableRuns = data;
this.runs = data;
});
},
watch: {
runs: function(val) {
this.$router.push( {query: { runs: this.runs }});
},
},
methods: { methods: {
handleItemClick: function(item) { handleItemClick: function(item) {
this.selected = item.name; this.selected = item.name;
this.$router.push(item.url); this.$router.push( { path: item.url, query: { runs: this.runs }});
}, },
}, },
}; };
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<div class="visual-dl-page-right"> <div class="visual-dl-page-right">
<div class="visual-dl-page-config-container"> <div class="visual-dl-page-config-container">
<ui-config <ui-config
:runs-items="runsItems"
:config="config" :config="config"
/> />
</div> </div>
...@@ -22,7 +21,7 @@ ...@@ -22,7 +21,7 @@
</template> </template>
<script> <script>
import {getHighDimensionalDatasets, getRuns} from '../service'; import {getHighDimensionalDatasets} from '../service';
import autoAdjustHeight from '../common/util/autoAdjustHeight'; import autoAdjustHeight from '../common/util/autoAdjustHeight';
import Config from './ui/Config'; import Config from './ui/Config';
import Chart from './ui/Chart'; import Chart from './ui/Chart';
...@@ -36,9 +35,14 @@ export default { ...@@ -36,9 +35,14 @@ export default {
'ui-chart': Chart, 'ui-chart': Chart,
}, },
name: 'HighDimensional', name: 'HighDimensional',
props: {
runs: {
type: Array,
required: true,
},
},
data() { data() {
return { return {
runsArray: [],
config: { config: {
searchText: '', searchText: '',
displayWordLabel: true, displayWordLabel: true,
...@@ -53,14 +57,10 @@ export default { ...@@ -53,14 +57,10 @@ export default {
}; };
}, },
created() { created() {
getRuns().then(({errno, data}) => { // Setting selectedRun should trigger fetchDatasets
this.runsArray = data; if (this.runs.length > 0) {
this.config.selectedRun = this.runs[0];
// Setting selectedRun should trigger fetchDatasets }
if (data.length > 0) {
this.config.selectedRun = data[0];
}
});
if (this.config.running && !this.isDemo) { if (this.config.running && !this.isDemo) {
this.startInterval(); this.startInterval();
...@@ -82,21 +82,15 @@ export default { ...@@ -82,21 +82,15 @@ export default {
'config.running': function(val) { 'config.running': function(val) {
(val && !this.isDemo) ? this.startInterval() : this.stopInterval(); (val && !this.isDemo) ? this.startInterval() : this.stopInterval();
}, },
runs: function(val) {
if (this.runs.length > 0) {
this.config.selectedRun = this.runs[0];
}
}
}, },
mounted() { mounted() {
autoAdjustHeight(); autoAdjustHeight();
}, },
computed: {
runsItems() {
let runsArray = this.runsArray || [];
return runsArray.map((item) => {
return {
name: item,
value: item,
};
});
},
},
methods: { methods: {
stopInterval() { stopInterval() {
clearInterval(this.getOringDataInterval); clearInterval(this.getOringDataInterval);
......
...@@ -40,17 +40,6 @@ ...@@ -40,17 +40,6 @@
</v-radio-group> </v-radio-group>
<v-radio-group
label="Run"
v-model="config.selectedRun"
dark>
<v-radio
v-for="item in runsItems"
:key="item.name"
:label="item.name"
:value="item.value" />
</v-radio-group>
<v-btn <v-btn
:color="config.running ? 'primary' : 'error'" :color="config.running ? 'primary' : 'error'"
v-model="config.running" v-model="config.running"
...@@ -68,10 +57,6 @@ ...@@ -68,10 +57,6 @@
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<div class="visual-dl-page-left"> <div class="visual-dl-page-left">
<ui-chart-page <ui-chart-page
:config="config" :config="config"
:runs-items="runsItems"
:tag-list="filteredTagsList" :tag-list="filteredTagsList"
:title="'Tags matching ' + config.groupNameReg" :title="'Tags matching ' + config.groupNameReg"
/> />
...@@ -11,7 +10,6 @@ ...@@ -11,7 +10,6 @@
v-for="item in groupedTags" v-for="item in groupedTags"
:key="item.group" :key="item.group"
:config="config" :config="config"
:runs-items="runsItems"
:tag-list="item.tags" :tag-list="item.tags"
:title="item.group" :title="item.group"
/> />
...@@ -19,7 +17,6 @@ ...@@ -19,7 +17,6 @@
<div class="visual-dl-page-right"> <div class="visual-dl-page-right">
<div class="visual-dl-page-config-container"> <div class="visual-dl-page-config-container">
<ui-config <ui-config
:runs-items="runsItems"
:config="config" :config="config"
/> />
</div> </div>
...@@ -28,7 +25,7 @@ ...@@ -28,7 +25,7 @@
</template> </template>
<script> <script>
import {getPluginHistogramsTags, getRuns} from '../service'; import {getPluginHistogramsTags} from '../service';
import Config from './ui/Config'; import Config from './ui/Config';
import ChartPage from './ui/ChartPage'; import ChartPage from './ui/ChartPage';
import {flatten, uniq} from 'lodash'; import {flatten, uniq} from 'lodash';
...@@ -39,16 +36,26 @@ export default { ...@@ -39,16 +36,26 @@ export default {
'ui-config': Config, 'ui-config': Config,
'ui-chart-page': ChartPage, 'ui-chart-page': ChartPage,
}, },
props: {
runs: {
type: Array,
required: true,
},
},
data() {
return {
tags: [],
config: {
groupNameReg: '.*',
horizontal: 'step',
chartType: 'offset',
runs: [],
running: true,
},
filteredTagsList: [],
};
},
computed: { computed: {
runsItems() {
let runsArray = this.runsArray || [];
return runsArray.map((item) => {
return {
name: item,
value: item,
};
});
},
tagsList() { tagsList() {
let tags = this.tags; let tags = this.tags;
...@@ -95,20 +102,6 @@ export default { ...@@ -95,20 +102,6 @@ export default {
}); });
}, },
}, },
data() {
return {
runsArray: [],
tags: [],
config: {
groupNameReg: '.*',
horizontal: 'step',
chartType: 'offset',
runs: [],
running: true,
},
filteredTagsList: [],
};
},
created() { created() {
getPluginHistogramsTags().then(({errno, data}) => { getPluginHistogramsTags().then(({errno, data}) => {
this.tags = data; this.tags = data;
...@@ -116,10 +109,7 @@ export default { ...@@ -116,10 +109,7 @@ export default {
let groupNameReg = this.config.groupNameReg; let groupNameReg = this.config.groupNameReg;
this.filterTagsList(groupNameReg); this.filterTagsList(groupNameReg);
}); });
getRuns().then(({errno, data}) => { this.config.runs = this.runs;
this.runsArray = data;
this.config.runs = data;
});
}, },
mounted() { mounted() {
...@@ -129,6 +119,9 @@ export default { ...@@ -129,6 +119,9 @@ export default {
'config.groupNameReg': function(val) { 'config.groupNameReg': function(val) {
this.throttledFilterTagsList(); this.throttledFilterTagsList();
}, },
runs: function(val) {
this.config.runs = val;
}
}, },
methods: { methods: {
filterTagsList(groupNameReg) { filterTagsList(groupNameReg) {
......
...@@ -41,10 +41,6 @@ const yValueFormat = format('.' + p + 'e'); ...@@ -41,10 +41,6 @@ const yValueFormat = format('.' + p + 'e');
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
tagInfo: { tagInfo: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
:runs="config.runs" :runs="config.runs"
:chart-type="config.chartType" :chart-type="config.chartType"
:running="config.running" :running="config.running"
:runs-items="runsItems"
/> />
</div> </div>
<v-pagination <v-pagination
...@@ -32,10 +31,6 @@ import {cloneDeep, flatten} from 'lodash'; ...@@ -32,10 +31,6 @@ import {cloneDeep, flatten} from 'lodash';
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -18,16 +18,6 @@ ...@@ -18,16 +18,6 @@
:value="mode.value"/> :value="mode.value"/>
</v-radio-group> </v-radio-group>
<label class="visual-dl-page-checkbox-group-label">Runs</label>
<v-checkbox
v-for="item in runsItems"
:key="item.name"
:label="item.name"
:value="item.value"
v-model="config.runs"
dark
/>
<v-btn <v-btn
class="visual-dl-page-run-toggle" class="visual-dl-page-run-toggle"
:color="config.running ? 'primary' : 'error'" :color="config.running ? 'primary' : 'error'"
...@@ -44,10 +34,6 @@ ...@@ -44,10 +34,6 @@
<script> <script>
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<ui-chart-page <ui-chart-page
:expand="true" :expand="true"
:config="filteredConfig" :config="filteredConfig"
:runs-items="runsItems"
:tag-list="filteredTagsList" :tag-list="filteredTagsList"
:title="'Tags matching ' + config.groupNameReg" :title="'Tags matching ' + config.groupNameReg"
/> />
...@@ -12,7 +11,6 @@ ...@@ -12,7 +11,6 @@
v-for="item in groupedTags" v-for="item in groupedTags"
:key="item.group" :key="item.group"
:config="filteredConfig" :config="filteredConfig"
:runs-items="runsItems"
:tag-list="item.tags" :tag-list="item.tags"
:title="item.group" :title="item.group"
/> />
...@@ -20,7 +18,6 @@ ...@@ -20,7 +18,6 @@
<div class="visual-dl-page-right"> <div class="visual-dl-page-right">
<div class="visual-dl-page-config-container"> <div class="visual-dl-page-config-container">
<ui-config <ui-config
:runs-items="runsItems"
:config="config" :config="config"
/> />
</div> </div>
...@@ -30,7 +27,7 @@ ...@@ -30,7 +27,7 @@
<script> <script>
import {getPluginImagesTags, getRuns} from '../service'; import {getPluginImagesTags} from '../service';
import {flatten, uniq} from 'lodash'; import {flatten, uniq} from 'lodash';
import autoAdjustHeight from '../common/util/autoAdjustHeight'; import autoAdjustHeight from '../common/util/autoAdjustHeight';
...@@ -43,9 +40,14 @@ export default { ...@@ -43,9 +40,14 @@ export default {
'ui-config': Config, 'ui-config': Config,
'ui-chart-page': ChartPage, 'ui-chart-page': ChartPage,
}, },
props: {
runs: {
type: Array,
required: true,
},
},
data() { data() {
return { return {
runsArray: [],
tags: [], tags: [],
config: { config: {
groupNameReg: '.*', groupNameReg: '.*',
...@@ -57,15 +59,6 @@ export default { ...@@ -57,15 +59,6 @@ export default {
}; };
}, },
computed: { computed: {
runsItems() {
let runsArray = this.runsArray || [];
return runsArray.map((item) => {
return {
name: item,
value: item,
};
});
},
tagsList() { tagsList() {
let tags = this.tags; let tags = this.tags;
...@@ -129,11 +122,7 @@ export default { ...@@ -129,11 +122,7 @@ export default {
let groupNameReg = this.config.groupNameReg; let groupNameReg = this.config.groupNameReg;
this.filterTagsList(groupNameReg); this.filterTagsList(groupNameReg);
}); });
this.config.runs = this.runs;
getRuns().then(({errno, data}) => {
this.runsArray = data;
this.config.runs = data;
});
}, },
mounted() { mounted() {
autoAdjustHeight(); autoAdjustHeight();
...@@ -142,6 +131,9 @@ export default { ...@@ -142,6 +131,9 @@ export default {
'config.groupNameReg': function(val) { 'config.groupNameReg': function(val) {
this.throttledFilterTagsList(); this.throttledFilterTagsList();
}, },
runs: function(val) {
this.config.runs = val;
}
}, },
methods: { methods: {
filterTagsList(groupNameReg) { filterTagsList(groupNameReg) {
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
:is-actual-image-size="config.isActualImageSize" :is-actual-image-size="config.isActualImageSize"
:runs="config.runs" :runs="config.runs"
:running="config.running" :running="config.running"
:runs-items="runsItems"
/> />
<v-pagination <v-pagination
...@@ -31,10 +30,6 @@ import {cloneDeep, flatten} from 'lodash'; ...@@ -31,10 +30,6 @@ import {cloneDeep, flatten} from 'lodash';
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -12,16 +12,6 @@ ...@@ -12,16 +12,6 @@
v-model="config.isActualImageSize" v-model="config.isActualImageSize"
dark/> dark/>
<label class="visual-dl-page-checkbox-group-label">Runs</label>
<v-checkbox
v-for="item in runsItems"
:key="item.name"
:label="item.name"
:value="item.value"
v-model="config.runs"
dark
/>
<v-btn <v-btn
:color="config.running ? 'primary' : 'error'" :color="config.running ? 'primary' : 'error'"
v-model="config.running" v-model="config.running"
...@@ -39,10 +29,6 @@ ...@@ -39,10 +29,6 @@
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -33,10 +33,6 @@ const intervalTime = 30; ...@@ -33,10 +33,6 @@ const intervalTime = 30;
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
tagInfo: { tagInfo: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -17,16 +17,25 @@ export default new Router({ ...@@ -17,16 +17,25 @@ export default new Router({
path: '/scalars', path: '/scalars',
name: 'Scalars', name: 'Scalars',
component: Scalars, component: Scalars,
props: (route) => ({
runs: route.query.runs
})
}, },
{ {
path: '/histograms', path: '/histograms',
name: 'Histograms', name: 'Histograms',
component: Histogram, component: Histogram,
props: (route) => ({
runs: route.query.runs
})
}, },
{ {
path: '/images', path: '/images',
name: 'Images', name: 'Images',
component: Images, component: Images,
props: (route) => ({
runs: route.query.runs
})
}, },
{ {
path: '/graphs', path: '/graphs',
...@@ -37,16 +46,25 @@ export default new Router({ ...@@ -37,16 +46,25 @@ export default new Router({
path: '/texts', path: '/texts',
name: 'Texts', name: 'Texts',
component: Texts, component: Texts,
props: (route) => ({
runs: route.query.runs
})
}, },
{ {
path: '/audio', path: '/audio',
name: 'Audio', name: 'Audio',
component: Audio, component: Audio,
props: (route) => ({
runs: route.query.runs
})
}, },
{ {
path: '/HighDimensional', path: '/HighDimensional',
name: 'HighDimensional', name: 'HighDimensional',
component: HighDimensional, component: HighDimensional,
props: (route) => ({
runs: route.query.runs
})
}, },
], ],
}); });
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<div class="visual-dl-page-left"> <div class="visual-dl-page-left">
<ui-chart-page <ui-chart-page
:config="config" :config="config"
:runs-items="runsItems"
:tag-list="filteredTagsList" :tag-list="filteredTagsList"
:title="'Tags matching' + config.groupNameReg" :title="'Tags matching' + config.groupNameReg"
/> />
...@@ -11,7 +10,6 @@ ...@@ -11,7 +10,6 @@
v-for="item in groupedTags" v-for="item in groupedTags"
:key="item.group" :key="item.group"
:config="config" :config="config"
:runs-items="runsItems"
:tag-list="item.tags" :tag-list="item.tags"
:title="item.group" :title="item.group"
/> />
...@@ -20,7 +18,6 @@ ...@@ -20,7 +18,6 @@
<div class="visual-dl-page-right"> <div class="visual-dl-page-right">
<div class="visual-dl-page-config-container"> <div class="visual-dl-page-config-container">
<ui-config <ui-config
:runs-items="runsItems"
:config="config" :config="config"
/> />
</div> </div>
...@@ -29,7 +26,7 @@ ...@@ -29,7 +26,7 @@
</template> </template>
<script> <script>
import {getPluginScalarsTags, getRuns} from '../service'; import {getPluginScalarsTags} from '../service';
import {flatten, uniq} from 'lodash'; import {flatten, uniq} from 'lodash';
import autoAdjustHeight from '../common/util/autoAdjustHeight'; import autoAdjustHeight from '../common/util/autoAdjustHeight';
...@@ -41,9 +38,14 @@ export default { ...@@ -41,9 +38,14 @@ export default {
'ui-config': Config, 'ui-config': Config,
'ui-chart-page': ChartPage, 'ui-chart-page': ChartPage,
}, },
props: {
runs: {
type: Array,
required: true,
},
},
data() { data() {
return { return {
runsArray: [],
tags: [], tags: [],
config: { config: {
groupNameReg: '.*', groupNameReg: '.*',
...@@ -58,15 +60,6 @@ export default { ...@@ -58,15 +60,6 @@ export default {
}; };
}, },
computed: { computed: {
runsItems() {
let runsArray = this.runsArray || [];
return runsArray.map((item) => {
return {
name: item,
value: item,
};
});
},
tagsList() { tagsList() {
let tags = this.tags; let tags = this.tags;
...@@ -121,11 +114,7 @@ export default { ...@@ -121,11 +114,7 @@ export default {
let groupNameReg = this.config.groupNameReg; let groupNameReg = this.config.groupNameReg;
this.filterTagsList(groupNameReg); this.filterTagsList(groupNameReg);
}); });
this.config.runs = this.runs;
getRuns().then(({errno, data}) => {
this.runsArray = data;
this.config.runs = data;
});
}, },
mounted() { mounted() {
autoAdjustHeight(); autoAdjustHeight();
...@@ -134,6 +123,9 @@ export default { ...@@ -134,6 +123,9 @@ export default {
'config.groupNameReg': function(val) { 'config.groupNameReg': function(val) {
this.throttledFilterTagsList(); this.throttledFilterTagsList();
}, },
runs: function(val) {
this.config.runs = val;
}
}, },
methods: { methods: {
filterTagsList(groupNameReg) { filterTagsList(groupNameReg) {
......
...@@ -103,10 +103,6 @@ const intervalTime = 15; ...@@ -103,10 +103,6 @@ const intervalTime = 15;
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
tagInfo: { tagInfo: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
:outlier="config.outlier" :outlier="config.outlier"
:runs="config.runs" :runs="config.runs"
:running="config.running" :running="config.running"
:runs-items="runsItems"
/> />
</div> </div>
<v-pagination <v-pagination
...@@ -38,10 +37,6 @@ export default { ...@@ -38,10 +37,6 @@ export default {
'ui-expand-panel': ExpandPanel, 'ui-expand-panel': ExpandPanel,
}, },
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -49,18 +49,6 @@ ...@@ -49,18 +49,6 @@
v-model="config.outlier" v-model="config.outlier"
dark/> dark/>
<label class="visual-dl-page-checkbox-group-label">Runs</label>
<v-checkbox
v-for="item in runsItems"
:key="item.name"
:label="item.name"
:value="item.value"
v-model="config.runs"
dark
class="visual-dl-page-runs-checkbox"
/>
<v-btn <v-btn
:color="config.running ? 'primary' : 'error'" :color="config.running ? 'primary' : 'error'"
v-model="config.running" v-model="config.running"
...@@ -78,10 +66,6 @@ ...@@ -78,10 +66,6 @@
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<ui-chart-page <ui-chart-page
:expand="true" :expand="true"
:config="filteredConfig" :config="filteredConfig"
:runs-items="runsItems"
:tag-list="filteredTagsList" :tag-list="filteredTagsList"
:title="'Tags matching ' + config.groupNameReg" :title="'Tags matching ' + config.groupNameReg"
/> />
...@@ -12,7 +11,6 @@ ...@@ -12,7 +11,6 @@
v-for="item in groupedTags" v-for="item in groupedTags"
:key="item.group" :key="item.group"
:config="filteredConfig" :config="filteredConfig"
:runs-items="runsItems"
:tag-list="item.tags" :tag-list="item.tags"
:title="item.group" :title="item.group"
/> />
...@@ -20,7 +18,6 @@ ...@@ -20,7 +18,6 @@
<div class="visual-dl-page-right"> <div class="visual-dl-page-right">
<div class="visual-dl-page-config-container"> <div class="visual-dl-page-config-container">
<ui-config <ui-config
:runs-items="runsItems"
:config="config" :config="config"
/> />
</div> </div>
...@@ -30,7 +27,7 @@ ...@@ -30,7 +27,7 @@
<script> <script>
import {getPluginTextsTags, getRuns} from '../service'; import {getPluginTextsTags} from '../service';
import {flatten, uniq} from 'lodash'; import {flatten, uniq} from 'lodash';
import autoAdjustHeight from '../common/util/autoAdjustHeight'; import autoAdjustHeight from '../common/util/autoAdjustHeight';
...@@ -43,9 +40,14 @@ export default { ...@@ -43,9 +40,14 @@ export default {
'ui-config': Config, 'ui-config': Config,
'ui-chart-page': ChartPage, 'ui-chart-page': ChartPage,
}, },
props: {
runs: {
type: Array,
required: true,
},
},
data() { data() {
return { return {
runsArray: [],
tags: [], tags: [],
config: { config: {
groupNameReg: '.*', groupNameReg: '.*',
...@@ -56,15 +58,6 @@ export default { ...@@ -56,15 +58,6 @@ export default {
}; };
}, },
computed: { computed: {
runsItems() {
let runsArray = this.runsArray || [];
return runsArray.map((item) => {
return {
name: item,
value: item,
};
});
},
tagsList() { tagsList() {
let tags = this.tags; let tags = this.tags;
...@@ -128,11 +121,7 @@ export default { ...@@ -128,11 +121,7 @@ export default {
let groupNameReg = this.config.groupNameReg; let groupNameReg = this.config.groupNameReg;
this.filterTagsList(groupNameReg); this.filterTagsList(groupNameReg);
}); });
this.config.runs = this.runs;
getRuns().then(({errno, data}) => {
this.runsArray = data;
this.config.runs = data;
});
}, },
mounted() { mounted() {
autoAdjustHeight(); autoAdjustHeight();
...@@ -141,6 +130,9 @@ export default { ...@@ -141,6 +130,9 @@ export default {
'config.groupNameReg': function(val) { 'config.groupNameReg': function(val) {
this.throttledFilterTagsList(); this.throttledFilterTagsList();
}, },
runs: function(val) {
this.config.runs = val;
}
}, },
methods: { methods: {
filterTagsList(groupNameReg) { filterTagsList(groupNameReg) {
......
...@@ -29,10 +29,6 @@ const intervalTime = 30; ...@@ -29,10 +29,6 @@ const intervalTime = 30;
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
tagInfo: { tagInfo: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
:outlier="config.outlier" :outlier="config.outlier"
:runs="config.runs" :runs="config.runs"
:running="config.running" :running="config.running"
:runs-items="runsItems"
/> />
</div> </div>
<v-pagination <v-pagination
...@@ -36,10 +35,6 @@ export default { ...@@ -36,10 +35,6 @@ export default {
'ui-expand-panel': ExpandPanel, 'ui-expand-panel': ExpandPanel,
}, },
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
...@@ -7,18 +7,6 @@ ...@@ -7,18 +7,6 @@
dark dark
/> />
<label class="visual-dl-page-checkbox-group-label">Runs</label>
<v-checkbox
v-for="item in runsItems"
:key="item.name"
:label="item.name"
:value="item.value"
v-model="config.runs"
dark
class="visual-dl-page-runs-checkbox"
/>
<v-btn <v-btn
:color="config.running ? 'primary' : 'error'" :color="config.running ? 'primary' : 'error'"
v-model="config.running" v-model="config.running"
...@@ -36,10 +24,6 @@ ...@@ -36,10 +24,6 @@
export default { export default {
props: { props: {
runsItems: {
type: Array,
required: true,
},
config: { config: {
type: Object, type: Object,
required: true, required: true,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册