gyyg-components 0.3.11 → 0.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gyyg-components",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "private": false,
   "main": "lib/gyyg-components.umd.js",
   "scripts": {

package/src/components/MecDialog/MecDialog.vue

@@ -18,13 +18,23 @@
       @close="closeMethod"
       :destroy-on-close="destroyOnClose"
       :modal='modal'
+      ref="dialog"
     >
-      <div slot="title" style="font-size: 16px; color: #303133;">
-        <el-icon :class="titleIcon" style="color: #1890ff; font-size: 18px;margin-right: 5px;"></el-icon>
+      <div
+        slot="title"
+        style="font-size: 16px; color: #303133;"
+      >
+        <el-icon
+          :class="titleIcon"
+          style="color: #1890ff; font-size: 18px;margin-right: 5px;"
+        ></el-icon>
         <span>{{ title }}</span>
       </div>
       <slot name="body" />
-      <div v-if="footer" slot="footer">
+      <div
+        v-if="footer"
+        slot="footer"
+      >
         <slot name="footer" />
       </div>
     </el-dialog>
@@ -77,7 +87,7 @@ export default {
       type: Boolean
     },
     //是否需要遮罩层
-    modal:{
+    modal: {
       default: true,
       type: Boolean
     },
@@ -106,16 +116,24 @@ export default {
   },
   computed: {
     customClass() {
-      let className = this.dialogClass;
+      let className = this.height !== 'auto' ? 'haveHeight-dialog' : this.dialogClass;
       return className;
     },
   },
+
   created() {
     this.type === "fullscreen" && (this.fullscreen = true);
   },
   methods: {
     open() {
       this.visible = true;
+      console.log(this.height)
+      if(this.height !== 'auto' && this.height) {
+        this.$nextTick(() => {
+          this.$refs.dialog.$el.firstElementChild.style.height = this.height;
+        });
+      }
+      
     },
     close() {
       this.visible = false;
@@ -134,18 +152,21 @@ export default {
 .base-dialog {
   text-align: left;
 }
+
 /deep/.el-dialog__wrapper {
   overflow: hidden;
   display: flex;
   justify-content: center;
   align-items: center;
   margin: auto 0;
+
   .el-dialog {
     display: flex;
     flex-direction: column;
     border-radius: 8px;
     margin: 0;
     margin-top: 0 !important;
+
     .el-dialog__header {
       text-align: left;
       background-color: #efefef;
@@ -200,6 +221,7 @@ export default {
     }
 
     .custom-table {
+
       // 取消表格下边线
       tbody tr:last-child td {
         border-bottom: none !important;
@@ -219,6 +241,7 @@ export default {
     .el-dialog__body {
       padding: 10px;
     }
+
     .el-dialog__footer {
       padding: 10px;
       border: none;
@@ -230,14 +253,12 @@ export default {
 }
 
 .shan-maintenance-dialog {
-    /deep/ .el-dialog {
-        height: 90%;
-    }
+  /deep/ .el-dialog {
+    height: 90%;
+  }
 }
+
 /deep/ .el-dialog {
   height: 100%;
 }
-/deep/ .el-dialog {
-  height: v-bind(height); /* 动态绑定 height */
-}
 </style>

package/src/directive/el-drag-dialog/drag.js

@@ -2,7 +2,7 @@ export default {
   bind(el, binding, vnode) {
     const dialogHeaderEl = el.querySelector('.el-dialog__header');
     const dragDom = el.querySelector('.el-dialog');
-    
+
     // 设置鼠标样式为可移动
     dialogHeaderEl.style.cssText += ';cursor:move;';
 
@@ -15,11 +15,19 @@ export default {
       }
     })();
 
+    let isMouseDown = false; // 标记鼠标是否按下
+
+    // 监听鼠标进入页面时的状态
+    document.addEventListener('mouseenter', () => {
+      isMouseDown = false; // 确保初始状态为未按下
+    });
+
     dialogHeaderEl.onmousedown = (e) => {
+      isMouseDown = true; // 鼠标按下时设置为 true
+
       // 鼠标按下时，计算当前元素距离可视区的距离
       const disX = e.clientX - dialogHeaderEl.offsetLeft;
       const disY = e.clientY - dialogHeaderEl.offsetTop;
-      console.log(disX, disY)
 
       // 获取初始位置样式
       let styL = getStyle(dragDom, 'left');
@@ -34,38 +42,46 @@ export default {
         styT = +styT.replace(/\px/g, '');
       }
 
-      document.onmousemove = function(e) {
-        // 计算移动的距离
-        let left = e.clientX - disX;
-        let top = e.clientY - disY;
-        console.log(left, top)
+      const onMouseMove = (e) => {
+        if (!isMouseDown) return; // 如果鼠标未按下，直接返回
 
-        // 获取屏幕宽高
-        const screenWidth = document.body.clientWidth;
-        const screenHeight = document.body.clientHeight;
+        requestAnimationFrame(() => {
+          // 计算移动的距离
+          let left = e.clientX - disX;
+          let top = e.clientY - disY;
 
-        // 获取对话框宽高
-        const dialogWidth = dragDom.offsetWidth;
-        const dialogHeight = dragDom.offsetHeight;
+          // 获取屏幕宽高
+          const screenWidth = document.body.clientWidth;
+          const screenHeight = document.body.clientHeight;
 
-        // 边界限制逻辑
-        left = Math.max(0, Math.min(left + styL, screenWidth - dialogWidth));
-        top = Math.max(0, Math.min(top + styT, screenHeight - dialogHeight));
+          // 获取对话框宽高
+          const dialogWidth = dragDom.offsetWidth;
+          const dialogHeight = dragDom.offsetHeight;
 
-        // 更新对话框位置
-        dragDom.style.left = `${left}px`;
-        dragDom.style.top = `${top}px`;
-        console.log(left, top)
+          // 边界限制逻辑
+          left = Math.max(0, Math.min(left + styL, screenWidth - dialogWidth));
+          top = Math.max(0, Math.min(top + styT, screenHeight - dialogHeight));
 
-        // 触发拖拽事件
-        vnode.child.$emit('dragDialog');
+          // 更新对话框位置
+          dragDom.style.left = `${left}px`;
+          dragDom.style.top = `${top}px`;
+
+          // 触发拖拽事件
+          vnode.child.$emit('dragDialog');
+        });
       };
 
-      document.onmouseup = function() {
+      const onMouseUp = () => {
+        isMouseDown = false; // 鼠标松开时设置为 false
+
         // 清除事件监听
-        document.onmousemove = null;
-        document.onmouseup = null;
+        document.removeEventListener('mousemove', onMouseMove);
+        document.removeEventListener('mouseup', onMouseUp);
       };
+
+      // 绑定事件监听
+      document.addEventListener('mousemove', onMouseMove);
+      document.addEventListener('mouseup', onMouseUp); // 在 document 上监听 mouseup
     };
-  }
+  },
 };

package/src/directive/hasPermi.js

@@ -6,22 +6,20 @@
  Vue.directive('hasPermi', {
     inserted(el, binding, vnode) {
     const { value } = binding
-    console.log('value',value)
     const all_permission = "*:*:*";
     const permissions = localStorage.getItem('authorities').split(',')//用户拥有的权限
     if (value && value instanceof Array && value.length > 0) {
-        const permissionFlag = value//
-
+        const permissionFlag =  value.join().split(',')//
+        console.log(permissionFlag)
         const hasPermissions = permissions.some(permission => {
         return all_permission === permission || permissionFlag.includes(permission)
         })
+        console.log(hasPermissions)
         if (!hasPermissions) {
             console.log(el.parentNode);
             el.parentNode && el.parentNode.removeChild(el)
         }
-    } else {
-        throw new Error(`请设置操作权限标签值`)
-    }
+    } 
     }
   })