From d64eafef245ddbf924420f38ac5457b2468f80be Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 24 Mar 2023 15:46:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?clay=20:=20=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C=E5=92=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/package.json              |  3 +-
 flowable-engine-web/src/views/Code.vue        | 94 +++++++++++++++++++
 flowable-engine-web/src/views/Index.vue       | 61 ++++++++++--
 .../process/config/TriggerNodeConfig.vue      | 21 ++++-
 4 files changed, 163 insertions(+), 16 deletions(-)
 create mode 100644 flowable-engine-web/src/views/Code.vue

diff --git a/flowable-engine-web/package.json b/flowable-engine-web/package.json
index 94e2d13..206e7d3 100644
--- a/flowable-engine-web/package.json
+++ b/flowable-engine-web/package.json
@@ -10,7 +10,6 @@
   "dependencies": {
     "axios": "^0.20.0",
     "clipboard": "^2.0.6",
-    "codemirror": "^6.0.0",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.8",
     "less": "^3.12.2",
@@ -21,6 +20,7 @@
     "signature_pad": "^3.0.0-beta.4",
     "trim-canvas": "^0.1.2",
     "vue": "^2.6.11",
+    "vue-codemirror": "^4.0.6",
     "vue-esign": "^1.1.4",
     "vue-router": "^3.4.3",
     "vuedraggable": "^2.24.1",
@@ -36,7 +36,6 @@
     "babel-preset-env": "^1.7.0",
     "style-resources-loader": "^1.3.2",
     "vue-cli-plugin-style-resources-loader": "^0.1.4",
-    "vue-codemirror": "^6.0.0",
     "vue-template-compiler": "^2.6.11"
   },
   "eslintConfig": {
diff --git a/flowable-engine-web/src/views/Code.vue b/flowable-engine-web/src/views/Code.vue
new file mode 100644
index 0000000..94e18c5
--- /dev/null
+++ b/flowable-engine-web/src/views/Code.vue
@@ -0,0 +1,94 @@
+<template>
+  <div>
+12222313
+    <codemirror v-model="item" :options="cmOptions" class="code" @ready="onCmReady3" @focus="onCmFocus"
+                    @input="onCmCodeChange" ref="myCmGenerate"></codemirror>
+  </div>
+</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'
+// 引入语言模式 可以从 codemirror/mode/ 下引入多个
+import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // 代码高亮必须引入
+
+export default {
+  components:{codemirror},
+  data() {
+    return {
+      item: '\n' +
+          '    onCmFocus(instance, event) {\n' +
+          '      console.log(instance)\n' +
+          '      console.log(event)\n' +
+          '    },',
+      cmOptions:{
+        tabSize: 4, // tab
+        indentUnit: 4,
+        attach:{},
+        styleActiveLine: true, // 高亮选中行
+        lineNumbers: true, // 显示行号
+        styleSelectedText: true,
+        line: true,
+        foldGutter: true, // 块槽
+        gutters: ['CodeMirror-linenumbers', "lock", "warn"],
+        highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
+        mode:'javascript',
+        // hint.js options
+        hintOptions: {
+          // 当匹配只有一项的时候是否自动补全
+          completeSingle: false
+        },
+        // 快捷键 可提供三种模式 sublime、emacs、vim
+        keyMap: 'sublime',
+        matchBrackets: true,
+        showCursorWhenSelecting: false,
+        // scrollbarStyle:null,
+        // readOnly:true,  //是否只读
+        theme: 'material', // 主题 material
+        extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
+        lastLineBefore:0
+      }
+    }
+  },
+  created() {
+    console.log("rererer")
+  },
+  methods: {
+    onCmReady3() {
+      // this.$refs.myCmGenerate.codemirror.setSize('400px', '400px')
+    },
+    onCmFocus(instance, event) {
+      console.log(instance)
+      console.log(event)
+    },
+    onCmCodeChange(instance, obj) {
+      console.log(instance)
+      console.log(obj)
+    }
+  }
+}
+
+export class Code {
+}
+</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>
+.code-mirror {
+  font-size: 13px;
+  line-height: 150%;
+  text-align: left;
+}
+</style>
diff --git a/flowable-engine-web/src/views/Index.vue b/flowable-engine-web/src/views/Index.vue
index 721c789..6b516ef 100644
--- a/flowable-engine-web/src/views/Index.vue
+++ b/flowable-engine-web/src/views/Index.vue
@@ -34,24 +34,74 @@
         </div>
       </div>
     </div>
+    <div>测试
+<!--      <vue-codemirror ref="myCmGenerate" class="code" :value="cmCode" :options="cmOptions" @ready="onCmReady3"/>-->
+     <Code/>
+    </div>
 
 
     <!--    <test type="user" ref="orgPicker" :v-model="select" :value="select" @dengjie="dengjie"-->
     <!--                @ok="selected"></test>-->
 
 
+
   </div>
 </template>
 
 <script>
-import Test from "@/components/common/Test";
 import axios from "axios";
 
+import Code from "./Code"
+
+
+
 export default {
   name: "Index",
-  components: {Test},
+  components: {Code},
   data() {
     return {
+      cmCode:"",
+      cmOptions:{
+        tabSize: 4, // tab
+        indentUnit: 4,
+        styleActiveLine: true, // 高亮选中行
+        lineNumbers: true, // 显示行号
+        styleSelectedText: true,
+        line: true,
+        foldGutter: true, // 块槽
+        gutters: ['CodeMirror-linenumbers', "lock", "warn"],
+        highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
+        mode:'javascript',
+        // hint.js options
+        hintOptions: {
+          // 当匹配只有一项的时候是否自动补全
+          completeSingle: false
+        },
+        // 快捷键 可提供三种模式 sublime、emacs、vim
+        keyMap: 'sublime',
+        matchBrackets: true,
+        showCursorWhenSelecting: false,
+        // scrollbarStyle:null,
+        // readOnly:true,  //是否只读
+        theme: 'material', // 主题 material
+        extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
+        lastLineBefore:0
+      },
+      cmOptionss:{
+        value:'',//编辑器的起始值。可以是字符串，也可以是文档对象。
+        mode:"text/x-hive",//第一个将模式名称映射到它们的构造函数，第二个将MIME类型映射到模式规范。
+        theme: "liquibyte",//编辑器样式的主题
+        indentWithTabs: true,//在缩进时，是否tabSize 应该用N个制表符替换前N *个空格。默认值为false。
+        smartIndent: true,//是否使用模式提供的上下文相关缩进（或者只是缩进与之前的行相同）。默认为true。
+        lineNumbers: true,//是否在编辑器左侧显示行号。
+        matchBrackets : true,//括号匹配
+        autofocus: true,//可用于使CodeMirror将焦点集中在初始化上
+        extraKeys: {"Ctrl-Space": "autocomplete"},//按键配置
+        hintOptions: {tables: {
+            users: ["name", "score", "birthDate"],
+            countries: ["name", "population", "size"]
+          }}
+      },
       token: localStorage.getItem("token"),
       username: null,
       select: [],
@@ -77,7 +127,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.select)
     let user = sessionStorage.getItem("user")
     if (user !== null && user !== '') {
       this.loginUser = JSON.parse(user)
@@ -85,13 +134,7 @@ export default {
     }
   },
   methods: {
-
-
     getToken() {
-      // let item = localStorage.getItem("token");
-      // if (item != null) {
-      //     return
-      // }
       axios.post(
           // "http://security-react.mytwins.top/auth/login",
           // getBaseUrl()+"/auth/login",
diff --git a/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue b/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
index 999e35d..d161e17 100644
--- a/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
+++ b/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
@@ -81,7 +81,7 @@
           <div v-if="config.http.handlerByScript">
             <div>
               <span>请求成功😀：</span>
-              <el-input type="textarea" v-model="config.http.success" :rows="3"></el-input>
+              <vue-codemirror :options="cmOptions"  v-model="config.http.success"/>
             </div>
             <div>
               <span>请求失败😥：</span>
@@ -108,15 +108,26 @@
 </template>
 
 <script>
-//import { codemirror } from 'vue-codemirror'
+import { VueCodemirror } from 'vue-codemirror'
 // 引入主题 可以从 codemirror/theme/ 下引入多个
-//import 'codemirror/theme/idea.css'
+import "vue-codemirror/node_modules/codemirror/lib/codemirror.css";
+import 'vue-codemirror/node_modules/codemirror/theme/idea.css'
 // 引入语言模式 可以从 codemirror/mode/ 下引入多个
-//import "codemirror/mode/javascript/javascript.js"
+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 {
   name: "TriggerNodeConfig",
-  components: {/*codemirror*/},
+  components: {VueCodemirror},
   props:{
     config:{
       type: Object,
-- 
2.40.1


From 311363703d21a567fb684e09eb55c20ce06a1ff0 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 24 Mar 2023 16:16:58 +0800
Subject: [PATCH 2/6] =?UTF-8?q?clay=20:=20=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C=E5=92=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/src/views/Code.vue        | 77 ++++++++-----------
 .../process/config/TriggerNodeConfig.vue      | 14 +---
 2 files changed, 33 insertions(+), 58 deletions(-)

diff --git a/flowable-engine-web/src/views/Code.vue b/flowable-engine-web/src/views/Code.vue
index 94e18c5..43b1dc5 100644
--- a/flowable-engine-web/src/views/Code.vue
+++ b/flowable-engine-web/src/views/Code.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
 12222313
-    <codemirror v-model="item" :options="cmOptions" class="code" @ready="onCmReady3" @focus="onCmFocus"
-                    @input="onCmCodeChange" ref="myCmGenerate"></codemirror>
+    <codemirror :value="item" :options="cmOptions" class="code" ref="myCmGenerate"
+                @input="changes"></codemirror>
   </div>
 </template>
 
@@ -10,10 +10,13 @@
 import {codemirror} from 'vue-codemirror'
 // 引入主题 可以从 codemirror/theme/ 下引入多个
 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/oceanic-next.css'
 // 引入语言模式 可以从 codemirror/mode/ 下引入多个
 import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // 代码高亮必须引入
-
+//代码补全
+import 'vue-codemirror/node_modules/codemirror/addon/hint/javascript-hint.js';
 export default {
   components:{codemirror},
   data() {
@@ -23,32 +26,28 @@ export default {
           '      console.log(instance)\n' +
           '      console.log(event)\n' +
           '    },',
+      foldContent : "46546555656545",
       cmOptions:{
-        tabSize: 4, // tab
-        indentUnit: 4,
-        attach:{},
-        styleActiveLine: true, // 高亮选中行
-        lineNumbers: true, // 显示行号
-        styleSelectedText: true,
-        line: true,
-        foldGutter: true, // 块槽
-        gutters: ['CodeMirror-linenumbers', "lock", "warn"],
-        highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
-        mode:'javascript',
-        // hint.js options
-        hintOptions: {
-          // 当匹配只有一项的时候是否自动补全
-          completeSingle: false
-        },
-        // 快捷键 可提供三种模式 sublime、emacs、vim
-        keyMap: 'sublime',
-        matchBrackets: true,
-        showCursorWhenSelecting: false,
-        // scrollbarStyle:null,
-        // readOnly:true,  //是否只读
-        theme: 'material', // 主题 material
+        mode: 'text/html', // 模式
+        theme: 'idea', // 主题
+        lineNumbers: true, // 是否显示行号
+        // lineWrapping: true,
+        // styleActiveLine: true, // 高亮选中行
+        // highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
+        // line: true,
+        // mode: 'text/x-java',
+        // gutters: ['CodeMirror-lint-markers'],
+        // theme: 'codemirror',
+        // keyMap: 'sublime',
+        // matchBrackets: true,
+        // showCursorWhenSelecting: false,
+        // hintOptions: {
+        //   // 当匹配只有一项的时候是否自动补全
+        //   completeSingle: true
+        // },
+        // foldGutter: true, // 支持折叠
         extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
-        lastLineBefore:0
+        gutters: ['CodeMirror-lint-javascript', 'CodeMirror-foldgutter']
       }
     }
   },
@@ -56,9 +55,6 @@ export default {
     console.log("rererer")
   },
   methods: {
-    onCmReady3() {
-      // this.$refs.myCmGenerate.codemirror.setSize('400px', '400px')
-    },
     onCmFocus(instance, event) {
       console.log(instance)
       console.log(event)
@@ -66,29 +62,16 @@ export default {
     onCmCodeChange(instance, obj) {
       console.log(instance)
       console.log(obj)
+    },
+    changes(){
+
     }
   }
 }
 
-export class Code {
-}
 </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>
-.code-mirror {
-  font-size: 13px;
-  line-height: 150%;
+.code {
   text-align: left;
 }
 </style>
diff --git a/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue b/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
index d161e17..9300913 100644
--- a/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
+++ b/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
@@ -81,7 +81,7 @@
           <div v-if="config.http.handlerByScript">
             <div>
               <span>请求成功😀：</span>
-              <vue-codemirror :options="cmOptions"  v-model="config.http.success"/>
+              <codemirror :options="cmOptions"  v-model="config.http.success"/>
             </div>
             <div>
               <span>请求失败😥：</span>
@@ -108,7 +108,7 @@
 </template>
 
 <script>
-import { VueCodemirror } from 'vue-codemirror'
+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'
@@ -116,14 +116,6 @@ import 'vue-codemirror/node_modules/codemirror/theme/idea.css'
 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 {
   name: "TriggerNodeConfig",
@@ -157,7 +149,7 @@ export default {
         // hint.js options
         hintOptions: {
           // 当匹配只有一项的时候是否自动补全
-          completeSingle: false
+          completeSingle: true
         },
         // 快捷键 可提供三种模式 sublime、emacs、vim
         keyMap: 'sublime',
-- 
2.40.1


From c57e31fc8466b266707f0898eca6026d1166d38f Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 24 Mar 2023 17:23:14 +0800
Subject: [PATCH 3/6] =?UTF-8?q?clay=20:=20=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C=E5=92=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/CodeEdit.vue        | 96 +++++++++++++++++++
 flowable-engine-web/src/views/Code.vue        | 77 ---------------
 flowable-engine-web/src/views/Index.vue       | 16 ----
 .../process/config/TriggerNodeConfig.vue      | 52 ++--------
 4 files changed, 102 insertions(+), 139 deletions(-)
 create mode 100644 flowable-engine-web/src/components/common/CodeEdit.vue
 delete mode 100644 flowable-engine-web/src/views/Code.vue

diff --git a/flowable-engine-web/src/components/common/CodeEdit.vue b/flowable-engine-web/src/components/common/CodeEdit.vue
new file mode 100644
index 0000000..69b578a
--- /dev/null
+++ b/flowable-engine-web/src/components/common/CodeEdit.vue
@@ -0,0 +1,96 @@
+<template>
+  <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'
+// 引入语言模式 可以从 codemirror/mode/ 下引入多个
+import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // 代码高亮必须引入
+import "vue-codemirror/node_modules/codemirror/mode/sql/sql"; // 代码高亮必须引入
+//代码补全
+import 'vue-codemirror/node_modules/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 '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",
+  components:{codemirror},
+  props:{
+    value:{
+      type:String,
+      default:"",
+    }
+  },
+  data(){
+    return {
+      code:"",
+      cmOptions:{
+        tabSize: 4, // tab
+        indentUnit: 2,
+        mode: 'javascript', // 模式
+        theme: 'idea', // 主题
+        lineNumbers: true, // 是否显示行号
+        lineWrapping: true,//是否自动换行
+        styleActiveLine: true, // 高亮选中行
+        highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
+        line: true,
+        matchBrackets: true,
+        // 自动括号匹配功能
+        showCursorWhenSelecting: false,
+        hintOptions: {
+          // 当匹配只有一项的时候是否自动补全
+          completeSingle: false
+        },
+        foldGutter: true, // 支持折叠
+        extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
+        gutters: ['CodeMirror-linenumbers', "lock", "warn"],
+      },
+    }
+  },
+  computed:{
+    _value :{
+      get(){
+        return this.value;
+      },
+      set(val){
+        this.value = val;
+      }
+    }
+  },
+  mounted() {
+    this.$refs.codeEdit.codemirror.on("inputRead",(cm)=>{
+      cm.showHint();
+    })
+    this.$refs.codeEdit.codemirror.on("change", (cm) => {
+      this._value = cm.getValue()
+      this.$emit("input",this._value)
+    })
+  },
+  methods:{
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/flowable-engine-web/src/views/Code.vue b/flowable-engine-web/src/views/Code.vue
deleted file mode 100644
index 43b1dc5..0000000
--- a/flowable-engine-web/src/views/Code.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <div>
-12222313
-    <codemirror :value="item" :options="cmOptions" class="code" ref="myCmGenerate"
-                @input="changes"></codemirror>
-  </div>
-</template>
-
-<script>
-import {codemirror} from 'vue-codemirror'
-// 引入主题 可以从 codemirror/theme/ 下引入多个
-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/oceanic-next.css'
-// 引入语言模式 可以从 codemirror/mode/ 下引入多个
-import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // 代码高亮必须引入
-//代码补全
-import 'vue-codemirror/node_modules/codemirror/addon/hint/javascript-hint.js';
-export default {
-  components:{codemirror},
-  data() {
-    return {
-      item: '\n' +
-          '    onCmFocus(instance, event) {\n' +
-          '      console.log(instance)\n' +
-          '      console.log(event)\n' +
-          '    },',
-      foldContent : "46546555656545",
-      cmOptions:{
-        mode: 'text/html', // 模式
-        theme: 'idea', // 主题
-        lineNumbers: true, // 是否显示行号
-        // lineWrapping: true,
-        // styleActiveLine: true, // 高亮选中行
-        // highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
-        // line: true,
-        // mode: 'text/x-java',
-        // gutters: ['CodeMirror-lint-markers'],
-        // theme: 'codemirror',
-        // keyMap: 'sublime',
-        // matchBrackets: true,
-        // showCursorWhenSelecting: false,
-        // hintOptions: {
-        //   // 当匹配只有一项的时候是否自动补全
-        //   completeSingle: true
-        // },
-        // foldGutter: true, // 支持折叠
-        extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
-        gutters: ['CodeMirror-lint-javascript', 'CodeMirror-foldgutter']
-      }
-    }
-  },
-  created() {
-    console.log("rererer")
-  },
-  methods: {
-    onCmFocus(instance, event) {
-      console.log(instance)
-      console.log(event)
-    },
-    onCmCodeChange(instance, obj) {
-      console.log(instance)
-      console.log(obj)
-    },
-    changes(){
-
-    }
-  }
-}
-
-</script>
-<style lang="less" scoped>
-.code {
-  text-align: left;
-}
-</style>
diff --git a/flowable-engine-web/src/views/Index.vue b/flowable-engine-web/src/views/Index.vue
index 6b516ef..284e26a 100644
--- a/flowable-engine-web/src/views/Index.vue
+++ b/flowable-engine-web/src/views/Index.vue
@@ -34,30 +34,14 @@
         </div>
       </div>
     </div>
-    <div>测试
-<!--      <vue-codemirror ref="myCmGenerate" class="code" :value="cmCode" :options="cmOptions" @ready="onCmReady3"/>-->
-     <Code/>
-    </div>
-
-
-    <!--    <test type="user" ref="orgPicker" :v-model="select" :value="select" @dengjie="dengjie"-->
-    <!--                @ok="selected"></test>-->
-
-
-
   </div>
 </template>
 
 <script>
 import axios from "axios";
 
-import Code from "./Code"
-
-
-
 export default {
   name: "Index",
-  components: {Code},
   data() {
     return {
       cmCode:"",
diff --git a/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue b/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
index 9300913..d7b1098 100644
--- a/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
+++ b/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
@@ -62,7 +62,7 @@
 
           </div>
         </el-form-item>
-        <el-form-item label="请求结果处理" prop="text">
+<!--        <el-form-item label="请求结果处理" prop="text">-->
           <div slot="label">
             <span>请求结果处理</span>
             <span style="margin-left: 20px">自定义脚本: </span>
@@ -81,14 +81,14 @@
           <div v-if="config.http.handlerByScript">
             <div>
               <span>请求成功😀：</span>
-              <codemirror :options="cmOptions"  v-model="config.http.success"/>
+              <code-edit v-model="config.http.success"/>
             </div>
             <div>
               <span>请求失败😥：</span>
-              <el-input type="textarea" v-model="config.http.fail" :rows="3"></el-input>
+              <code-edit v-model="config.http.fail"/>
             </div>
           </div>
-        </el-form-item>
+<!--        </el-form-item>-->
       </div>
       <div v-else-if="config.type === 'EMAIL'">
         <el-form-item label="邮件主题" prop="text">
@@ -108,18 +108,10 @@
 </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'
-// 引入语言模式 可以从 codemirror/mode/ 下引入多个
-import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript"; // 代码高亮必须引入
-
-
-
+import CodeEdit from "@/components/common/CodeEdit";
 export default {
   name: "TriggerNodeConfig",
-  components: {VueCodemirror},
+  components: {CodeEdit},
   props:{
     config:{
       type: Object,
@@ -135,32 +127,6 @@ export default {
   },
   data() {
     return {
-      cmOptions:{
-        tabSize: 4, // tab
-        indentUnit: 4,
-        styleActiveLine: true, // 高亮选中行
-        lineNumbers: true, // 显示行号
-        styleSelectedText: true,
-        line: true,
-        foldGutter: true, // 块槽
-        gutters: ['CodeMirror-linenumbers', "lock", "warn"],
-        highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
-        mode:'javascript',
-        // hint.js options
-        hintOptions: {
-          // 当匹配只有一项的时候是否自动补全
-          completeSingle: true
-        },
-        // 快捷键 可提供三种模式 sublime、emacs、vim
-        keyMap: 'sublime',
-        matchBrackets: true,
-        showCursorWhenSelecting: false,
-        // scrollbarStyle:null,
-        // readOnly:true,  //是否只读
-        theme: 'material', // 主题 material
-        extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
-        lastLineBefore:0
-      }
     }
   },
   methods: {
@@ -175,12 +141,6 @@ export default {
     delItem(items, index){
       items.splice(index, 1)
     },
-    onCmCodeChange(){
-
-    },
-    onCmReady(){
-
-    }
   }
 }
 </script>
-- 
2.40.1


From eaff8c9a71a7e363fd9f13780a5d0eb1de73d4b6 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 24 Mar 2023 17:26:52 +0800
Subject: [PATCH 4/6] =?UTF-8?q?clay=20:=20=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C=E5=92=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=97=B6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/src/api/org.js            |  21 +-
 flowable-engine-web/src/api/query.js          |  70 ----
 .../src/components/common/RolePicker.vue      |   2 +-
 flowable-engine-web/src/router/index.js       |   6 -
 flowable-engine-web/src/views/query/index.vue | 352 ------------------
 5 files changed, 2 insertions(+), 449 deletions(-)
 delete mode 100644 flowable-engine-web/src/api/query.js
 delete mode 100644 flowable-engine-web/src/views/query/index.vue

diff --git a/flowable-engine-web/src/api/org.js b/flowable-engine-web/src/api/org.js
index 660e418..f862b25 100644
--- a/flowable-engine-web/src/api/org.js
+++ b/flowable-engine-web/src/api/org.js
@@ -1,15 +1,5 @@
 import request from '@/api/request.js'
 
-
-// 查询组织架构树
-export function getOrgTree(param) {
-  return request({
-    url: 'oa/org/tree',
-    method: 'get',
-    params: param
-  })
-}
-
 // 查询系统角色
 export function getRole() {
   return request({
@@ -17,15 +7,6 @@ export function getRole() {
     method: 'get'
   })
 }
-
-// 搜索人员
-export function getUserByName(param) {
-  return request({
-    url: 'oa/org/tree/user/search',
-    method: 'get',
-    params: param
-  })
-}
 //获取采取树形控件的部门option
 export function getDepartmentTree() {
   return request({
@@ -43,5 +24,5 @@ export function getUserTree(type,chooseId){
 }
 
 export default {
-  getOrgTree, getUserByName, getRole,getDepartmentTree,getUserTree
+  getRole,getDepartmentTree,getUserTree
 }
diff --git a/flowable-engine-web/src/api/query.js b/flowable-engine-web/src/api/query.js
deleted file mode 100644
index 2f9f0e9..0000000
--- a/flowable-engine-web/src/api/query.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import request from '@/api/request.js'
-
-
-// 查询万能查询列表
-export function listQuery(query) {
-  return request({
-    url: '/custom-query/uni/query',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询万能查询详细
-export function getQuery(id) {
-  return request({
-    url: '/custom-query/uni/query/' + id,
-    method: 'get'
-  })
-}
-
-// 新增万能查询
-export function addQuery(data) {
-  return request({
-    url: '/custom-query/uni/query',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改万能查询
-export function updateQuery(data) {
-  return request({
-    url: '/custom-query/uni/query',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除万能查询
-export function delQuery(id) {
-  return request({
-    url: '/custom-query/uni/query/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出万能查询
-export function exportQuery(query) {
-  return request({
-    url: '/custom-query/uni/query/export',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取条件
-export function getQueryInfo(id) {
-  return request({
-    url: '/query/'+id,
-    method: 'get',
-  })
-}
-// 修改条件
-export function editQueryInfo(data) {
-  return request({
-    url: '/query',
-    method: 'put',
-    data: data
-  })
-}
diff --git a/flowable-engine-web/src/components/common/RolePicker.vue b/flowable-engine-web/src/components/common/RolePicker.vue
index 402aec3..74d3098 100644
--- a/flowable-engine-web/src/components/common/RolePicker.vue
+++ b/flowable-engine-web/src/components/common/RolePicker.vue
@@ -76,7 +76,6 @@ export default {
     };
   },
   created() {
-    this.getRole();
   },
   methods: {
     //获取角色信息
@@ -89,6 +88,7 @@ export default {
     },
     //用于弹出角色选择器
     showRolePicker() {
+      this.getRole();
       this.visible = true;
     },
     //选中角色
diff --git a/flowable-engine-web/src/router/index.js b/flowable-engine-web/src/router/index.js
index 7170001..b6941b8 100644
--- a/flowable-engine-web/src/router/index.js
+++ b/flowable-engine-web/src/router/index.js
@@ -33,12 +33,6 @@ const router = new Router({
       component: () => import("@/views/admin/FormsPanel.vue"),
       meta: {title: '表单列表', viewport: viewport}
     },
-    {
-      path: "/query",
-      name: "query",
-      component: () => import("@/views/query/index.vue"),
-      meta: {title: '自定义查询', viewport: viewport}
-    },
     {
       path: "/admin/design",
       name: "design",
diff --git a/flowable-engine-web/src/views/query/index.vue b/flowable-engine-web/src/views/query/index.vue
deleted file mode 100644
index a043720..0000000
--- a/flowable-engine-web/src/views/query/index.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="uqName">
-        <el-input
-          v-model="queryParams.uqName"
-          placeholder="请输入名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="描述" prop="uqDescribe">
-        <el-input
-          v-model="queryParams.uqDescribe"
-          placeholder="请输入描述"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="daterangeCreateTime"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="queryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column type="index" width="50"></el-table-column>
-      <el-table-column label="名称" align="center" prop="uqName"/>
-      <el-table-column label="描述" align="center" prop="uqDescribe"/>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.createTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.updateTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isRelease===2">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            type="text"
-            size="small"
-            icon="el-icon-edit-outline"
-            @click="handleEditTable(scope.row)"
-          >设计</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-          </span>
-          <span v-if="scope.row.isRelease===1">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handRelease(scope.row.id)"
-          >撤销</el-button>
-          </span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改万能查询对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="名称" prop="uqName">
-          <el-input v-model="form.uqName" placeholder="请输入名称"/>
-        </el-form-item>
-        <el-form-item label="描述" prop="uqDescribe">
-          <el-input v-model="form.uqDescribe" placeholder="请输入描述"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {listQuery, getQuery, delQuery, addQuery, updateQuery, exportQuery, Release} from "@/api/query";
-import {Message} from "element-ui";
-
-export default {
-  name: "Query",
-  components: {},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 万能查询表格数据
-      queryList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 创建时间时间范围
-      daterangeCreateTime: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        uqName: null,
-        uqDescribe: null,
-        type: 1
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        uqName: [
-          {required: true, message: "名称不能为空}", trigger: "blur"},
-        ],
-        uqDescribe: [
-          {required: true, message: "描述不能为空}", trigger: "blur"},
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询万能查询列表 */
-    getList() {
-      this.loading = true;
-      listQuery(this.queryParams).then(response => {
-        let data = response.data
-        this.queryList = data.rows;
-        this.total = data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        uqName: null,
-        uqDescribe: null,
-      };
-      // this.$refs['form'].resetFields()
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    handleEditTable(row) {
-      this.$router.push("/query/edit/" + row.id);
-    },
-    /** 发布与撤销 */
-    handRelease(id) {
-      let that = this
-      this.$confirm('是否确认撤销该查询?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function () {
-        let data = {
-          id: id,
-          isRelease: 2
-        }
-        Release(data).then(res => {
-          Message({
-            message: res.msg,
-            type: 'success'
-          })
-          that.getList()
-        })
-      })
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.daterangeCreateTime = [];
-      this.$refs.queryForm.resetFields()
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加自定义查询";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getQuery(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改自定义查询";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        this.form.type = 1
-        if (valid) {
-          if (this.form.id != null) {
-            updateQuery(this.form).then(response => {
-              Message({
-                message: "修改成功",
-                type: 'success'
-              })
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addQuery(this.form).then(response => {
-              Message({
-                message: "新增成功",
-                type: 'success'
-              })
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除自定义查询编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return delQuery(ids);
-      }).then(() => {
-        this.getList();
-        this.msgSuccess("删除成功");
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有自定义查询数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return exportQuery(queryParams);
-      }).then(response => {
-        this.download(response.msg);
-      })
-    }
-  }
-};
-</script>
-- 
2.40.1


From 8553e09812f96873f6856e035e9b1ff669feaded Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 24 Mar 2023 18:04:22 +0800
Subject: [PATCH 5/6] =?UTF-8?q?clay=20:=20=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=BB=8E=E7=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/src/views/Index.vue | 111 +++++++-----------------
 1 file changed, 30 insertions(+), 81 deletions(-)

diff --git a/flowable-engine-web/src/views/Index.vue b/flowable-engine-web/src/views/Index.vue
index 284e26a..37b4fbc 100644
--- a/flowable-engine-web/src/views/Index.vue
+++ b/flowable-engine-web/src/views/Index.vue
@@ -2,17 +2,13 @@
   <div style="text-align: center">
     <!--    <h4>先选择本次登录人员的身份，再进入相应的系统 😅</h4>-->
     <h4>欢迎进入Spring Security 配套 Workflow工作流模块</h4>
-    <div v-if="!token">
-      <el-input v-model="username"/>
-      <el-button @click="getToken">登录</el-button>
-    </div>
     <div class="work-panel">
-      <!--      <div class="user">-->
-      <!--        <el-button type="primary" round size="small" @click="showRolePicker()" icon="el-icon-user">选择本次登录者</el-button>-->
-      <!--        <div v-if="loginUser !== '' && loginUser !== null">-->
-      <!--          <span>{{ loginUser.name }}</span>-->
-      <!--        </div>-->
-      <!--      </div>-->
+      <div class="user">
+        <el-button type="primary" round size="small" @click="showRolePicker()" icon="el-icon-user">选择本次登录者</el-button>
+        <div v-if="token !== '' && token !== null">
+          <span>{{ loginUser.name }}</span>
+        </div>
+      </div>
       <div class="panel">
         <div class="panel-item" @click="to('/workSpace')">
           <div>
@@ -34,73 +30,21 @@
         </div>
       </div>
     </div>
+    <user-picker title="请选择系统角色" :multiple="false" ref="userPicker" :v-model="select" @ok="selectedUser"/>
   </div>
 </template>
 
 <script>
 import axios from "axios";
+import UserPicker from "../components/common/UserPicker";
 
 export default {
   name: "Index",
+  components: {UserPicker},
   data() {
     return {
-      cmCode:"",
-      cmOptions:{
-        tabSize: 4, // tab
-        indentUnit: 4,
-        styleActiveLine: true, // 高亮选中行
-        lineNumbers: true, // 显示行号
-        styleSelectedText: true,
-        line: true,
-        foldGutter: true, // 块槽
-        gutters: ['CodeMirror-linenumbers', "lock", "warn"],
-        highlightSelectionMatches: { showToken: /w/, annotateScrollbar: true }, // 可以启用该选项来突出显示当前选中的内容的所有实例
-        mode:'javascript',
-        // hint.js options
-        hintOptions: {
-          // 当匹配只有一项的时候是否自动补全
-          completeSingle: false
-        },
-        // 快捷键 可提供三种模式 sublime、emacs、vim
-        keyMap: 'sublime',
-        matchBrackets: true,
-        showCursorWhenSelecting: false,
-        // scrollbarStyle:null,
-        // readOnly:true,  //是否只读
-        theme: 'material', // 主题 material
-        extraKeys: { 'Ctrl': 'autocomplete' }, // 可以用于为编辑器指定额外的键绑定，以及keyMap定义的键绑定
-        lastLineBefore:0
-      },
-      cmOptionss:{
-        value:'',//编辑器的起始值。可以是字符串，也可以是文档对象。
-        mode:"text/x-hive",//第一个将模式名称映射到它们的构造函数，第二个将MIME类型映射到模式规范。
-        theme: "liquibyte",//编辑器样式的主题
-        indentWithTabs: true,//在缩进时，是否tabSize 应该用N个制表符替换前N *个空格。默认值为false。
-        smartIndent: true,//是否使用模式提供的上下文相关缩进（或者只是缩进与之前的行相同）。默认为true。
-        lineNumbers: true,//是否在编辑器左侧显示行号。
-        matchBrackets : true,//括号匹配
-        autofocus: true,//可用于使CodeMirror将焦点集中在初始化上
-        extraKeys: {"Ctrl-Space": "autocomplete"},//按键配置
-        hintOptions: {tables: {
-            users: ["name", "score", "birthDate"],
-            countries: ["name", "population", "size"]
-          }}
-      },
       token: localStorage.getItem("token"),
-      username: null,
       select: [],
-      roleData: [
-        {
-          roleId: 1,
-          roleName: "角色名称",
-        }
-      ],
-      deptData: [
-        {
-          deptId: 1,
-          deptName: "角色名称",
-        }
-      ],
       loginUser: {
         id: 381496,
         name: "clay",
@@ -119,16 +63,14 @@ export default {
   },
   methods: {
     getToken() {
+      localStorage.clear()
       axios.post(
-          // "http://security-react.mytwins.top/auth/login",
-          // getBaseUrl()+"/auth/login",
-          "http://gateway.mytwins.top/auth/login",
-          // "http://localhost:8000/auth/login",
+          // "http://gateway.mytwins.top/auth/workflow/login",
+          "http://localhost:8000/auth/workflow/login",
           {
             code: "string",
             password: "926425",
-            // username: "admin",
-            username: this.username,
+            username: this.loginUser.id,
             uuid: "string"
           }
       ).then(res => {
@@ -137,20 +79,27 @@ export default {
         localStorage.setItem("token", this.token)
       })
     },
-
-
+    selectedUser(select) {
+      let userInfoList = []
+      for (let val of select) {
+        let userInfo = {
+          id: val.id,
+          name: val.name,
+          avatar: val.avatar,
+        }
+        this.loginUser = userInfo;
+        userInfoList.push(userInfo)
+      }
+      this.getToken()
+      this.select = userInfoList;
+    },
     //显示角色选择框
     showRolePicker() {
-      this.$refs.orgPicker.visible = true
-    },
-    selected(select) {
-      this.select = select
-      this.loginUser = select.length > 0 ? select[0] : ''
-      this.showUserSelect = false
-      sessionStorage.setItem("user", JSON.stringify(this.loginUser))
+      localStorage.clear()
+      this.$refs.userPicker.showUserPicker()
     },
     to(path) {
-      if (this.loginUser === null || this.loginUser === '') {
+      if (this.token === null || this.token === '' || this.token === 'undefined') {
         this.$message.warning("请先选择一个人员身份进行登录")
       } else {
         this.$router.push(path)
-- 
2.40.1


From 39e1773dc7d285cc7d57c7b3c764a501095c0b99 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 24 Mar 2023 18:06:30 +0800
Subject: [PATCH 6/6] =?UTF-8?q?clay=20:=20=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=BB=8E=E7=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/src/views/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flowable-engine-web/src/views/Index.vue b/flowable-engine-web/src/views/Index.vue
index 37b4fbc..67b990d 100644
--- a/flowable-engine-web/src/views/Index.vue
+++ b/flowable-engine-web/src/views/Index.vue
@@ -65,8 +65,8 @@ export default {
     getToken() {
       localStorage.clear()
       axios.post(
-          // "http://gateway.mytwins.top/auth/workflow/login",
-          "http://localhost:8000/auth/workflow/login",
+          "http://gateway.mytwins.top/auth/workflow/login",
+          // "http://localhost:8000/auth/workflow/login",
           {
             code: "string",
             password: "926425",
-- 
2.40.1