diff --git a/packages/nc-gui/components/monaco/Monaco.vue b/packages/nc-gui/components/monaco/Monaco.vue index 8719642a26..3dc88ca362 100644 --- a/packages/nc-gui/components/monaco/Monaco.vue +++ b/packages/nc-gui/components/monaco/Monaco.vue @@ -15,7 +15,7 @@ @selection="selectionFn" theme="vs-dark" v-model="codeLocal" - language="sql" + lang="sql" :minimap="minimap" :readOnly="readOnly" > diff --git a/packages/nc-gui/components/monaco/MonacoEditor.js b/packages/nc-gui/components/monaco/MonacoEditor.js index 5f163429f3..eacb3fd609 100644 --- a/packages/nc-gui/components/monaco/MonacoEditor.js +++ b/packages/nc-gui/components/monaco/MonacoEditor.js @@ -1,7 +1,6 @@ /* eslint-disable */ import assign from "nano-assign"; import sqlAutoCompletions from "./sqlAutoCompletions"; -// import {ext} from "vee-validate/dist/rules.esm"; export default { @@ -13,7 +12,7 @@ export default { type: String, default: "vs" }, - language: String, + lang: String, options: Object, readOnly: Boolean, amdRequire: { @@ -59,7 +58,7 @@ export default { } }, - language(newVal) { + lang(newVal) { if (this.editor) { window.monaco.editor.setModelLanguage(this.editor.getModel(), newVal); } @@ -110,7 +109,7 @@ export default { { value: this.value, theme: this.theme, - language: this.language, + language: this.lang, // quickSuggestions: { other: true, comments: true, strings: true }, automaticLayout: true, readOnly: false diff --git a/packages/nc-gui/components/monaco/MonacoJsonEditor.js b/packages/nc-gui/components/monaco/MonacoJsonEditor.js index df102a48bb..1362ac4f1c 100644 --- a/packages/nc-gui/components/monaco/MonacoJsonEditor.js +++ b/packages/nc-gui/components/monaco/MonacoJsonEditor.js @@ -16,7 +16,7 @@ export default { type: String, default: "vs-dark" }, - language: String, + lang: String, options: Object, readOnly: Boolean, amdRequire: { diff --git a/packages/nc-gui/components/monaco/MonacoJsonObjectEditor.js b/packages/nc-gui/components/monaco/MonacoJsonObjectEditor.js index 86b1588f89..f4131a477b 100644 --- a/packages/nc-gui/components/monaco/MonacoJsonObjectEditor.js +++ b/packages/nc-gui/components/monaco/MonacoJsonObjectEditor.js @@ -15,7 +15,7 @@ export default { type: String, default: "vs-dark" }, - language: String, + lang: String, options: Object, readOnly: Boolean, amdRequire: { diff --git a/packages/nc-gui/components/monaco/MonacoSingleLineEditor.js b/packages/nc-gui/components/monaco/MonacoSingleLineEditor.js index 8a4def5081..2a04ab4ff6 100644 --- a/packages/nc-gui/components/monaco/MonacoSingleLineEditor.js +++ b/packages/nc-gui/components/monaco/MonacoSingleLineEditor.js @@ -16,7 +16,7 @@ export default { type: String, default: "vs" }, - language: String, + lang: String, options: Object, readOnly: Boolean, amdRequire: { diff --git a/packages/nc-gui/components/monaco/MonacoSqlEditor.vue b/packages/nc-gui/components/monaco/MonacoSqlEditor.vue index 92ff697d3c..b2649a67d1 100644 --- a/packages/nc-gui/components/monaco/MonacoSqlEditor.vue +++ b/packages/nc-gui/components/monaco/MonacoSqlEditor.vue @@ -11,7 +11,7 @@ @selection="selectionFn" theme="vs-dark" v-model="codeLocal" - language="sql" + lang="sql" :minimap="minimap" :readOnly="readOnly" :actions="actions" diff --git a/packages/nc-gui/components/project/apiClientOld.vue b/packages/nc-gui/components/project/apiClientOld.vue index 17315ddd52..dd71a30d1b 100644 --- a/packages/nc-gui/components/project/apiClientOld.vue +++ b/packages/nc-gui/components/project/apiClientOld.vue @@ -235,7 +235,7 @@ class="editor card" theme="vs-dark" v-model="api.body" - language="json" + lang="json" :options="{validate:true,documentFormattingEdits:true,foldingRanges:true}" > diff --git a/packages/nc-gui/components/project/apiClientSwagger.vue b/packages/nc-gui/components/project/apiClientSwagger.vue index ec037b5ca4..1170f53c3e 100644 --- a/packages/nc-gui/components/project/apiClientSwagger.vue +++ b/packages/nc-gui/components/project/apiClientSwagger.vue @@ -386,7 +386,7 @@ class="editor card" theme="vs-dark" v-model="api.body" - language="json" + lang="json" :options="{validate:true,documentFormattingEdits:true,foldingRanges:true}" > diff --git a/packages/nc-gui/components/project/tableTabs/columnActions/jsonToColumn.vue b/packages/nc-gui/components/project/tableTabs/columnActions/jsonToColumn.vue index feb1e2ea79..cc15b24acd 100644 --- a/packages/nc-gui/components/project/tableTabs/columnActions/jsonToColumn.vue +++ b/packages/nc-gui/components/project/tableTabs/columnActions/jsonToColumn.vue @@ -23,7 +23,7 @@ diff --git a/packages/nc-gui/components/project/tableTabs/webhook/httpWebhook.vue b/packages/nc-gui/components/project/tableTabs/webhook/httpWebhook.vue index e0187943e2..e8013577d1 100644 --- a/packages/nc-gui/components/project/tableTabs/webhook/httpWebhook.vue +++ b/packages/nc-gui/components/project/tableTabs/webhook/httpWebhook.vue @@ -50,7 +50,7 @@ class="editor card text-left" theme="vs-dark" v-model="api.body" - language="json" + lang="json" :options="{validate:true,documentFormattingEdits:true,foldingRanges:true}" > @@ -62,7 +62,7 @@ class="editor card text-left" theme="vs-dark" v-model="api.auth" - language="json" + lang="json" :options="{validate:true,documentFormattingEdits:true,foldingRanges:true}" > diff --git a/packages/nc-gui/store/plugins.js b/packages/nc-gui/store/plugins.js index ed9278d8b6..2ea246baba 100644 --- a/packages/nc-gui/store/plugins.js +++ b/packages/nc-gui/store/plugins.js @@ -1,4 +1,3 @@ -import settings from "@/components/settings"; export const state = () => ({}); @@ -41,7 +40,7 @@ export const actions = { settings }) } catch (e) { - console.log(e) + // ignore } } }