-
All documents
-
Field
+
All documents
+
Field
@@ -512,10 +512,17 @@
:agg-min="metricAggType === 'min' && metricAggKey"
:agg-max="metricAggType === 'max' && metricAggKey"
class="m-n-med"
- @click="clickChart" />
+ @click="clickChart"
+ @group="val => groupByValue = val" />
-
+
@@ -524,6 +531,7 @@
export default {
data() {
return {
+ groupByValue: '',
eventViewerFrom: '',
eventViewerVisible: false,
popWhenVisible: false,
@@ -877,6 +885,14 @@ export default {
},
methods: {
+ changeGroupedOver() {
+ this.validate();
+
+ if (this.groupedOver === 'all') {
+ this.groupByValue = '';
+ }
+ },
+
clickChart(val) {
this.eventViewerFrom = val.name;
this.eventViewerVisible = true;
@@ -888,13 +904,8 @@ export default {
await this.validateOf();
}
- if (this.$refs.over) {
- await this.validateOver();
- }
-
- if (this.$refs.overall) {
- await this.validateOverall();
- }
+ await this.validateOver();
+ await this.validateOverall();
if (this.$refs.compare) {
await this.validateCompare();
diff --git a/src/store/config/index.js b/src/store/config/index.js
index 98e448b5..e6f8c880 100644
--- a/src/store/config/index.js
+++ b/src/store/config/index.js
@@ -536,10 +536,15 @@ export default {
};
if (forTest) {
- // when run as part of a test, fix path since rule will be in server_data/tests/
config.import = '../../rules/BaseRule.config';
} else {
- let dots = '';
+ let dots;
+
+ if (!state.path) {
+ dots = '';
+ } else {
+ dots = '../';
+ }
for (let i = 1; i < state.path.split('/').length; i++) {
dots += '../';
diff --git a/src/style/element.scss b/src/style/element.scss
index a656111d..ed983075 100644
--- a/src/style/element.scss
+++ b/src/style/element.scss
@@ -15,6 +15,10 @@
border-radius: 0 !important;
}
+.el-select-dropdown {
+ max-width: 800px;
+}
+
.view-only.el-form-item--mini .el-form-item__content {
line-height: 1.3;
}
diff --git a/src/views/RuleView.vue b/src/views/RuleView.vue
index 84ff18a3..946d884e 100644
--- a/src/views/RuleView.vue
+++ b/src/views/RuleView.vue
@@ -461,7 +461,11 @@ export default {
}
)
.then(async () => {
- let enabled = await this.$store.dispatch('configs/enableRule', this.$store.getters['config/config']());
+ let enabled = await this.$store.dispatch(
+ 'configs/enableRule',
+ this.$store.getters['config/config']()
+ );
+
if (enabled) {
this.$message({
type: 'success',