vxe-table 4.17.0-beta.8 → 4.17.0-beta.9

package/es/table/module/keyboard/hook.js

@@ -1,30 +1,8 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { getRefElem } from '../../src/util';
-import { hasClass, getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
+import { getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
 const { hooks } = VxeUI;
-const browseObj = XEUtils.browse();
-function getTargetOffset(target, container) {
-    let offsetTop = 0;
-    let offsetLeft = 0;
-    const triggerCheckboxLabel = !browseObj.firefox && hasClass(target, 'vxe-checkbox--label');
-    if (triggerCheckboxLabel) {
-        const checkboxLabelStyle = getComputedStyle(target);
-        offsetTop -= XEUtils.toNumber(checkboxLabelStyle.paddingTop);
-        offsetLeft -= XEUtils.toNumber(checkboxLabelStyle.paddingLeft);
-    }
-    while (target && target !== container) {
-        offsetTop += target.offsetTop;
-        offsetLeft += target.offsetLeft;
-        target = target.offsetParent;
-        if (triggerCheckboxLabel) {
-            const checkboxStyle = getComputedStyle(target);
-            offsetTop -= XEUtils.toNumber(checkboxStyle.paddingTop);
-            offsetLeft -= XEUtils.toNumber(checkboxStyle.paddingLeft);
-        }
-    }
-    return { offsetTop, offsetLeft };
-}
 hooks.add('tableKeyboardModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
@@ -117,6 +95,7 @@ hooks.add('tableKeyboardModule', {
                 if (!bodyWrapperElem) {
                     return;
                 }
+                const bodyRect = bodyWrapperElem.getBoundingClientRect();
                 const el = refElem.value;
                 const disX = evnt.clientX;
                 const disY = evnt.clientY;
@@ -125,9 +104,8 @@ hooks.add('tableKeyboardModule', {
                 const selectRecords = $xeTable.getCheckboxRecords();
                 let lastRangeRows = [];
                 const marginSize = 1;
-                const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem);
-                const startTop = offsetRest.offsetTop + evnt.offsetY;
-                const startLeft = offsetRest.offsetLeft + evnt.offsetX;
+                const startTop = evnt.clientY - bodyRect.y + bodyWrapperElem.scrollTop;
+                const startLeft = evnt.clientX - bodyRect.x + bodyWrapperElem.scrollLeft;
                 const startScrollTop = bodyWrapperElem.scrollTop;
                 const rowHeight = trElem.offsetHeight;
                 const trRect = trElem.getBoundingClientRect();

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.17.0-beta.8";
+export const version = "4.17.0-beta.9";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.17.0-beta.8"}`;
+const version = `table v${"4.17.0-beta.9"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/es/ui/src/utils.js

@@ -1,6 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '@vxe-ui/core';
 import DomZIndex from 'dom-zindex';
+const { getConfig } = VxeUI;
 export function isEnableConf(conf) {
     return conf && conf.enabled !== false;
 }
@@ -24,14 +25,14 @@ export function hasChildrenList(item) {
     return item && item.children && item.children.length > 0;
 }
 export function getFuncText(content, args) {
-    if (content) {
-        const translate = VxeUI.getConfig().translate;
-        return XEUtils.toValueString(translate ? translate('' + content, args) : content);
+    if (XEUtils.eqNull(content)) {
+        return '';
     }
-    return '';
+    const translate = getConfig().translate;
+    return `${translate ? translate('' + content, args) : content}`;
 }
 export function formatText(value, placeholder) {
-    return '' + (isEmptyValue(value) ? (placeholder ? VxeUI.getConfig().emptyCell : '') : value);
+    return '' + (isEmptyValue(value) ? (placeholder ? getConfig().emptyCell : '') : value);
 }
 /**
  * 判断值为：'' | null | undefined 时都属于空值

package/lib/index.umd.js

@@ -2830,7 +2830,7 @@ __webpack_require__.d(__webpack_exports__, {
   config: function() { return /* reexport */ config; },
   "default": function() { return /* binding */ entry_lib; },
   formats: function() { return /* reexport */ formats; },
-  getConfig: function() { return /* reexport */ getConfig; },
+  getConfig: function() { return /* reexport */ ui_getConfig; },
   getI18n: function() { return /* reexport */ getI18n; },
   getIcon: function() { return /* reexport */ getIcon; },
   getTheme: function() { return /* reexport */ getTheme; },
@@ -2879,7 +2879,7 @@ __webpack_require__.d(components_namespaceObject, {
   commands: function() { return commands; },
   config: function() { return config; },
   formats: function() { return formats; },
-  getConfig: function() { return getConfig; },
+  getConfig: function() { return ui_getConfig; },
   getI18n: function() { return getI18n; },
   getIcon: function() { return getIcon; },
   getTheme: function() { return getTheme; },
@@ -3094,6 +3094,9 @@ updateVar();
 
 
 
+const {
+  getConfig
+} = core_.VxeUI;
 function isEnableConf(conf) {
   return conf && conf.enabled !== false;
 }
@@ -3120,14 +3123,14 @@ function hasChildrenList(item) {
   return item && item.children && item.children.length > 0;
 }
 function getFuncText(content, args) {
-  if (content) {
-    const translate = core_.VxeUI.getConfig().translate;
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(translate ? translate('' + content, args) : content);
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(content)) {
+    return '';
   }
-  return '';
+  const translate = getConfig().translate;
+  return `${translate ? translate('' + content, args) : content}`;
 }
 function formatText(value, placeholder) {
-  return '' + (isEmptyValue(value) ? placeholder ? core_.VxeUI.getConfig().emptyCell : '' : value);
+  return '' + (isEmptyValue(value) ? placeholder ? getConfig().emptyCell : '' : value);
 }
 /**
  * 判断值为：'' | null | undefined 时都属于空值
@@ -3138,7 +3141,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.0-beta.8";
+const version = "4.17.0-beta.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3499,7 +3502,7 @@ core_.VxeUI.setIcon({
 const setTheme = core_.VxeUI.setTheme;
 const getTheme = core_.VxeUI.getTheme;
 const setConfig = core_.VxeUI.setConfig;
-const getConfig = core_.VxeUI.getConfig;
+const ui_getConfig = core_.VxeUI.getConfig;
 const setIcon = core_.VxeUI.setIcon;
 const getIcon = core_.VxeUI.getIcon;
 const setLanguage = core_.VxeUI.setLanguage;
@@ -3650,7 +3653,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.0-beta.8"}`;
+const log_version = `table v${"4.17.0-beta.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -15784,31 +15787,6 @@ export_hook_hooks.add('tableExportModule', {
 const {
   hooks: keyboard_hook_hooks
 } = core_.VxeUI;
-const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
-function getTargetOffset(target, container) {
-  let offsetTop = 0;
-  let offsetLeft = 0;
-  const triggerCheckboxLabel = !browseObj.firefox && hasClass(target, 'vxe-checkbox--label');
-  if (triggerCheckboxLabel) {
-    const checkboxLabelStyle = getComputedStyle(target);
-    offsetTop -= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(checkboxLabelStyle.paddingTop);
-    offsetLeft -= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(checkboxLabelStyle.paddingLeft);
-  }
-  while (target && target !== container) {
-    offsetTop += target.offsetTop;
-    offsetLeft += target.offsetLeft;
-    target = target.offsetParent;
-    if (triggerCheckboxLabel) {
-      const checkboxStyle = getComputedStyle(target);
-      offsetTop -= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(checkboxStyle.paddingTop);
-      offsetLeft -= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(checkboxStyle.paddingLeft);
-    }
-  }
-  return {
-    offsetTop,
-    offsetLeft
-  };
-}
 keyboard_hook_hooks.add('tableKeyboardModule', {
   setupTable($xeTable) {
     const {
@@ -15928,6 +15906,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
         if (!bodyWrapperElem) {
           return;
         }
+        const bodyRect = bodyWrapperElem.getBoundingClientRect();
         const el = refElem.value;
         const disX = evnt.clientX;
         const disY = evnt.clientY;
@@ -15936,9 +15915,8 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
         const selectRecords = $xeTable.getCheckboxRecords();
         let lastRangeRows = [];
         const marginSize = 1;
-        const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem);
-        const startTop = offsetRest.offsetTop + evnt.offsetY;
-        const startLeft = offsetRest.offsetLeft + evnt.offsetX;
+        const startTop = evnt.clientY - bodyRect.y + bodyWrapperElem.scrollTop;
+        const startLeft = evnt.clientX - bodyRect.x + bodyWrapperElem.scrollLeft;
         const startScrollTop = bodyWrapperElem.scrollTop;
         const rowHeight = trElem.offsetHeight;
         const trRect = trElem.getBoundingClientRect();