flowable-engine-web/src/App.vue

@@ -17,7 +17,7 @@
     created() {
     },
     mounted() {
-      let beforeUrl = sessionStorage.getItem('router-path')
+      let beforeUrl = localStorage.getItem('router-path')
       if(beforeUrl === undefined || beforeUrl === ''){
         //this.$router.push("/workPanel")
       }else {

flowable-engine-web/src/api/request.js

@@ -6,12 +6,11 @@ import { Notification, MessageBox, Message } from "element-ui";
 // 第三方插件
 import "element-ui/lib/theme-chalk/index.css";
 
-Vue.prototype.$axios = axios;
 // 字体图标
 
 export function getBaseUrl(){
-	return "http://gateway.mytwins.top"
+	// return "http://gateway.mytwins.top"
-	// return "http://192.168.101.8:8000"
+	return "http://192.168.101.8:8000"
 	// return "http://localhost:8000"
 }
 
@@ -26,7 +25,7 @@ service.defaults.withCredentials = true; // 让ajax携带cookie
 service.interceptors.request.use(
 	// 每次请求都自动携带Cookie
 	config => {
-		config.headers['authorization'] = sessionStorage.getItem("token") // 让每个请求携带自定义token 请根据实际情况自行修改
+		config.headers['authorization'] = localStorage.getItem("token") // 让每个请求携带自定义token 请根据实际情况自行修改
 		return config;
 	},
 	error => {
@@ -38,8 +37,8 @@ service.interceptors.response.use(
 	rsp => {
 		let data = rsp.data
 		if (data.code === 401){
-			sessionStorage.clear()
+			localStorage.clear()
-			window.open("/")
+			window.location.href = "/"
 		}
 		if (data.code === 1000){
 			return data

flowable-engine-web/src/components/common/CodeEdit.vue

@@ -59,7 +59,7 @@ export default {
   computed:{
     _value :{
       get(){
-        return this.value;
+        return this.value || "";
       },
       set(val){
         this.value = val;
@@ -72,7 +72,7 @@ export default {
     })
     this.$refs.codeEdit.codemirror.on("change", (cm) => {
       this._value = cm.getValue()
-      this.$emit("input",this._value)
+      this.$emit("input",cm.getValue())
     })
   },
   methods:{

flowable-engine-web/src/components/common/Comment.vue

@@ -137,7 +137,7 @@ export default {
       uploadParams: {},
       uploadFileUrl: getBaseUrl() + "/flowable/process/file",
       headers: {
-        authorization: sessionStorage.getItem("token")
+        authorization: localStorage.getItem("token")
       },
       context: null,
       rollBackId: null,

flowable-engine-web/src/main.js

@@ -18,19 +18,6 @@ import WDialog from '@/components/common/WDialog'
 import Tip from '@/components/common/Tip'
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 Vue.use(ElementUI);
 Vue.use(AvatarEllipsis);
 Vue.use(Ellipsis);

flowable-engine-web/src/router/index.js

@@ -77,7 +77,7 @@ router.beforeEach((to, from, next) => {
     head[0].appendChild(meta)
   }
   next();
-  sessionStorage.setItem('router-path', to.path)
+  localStorage.setItem('router-path', to.path)
 })
 
 export default router;

flowable-engine-web/src/views/Index.vue

@@ -44,13 +44,13 @@ export default {
   components: {UserPicker},
   data() {
     return {
-      token: sessionStorage.getItem("token"),
+      token: localStorage.getItem("token"),
       select: [],
       loginUser: {}
     }
   },
   mounted() {
-    let user = sessionStorage.getItem("userInfo")
+    let user = localStorage.getItem("userInfo")
     if (user !== null && user !== '') {
       this.loginUser = JSON.parse(user)
       this.select.push(this.loginUser)
@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     getToken() {
-      sessionStorage.clear()
+      localStorage.clear()
       axios.post(
           "http://gateway.mytwins.top/auth/workflow/login",
           // "http://localhost:8000/auth/workflow/login",
@@ -69,9 +69,9 @@ export default {
             uuid: "string"
           }
       ).then(res => {
-        sessionStorage.setItem("userInfo",JSON.stringify(this.loginUser))
+        localStorage.setItem("userInfo",JSON.stringify(this.loginUser))
         this.token = res.data.data
-        sessionStorage.setItem("token", this.token)
+        localStorage.setItem("token", this.token)
       })
     },
     selectedUser(select) {
@@ -90,7 +90,7 @@ export default {
     },
     //显示角色选择框
     showRolePicker() {
-      sessionStorage.clear()
+      localStorage.clear()
       this.$refs.userPicker.showUserPicker()
     },
     to(path) {

flowable-engine-web/src/views/admin/layout/process/DefaultNodeProps.js

@@ -90,8 +90,8 @@ export const TRIGGER_PROPS = {
         ],
         retry: 1,
         handlerByScript: false,
-        success: 'function handlerSuccess(res) {\n  return true;\n}',
+        success: 'function handlerSuccess(res) {\n  return {\n    state: true, \n    msg: "请求成功!" \n  };\n}',
-        fail: 'function handlerFail(res) {\n  return true;\n}'
+        fail: 'function handlerFail(res) {\n  return {\n    state: true, \n    msg: "请求失败!" \n  };\n}'
     },
     email: {
         subject: '',

flowable-engine-web/src/views/common/form/components/ImageUpload.vue

@@ -105,7 +105,7 @@ export default {
       disabled: false,
       uploadFileUrl: getBaseUrl() + "/flowable/process/file",
       headers: {
-        authorization: sessionStorage.getItem("token")
+        authorization: localStorage.getItem("token")
       },
       uploadParams: {},
       dialogImageUrl: '',

flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue

@@ -24,16 +24,19 @@
             <el-button type="text" @click="addItem(config.http.headers)"> + 添加</el-button>
           </div>
           <div v-for="(header, index) in config.http.headers" :key="index">
-            - <el-input placeholder="参数名" size="small" style="width: 100px;" v-model="header.name" />
+            -
+            <el-input placeholder="参数名" size="small" style="width: 100px;" v-model="header.name"/>
             <el-radio-group size="small" style="margin: 0 5px;" v-model="header.isField">
               <el-radio-button :label="true">表单</el-radio-button>
               <el-radio-button :label="false">固定</el-radio-button>
             </el-radio-group>
-            <el-select v-if="header.isField" style="width: 180px;" v-model="header.value" size="small" placeholder="请选择表单字段">
+            <el-select v-if="header.isField" style="width: 180px;" v-model="header.value" size="small"
+                       placeholder="请选择表单字段">
               <el-option v-for="form in forms" :key="form.id" :label="form.title" :value="form.title"></el-option>
             </el-select>
             <el-input v-else placeholder="请设置字段值" size="small" v-model="header.value" style="width: 180px;"/>
-            <el-icon class="el-icon-delete" @click="delItem(config.http.headers, index)" style="margin-left: 5px; color: #c75450; cursor: pointer"/>
+            <el-icon class="el-icon-delete" @click="delItem(config.http.headers, index)"
+                     style="margin-left: 5px; color: #c75450; cursor: pointer"/>
           </div>
         </el-form-item>
         <el-form-item label="Header请求参数" prop="text">
@@ -47,16 +50,19 @@
             </el-radio-group>
           </div>
           <div v-for="(param, index) in config.http.params" :key="index">
-            - <el-input placeholder="参数名" size="small" style="width: 100px;" v-model="param.name" />
+            -
+            <el-input placeholder="参数名" size="small" style="width: 100px;" v-model="param.name"/>
             <el-radio-group size="small" style="margin: 0 5px;" v-model="param.isField">
               <el-radio-button :label="true">表单</el-radio-button>
               <el-radio-button :label="false">固定</el-radio-button>
             </el-radio-group>
-            <el-select v-if="param.isField" style="width: 180px;" v-model="param.value" size="small" placeholder="请选择表单字段">
+            <el-select v-if="param.isField" style="width: 180px;" v-model="param.value" size="small"
+                       placeholder="请选择表单字段">
               <el-option v-for="form in forms" :key="form.id" :label="form.title" :value="form.id"></el-option>
             </el-select>
             <el-input v-else placeholder="请设置字段值" size="small" v-model="param.value" style="width: 180px;"/>
-            <el-icon class="el-icon-delete" @click="delItem(config.http.params, index)" style="margin-left: 5px; color: #c75450; cursor: pointer"/>
+            <el-icon class="el-icon-delete" @click="delItem(config.http.params, index)"
+                     style="margin-left: 5px; color: #c75450; cursor: pointer"/>
           </div>
           <div>
 
@@ -69,7 +75,9 @@
           <el-switch v-model="config.http.handlerByScript"></el-switch>
         </div>
         <span class="item-desc" v-if="config.http.handlerByScript">
-          👉 返回值为 ture 则流程通过，为 false 则流程将被驳回
+          <p>👉 返回值为 ture 则流程通过，为 false 则流程将被驳回</p>
+          <p>👉 (上线注意)占不支持ES高级语法</p>
+          <p>👉 (上线注意)不支持浏览器的内置函数</p>
           <!--          <div>支持函数-->
           <!--            <span style="color: dodgerblue">setFormByName(-->
           <!--              <span style="color: #939494">'表单字段名', '表单字段值'</span>-->
@@ -79,6 +87,9 @@
         </span>
         <span class="item-desc" v-else>👉 无论请求结果如何，均通过</span>
         <div v-if="config.http.handlerByScript">
+          <div>
+            <el-button @click="testHander">测试</el-button>
+          </div>
           <div>
             <span>请求成功😀：</span>
             <code-edit v-model="config.http.success"/>
@@ -95,17 +106,20 @@
           <el-input placeholder="请输入邮件主题" size="medium" v-model="config.email.subject"/>
         </el-form-item>
         <el-form-item label="收件方" prop="text">
-          <el-select size="small" style="width: 100%;" v-model="config.email.to" filterable multiple allow-create default-first-option placeholder="请输入收件人">
+          <el-select size="small" style="width: 100%;" v-model="config.email.to" filterable multiple allow-create
+                     default-first-option placeholder="请输入收件人">
             <el-option v-for="sender in config.email.to" :key="sender" :label="sender" :value="sender"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="抄送方" prop="text">
-          <el-select size="small" style="width: 100%;" v-model="config.email.cc" filterable multiple allow-create default-first-option placeholder="请输入收件人">
+          <el-select size="small" style="width: 100%;" v-model="config.email.cc" filterable multiple allow-create
+                     default-first-option placeholder="请输入收件人">
             <el-option v-for="item in config.email.cc" :key="item" :label="item" :value="item"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="邮件正文" prop="text">
-          <el-input type="textarea" v-model="config.email.content" :rows="4" placeholder="邮件内容，支持变量提取表单数据 ${表单字段名} "></el-input>
+          <el-input type="textarea" v-model="config.email.content" :rows="4"
+                    placeholder="邮件内容，支持变量提取表单数据 ${表单字段名} "></el-input>
         </el-form-item>
       </div>
     </el-form>
@@ -114,6 +128,8 @@
 
 <script>
 import CodeEdit from "@/components/common/CodeEdit";
+import axios from "axios";
+
 export default {
   name: "TriggerNodeConfig",
   components: {CodeEdit},
@@ -131,8 +147,7 @@ export default {
     }
   },
   data() {
-    return {
+    return {}
-    }
   },
   methods: {
     addItem(items) {
@@ -146,6 +161,48 @@ export default {
     delItem(items, index) {
       items.splice(index, 1)
     },
+    testHander() {
+      let http = this.config.http;
+      if (http.url == null || http.url === '') {
+        this.$message.error("请填写请求路径!")
+        return
+      }
+      let headers = {}
+      for (let header of http.headers) {
+        if (header.isField) {
+          this.$message.error("测试只支持固定参数")
+          return
+        }
+        if (header.name !== "" && header.value !== "") {
+          this.$set(headers, header.name, header.value);
+        }
+      }
+      if (http.contentType === "FORM") {
+        this.$set(headers, "Content-Type", "multipart/form-data")
+      } else {
+        this.$set(headers, "Content-Type", "application/json")
+      }
+      console.log("==================[测试打印内容]==================")
+      axios.request({
+        method: http.method,
+        url: http.url,
+        headers: headers
+      }).then(res => {
+        console.log(res)
+        if (res.status === 200) {
+          let data = res.data
+          let successFun = eval("(false ||" + http.success + ")");
+          let result = successFun(data);
+          console.log(result, "成功函数执行的返回结果")
+        } else {
+          let failFun = eval("(false ||" + http.fail + ")");
+          let result = failFun(res);
+          console.log(result, "失败函数执行的返回结果")
+        }
+      }).finally(() => {
+        console.log("==================[测试打印结束]==================")
+      })
+    },
   }
 }
 </script>