root
/
yibu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

隐藏0.01未完成功能

main
pixel 4 years ago
parent
da0f416e2e
commit
4f67349377
7 changed files with 43 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      server/constant/workflow.go
  2. 18
      server/model/wf_process.go
  3. 17
      server/service/wk_process.go
  4. 4
      web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue
  5. 21
      web/src/components/gva-wfd/components/ItemPanel.vue
  6. 1
      web/src/components/gva-wfd/components/Wfd.vue
  7. 1
      web/src/view/workflow/workflowCreate/workflowCreate.vue

19
server/constant/workflow.go
View File

@ -0,0 +1,19 @@
package constant
//定义clazz常量
const (
USER_TASK string = "userTask" // 审批节点
//SCRIPT_TASK string = "scriptTask" //脚本节点
//RECEIVE_TASK string = "receiveTask"
//MAIL_TASK string = "mailTask" //邮件节点
//TIMER_START string = "timerStart" // 定时节点
//MESSAGE_START string = "messageStart" // 消息节点
EXCLUSIVE_GATEWAY string = "exclusiveGateway" // 排他网关
INCLUSIVE_GATEWAY string = "inclusiveGateway" // 包容网关
PARELLEL_GATEWAY string = "parallelGateway" // 并行网关
FLOW string = "flow" // 连线
START string = "start" // 开始节点
END string = "end" // 结束节点
//PROCESS string = "process" // 基础节点
)

18
server/model/wf_process.go
View File

