Merge 5a2c08b into 5390f40

ElemeFE · Nov 2, 2021 · d8d680f · d8d680f
2 parents 5390f40 + 5a2c08b
commit d8d680f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/message/src/main.js b/packages/message/src/main.js
@@ -33,7 +33,7 @@ const Message = function(options) {
   }
   instance.$mount();
   document.body.appendChild(instance.$el);
-  let verticalOffset = options.offset || 20;
+  let verticalOffset = options.offset === 0 ? options.offset : (options.offset || 20);
   instances.forEach(item => {
     verticalOffset += item.$el.offsetHeight + 16;
   });

diff --git a/packages/table/src/table-header.js b/packages/table/src/table-header.js
@@ -429,7 +429,7 @@ export default {
         let rect = target.getBoundingClientRect();
 
         const bodyStyle = document.body.style;
-        if (rect.width > 12 && rect.right - event.pageX < 8) {
+        if (rect.width > 12 && rect.right - event.clientX < 8) {
           bodyStyle.cursor = 'col-resize';
           if (hasClass(target, 'is-sortable')) {
             target.style.cursor = 'col-resize';