vxe-table 4.17.0-beta.8 → 4.17.0

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"4.17.0-beta.8"}`;
+const version = `table v${"4.17.0"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.17.0-beta.8",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.17.0",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/lib/ui/src/utils.js

@@ -16,6 +16,9 @@ var _xeUtils = _interopRequireDefault(require("xe-utils"));
 var _core = require("@vxe-ui/core");
 var _domZindex = _interopRequireDefault(require("dom-zindex"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const {
+  getConfig
+} = _core.VxeUI;
 function isEnableConf(conf) {
   return conf && conf.enabled !== false;
 }
@@ -42,14 +45,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 _xeUtils.default.toValueString(translate ? translate('' + content, args) : content);
+  if (_xeUtils.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 时都属于空值

package/lib/ui/src/utils.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.eqEmptyValue=eqEmptyValue,exports.formatText=formatText,exports.getFuncText=getFuncText,exports.getLastZIndex=getLastZIndex,exports.hasChildrenList=hasChildrenList,exports.isEmptyValue=isEmptyValue,exports.isEnableConf=isEnableConf,exports.nextZIndex=nextZIndex,exports.parseFile=parseFile;var _xeUtils=_interopRequireDefault(require("xe-utils")),_core=require("@vxe-ui/core"),_domZindex=_interopRequireDefault(require("dom-zindex"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function isEnableConf(e){return e&&!1!==e.enabled}function isEmptyValue(e){return null==e||""===e}function parseFile(e){var e=e.name,t=_xeUtils.default.lastIndexOf(e,"."),n=e.substring(t+1,e.length).toLowerCase();return{filename:e.substring(0,t),type:n}}function nextZIndex(){return _domZindex.default.getNext()}function getLastZIndex(){return _domZindex.default.getCurrent()}function hasChildrenList(e){return e&&e.children&&0<e.children.length}function getFuncText(e,t){var n;return e?(n=_core.VxeUI.getConfig().translate,_xeUtils.default.toValueString(n?n(""+e,t):e)):""}function formatText(e,t){return""+(isEmptyValue(e)?t?_core.VxeUI.getConfig().emptyCell:"":e)}function eqEmptyValue(e){return""===e||_xeUtils.default.eqNull(e)}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.eqEmptyValue=eqEmptyValue,exports.formatText=formatText,exports.getFuncText=getFuncText,exports.getLastZIndex=getLastZIndex,exports.hasChildrenList=hasChildrenList,exports.isEmptyValue=isEmptyValue,exports.isEnableConf=isEnableConf,exports.nextZIndex=nextZIndex,exports.parseFile=parseFile;var _xeUtils=_interopRequireDefault(require("xe-utils")),_core=require("@vxe-ui/core"),_domZindex=_interopRequireDefault(require("dom-zindex"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getConfig=_core.VxeUI.getConfig;function isEnableConf(e){return e&&!1!==e.enabled}function isEmptyValue(e){return null==e||""===e}function parseFile(e){var e=e.name,t=_xeUtils.default.lastIndexOf(e,"."),n=e.substring(t+1,e.length).toLowerCase();return{filename:e.substring(0,t),type:n}}function nextZIndex(){return _domZindex.default.getNext()}function getLastZIndex(){return _domZindex.default.getCurrent()}function hasChildrenList(e){return e&&e.children&&0<e.children.length}function getFuncText(e,t){var n;return _xeUtils.default.eqNull(e)?"":""+((n=getConfig().translate)?n(""+e,t):e)}function formatText(e,t){return""+(isEmptyValue(e)?t?getConfig().emptyCell:"":e)}function eqEmptyValue(e){return""===e||_xeUtils.default.eqNull(e)}

package/lib/vxe-table/style/style.css

@@ -1788,6 +1788,18 @@
   overflow: hidden;
   flex-grow: 1;
 }
+.vxe-table--viewport-wrapper.x-ob--contain > .vxe-table--main-wrapper > .vxe-table--header-wrapper > .vxe-table--header-inner-wrapper {
+  overscroll-behavior-x: contain;
+}
+.vxe-table--viewport-wrapper.x-ob--contain > .vxe-table--main-wrapper > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overscroll-behavior-x: contain;
+}
+.vxe-table--viewport-wrapper.x-ob--contain > .vxe-table--main-wrapper > .vxe-table--footer-wrapper > .vxe-table--footer-inner-wrapper {
+  overscroll-behavior-x: contain;
+}
+.vxe-table--viewport-wrapper.y-ob--contain > .vxe-table--main-wrapper > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overscroll-behavior-y: contain;
+}
 
 .vxe-table--header-wrapper,
 .vxe-table--body-wrapper,
@@ -2212,6 +2224,9 @@
   left: 0;
   bottom: 0;
 }
+.vxe-table .vxe-table--scroll-x-wrapper {
+  height: 100%;
+}
 .vxe-table .vxe-table--scroll-x-handle {
   overflow-y: hidden;
   overflow-x: scroll;
@@ -3151,6 +3166,10 @@
   outline: 0;
   background-color: var(--vxe-ui-layout-background-color);
 }
+.vxe-table--render-default .vxe-table--fixed-left-wrapper.y-ob--contain > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper,
+.vxe-table--render-default .vxe-table--fixed-right-wrapper.y-ob--contain > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overscroll-behavior-y: contain;
+}
 .vxe-table--render-default .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper,
 .vxe-table--render-default .vxe-table--fixed-right-wrapper .vxe-table--body-wrapper {
   outline: 0;