From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/components/jeecg/JModal/JModal.vue | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/components/jeecg/JModal/JModal.vue b/src/components/jeecg/JModal/JModal.vue
index 1e5bb9f..bc8936e 100644
--- a/src/components/jeecg/JModal/JModal.vue
+++ b/src/components/jeecg/JModal/JModal.vue
@@ -8,7 +8,7 @@
v-on="$listeners"
@ok="handleOk"
@cancel="handleCancel"
- destroyOnClose
+ :destroyOnClose="destroyOnClose"
>
<slot></slot>
@@ -49,13 +49,17 @@
import { getClass, getStyle } from '@/utils/props-util'
import { triggerWindowResizeEvent } from '@/utils/util'
+import ModalDragMixins from './ModalDragMixins'
export default {
name: 'JModal',
+ mixins: [ModalDragMixins],
props: {
title: String,
// 鍙娇鐢� .sync 淇グ绗�
visible: Boolean,
+ // 鏄惁寮�鍚嫋鎷�
+ draggable: Boolean,
// 鏄惁鍏ㄥ睆寮圭獥锛屽綋鍏ㄥ睆鏃舵棤璁哄浣曢兘浼氱姝� body 婊氬姩銆傚彲浣跨敤 .sync 淇グ绗�
fullscreen: {
type: Boolean,
@@ -68,6 +72,11 @@
},
// 鐐瑰嚮纭畾鎸夐挳鐨勬椂鍊欐槸鍚﹀叧闂脊绐�
okClose: {
+ type: Boolean,
+ default: true
+ },
+ // 鍏抽棴鏃堕攢姣佸脊绐楀唴瀹�
+ destroyOnClose: {
type: Boolean,
default: true
},
@@ -162,6 +171,19 @@
toggleFullscreen() {
this.innerFullscreen = !this.innerFullscreen
triggerWindowResizeEvent()
+ // 寮�鍚嫋鎷藉悗鐨勭壒娈婂鐞�
+ if (this.draggable) {
+ // 鍏ㄥ睆鐨勬椂鍊欑姝㈡嫋鍔�
+ if (this.innerFullscreen) {
+ // 杩樺師寮圭獥鐨勪綅缃负0,0
+ this.setModalPosition(0, 0, false)
+ this.dragSettings.headerEl.style.cursor = null
+ } else {
+ // 鍙栨秷鍏ㄥ睆鐨勬椂鍊欙紝灏嗗脊绐楃Щ鍔ㄥ埌涓婃璁板綍鐨勪綅缃�
+ this.resetModalPosition()
+ this.dragSettings.headerEl.style.cursor = 'move'
+ }
+ }
},
}
--
Gitblit v1.9.3