@@ -64,12 +66,11 @@
转交审批管理员
转交到指定人员
-
-
@@ -134,8 +135,6 @@
-
-
@@ -144,12 +143,11 @@
import RolePicker from "@/components/common/RolePicker";
import UserPicker from "@/components/common/UserPicker";
import RoleItems from "../RoleItems";
-import OrgItems from "../OrgItems";
export default {
name: "ApprovalNodeConfig",
- components: {RoleItems, OrgItems, RolePicker, UserPicker},
+ components: {RoleItems, RolePicker, UserPicker},
props: {
config: {
type: Object,
@@ -185,6 +183,14 @@ export default {
this.config.assignedUser = val
}
},
+ nobodyAssignedUser: {
+ get() {
+ return this.config.nobody.assignedUser || [];
+ },
+ set(val) {
+ this.config.nobody.assignedUser = val
+ }
+ },
roleList: {
get() {
return this.config.roleList || [];
@@ -217,7 +223,6 @@ export default {
case "LEADER_TOP":
return this.nodeProps.formUser !== "";
case "FORM_USER":
- return true;
case "ROLE":
return true;
default:
@@ -226,15 +231,17 @@ export default {
}
},
methods: {
- selectUser() {
- this.$refs.userPicker.showUserPicker()
- },
- selectNoSetUser() {
-
- },
- //弹出角色选择器,选择系统角色
- selectRole() {
- this.$refs.rolePicker.showRolePicker();
+ selectNoSetUser(select) {
+ let userInfoList = []
+ for (let val of select) {
+ let userInfo = {
+ id: val.id,
+ name: val.name,
+ avatar: val.avatar,
+ }
+ userInfoList.push(userInfo)
+ }
+ this.nobodyAssignedUser = userInfoList
},
selectedRole(select) {
this.roleList = select
--
2.40.1
From 059ac66d7a5bfa920bc446444c1ece687318bc4d Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 25 Mar 2023 23:16:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?clay=20:=20=E8=A7=A6=E5=8F=91=E5=99=A8?=
=?UTF-8?q?=E7=9A=84http=E8=AF=B7=E6=B1=82=E6=9C=89=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
flowable-engine-web/src/App.vue | 2 +-
flowable-engine-web/src/api/request.js | 11 +-
.../src/components/common/CodeEdit.vue | 4 +-
.../src/components/common/Comment.vue | 2 +-
flowable-engine-web/src/main.js | 13 --
flowable-engine-web/src/router/index.js | 2 +-
flowable-engine-web/src/views/Index.vue | 12 +-
.../admin/layout/process/DefaultNodeProps.js | 4 +-
.../common/form/components/ImageUpload.vue | 2 +-
.../process/config/TriggerNodeConfig.vue | 153 ++++++++++++------
10 files changed, 124 insertions(+), 81 deletions(-)
diff --git a/flowable-engine-web/src/App.vue b/flowable-engine-web/src/App.vue
index 3515aa4..b1f0b81 100644
--- a/flowable-engine-web/src/App.vue
+++ b/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 {
diff --git a/flowable-engine-web/src/api/request.js b/flowable-engine-web/src/api/request.js
index cccdf16..6fc9891 100644
--- a/flowable-engine-web/src/api/request.js
+++ b/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://192.168.101.8:8000"
+ // return "http://gateway.mytwins.top"
+ 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()
- window.open("/")
+ localStorage.clear()
+ window.location.href = "/"
}
if (data.code === 1000){
return data
diff --git a/flowable-engine-web/src/components/common/CodeEdit.vue b/flowable-engine-web/src/components/common/CodeEdit.vue
index 5a70ad1..71159c4 100644
--- a/flowable-engine-web/src/components/common/CodeEdit.vue
+++ b/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:{
diff --git a/flowable-engine-web/src/components/common/Comment.vue b/flowable-engine-web/src/components/common/Comment.vue
index 1c4338a..46b11d2 100644
--- a/flowable-engine-web/src/components/common/Comment.vue
+++ b/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,
diff --git a/flowable-engine-web/src/main.js b/flowable-engine-web/src/main.js
index 35b0f96..a327490 100644
--- a/flowable-engine-web/src/main.js
+++ b/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);
diff --git a/flowable-engine-web/src/router/index.js b/flowable-engine-web/src/router/index.js
index b6941b8..108bdcf 100644
--- a/flowable-engine-web/src/router/index.js
+++ b/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;
diff --git a/flowable-engine-web/src/views/Index.vue b/flowable-engine-web/src/views/Index.vue
index bcfcb74..19f45a6 100644
--- a/flowable-engine-web/src/views/Index.vue
+++ b/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) {
diff --git a/flowable-engine-web/src/views/admin/layout/process/DefaultNodeProps.js b/flowable-engine-web/src/views/admin/layout/process/DefaultNodeProps.js
index e5d8c20..9ce2577 100644
--- a/flowable-engine-web/src/views/admin/layout/process/DefaultNodeProps.js
+++ b/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}',
- fail: 'function handlerFail(res) {\n return true;\n}'
+ success: 'function handlerSuccess(res) {\n return {\n state: true, \n msg: "请求成功!" \n };\n}',
+ fail: 'function handlerFail(res) {\n return {\n state: true, \n msg: "请求失败!" \n };\n}'
},
email: {
subject: '',
diff --git a/flowable-engine-web/src/views/common/form/components/ImageUpload.vue b/flowable-engine-web/src/views/common/form/components/ImageUpload.vue
index 843f112..fda0fff 100644
--- a/flowable-engine-web/src/views/common/form/components/ImageUpload.vue
+++ b/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: '',
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 a1553c8..4ebeec8 100644
--- a/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
+++ b/flowable-engine-web/src/views/common/process/config/TriggerNodeConfig.vue
@@ -9,7 +9,7 @@
-
+
@@ -24,22 +24,25 @@
+ 添加
- -
+ -
+
表单
固定
-
+
-
+
请求参数
- + 添加
+ + 添加
参数类型 -
json
@@ -47,65 +50,76 @@
- -
+ -
+
表单
固定
-
+
-
+
-
-
- 请求结果处理
- 自定义脚本:
-
-
-
- 👉 返回值为 ture 则流程通过，为 false 则流程将被驳回
-
-
-
-
-
-
+
+
+ 请求结果处理
+ 自定义脚本:
+
+
+
+ 👉 返回值为 ture 则流程通过，为 false 则流程将被驳回
+ 👉 (上线注意)占不支持ES高级语法
+ 👉 (上线注意)不支持浏览器的内置函数
+
+
+
+
+
+
- 👉 无论请求结果如何，均通过
-
-
- 请求成功😀：
-
-
-
- 请求失败😥：
-
-
+
👉 无论请求结果如何，均通过
+
+
+ 测试
-
+
+ 请求成功😀：
+
+
+
+ 请求失败😥：
+
+
+
+
-
+
-
+
-
+
-
+
@@ -114,44 +128,87 @@
--
2.40.1