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

Merge pull request 'clay : 更改请求接口' (#73) from master into pro
continuous-integration/drone/push Build is failing Details 

Reviewed-on: #73
This commit is contained in:
clay 2023-06-14 07:53:02 +00:00
parent 72713a2846 d4f1174422
commit b776a272e6
14 changed files with 93 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flowable-engine-web/package.json
View File

@ -10,6 +10,7 @@
"dependencies": {
"axios": "^0.20.0",
"clipboard": "^2.0.6",
"codemirror": "^6.0.1",
"core-js": "^3.6.5",
"element-ui": "^2.15.8",
"less": "^3.12.2",

14
flowable-engine-web/src/api/common.js
View File

@ -4,14 +4,22 @@ import request from '@/api/request.js'
export function deleteFile(fileId) {
// 删除文件
return request({
url: '/flowable/process/file/' + fileId,
url: '/workflow/process/file/' + fileId,
method: 'delete',
})
}
export function getProcessListener(type){
export function getProcessListener(type) {
return request({
url: `/flowable/process/listener/option/${type}`,
url: `/workflow/process/listener/option/${type}`,
method: 'get',
})
}
export function login(param) {
return request({
url: "/auth/workflow/login",
method: "post",
data: param
});
}

10
flowable-engine-web/src/api/listener.js
View File

@ -8,7 +8,7 @@ import request from '@/api/request.js'
// 获取系统内置监听器列表
export function getListenerList(param) {
return request({
url: "/flowable/process/listener",
url: "/workflow/process/listener",
method: "get",
data: param
})
@ -16,14 +16,14 @@ export function getListenerList(param) {
// 获取系统内置监听器详细信息
export function getListenerById(id) {
return request({
url: "/flowable/process/listener/"+id,
url: "/workflow/process/listener/"+id,
method: "get"
})
}
// 新增系统内置监听器
export function addListener(param) {
return request({
url: "/flowable/process/listener",
url: "/workflow/process/listener",
method: "post",
data: param
})
@ -31,7 +31,7 @@ export function addListener(param) {
// 修改系统内置监听器
export function updateListener(param) {
return request({
url: '/flowable/process/listener',
url: '/workflow/process/listener',
method: "put",
data: param
})
@ -39,7 +39,7 @@ export function updateListener(param) {
//删除系统内置监听器
export function deleteListener(idList) {
return request({
url: "/flowable/process/listener/" + idList,
url: "/workflow/process/listener/" + idList,
method: "delete",
})
}

16
flowable-engine-web/src/api/processDefinition.js
View File

@ -7,7 +7,7 @@ import request from '@/api/request.js'
*/
export function getProcessDefinitionList(param) {
return request({
url: "/flowable/process/definition",
url: "/workflow/process/definition",
method: "get",
params: param
})
@ -15,14 +15,14 @@ export function getProcessDefinitionList(param) {
export function getProcessDefinitionInfo(deploymentId) {
return request({
url: "/flowable/process/definition/" + deploymentId,
url: "/workflow/process/definition/" + deploymentId,
method: "get",
})
}
export function getInitiateInfo(processDefinitionKey) {
return request({
url: "/flowable/process/definition/key/" + processDefinitionKey,
url: "/workflow/process/definition/key/" + processDefinitionKey,
method: "get",
})
}
@ -30,21 +30,21 @@ export function getInitiateInfo(processDefinitionKey) {
export function getHistoryVersion(processDefinitionKey) {
return request({
url: "/flowable/process/definition/history/" + processDefinitionKey,
url: "/workflow/process/definition/history/" + processDefinitionKey,
method: "get",
})
}
export function deleteHistoryVersion(deploymentId) {
return request({
url: "/flowable/process/definition/" + deploymentId,
url: "/workflow/process/definition/" + deploymentId,
method: "delete",
})
}
export function suspendProcessDefinition(processDefinitionId) {
return request({
url: "/flowable/process/definition/suspend",
url: "/workflow/process/definition/suspend",
method: "put",
data: processDefinitionId
})
@ -52,7 +52,7 @@ export function suspendProcessDefinition(processDefinitionId) {
export function activateProcessDefinition(processDefinitionId) {
return request({
url: "/flowable/process/definition/activate",
url: "/workflow/process/definition/activate",
method: "put",
data: processDefinitionId
})
@ -60,7 +60,7 @@ export function activateProcessDefinition(processDefinitionId) {
export function addProcessDefinition(param) {
return request({
url: "/flowable/process/definition",
url: "/workflow/process/definition",
method: "post",
data: param
})

12
flowable-engine-web/src/api/processInstance.js
View File

@ -7,14 +7,14 @@ import request from '@/api/request.js'
*/
export function startProcessInstance(param) {
return request({
url: "/flowable/process/instance/start",
url: "/workflow/process/instance/start",
method: "post",
data: param
})
}
export function restartProcessInstance(param) {
return request({
url: "/flowable/process/instance/restart",
url: "/workflow/process/instance/restart",
method: "post",
data: param
})
@ -22,21 +22,21 @@ export function restartProcessInstance(param) {
export function getAboutInstanceList() {
return request({
url: "/flowable/process/instance/about",
url: "/workflow/process/instance/about",
method: "get",
})
}
export function getInitiatedInstanceList() {
return request({
url: "/flowable/process/instance/self",
url: "/workflow/process/instance/self",
method: "get",
})
}
export function getInitiatedInstanceInfo(processInstanceId) {
return request({
url: "/flowable/process/instance/info/"+processInstanceId,
url: "/workflow/process/instance/info/"+processInstanceId,
method: "get",
})
}
@ -44,7 +44,7 @@ export function getInitiatedInstanceInfo(processInstanceId) {
export function getInitiatedInstanceReInfo(instanceId) {
return request({
url: "/flowable/process/instance/re/info/"+instanceId,
url: "/workflow/process/instance/re/info/"+instanceId,
method: "get",
})
}

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

@ -8,9 +8,10 @@ import "element-ui/lib/theme-chalk/index.css";
// 字体图标
export function getBaseUrl(){
return "http://gateway.feashow.cn"
// return "http://192.168.101.8:8000"
// return "http://gateway.feashow.cn"
// return "http://192.168.101.7:8000"
// return "http://localhost:8000"
return "/api";
}
const service = axios.create({

12
flowable-engine-web/src/api/task.js
View File

@ -4,27 +4,27 @@ import request from '@/api/request.js'
export function getTaskList() {
return request({
url: "/flowable/process/task",
url: "/workflow/process/task",
method: "get",
})
}
export function getTaskInfo(taskId) {
return request({
url: "/flowable/process/task/"+taskId,
url: "/workflow/process/task/"+taskId,
method: "get",
})
}
export function completeTask(params) {
return request({
url: "/flowable/process/task/complete",
url: "/workflow/process/task/complete",
method: "put",
data: params
})
}
export function refuseTask(params) {
return request({
url: "/flowable/process/task/refuse",
url: "/workflow/process/task/refuse",
method: "put",
data: params
})
@ -32,7 +32,7 @@ export function refuseTask(params) {
export function rollBackTask(params) {
return request({
url: "/flowable/process/task/rollback",
url: "/workflow/process/task/rollback",
method: "put",
data: params
})
@ -40,7 +40,7 @@ export function rollBackTask(params) {
export function addComment(params) {
return request({
url: "/flowable/process/task/comment",
url: "/workflow/process/task/comment",
method: "post",
data: params
})

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

@ -135,7 +135,7 @@ export default {
attachmentList: [],
disabled: false,
uploadParams: {},
uploadFileUrl: getBaseUrl() + "/flowable/process/file",
uploadFileUrl: getBaseUrl() + "/workflow/process/file",
headers: {
authorization: localStorage.getItem("token")
},

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

@ -36,8 +36,8 @@
</template>
<script>
import axios from "axios";
import UserPicker from "../components/common/UserPicker";
import {login} from '../api/common'
export default {
name: "Index",
@ -59,18 +59,14 @@ export default {
methods: {
getToken() {
localStorage.clear()
axios.post(
"http://gateway.feashow.cn/auth/workflow/login",
// "http://localhost:8000/auth/workflow/login",
{
login({
code: "string",
password: "926425",
username: this.loginUser.id,
uuid: "string"
}
).then(res => {
}).then(res => {
localStorage.setItem("userInfo",JSON.stringify(this.loginUser))
this.token = res.data.data
this.token = res.data
localStorage.setItem("token", this.token)
})
},

2
flowable-engine-web/src/views/admin/layout/FormDesign.vue
View File

@ -85,6 +85,8 @@
<form-component-config/>
</div>
</el-aside>
<w-dialog clickClose closeFree width="800px" :showFooter="false" :border="false" title="表单预览"
v-model="viewFormVisible">
<el-radio-group v-model="formPreviewModel" @change="formPreviewModelChange">

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

@ -18,7 +18,7 @@
:auto-upload="true"
:on-success="handleUploadSuccess"
:before-upload="beforeUpload">
<i slot="default" class="el-icon-plus"></i>
<i slot="default" class="el-icon-plus"></i>v
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<label class="el-upload-list__item-status-label">
@ -103,7 +103,7 @@ export default {
return {
fileList: [],
disabled: false,
uploadFileUrl: getBaseUrl() + "/flowable/process/file",
uploadFileUrl: getBaseUrl() + "/workflow/process/file",
headers: {
authorization: localStorage.getItem("token")
},

13
flowable-engine-web/src/views/common/process/nodes/AddNode.vue Normal file
View File

@ -0,0 +1,13 @@
<template>
<el-button size="small" round class="add-branch-btn-el" @click=""
</template>
<script>
export default {
name: "AddNode"
}
</script>
<style scoped>
</style>

1
flowable-engine-web/src/views/workspace/DisposalTask.vue
View File

@ -172,7 +172,6 @@ export default {
that.taskData = res.data;
that.$store.state.design = that.taskData;
that.$store.state.userTaskOption = that.taskData.userTaskOption;
console.log(that.taskData.userTaskOption,"that.taskData.userTaskOption")
this.loading = false;
});

55
flowable-engine-web/vue.config.js
View File

@ -5,32 +5,39 @@ module.exports = {
outputDir: "dist",
// 开发环境显示报错位置 生产环境设置为false减少打包体积
productionSourceMap: true,
// devServer: {
// host: '0.0.0.0',
// port: 80,
// open: true,
// proxy: {
// // detail: https://cli.vuejs.org/config/#devserver-proxy
// [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8080`,
// changeOrigin: true,
// pathRewrite: {
// ['^' + process.env.VUE_APP_BASE_API]: ''
// }
// }
// },
// disableHostCheck: true
// },
devServer: {
port: 88,
disableHostCheck: true,
/*overlay: {
warning: false,
errors: false
}*/
host: '0.0.0.0',
port: 80,
open: true,
proxy: {
'^/api': {
target: 'http://gateway.feashow.cn',
ws: true,
changeOrigin: true,
pathRewrite: {
'^/api': ''
}
},
// detail: https://cli.vuejs.org/config/#devserver-proxy
// api: {
// target: `http://localhost:8000`,
// changeOrigin: true,
// pathRewrite: {
// ['^api']: '/'
// }
// }
},
disableHostCheck: true
},
// devServer: {
// port: 88,
// disableHostCheck: true,
// /*overlay: {
// warning: false,
// errors: false
// }*/
//
// },
pluginOptions: {
"style-resources-loader": {
preProcessor: "less",