fabio286/antares
1
1
Fork 0
mirror of https://github.com/Fabio286/antares.git synced 2025-06-05 21:59:22 +02:00
Code Issues Releases Wiki Activity

fix: no connection passed to connection's edit modal

Browse Source
This commit is contained in:
Fabio
2020-10-05 09:21:33 +02:00
parent 319d9beef1
commit ce25cd0a31
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package.json
View File

@ -53,28 +53,28 @@
"lodash": "^4.17.20", "lodash": "^4.17.20",
"moment": "^2.29.0", "moment": "^2.29.0",
"monaco-editor": "^0.20.0", "monaco-editor": "^0.20.0",
"mssql": "^6.2.2", "mssql": "^6.2.3",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"pg": "^8.3.3", "pg": "^8.4.0",
"source-map-support": "^0.5.16", "source-map-support": "^0.5.16",
"spectre.css": "^0.5.9", "spectre.css": "^0.5.9",
"vue-i18n": "^8.21.0", "vue-i18n": "^8.21.0",
"vue-the-mask": "^0.11.1", "vue-the-mask": "^0.11.1",
"vuedraggable": "^2.24.1", "vuedraggable": "^2.24.1",
"vuex": "^3.5.1", "vuex": "^3.5.1",
"vuex-persist": "^3.1.0" "vuex-persist": "^3.1.3"
}, },
"devDependencies": { "devDependencies": {
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"electron": "^10.1.0", "electron": "^10.1.3",
"electron-builder": "^22.8.1", "electron-builder": "^22.8.1",
"electron-devtools-installer": "^3.1.1", "electron-devtools-installer": "^3.1.1",
"electron-webpack": "^2.8.2", "electron-webpack": "^2.8.2",
"electron-webpack-vue": "^2.4.0", "electron-webpack-vue": "^2.4.0",
"eslint": "^7.8.1", "eslint": "^7.10.0",
"eslint-config-standard": "^14.1.1", "eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1", "eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1", "eslint-plugin-standard": "^4.0.1",
@ -83,7 +83,7 @@
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"sass-loader": "^10.0.2", "sass-loader": "^10.0.2",
"standard-version": "^9.0.0", "standard-version": "^9.0.0",
"stylelint": "^13.7.0", "stylelint": "^13.7.2",
"stylelint-config-standard": "^20.0.0", "stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.18.0", "stylelint-scss": "^3.18.0",
"vue": "^2.6.12", "vue": "^2.6.12",

10
src/renderer/components/ModalEditConnection.vue
View File

@ -144,7 +144,7 @@
</template> </template>
<script> <script>
import { mapActions, mapGetters } from 'vuex'; import { mapActions } from 'vuex';
import Connection from '@/ipc-api/Connection'; import Connection from '@/ipc-api/Connection';
import ModalAskCredentials from '@/components/ModalAskCredentials'; import ModalAskCredentials from '@/components/ModalAskCredentials';
import BaseToast from '@/components/BaseToast'; import BaseToast from '@/components/BaseToast';
@ -155,6 +155,9 @@ export default {
ModalAskCredentials, ModalAskCredentials,
BaseToast BaseToast
}, },
props: {
connection: Object
},
data () { data () {
return { return {
toast: { toast: {
@ -166,11 +169,6 @@ export default {
localConnection: null localConnection: null
}; };
}, },
computed: {
...mapGetters({
connection: 'application/getSelectedConnection'
})
},
created () { created () {
this.localConnection = Object.assign({}, this.connection); this.localConnection = Object.assign({}, this.connection);
window.addEventListener('keydown', this.onKey); window.addEventListener('keydown', this.onKey);

6
src/renderer/components/SettingBarContext.vue
View File

@ -10,7 +10,11 @@
<span class="d-flex"><i class="mdi mdi-18px mdi-delete text-light pr-1" /> {{ $t('word.delete') }}</span> <span class="d-flex"><i class="mdi mdi-18px mdi-delete text-light pr-1" /> {{ $t('word.delete') }}</span>
</div> </div>
<ModalEditConnection v-if="isEditModal" @close="hideEditModal" /> <ModalEditConnection
v-if="isEditModal"
:connection="contextConnection"
@close="hideEditModal"
/>
<ConfirmModal <ConfirmModal
v-if="isConfirmModal" v-if="isConfirmModal"
@confirm="confirmDeleteConnection" @confirm="confirmDeleteConnection"