Showing
1 changed file
with
19 additions
and
10 deletions
| ... | @@ -907,12 +907,17 @@ export default { | ... | @@ -907,12 +907,17 @@ export default { |
| 907 | localStorage.setItem('showConfirmation', '0'); | 907 | localStorage.setItem('showConfirmation', '0'); |
| 908 | }); | 908 | }); |
| 909 | // 监听 resize 事件 | 909 | // 监听 resize 事件 |
| 910 | - // window.addEventListener('resize', function () { | 910 | + window.addEventListener('resize', function () { |
| 911 | - // state.detailModel = null; | 911 | + setTimeout(() => { |
| 912 | - // editor.closeModel(); | 912 | + nextTick(() => { |
| 913 | - // }); | 913 | + // 预览流程图的背景 |
| 914 | + $('.preview-container').find('.g6-grid').parent().css('zIndex', '0'); | ||
| 915 | + $('.preview-container').find('canvas').css('zIndex', '1').css('position', 'relative'); | ||
| 916 | + }) | ||
| 917 | + }, 500); | ||
| 918 | + }); | ||
| 914 | // 适口高度 | 919 | // 适口高度 |
| 915 | - state.window_height = $(window).height() - 200 + 'px'; | 920 | + state.window_height = $(window).height() - 150 + 'px'; |
| 916 | }); | 921 | }); |
| 917 | 922 | ||
| 918 | /** | 923 | /** |
| ... | @@ -2274,10 +2279,11 @@ export default { | ... | @@ -2274,10 +2279,11 @@ export default { |
| 2274 | 2279 | ||
| 2275 | // state.detailModel = model; | 2280 | // state.detailModel = model; |
| 2276 | console.warn(model); | 2281 | console.warn(model); |
| 2277 | - if (model.id !== 'start-node') { | 2282 | + if (model.id === 'end-node' || model.id === 'start-node') { |
| 2278 | - state.preview_form_url = 'https://oa-dev.onwall.cn/f/custom_form/front/index.html#/?code=fboupg&model=preview' | 2283 | + ElNotification.error('该节点无法预览'); |
| 2279 | - } else { | ||
| 2280 | state.preview_form_url = null; | 2284 | state.preview_form_url = null; |
| 2285 | + } else { | ||
| 2286 | + state.preview_form_url = 'https://oa-dev.onwall.cn/f/custom_form/front/index.html#/?code=fboupg&model=preview' | ||
| 2281 | } | 2287 | } |
| 2282 | } | 2288 | } |
| 2283 | 2289 | ||
| ... | @@ -2620,8 +2626,11 @@ body { | ... | @@ -2620,8 +2626,11 @@ body { |
| 2620 | } | 2626 | } |
| 2621 | .preview-dialog { | 2627 | .preview-dialog { |
| 2622 | .el-dialog__body { | 2628 | .el-dialog__body { |
| 2623 | - padding-right: 0; | 2629 | + padding: 0; |
| 2624 | - padding-left: 0; | 2630 | + padding-bottom: 25px; |
| 2631 | + } | ||
| 2632 | + .el-dialog__footer { | ||
| 2633 | + padding: 0; | ||
| 2625 | } | 2634 | } |
| 2626 | } | 2635 | } |
| 2627 | .preview-detail-container { | 2636 | .preview-detail-container { | ... | ... |
-
Please register or login to post a comment