Showing
1 changed file
with
8 additions
and
3 deletions
| ... | @@ -412,7 +412,7 @@ | ... | @@ -412,7 +412,7 @@ |
| 412 | </template> | 412 | </template> |
| 413 | </el-dialog> | 413 | </el-dialog> |
| 414 | </div> | 414 | </div> |
| 415 | - <!-- TODO: 提示功能 --> | 415 | + <!-- TAG: 提示功能 --> |
| 416 | <div v-if="state.current_enable_version === state.select_flow_version" class="add-tip"> | 416 | <div v-if="state.current_enable_version === state.select_flow_version" class="add-tip"> |
| 417 | <i class="el-icon-warning icon"></i> <span style="font-size: 13px;">流程已启用,如需增删节点和连线,请 <span class="add" @click="addFlowVersion">添加新版本</span></span> | 417 | <i class="el-icon-warning icon"></i> <span style="font-size: 13px;">流程已启用,如需增删节点和连线,请 <span class="add" @click="addFlowVersion">添加新版本</span></span> |
| 418 | </div> | 418 | </div> |
| ... | @@ -726,6 +726,7 @@ export default { | ... | @@ -726,6 +726,7 @@ export default { |
| 726 | flow_id: '', | 726 | flow_id: '', |
| 727 | form_id: '', | 727 | form_id: '', |
| 728 | type: '', | 728 | type: '', |
| 729 | + _path: '', // 预览流程表单时的参数 | ||
| 729 | }; | 730 | }; |
| 730 | // 将url以问号为分隔符拆分为两部分 | 731 | // 将url以问号为分隔符拆分为两部分 |
| 731 | const parts = url.split("?"); | 732 | const parts = url.split("?"); |
| ... | @@ -1136,6 +1137,7 @@ export default { | ... | @@ -1136,6 +1137,7 @@ export default { |
| 1136 | } | 1137 | } |
| 1137 | 1138 | ||
| 1138 | const copyFLowVersion = async () => { // 复制版本流程 | 1139 | const copyFLowVersion = async () => { // 复制版本流程 |
| 1140 | + // TODO: 复制时后台数据也需要把单个节点的信息复制过去,前端只是复制了一个结构 | ||
| 1139 | let { nodes, edges } = editor.editorState.graph.save(); | 1141 | let { nodes, edges } = editor.editorState.graph.save(); |
| 1140 | 1142 | ||
| 1141 | // 使用时需要把自定义节点的类型带过去 activity/control | 1143 | // 使用时需要把自定义节点的类型带过去 activity/control |
| ... | @@ -2377,11 +2379,14 @@ export default { | ... | @@ -2377,11 +2379,14 @@ export default { |
| 2377 | model.labelCfg = model.labelCfg || { style: {} } | 2379 | model.labelCfg = model.labelCfg || { style: {} } |
| 2378 | model.data = model.data ? model.data : {}; | 2380 | model.data = model.data ? model.data : {}; |
| 2379 | 2381 | ||
| 2380 | - if (model.id === 'end-node' || model.id === 'start-node') { | 2382 | + if (model.id === 'end-node') { |
| 2381 | ElNotification.error('该节点无法预览'); | 2383 | ElNotification.error('该节点无法预览'); |
| 2382 | state.preview_form_url = null; | 2384 | state.preview_form_url = null; |
| 2383 | } else { | 2385 | } else { |
| 2384 | - state.preview_form_url = 'https://oa-dev.onwall.cn/f/custom_form/front/index.html#/?code=fboupg&model=preview' | 2386 | + let flow_id = getFlowId(); |
| 2387 | + // TODO: 等待正式参数 | ||
| 2388 | + let _path = urlQuery._path? urlQuery._path : ''; | ||
| 2389 | + state.preview_form_url = `/admin/?a=flow&t=view&p=${_path}&_flow=${flow_id}&_flow_node=${model.id}`; | ||
| 2385 | } | 2390 | } |
| 2386 | } | 2391 | } |
| 2387 | 2392 | ... | ... |
-
Please register or login to post a comment