gyyg-components 0.3.12 → 0.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gyyg-components",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "private": false,
   "main": "lib/gyyg-components.umd.js",
   "scripts": {
@@ -13,7 +13,7 @@
     "babel-plugin-component": "^1.1.1",
     "core-js": "^3.6.5",
     "element-resize-detector": "^1.2.4",
-    "element-ui": "2.15.6",
+    "element-ui": "^2.15.14",
     "moment": "^2.30.1",
     "sortablejs": "^1.15.6",
     "vue": "^2.6.11"

package/src/components/MecInput/MecInput.vue

@@ -143,7 +143,7 @@
         } else if (this.inputType === 'english') {
           // 只允许输入英文
           value = value.replace(/[^a-zA-Z\s]/g, '');
-        }else if (this.inputType === 'amount') {
+        }else if (this.inputType === 'amount') { // 金额
           // 只允许输入数字和小数点
           value = value.replace(/[^0-9.]/g, '');
           // 确保小数点只出现一次

package/src/components/MecTable/MecTable.vue

@@ -206,6 +206,8 @@ export default {
             default: () => {
                 return {
                     backgroundColor: "#EFF3F8",
+                    fontWeight: 'normal',
+                    color: '#303133',
                 }
             }
         },

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,7 +15,16 @@ 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;
@@ -33,36 +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 screenWidth = document.body.clientWidth;
-        const screenHeight = document.body.clientHeight;
-
-        // 获取对话框宽高
-        const dialogWidth = dragDom.offsetWidth;
-        const dialogHeight = dragDom.offsetHeight;
-
-        // 边界限制逻辑
-        left = Math.max(0, Math.min(left + styL, screenWidth - dialogWidth));
-        top = Math.max(0, Math.min(top + styT, screenHeight - dialogHeight));
-
-        // 更新对话框位置
-        dragDom.style.left = `${left}px`;
-        dragDom.style.top = `${top}px`;
-        // 触发拖拽事件
-        vnode.child.$emit('dragDialog');
+      const onMouseMove = (e) => {
+        if (!isMouseDown) return; // 如果鼠标未按下，直接返回
+
+        requestAnimationFrame(() => {
+          // 计算移动的距离
+          let left = e.clientX - disX;
+          let top = e.clientY - disY;
+
+          // 获取屏幕宽高
+          const screenWidth = document.body.clientWidth;
+          const screenHeight = document.body.clientHeight;
+
+          // 获取对话框宽高
+          const dialogWidth = dragDom.offsetWidth;
+          const dialogHeight = dragDom.offsetHeight;
+
+          // 边界限制逻辑
+          left = Math.max(0, Math.min(left + styL, screenWidth - dialogWidth));
+          top = Math.max(0, Math.min(top + styT, screenHeight - dialogHeight));
+
+          // 更新对话框位置
+          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,15 +6,15 @@
  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)