diff --git a/src/components/ArrayEditorTable.vue b/src/components/ArrayEditorTable.vue index 2d8122531..17ff494e3 100644 --- a/src/components/ArrayEditorTable.vue +++ b/src/components/ArrayEditorTable.vue @@ -7,14 +7,14 @@ diff --git a/src/components/Buttons/CreateButton.vue b/src/components/Buttons/CreateButton.vue index 1aac8eb2f..7549e2208 100644 --- a/src/components/Buttons/CreateButton.vue +++ b/src/components/Buttons/CreateButton.vue @@ -1,8 +1,7 @@ @@ -10,6 +9,11 @@ diff --git a/src/components/Buttons/RefreshButton.vue b/src/components/Buttons/RefreshButton.vue index dda6e8b2a..c2566d07e 100644 --- a/src/components/Buttons/RefreshButton.vue +++ b/src/components/Buttons/RefreshButton.vue @@ -1,6 +1,7 @@ - + + + @@ -661,12 +665,13 @@ export default defineComponent({ } .form-table { .cell { - .btn.disabled { - cursor: not-allowed; - color: var(--color-text-placeholder); - } - .btn + .btn { - margin-left: 8px; + .el-button { + padding: 0; + margin-right: 0; + border: none; + & + .el-button { + margin-left: 8px; + } } } } diff --git a/src/views/Clients/Clients.vue b/src/views/Clients/Clients.vue index d5c83f2c8..ea1049022 100644 --- a/src/views/Clients/Clients.vue +++ b/src/views/Clients/Clients.vue @@ -74,18 +74,7 @@ - - - - + @@ -185,7 +174,7 @@ import { useCursorPagination } from '@/hooks/usePagination' import usePaginationRemember from '@/hooks/usePaginationRemember' import { Client } from '@/types/client' import { CheckStatus } from '@/types/enum' -import { ArrowDown, ArrowUp, Delete } from '@element-plus/icons-vue' +import { Delete } from '@element-plus/icons-vue' import { isEmptyObj } from '@emqx/shared-ui-utils' import { ElMessage, ElMessageBox } from 'element-plus' import { computed } from 'vue' diff --git a/src/views/Config/BasicConfig/ForceShutdown.vue b/src/views/Config/BasicConfig/ForceShutdown.vue new file mode 100644 index 000000000..4bb8db673 --- /dev/null +++ b/src/views/Config/BasicConfig/ForceShutdown.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/Dashboard/components/NodesGraphCard.vue b/src/views/Dashboard/components/NodesGraphCard.vue index aaf34253b..fe764531a 100644 --- a/src/views/Dashboard/components/NodesGraphCard.vue +++ b/src/views/Dashboard/components/NodesGraphCard.vue @@ -12,9 +12,9 @@
{{ tl('nodeData') }}
- + {{ tl('viewNodes') }} - +
@@ -155,10 +155,10 @@ const { nodes, loadData: getNodes } = useClusterNodes({ * first time get node data, select the first node */ let isInitialized = false -let stats: Ref> = ref([]) -let graph: Ref = ref(undefined) +const stats: Ref> = ref([]) +const graph: Ref = ref(undefined) const currentNodeName = ref('') -let infoLoading: Ref = ref(true) +const infoLoading: Ref = ref(true) const currentInfo = computed(() => { if (!currentNodeName.value || nodes.value.length === 0 || stats.value.length === 0) { @@ -170,7 +170,7 @@ const currentInfo = computed(() => { const { transMsNumToSimpleStr } = useDurationStr() const { syncPolling } = useSyncPolling() -let getStats = async () => { +const getStats = async () => { try { stats.value = await loadStats() } catch (error) { @@ -186,7 +186,7 @@ const getNodeInfoByName = (nodeName: string) => { const { tl } = useI18nTl('Dashboard') -let calcMemoryPercentage = computed(() => { +const calcMemoryPercentage = computed(() => { return calcPercentage( currentInfo.value.node['memory_used'], currentInfo.value.node['memory_total'], diff --git a/src/views/Diagnose/LogTrace/LogTrace.vue b/src/views/Diagnose/LogTrace/LogTrace.vue index d09c40981..31d0e2486 100644 --- a/src/views/Diagnose/LogTrace/LogTrace.vue +++ b/src/views/Diagnose/LogTrace/LogTrace.vue @@ -10,17 +10,9 @@ diff --git a/src/views/Gateway/components/topicEditList.vue b/src/views/Gateway/components/topicEditList.vue index d465ea6a8..042bc3420 100644 --- a/src/views/Gateway/components/topicEditList.vue +++ b/src/views/Gateway/components/topicEditList.vue @@ -23,14 +23,14 @@ diff --git a/src/views/RuleEngine/Rule/components/RuleFilterForm.vue b/src/views/RuleEngine/Rule/components/RuleFilterForm.vue index 6cf976360..5f7f9d105 100644 --- a/src/views/RuleEngine/Rule/components/RuleFilterForm.vue +++ b/src/views/RuleEngine/Rule/components/RuleFilterForm.vue @@ -107,18 +107,7 @@ - - - - + @@ -131,7 +120,6 @@ import useSourceList from '@/hooks/Rule/action/useSourceList' import useBridgeTypeValue from '@/hooks/Rule/bridge/useBridgeTypeValue' import useI18nTl from '@/hooks/useI18nTl' import { FilterParamsForQueryRules } from '@/types/rule' -import { ArrowDown, ArrowUp } from '@element-plus/icons-vue' import { omit } from 'lodash' import type { Ref } from 'vue' import { computed, ref } from 'vue' diff --git a/src/views/RuleEngine/components/RuleForm.vue b/src/views/RuleEngine/components/RuleForm.vue index 3d567d6f7..a0c51739b 100644 --- a/src/views/RuleEngine/components/RuleForm.vue +++ b/src/views/RuleEngine/components/RuleForm.vue @@ -79,6 +79,9 @@ {{ savedAfterDataChange ? tl('backToRuleList') : $t('Base.cancel') }} + + {{ tl('saveAsCopy') }} + {{ isEdit ? $t('Base.update') : $t('Base.save') }} - - {{ tl('saveAsCopy') }} -
diff --git a/src/views/Subscriptions/Subscriptions.vue b/src/views/Subscriptions/Subscriptions.vue index f939ef3ba..eef42e9da 100644 --- a/src/views/Subscriptions/Subscriptions.vue +++ b/src/views/Subscriptions/Subscriptions.vue @@ -61,18 +61,7 @@ - - - - + @@ -129,7 +118,6 @@ import InfoTooltip from '@/components/InfoTooltip.vue' import useMQTTVersion5NewConfig from '@/hooks/useMQTTVersion5NewConfig' import usePaginationWithHasNext from '@/hooks/usePaginationWithHasNext' import useClusterNodes from '@/hooks/useClusterNodes' -import { ArrowDown, ArrowUp } from '@element-plus/icons-vue' import CommonPagination from '../../components/commonPagination.vue' import 'element-plus/theme-chalk/display.css' @@ -163,8 +151,8 @@ const handleReset = () => { } const genQueryParams = (params: Record) => { const { clientid, qos, share_group, node, match_topic } = params - let newParams: Record = { - clientid: clientid === '' ? undefined : clientid ?? undefined, + const newParams: Record = { + clientid: clientid === '' ? undefined : (clientid ?? undefined), qos: qos === '' ? undefined : qos, share_group: share_group || undefined, node: node || undefined,