Skip to content

Commit b50bbd3

Browse files
committed
[remote-config] Update action buttons
1 parent 56d957f commit b50bbd3

File tree

2 files changed

+8
-3
lines changed
  • frontend/express/public/javascripts/countly/vue/components
  • plugins/remote-config/frontend/public/templates

2 files changed

+8
-3
lines changed

frontend/express/public/javascripts/countly/vue/components/dropdown.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
template: '<cly-dropdown class="cly-vue-more-options" ref="dropdown" :placement="placement" :disabled="disabled" v-on="$listeners">\
530530
<template v-slot:trigger>\
531531
<slot name="trigger">\
532-
<el-button :data-test-id="testId + \'-more-option-button\'" :size="size" :icon="icon" :type="type">\
532+
<el-button :data-test-id="testId + \'-more-option-button\'" :size="size" :icon="icon" :type="type" :disabled="disabledButton">\
533533
<span :data-test-id="testId + \'-more-option-text\'" v-if="text">{{text}}</span>\
534534
</el-button>\
535535
</slot>\
@@ -560,6 +560,10 @@
560560
type: Boolean,
561561
default: false
562562
},
563+
disabledButton: {
564+
type: Boolean,
565+
default: false,
566+
},
563567
placement: {
564568
type: String,
565569
default: 'bottom-end'

plugins/remote-config/frontend/public/templates/parameters.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
v-if="rowScope.row.hover"
6767
size="small"
6868
v-tooltip.left="rowScope.row.editable ? '' : i18n('remote-config.parameter.action-tooltip-content')"
69+
:disabledButton="rowScope.row.editable ? false : true"
6970
@command="handleCommand($event, scope, rowScope.row)">
7071
<el-dropdown-item v-if="hasUpdateRight && rowScope.row.editable" command="edit">{{i18n('common.edit')}}</el-dropdown-item>
7172
<el-dropdown-item v-if="hasDeleteRight && rowScope.row.editable" command="remove">{{i18n('common.delete')}}</el-dropdown-item>
@@ -75,9 +76,9 @@
7576
<el-table-column v-if="hasUpdateRight" min-width="110">
7677
<template v-slot="rowScope">
7778
<div v-if="rowScope.row.hover && rowScope.row.editable">
78-
<el-button v-if="rowScope.row.status==='Stopped' || rowScope.row.status==='Expired'" @click="startParameter(rowScope.row)" size="small" icon="el-icon-remove">{{i18n('remote-config.enable')}}
79+
<el-button v-if="rowScope.row.status==='Stopped' || rowScope.row.status==='Expired'" @click.stop="startParameter(rowScope.row)" size="small" icon="el-icon-remove">{{i18n('remote-config.enable')}}
7980
</el-button>
80-
<el-button v-else @click="stopParameter(rowScope.row)" size="small" icon="el-icon-remove">{{i18n('remote-config.disable')}}
81+
<el-button v-else @click.stop="stopParameter(rowScope.row)" size="small" icon="el-icon-remove">{{i18n('remote-config.disable')}}
8182
</el-button>
8283
</div>
8384
</template>

0 commit comments

Comments
 (0)