clay
/
workflow-engine-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clay : 细节修改

This commit is contained in:
clay 2023-03-25 16:39:37 +08:00
parent 090863bcd3
commit 055d757581
8 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flowable-engine-web/src/api/request.js
View File

@ -26,7 +26,7 @@ service.defaults.withCredentials = true; // 让ajax携带cookie
service.interceptors.request.use(
// 每次请求都自动携带Cookie
config => {
config.headers['authorization'] = localStorage.getItem("token") // 让每个请求携带自定义token 请根据实际情况自行修改
config.headers['authorization'] = sessionStorage.getItem("token") // 让每个请求携带自定义token 请根据实际情况自行修改
return config;
},
error => {
@ -38,7 +38,8 @@ service.interceptors.response.use(
rsp => {
let data = rsp.data
if (data.code === 401){
localStorage.clear()
sessionStorage.clear()
window.open("/")
}
if (data.code === 1000){
return data

2
flowable-engine-web/src/components/common/Comment.vue
View File

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

21
flowable-engine-web/src/views/Index.vue
View File

@ -6,6 +6,7 @@
<div class="user">
<el-button type="primary" round size="small" @click="showRolePicker()" icon="el-icon-user">选择本次登录者</el-button>
<div v-if="token !== '' && token !== null">
<el-avatar size="large" :src="loginUser.avatar"></el-avatar>
<span>{{ loginUser.name }}</span>
</div>
</div>
@ -43,19 +44,13 @@ export default {
components: {UserPicker},
data() {
return {
token: localStorage.getItem("token"),
token: sessionStorage.getItem("token"),
select: [],
loginUser: {
id: 381496,
name: "clay",
selected: false,
sex: null,
type: "user"
}
loginUser: {}
}
},
mounted() {
let user = sessionStorage.getItem("user")
let user = sessionStorage.getItem("userInfo")
if (user !== null && user !== '') {
this.loginUser = JSON.parse(user)
this.select.push(this.loginUser)
@ -63,7 +58,7 @@ export default {
},
methods: {
getToken() {
localStorage.clear()
sessionStorage.clear()
axios.post(
"http://gateway.mytwins.top/auth/workflow/login",
// "http://localhost:8000/auth/workflow/login",
@ -74,9 +69,9 @@ export default {
uuid: "string"
}
).then(res => {
console.log(res)
sessionStorage.setItem("userInfo",JSON.stringify(this.loginUser))
this.token = res.data.data
localStorage.setItem("token", this.token)
sessionStorage.setItem("token", this.token)
})
},
selectedUser(select) {
@ -95,7 +90,7 @@ export default {
},
//显示角色选择框
showRolePicker() {
localStorage.clear()
sessionStorage.clear()
this.$refs.userPicker.showUserPicker()
},
to(path) {

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

@ -90,12 +90,13 @@ export const TRIGGER_PROPS = {
],
retry: 1,
handlerByScript: false,
success: 'function handlerOk(res) {\n return true;\n}',
success: 'function handlerSuccess(res) {\n return true;\n}',
fail: 'function handlerFail(res) {\n return true;\n}'
},
email:{
subject: '',
to: [],
cc: [],
content: ''
}
}

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

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

1
flowable-engine-web/src/views/common/process/config/CcNodeConfig.vue
View File

@ -30,7 +30,6 @@ export default {
return this.config.shouldAdd || false
},
set(val){
console.log("asdjhajdhasjdhasdhasjdad")
this.config.shouldAdd = val
}
},

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

@ -23,7 +23,7 @@
<span style="margin-right: 10px">Header请求头</span>
<el-button type="text" @click="addItem(config.http.headers)"> + 添加</el-button>
</div>
<div v-for="(header, index) in config.http.headers" :key="header.name">
<div v-for="(header, index) in config.http.headers" :key="index">
- <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>
@ -38,7 +38,7 @@
</el-form-item>
<el-form-item label="Header请求参数" prop="text">
<div slot="label">
<span style="margin-right: 10px">Header请求参数 </span>
<span style="margin-right: 10px">请求参数 </span>
<el-button style="margin-right: 20px" type="text" @click="addItem(config.http.params)"> + 添加</el-button>
<span>参数类型 - </span>
<el-radio-group size="mini" style="margin: 0 5px;" v-model="config.http.contentType">
@ -46,14 +46,14 @@
<el-radio-button label="FORM">form</el-radio-button>
</el-radio-group>
</div>
<div v-for="(param, index) in config.http.params" :key="param.name">
<div v-for="(param, index) in config.http.params" :key="index">
- <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-option v-for="form in forms" :key="form.id" :label="form.title" :value="form.title"></el-option>
<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"/>
@ -70,12 +70,12 @@
</div>
<span class="item-desc" v-if="config.http.handlerByScript">
👉 返回值为 ture 则流程通过，为 false 则流程将被驳回
<div>支持函数
<span style="color: dodgerblue">setFormByName(
<span style="color: #939494">'表单字段名', '表单字段值'</span>
)</span>
可改表单数据
</div>
<!-- <div>支持函数-->
<!-- <span style="color: dodgerblue">setFormByName(-->
<!-- <span style="color: #939494">'表单字段名', '表单字段值'</span>-->
<!-- )</span>-->
<!-- 可改表单数据-->
<!-- </div>-->
</span>
<span class="item-desc" v-else>👉 无论请求结果如何，均通过</span>
<div v-if="config.http.handlerByScript">
@ -96,7 +96,12 @@
</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-option v-for="item in config.email.to" :key="item" :label="item" :value="item"></el-option>
<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-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">

2
flowable-engine-web/src/views/common/process/nodes/CcNode.vue
View File

@ -28,7 +28,7 @@ export default {
computed: {
selectUser() {
return {
show: this.config.props.assignedType !== 'ASSIGN_USER',
show: this.config.props.assignedType !== 'ASSIGN_USER' && this.config.props.shouldAdd,
multiple: true
};
},