@ -55,24 +55,6 @@ func (w WorkflowBase) GetWorkflowBase() (workflowBase WorkflowBase) {
return w
}
//定义clazz常量
const (
USER_TASK string = "userTask"
SCRIPT_TASK string = "scriptTask"
RECEIVE_TASK string = "receiveTask"
MAIL_TASK string = "mailTask"
TIMER_START string = "timerStart"
MESSAGE_START string = "messageStart"
EXCLUSIVE_GATEWAY string = "exclusiveGateway" // 排他网关
INCLUSIVE_GATEWAY string = "inclusiveGateway" // 包容网关
PARELLEL_GATEWAY string = "parallelGateway" // 并行网关
FLOW string = "flow"
START string = "start"
END string = "end"
PROCESS string = "process"
)
type WorkflowMove struct {
global.GVA_MODEL
WorkflowProcessID string `json:"workflowProcessID" gorm:"comment:工作流模板ID"`

17
server/service/wk_process.go
View File

@ -3,6 +3,7 @@ package service
import (
"errors"
"fmt"
"gin-vue-admin/constant"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
@ -134,7 +135,7 @@ func GetWorkflowProcess(id string) (err error, workflowProcess model.WorkflowPro
//@return: err error, workflowNodes []model.WorkflowNode
func FindWorkflowStep(id string) (err error, workflowNode model.WorkflowProcess) {
err = global.GVA_DB.Preload("Nodes", "clazz = ?", model.START).Where("id = ?", id).First(&workflowNode).Error
err = global.GVA_DB.Preload("Nodes", "clazz = ?", constant.START).Where("id = ?", id).First(&workflowNode).Error
return
}
@ -221,7 +222,7 @@ func complete(tx *gorm.DB, wfm *model.WorkflowMove) (err error) {
return txErr
}
if nodeInfo.Clazz == model.START || nodeInfo.Clazz == model.USER_TASK {
if nodeInfo.Clazz == constant.START || nodeInfo.Clazz == constant.USER_TASK {
txErr = tx.Find(&Edges, "workflow_process_id = ? and source = ?", wfm.WorkflowProcessID, wfm.WorkflowNodeID).Error
if txErr != nil {
return txErr
@ -273,11 +274,11 @@ func complete(tx *gorm.DB, wfm *model.WorkflowMove) (err error) {
}
}
}
} else if nodeInfo.Clazz == model.EXCLUSIVE_GATEWAY {
} else if nodeInfo.Clazz == constant.EXCLUSIVE_GATEWAY {
return errors.New("目前只支持start节点和userTask功能，其他功能正在开发中")
} else if nodeInfo.Clazz == model.INCLUSIVE_GATEWAY {
} else if nodeInfo.Clazz == constant.INCLUSIVE_GATEWAY {
return errors.New("目前只支持start节点和userTask功能，其他功能正在开发中")
} else if nodeInfo.Clazz == model.PARELLEL_GATEWAY {
} else if nodeInfo.Clazz == constant.PARELLEL_GATEWAY {
return errors.New("目前只支持start节点和userTask功能，其他功能正在开发中")
} else {
return errors.New("目前只支持start节点和userTask功能，其他功能正在开发中")
@ -296,7 +297,7 @@ func createNewWorkflowMove(tx *gorm.DB, oldWfm *model.WorkflowMove, targetNodeID
return txErr, []model.WorkflowMove{}
}
switch nodeInfo.Clazz {
case model.EXCLUSIVE_GATEWAY:
case constant.EXCLUSIVE_GATEWAY:
// 当为排他网关时候 选择一个参数进行排他线路选择
txErr := tx.First(&edge, "workflow_process_id = ? and source = ? and condition_expression = ?", oldWfm.WorkflowProcessID, nodeInfo.ID, oldWfm.Param).Error
if txErr != nil {
@ -313,7 +314,7 @@ func createNewWorkflowMove(tx *gorm.DB, oldWfm *model.WorkflowMove, targetNodeID
Action: "",
IsActive: true})
return nil, newWfm
case model.INCLUSIVE_GATEWAY:
case constant.INCLUSIVE_GATEWAY:
// 当为包容网关时，需要等待其他网关执行结束才进行创建
txErr := tx.Find(&edges, "workflow_process_id = ? and target = ?", oldWfm.WorkflowProcessID, nodeInfo.ID).Error
if txErr != nil {
@ -361,7 +362,7 @@ func createNewWorkflowMove(tx *gorm.DB, oldWfm *model.WorkflowMove, targetNodeID
}
return nil, newWfm
case model.PARELLEL_GATEWAY:
case constant.PARELLEL_GATEWAY:
// 当为并行网关时候 找出所有线路创建并行节点
txErr := tx.Find(&edges, "workflow_process_id = ? and source = ?", oldWfm.WorkflowProcessID, nodeInfo.ID).Error
if txErr != nil {

4
web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue
View File

@ -74,14 +74,14 @@
@input="(value) => onChange('dueDate', value)"
/>
</div>
<div class="panelRow">
<!-- <div class="panelRow">
<el-checkbox
@change="(value) => onChange('isSequential', value)"
:disabled="readOnly"
:value="!!model.isSequential"
>{{ i18n['userTask.counterSign'] }}</el-checkbox
>
</div>
</div> -->
<div class="panelRow">
<div>视图文件路径（以view开头）</div>

21
web/src/components/gva-wfd/components/ItemPanel.vue
View File

@ -5,9 +5,9 @@
<img data-item="{clazz:'start',size:'50*50',label:''}"
:src="require('../assets/flow/start.svg')" style="width:42px;height:42px" />
<div>{{i18n['startEvent']}}</div>
<img data-item="{clazz:'timerStart',size:'50*50',label:''}"
<!-- <img data-item="{clazz:'timerStart',size:'50*50',label:''}"
:src="require('../assets/flow/timer-start.svg')" style="width:42px;height:42px" />
<div>{{i18n['timerEvent']}}</div>
<div>{{i18n['timerEvent']}}</div> -->
<!-- <img data-item="{clazz:'messageStart',size:'50*50',label:''}"
:src="require('../assets/flow/message-start.svg')" style="width:42px;height:42px" />
<div>{{i18n['messageEvent']}}</div>
@ -19,18 +19,18 @@
<img :data-item="userTaskData"
:src="require('../assets/flow/user-task.svg')" style="width:80px;height:44px" />
<div>{{i18n['userTask']}}</div>
<img :data-item="scriptTaskData"
<!-- <img :data-item="scriptTaskData"
:src="require('../assets/flow/script-task.svg')" style="width:80px;height:44px" />
<div>{{i18n['scriptTask']}}</div>
<div>{{i18n['scriptTask']}}</div> -->
<!-- <img :data-item="javaTaskData"
:src="require('../assets/flow/java-task.svg')" style="width:80px;height:44px" />
<div>{{i18n['javaTask']}}</div> -->
<img :data-item="mailTaskData"
<!-- <img :data-item="mailTaskData"
:src="require('../assets/flow/mail-task.svg')" style="width:80px;height:44px" />
<div>{{i18n['mailTask']}}</div>
<img :data-item="receiveTaskData"
:src="require('../assets/flow/receive-task.svg')" style="width:80px;height:44px" />
<div>{{i18n['receiveTask']}}</div>
<div>{{i18n['receiveTask']}}</div> -->
</el-collapse-item>
<el-collapse-item :title="i18n['gateway']" name="3">
<img data-item="{clazz:'exclusiveGateway',size:'60*60',label:''}"
@ -43,23 +43,24 @@
:src="require('../assets/flow/inclusive-gateway.svg')" style="width:48px;height:48px" />
<div>{{i18n['inclusiveGateway']}}</div>
</el-collapse-item>
<el-collapse-item :title="i18n['catch']" name="4">
<!-- <el-collapse-item :title="i18n['catch']" name="4">
<img data-item="{clazz:'timerCatch',size:'60*35',label:''}"
:src="require('../assets/flow/timer-catch.svg')" style="width:58px;height:38px" />
<div>{{i18n['timerEvent']}}</div>
<!-- <img data-item="{clazz:'messageCatch',size:'60*35',label:''}"
<img data-item="{clazz:'messageCatch',size:'60*35',label:''}"
:src="require('../assets/flow/message-catch.svg')" style="width:58px;height:38px" />
<div>{{i18n['messageEvent']}}</div>
<img data-item="{clazz:'signalCatch',size:'60*35',label:''}"
:src="require('../assets/flow/signal-catch.svg')" style="width:58px;height:38px" />
<div>{{i18n['signalEvent']}}</div> -->
</el-collapse-item>
<div>{{i18n['signalEvent']}}</div>
</el-collapse-item> -->
<el-collapse-item :title="i18n['end']" name="5">
<img data-item="{clazz:'end',size:'50*50',label:''}"
:src="require('../assets/flow/end.svg')" style="width:42px;height:42px" />
<div>{{i18n['endEvent']}}</div>
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>

1
web/src/components/gva-wfd/components/Wfd.vue
View File

@ -249,6 +249,7 @@
},
created() {
this.processModel = this.propProcessModel
this.selectedModel = this.processModel
},
};
</script>

1
web/src/view/workflow/workflowCreate/workflowCreate.vue
View File

@ -1,5 +1,6 @@
<template>
<div>
<p style="text-align:center;padding-bottom:4px">当前版本为0.01试用版本，可满足最简单的流程功能，未完成功能，如脚本节点，邮件节点等目前暂时注释入口，期待大家PR</p>
<el-button
size="small"
style="float: right; margin-top: 6px; margin-right: 6px"

Write Preview
Loading…
Cancel
Save