Skip to content

Commit 95186f3

Browse files
committed
修复bug
1 parent 027db9c commit 95186f3

File tree

3 files changed

+33
-12
lines changed

3 files changed

+33
-12
lines changed

spring-cloud-gray-webui/src/store/modules/ns.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { getDefaultNamespace } from '@/api/ns'
2+
import { setDefaultNamespace2Cookie, removeDefaultNamespaceByCookie } from '@/utils/ns'
23

34
const state = {
45
defaultNamespace: null
@@ -13,6 +14,7 @@ const mutations = {
1314
const actions = {
1415
setDefault({ commit }, ns) {
1516
commit('SET_DEFAULT_NAMESPACE', ns)
17+
setDefaultNamespace2Cookie(ns)
1618
},
1719

1820
// get user info
@@ -28,12 +30,17 @@ const actions = {
2830
getDefaultNamespace().then(response => {
2931
const { data } = response
3032
commit('SET_DEFAULT_NAMESPACE', data)
31-
console.log('AAAAA' + data)
33+
setDefaultNamespace2Cookie(data)
3234
resolve()
3335
}).catch(error => {
3436
reject(error)
3537
})
3638
})
39+
},
40+
41+
clear({ commit }) {
42+
commit('SET_DEFAULT_NAMESPACE', '')
43+
removeDefaultNamespaceByCookie()
3744
}
3845
}
3946

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
1+
import Cookies from 'js-cookie'
12
import store from '../store'
23

4+
const defaultNS = 'Default-NS'
5+
36
export function getDefaultNamespace() {
47
// return store.dispatch('ns/getDefault')
5-
return store.state.ns.defaultNamespace
8+
return store.state.ns.defaultNamespace || Cookies.get(defaultNS)
69
// return 'test'
710
}
811

912
export function setDefaultNamespace(ns) {
1013
// store.state.ns.defaultNamespace = ns
1114
// store.commit('SET_DEFAULT_NAMESPACE', ns)
1215
store.dispatch('ns/setDefault', ns)
13-
console.log(getDefaultNamespace())
16+
}
17+
18+
export function setDefaultNamespace2Cookie(ns) {
19+
Cookies.set(defaultNS, ns)
20+
}
21+
22+
export function removeDefaultNamespaceByCookie() {
23+
Cookies.remove(defaultNS)
24+
}
25+
26+
export function getDefaultNamespaceByCookie() {
27+
Cookies.get(defaultNS)
1428
}

spring-cloud-gray-webui/src/views/gray-decision/components/TrackAttribute.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<el-form-item label="name" prop="name">
2424
<el-input v-model="infos.name" />
2525
</el-form-item>
26-
<el-form-item label="values" prop="values">
27-
<el-input v-model="infos.values" />
26+
<el-form-item label="value" prop="value">
27+
<el-input v-model="infos.value" />
2828
</el-form-item>
2929
</div>
3030
<div class="infosBox">
@@ -50,10 +50,10 @@ export default {
5050
data() {
5151
return {
5252
infos: {
53-
values: '',
53+
value: '',
5454
name: '',
5555
compareMode: '',
56-
infos: '{"compareMode":"","name":"","values":""}'
56+
infos: '{"compareMode":"","name":"","value":""}'
5757
},
5858
options: [{
5959
value: 'GT',
@@ -89,7 +89,7 @@ export default {
8989
rules: {
9090
compareMode: [{ required: true, message: 'compareMode is required', trigger: 'change' }],
9191
name: [{ required: true, message: 'header is required', trigger: 'blur' }],
92-
values: [{ required: true, message: 'values is required', trigger: 'blur' }]
92+
value: [{ required: true, message: 'value is required', trigger: 'blur' }]
9393
}
9494
}
9595
},
@@ -100,8 +100,8 @@ export default {
100100
compareMode() {
101101
return this.infos.compareMode
102102
},
103-
values() {
104-
return this.infos.values
103+
value() {
104+
return this.infos.value
105105
}
106106
},
107107
watch: {
@@ -111,7 +111,7 @@ export default {
111111
compareMode(a) {
112112
this.setInfos()
113113
},
114-
values(a) {
114+
value(a) {
115115
this.setInfos()
116116
},
117117
info(a) {
@@ -133,7 +133,7 @@ export default {
133133
},
134134
methods: {
135135
setInfos() {
136-
this.infos.infos = '{"compareMode":"' + this.infos.compareMode + '","name":"' + this.infos.name + '","values":"' + this.infos.values + '"}'
136+
this.infos.infos = '{"compareMode":"' + this.infos.compareMode + '","name":"' + this.infos.name + '","value":"' + this.infos.value + '"}'
137137
this.$emit('sendInfos', this.infos.infos)
138138
},
139139
clear() {

0 commit comments

Comments
 (0)