This commit is contained in:
14
ayanova/package-lock.json
generated
14
ayanova/package-lock.json
generated
@@ -14079,11 +14079,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
"nano-assign": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/nano-assign/-/nano-assign-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-1K8ncUoAYFPYcCZqrB+K2XQaFCmA35rryJCtPkGrG3zYkwm+iIUZRIHyaAfuy6zxaK9siPdjeJq7+Inijm6xhw=="
|
|
||||||
},
|
|
||||||
"nanomatch": {
|
"nanomatch": {
|
||||||
"version": "1.2.13",
|
"version": "1.2.13",
|
||||||
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
|
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
|
||||||
@@ -19027,15 +19022,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vue-monaco": {
|
|
||||||
"version": "1.2.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/vue-monaco/-/vue-monaco-1.2.1.tgz",
|
|
||||||
"integrity": "sha512-2orch8gJ9sxb95UJbFe7YIS5t9q0Op5ppU+rWUjHgHHsY2Hc2svcnJsbXBKNJYYyJLdzRq0uO4eP0N7mi1iG7w==",
|
|
||||||
"requires": {
|
|
||||||
"monaco-editor": "^0.20.0",
|
|
||||||
"nano-assign": "^1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"vue-router": {
|
"vue-router": {
|
||||||
"version": "3.3.4",
|
"version": "3.3.4",
|
||||||
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
"jwt-decode": "^2.2.0",
|
"jwt-decode": "^2.2.0",
|
||||||
"luxon": "^1.24.1",
|
"luxon": "^1.24.1",
|
||||||
"marked": "^0.8.2",
|
"marked": "^0.8.2",
|
||||||
|
"monaco-editor": "^0.20.0",
|
||||||
"monaco-editor-webpack-plugin": "^1.9.0",
|
"monaco-editor-webpack-plugin": "^1.9.0",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
"register-service-worker": "^1.7.1",
|
"register-service-worker": "^1.7.1",
|
||||||
@@ -27,7 +28,6 @@
|
|||||||
"vue": "^2.6.11",
|
"vue": "^2.6.11",
|
||||||
"vue-chartjs": "^3.5.0",
|
"vue-chartjs": "^3.5.0",
|
||||||
"vue-currency-input": "^1.19.0",
|
"vue-currency-input": "^1.19.0",
|
||||||
"vue-monaco": "^1.2.1",
|
|
||||||
"vue-router": "^3.3.4",
|
"vue-router": "^3.3.4",
|
||||||
"vuetify": "^2.3.0",
|
"vuetify": "^2.3.0",
|
||||||
"vuex": "^3.4.0",
|
"vuex": "^3.4.0",
|
||||||
|
|||||||
@@ -32,12 +32,17 @@
|
|||||||
</v-btn-toggle>
|
</v-btn-toggle>
|
||||||
</v-col>
|
</v-col>
|
||||||
<v-col cols="12" v-show="activeTab != 'properties'">
|
<v-col cols="12" v-show="activeTab != 'properties'">
|
||||||
<MonacoEditor
|
<h6>Editor here</h6>
|
||||||
|
<div
|
||||||
|
id="editContainer"
|
||||||
|
style="width:100%;height:100%;border:1px solid #ccc;"
|
||||||
|
></div>
|
||||||
|
<!-- <MonacoEditor
|
||||||
ref="editor"
|
ref="editor"
|
||||||
v-model="obj.template"
|
v-model="obj.template"
|
||||||
language="javascript"
|
language="javascript"
|
||||||
:options="monacoOptions"
|
:options="monacoOptions"
|
||||||
/>
|
/> -->
|
||||||
</v-col>
|
</v-col>
|
||||||
<v-col cols="12" v-show="activeTab == 'properties'">
|
<v-col cols="12" v-show="activeTab == 'properties'">
|
||||||
<h5>Properties</h5>
|
<h5>Properties</h5>
|
||||||
@@ -72,13 +77,24 @@
|
|||||||
//
|
//
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//https://github.com/egoist/vue-monaco
|
//https://github.com/egoist/vue-monaco
|
||||||
import MonacoEditor from "vue-monaco";
|
// import MonacoEditor from "vue-monaco";
|
||||||
|
import * as monaco from "monaco-editor";
|
||||||
|
|
||||||
const FORM_KEY = "ay-report-edit";
|
const FORM_KEY = "ay-report-edit";
|
||||||
export default {
|
export default {
|
||||||
components: {
|
// components: {
|
||||||
MonacoEditor
|
// MonacoEditor
|
||||||
|
// },
|
||||||
|
mounted() {
|
||||||
|
this.editor = monaco.editor.create(
|
||||||
|
document.getElementById("editContainer"),
|
||||||
|
{
|
||||||
|
value: 'console.log("Hello, world");',
|
||||||
|
theme: "vs",
|
||||||
|
language: "javascript"
|
||||||
|
}
|
||||||
|
);
|
||||||
|
console.log(this.editor);
|
||||||
},
|
},
|
||||||
beforeCreate() {
|
beforeCreate() {
|
||||||
window.$gz.eventBus.$emit("menu-change", {
|
window.$gz.eventBus.$emit("menu-change", {
|
||||||
@@ -98,9 +114,10 @@ export default {
|
|||||||
editingActiveTranslation: false,
|
editingActiveTranslation: false,
|
||||||
duplicating: false,
|
duplicating: false,
|
||||||
monacoOptions: { automaticLayout: true },
|
monacoOptions: { automaticLayout: true },
|
||||||
|
editor: null,
|
||||||
editAreaHeight: 300,
|
editAreaHeight: 300,
|
||||||
activeTab: "properties",
|
activeTab: "template",
|
||||||
lastTab: "properties",
|
lastTab: "template",
|
||||||
obj: {
|
obj: {
|
||||||
id: 0,
|
id: 0,
|
||||||
concurrency: 0,
|
concurrency: 0,
|
||||||
@@ -155,6 +172,7 @@ import router from "./router";
|
|||||||
//probably should do this way
|
//probably should do this way
|
||||||
//https://github.com/Microsoft/monaco-editor/issues/604
|
//https://github.com/Microsoft/monaco-editor/issues/604
|
||||||
//https://github.com/Microsoft/monaco-editor/blob/bad3c34056624dca34ac8be5028ae3454172125c/website/playground/playground.js#L108
|
//https://github.com/Microsoft/monaco-editor/blob/bad3c34056624dca34ac8be5028ae3454172125c/website/playground/playground.js#L108
|
||||||
|
//https://github.com/microsoft/monaco-editor-samples/tree/master/browser-esm-webpack-monaco-plugin
|
||||||
onViewChange() {
|
onViewChange() {
|
||||||
let vm = this;
|
let vm = this;
|
||||||
let editor = vm.$refs.editor ? vm.$refs.editor.getEditor() : null;
|
let editor = vm.$refs.editor ? vm.$refs.editor.getEditor() : null;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ module.exports = {
|
|||||||
plugins: [
|
plugins: [
|
||||||
new MonacoWebpackPlugin({
|
new MonacoWebpackPlugin({
|
||||||
// available options are documented at https://github.com/Microsoft/monaco-editor-webpack-plugin#options
|
// available options are documented at https://github.com/Microsoft/monaco-editor-webpack-plugin#options
|
||||||
|
//https://github.com/Microsoft/monaco-editor-webpack-plugin
|
||||||
languages: [
|
languages: [
|
||||||
"javascript",
|
"javascript",
|
||||||
"css",
|
"css",
|
||||||
|
|||||||
Reference in New Issue
Block a user