CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: colorpicker return object instead of string (fix #193)

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2021-02-07 22:16:10 +01:00
parent 0cffe5f235
commit 6fb8d16143
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/panels/ToolsPanel.vue
View File

@ -361,10 +361,8 @@
} }
}, },
setChartColor(value) { setChartColor(value) {
if ( if ("name" in this.editHeater.object) {
"name" in this.editHeater.object && if (typeof value === "object" && 'hex' in value) value = value.hex
typeof value === "string"
) {
this.$store.commit('printer/tempHistory/setColor', { name: this.editHeater.object.name, value: value }) this.$store.commit('printer/tempHistory/setColor', { name: this.editHeater.object.name, value: value })
this.$store.dispatch('gui/setTempchartDatasetSetting', { name: this.editHeater.object.name, type: 'color', value: value }) this.$store.dispatch('gui/setTempchartDatasetSetting', { name: this.editHeater.object.name, type: 'color', value: value })
} }

17
src/store/gui/actions.js
View File

@ -5,8 +5,23 @@ export default {
commit('reset') commit('reset')
}, },
getData({ commit }, payload) { getData({ commit, dispatch }, payload) {
commit('setData', payload) commit('setData', payload)
if (
'state' in payload &&
'tempchart' in payload.state &&
'datasetSettings' in payload.state.tempchart
) {
for (const key of Object.keys(payload.state.tempchart.datasetSettings)) {
if (
'color' in payload.state.tempchart.datasetSettings[key] &&
typeof payload.state.tempchart.datasetSettings[key].color === "object"
) {
dispatch('setTempchartDatasetSetting', { name: key, type: 'color', value: payload.state.tempchart.datasetSettings[key].color.hex })
}
}
}
}, },
setSettings({ commit, dispatch }, payload) { setSettings({ commit, dispatch }, payload) {

5
src/store/server/actions.js
View File

@ -12,16 +12,17 @@ export default {
Vue.prototype.$socket.sendObj('server.files.list', { root: 'config' }, 'server/checkMainsailJson') Vue.prototype.$socket.sendObj('server.files.list', { root: 'config' }, 'server/checkMainsailJson')
}, },
checkMainsailJson({ commit, dispatch, rootState }, payload) { checkMainsailJson({ dispatch, rootState }, payload) {
let boolFallback = true let boolFallback = true
Object.entries(payload).forEach(([, file]) => { Object.entries(payload).forEach(([, file]) => {
if ('filename' in file && file.filename === '.mainsail.json') { if ('filename' in file && file.filename === '.mainsail.json') {
boolFallback = false boolFallback = false
window.console.log(".mainsail.json gefunden")
fetch('//'+rootState.socket.hostname+':'+rootState.socket.port+'/server/files/config/.mainsail.json?time='+Date.now()) fetch('//'+rootState.socket.hostname+':'+rootState.socket.port+'/server/files/config/.mainsail.json?time='+Date.now())
.then(res => res.json()).then(file => { .then(res => res.json()).then(file => {
commit('gui/setData', file, { root: true }) dispatch('gui/getData', file, { root: true })
if (!rootState.socket.remoteMode) dispatch('farm/readStoredPrinters', {}, { root: true }) if (!rootState.socket.remoteMode) dispatch('farm/readStoredPrinters', {}, { root: true })
dispatch('printer/init', null, { root: true }) dispatch('printer/init', null, { root: true })
}) })