master #47

Merged
clay merged 6 commits from master into pro 2023-03-24 10:11:12 +00:00
2 changed files with 33 additions and 58 deletions
Showing only changes of commit 311363703d - Show all commits

View File

@ -1,8 +1,8 @@
<template> <template>
<div> <div>
12222313 12222313
<codemirror v-model="item" :options="cmOptions" class="code" @ready="onCmReady3" @focus="onCmFocus" <codemirror :value="item" :options="cmOptions" class="code" ref="myCmGenerate"
@input="onCmCodeChange" ref="myCmGenerate"></codemirror> @input="changes"></codemirror>
</div> </div>
</template> </template>
@ -10,10 +10,13 @@
import {codemirror} from 'vue-codemirror' import {codemirror} from 'vue-codemirror'
// codemirror/theme/ // codemirror/theme/
import "vue-codemirror/node_modules/codemirror/lib/codemirror.css"; import "vue-codemirror/node_modules/codemirror/lib/codemirror.css";
import "vue-codemirror/node_modules/codemirror/lib/codemirror.js";
import 'vue-codemirror/node_modules/codemirror/theme/idea.css' import 'vue-codemirror/node_modules/codemirror/theme/idea.css'
import 'vue-codemirror/node_modules/codemirror/theme/oceanic-next.css'
// codemirror/mode/ // codemirror/mode/
import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; //
//
import 'vue-codemirror/node_modules/codemirror/addon/hint/javascript-hint.js';
export default { export default {
components:{codemirror}, components:{codemirror},
data() { data() {
@ -23,32 +26,28 @@ export default {
' console.log(instance)\n' + ' console.log(instance)\n' +
' console.log(event)\n' + ' console.log(event)\n' +
' },', ' },',
foldContent : "46546555656545",
cmOptions:{ cmOptions:{
tabSize: 4, // tab mode: 'text/html', //
indentUnit: 4, theme: 'idea', //
attach:{}, lineNumbers: true, //
styleActiveLine: true, // // lineWrapping: true,
lineNumbers: true, // // styleActiveLine: true, //
styleSelectedText: true, // highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, //
line: true, // line: true,
foldGutter: true, // // mode: 'text/x-java',
gutters: ['CodeMirror-linenumbers', "lock", "warn"], // gutters: ['CodeMirror-lint-markers'],
highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // // theme: 'codemirror',
mode:'javascript', // keyMap: 'sublime',
// hint.js options // matchBrackets: true,
hintOptions: { // showCursorWhenSelecting: false,
// // hintOptions: {
completeSingle: false // //
}, // completeSingle: true
// sublimeemacsvim // },
keyMap: 'sublime', // foldGutter: true, //
matchBrackets: true,
showCursorWhenSelecting: false,
// scrollbarStyle:null,
// readOnly:true, //
theme: 'material', // material
extraKeys: { 'Ctrl': 'autocomplete' }, // keyMap extraKeys: { 'Ctrl': 'autocomplete' }, // keyMap
lastLineBefore:0 gutters: ['CodeMirror-lint-javascript', 'CodeMirror-foldgutter']
} }
} }
}, },
@ -56,9 +55,6 @@ export default {
console.log("rererer") console.log("rererer")
}, },
methods: { methods: {
onCmReady3() {
// this.$refs.myCmGenerate.codemirror.setSize('400px', '400px')
},
onCmFocus(instance, event) { onCmFocus(instance, event) {
console.log(instance) console.log(instance)
console.log(event) console.log(event)
@ -66,29 +62,16 @@ export default {
onCmCodeChange(instance, obj) { onCmCodeChange(instance, obj) {
console.log(instance) console.log(instance)
console.log(obj) console.log(obj)
},
changes(){
} }
} }
} }
export class Code {
}
</script> </script>
<style>
.CodeMirror-scroll {
overflow: scroll !important;
margin-bottom: 0;
margin-right: 0;
padding-bottom: 0;
height: 100%;
outline: none;
position: relative;
border: 1px solid #dddddd;
}
</style>
<style lang="less" scoped> <style lang="less" scoped>
.code-mirror { .code {
font-size: 13px;
line-height: 150%;
text-align: left; text-align: left;
} }
</style> </style>

View File

@ -81,7 +81,7 @@
<div v-if="config.http.handlerByScript"> <div v-if="config.http.handlerByScript">
<div> <div>
<span>请求成功😀</span> <span>请求成功😀</span>
<vue-codemirror :options="cmOptions" v-model="config.http.success"/> <codemirror :options="cmOptions" v-model="config.http.success"/>
</div> </div>
<div> <div>
<span>请求失败😥</span> <span>请求失败😥</span>
@ -108,7 +108,7 @@
</template> </template>
<script> <script>
import { VueCodemirror } from 'vue-codemirror' import { codemirror } from 'vue-codemirror'
// codemirror/theme/ // codemirror/theme/
import "vue-codemirror/node_modules/codemirror/lib/codemirror.css"; import "vue-codemirror/node_modules/codemirror/lib/codemirror.css";
import 'vue-codemirror/node_modules/codemirror/theme/idea.css' import 'vue-codemirror/node_modules/codemirror/theme/idea.css'
@ -116,14 +116,6 @@ import 'vue-codemirror/node_modules/codemirror/theme/idea.css'
import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; //
// import { VueCodemirror } from 'vue-codemirror';
// import 'vue-codemirror/node_modules/codemirror/theme/liquibyte.css';//theme,theme
// import 'vue-codemirror/node_modules/codemirror/addon/hint/show-hint.css';//
//
// import 'vue-codemirror/node_modules/codemirror/mode/sql/sql.js';//使mode
// import 'vue-codemirror/node_modules/codemirror/addon/edit/matchbrackets.js';
// import 'vue-codemirror/node_modules/codemirror/addon/hint/show-hint.js';//
// import 'vue-codemirror/node_modules/codemirror/addon/hint/sql-hint.js';//
export default { export default {
name: "TriggerNodeConfig", name: "TriggerNodeConfig",
@ -157,7 +149,7 @@ export default {
// hint.js options // hint.js options
hintOptions: { hintOptions: {
// //
completeSingle: false completeSingle: true
}, },
// sublimeemacsvim // sublimeemacsvim
keyMap: 'sublime', keyMap: 'sublime',