From 2c6a69b3e6c2bc5fbeacc8e7b192dd58dd49d3d3 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 25 Mar 2023 15:47:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?clay=20:=20ci/cd=20=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                                    |  2 +-
 flowable-engine-web/src/api/request.js        |  2 +-
 .../src/components/common/CodeEdit.vue        | 25 +++++--------------
 flowable-engine-web/src/main.js               | 14 +++++++++++
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 02d8c8f..6ea7f3a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,7 @@ type: docker
 name: flowable-engine-web
 steps:
   - name: build-package-vue
-    image: node:14.20
+    image: node:14.17.3
     volumes:
       - name: cache
         path: /drone/src/node_modules
diff --git a/flowable-engine-web/src/api/request.js b/flowable-engine-web/src/api/request.js
index cca30b6..73df665 100644
--- a/flowable-engine-web/src/api/request.js
+++ b/flowable-engine-web/src/api/request.js
@@ -11,7 +11,7 @@ Vue.prototype.$axios = axios;
 
 export function getBaseUrl(){
 	return "http://gateway.mytwins.top"
-	// return "http://192.168.101.7:8000"
+	// return "http://192.168.101.8:8000"
 	// return "http://localhost:8000"
 }
 
diff --git a/flowable-engine-web/src/components/common/CodeEdit.vue b/flowable-engine-web/src/components/common/CodeEdit.vue
index 69b578a..85eb233 100644
--- a/flowable-engine-web/src/components/common/CodeEdit.vue
+++ b/flowable-engine-web/src/components/common/CodeEdit.vue
@@ -2,35 +2,22 @@
   <codemirror ref="codeEdit"
               :options="cmOptions"
               v-model="_value"
-              @input="inputChange"
               class="code"/>
 </template>
 
 <script>
 import { codemirror } from 'vue-codemirror'
 // 引入主题 可以从 codemirror/theme/ 下引入多个
-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/duotone-dark.css'
+import "codemirror/lib/codemirror.css";
+import 'codemirror/theme/idea.css'
+import 'codemirror/theme/duotone-dark.css'
 // 引入语言模式 可以从 codemirror/mode/ 下引入多个
-import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // 代码高亮必须引入
-import "vue-codemirror/node_modules/codemirror/mode/sql/sql"; // 代码高亮必须引入
+import "codemirror/mode/javascript/javascript"; // 代码高亮必须引入
 //代码补全
-import 'vue-codemirror/node_modules/codemirror/addon/hint/javascript-hint.js';
+import 'codemirror/addon/hint/javascript-hint.js';
 // import 'vue-codemirror/node_modules/codemirror/addon/hint/show-hint.css';
-import 'vue-codemirror/node_modules/codemirror/addon/hint/show-hint.js';
+import 'codemirror/addon/hint/show-hint.js';
 
-// 代码段折叠功能
-import 'vue-codemirror/node_modules/codemirror/addon/fold/foldcode'
-import 'vue-codemirror/node_modules/codemirror/addon/fold/foldgutter'
-import 'vue-codemirror/node_modules/codemirror/addon/fold/foldgutter.css'
-
-import 'vue-codemirror/node_modules/codemirror/addon/fold/brace-fold'
-import 'vue-codemirror/node_modules/codemirror/addon/fold/comment-fold'
-import 'vue-codemirror/node_modules/codemirror/addon/fold/xml-fold.js';
-import 'vue-codemirror/node_modules/codemirror/addon/fold/indent-fold.js';
-import 'vue-codemirror/node_modules/codemirror/addon/fold/markdown-fold.js';
-import 'vue-codemirror/node_modules/codemirror/addon/fold/comment-fold.js';
 
 export default {
   name: "CodeEdit",
diff --git a/flowable-engine-web/src/main.js b/flowable-engine-web/src/main.js
index 1ae1e33..35b0f96 100644
--- a/flowable-engine-web/src/main.js
+++ b/flowable-engine-web/src/main.js
@@ -17,6 +17,20 @@ import Ellipsis from '@/components/common/Ellipsis'
 import WDialog from '@/components/common/WDialog'
 import Tip from '@/components/common/Tip'
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Vue.use(ElementUI);
 Vue.use(AvatarEllipsis);
 Vue.use(Ellipsis);
-- 
2.40.1


From 090863bcd3891efba4db8404fdcba2acf9832bcc Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 25 Mar 2023 15:49:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?clay=20:=20ci/cd=20=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/src/components/common/CodeEdit.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flowable-engine-web/src/components/common/CodeEdit.vue b/flowable-engine-web/src/components/common/CodeEdit.vue
index 85eb233..5a70ad1 100644
--- a/flowable-engine-web/src/components/common/CodeEdit.vue
+++ b/flowable-engine-web/src/components/common/CodeEdit.vue
@@ -17,6 +17,7 @@ import "codemirror/mode/javascript/javascript"; // 代码高亮必须引入
 import 'codemirror/addon/hint/javascript-hint.js';
 // import 'vue-codemirror/node_modules/codemirror/addon/hint/show-hint.css';
 import 'codemirror/addon/hint/show-hint.js';
+import "codemirror/keymap/sublime.js"
 
 
 export default {
@@ -48,6 +49,7 @@ export default {
           // 当匹配只有一项的时候是否自动补全
           completeSingle: false
         },
+        keyMap: "sublime",
         foldGutter: true, // 支持折叠
         extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
         gutters: ['CodeMirror-linenumbers', "lock", "warn"],
-- 
2.40.1