vxe-pc-ui 3.3.40 → 3.3.42

package/lib/list/src/list.js

@@ -44,7 +44,9 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
     var reactData = {
       scrollYLoad: false,
       bodyHeight: 0,
-      rowHeight: 0,
+      customHeight: 0,
+      customMaxHeight: 0,
+      parentHeight: 0,
       topSpaceHeight: 0,
       items: []
     };
@@ -76,14 +78,17 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
     computeStyles: function computeStyles() {
       var $xeList = this;
       var props = $xeList;
+      var reactData = $xeList.reactData;
       var height = props.height,
         maxHeight = props.maxHeight;
+      var customHeight = reactData.customHeight,
+        customMaxHeight = reactData.customMaxHeight;
       var style = {};
       if (height) {
-        style.height = "".concat(isNaN(height) ? height : "".concat(height, "px"));
+        style.height = "".concat(customHeight, "px");
       } else if (maxHeight) {
         style.height = 'auto';
-        style.maxHeight = "".concat(isNaN(maxHeight) ? maxHeight : "".concat(maxHeight, "px"));
+        style.maxHeight = "".concat(customMaxHeight, "px");
       }
       return style;
     }
@@ -144,6 +149,33 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
       $xeList.clearScroll();
       return $xeList.loadData(datas);
     },
+    calcTableHeight: function calcTableHeight(key) {
+      var $xeList = this;
+      var props = $xeList;
+      var reactData = $xeList.reactData;
+      var parentHeight = reactData.parentHeight;
+      var val = props[key];
+      var num = 0;
+      if (val) {
+        if (val === '100%' || val === 'auto') {
+          num = parentHeight;
+        } else {
+          if ((0, _dom.isScale)(val)) {
+            num = Math.floor((_xeUtils.default.toInteger(val) || 1) / 100 * parentHeight);
+          } else {
+            num = _xeUtils.default.toNumber(val);
+          }
+          num = Math.max(40, num);
+        }
+      }
+      return num;
+    },
+    updateHeight: function updateHeight() {
+      var $xeList = this;
+      var reactData = $xeList.reactData;
+      reactData.customHeight = $xeList.calcTableHeight('height');
+      reactData.customMaxHeight = $xeList.calcTableHeight('maxHeight');
+    },
     updateYSpace: function updateYSpace() {
       var $xeList = this;
       var reactData = $xeList.reactData;
@@ -200,12 +232,11 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
           var offsetYSize = sYOpts.oSize ? _xeUtils.default.toNumber(sYOpts.oSize) : _dom.browse.edge ? 10 : 0;
           scrollYStore.offsetSize = offsetYSize;
           scrollYStore.visibleSize = visibleYSize;
-          scrollYStore.endIndex = Math.max(scrollYStore.startIndex, visibleYSize + offsetYSize, scrollYStore.endIndex);
+          scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
           $xeList.updateYData();
         } else {
           $xeList.updateYSpace();
         }
-        reactData.rowHeight = rowHeight;
       });
     },
     /**
@@ -266,11 +297,17 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
      */
     recalculate: function recalculate() {
       var $xeList = this;
+      var reactData = $xeList.reactData;
       var el = $xeList.$refs.refElem;
-      if (el.clientWidth && el.clientHeight) {
-        return $xeList.computeScrollLoad();
+      if (el) {
+        var parentEl = el.parentElement;
+        reactData.parentHeight = parentEl ? parentEl.clientHeight : 0;
+        $xeList.updateHeight();
+        if (el.clientWidth && el.clientHeight) {
+          return $xeList.computeScrollLoad();
+        }
       }
-      return Promise.resolve();
+      return $xeList.$nextTick();
     },
     loadYData: function loadYData(evnt) {
       var $xeList = this;
@@ -374,6 +411,14 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
       var props = $xeList;
       $xeList.loadData(props.data || []);
     },
+    height: function height() {
+      var $xeList = this;
+      $xeList.recalculate();
+    },
+    maxHeight: function maxHeight() {
+      var $xeList = this;
+      $xeList.recalculate();
+    },
     syncResize: function syncResize(val) {
       var $xeList = this;
       if (val) {
@@ -389,23 +434,25 @@ var _default2 = exports.default = (0, _comp.defineVxeComponent)({
   created: function created() {
     var $xeList = this;
     var props = $xeList;
-    _ui.globalEvents.on($xeList, 'resize', function () {
-      $xeList.recalculate();
-    });
     $xeList.loadData(props.data || []);
   },
   mounted: function mounted() {
     var $xeList = this;
     var props = $xeList;
     var internalData = $xeList.internalData;
+    $xeList.recalculate();
     if (props.autoResize) {
       var el = $xeList.$refs.refElem;
       var resizeObserver = _ui.globalResize.create(function () {
         return $xeList.recalculate();
       });
       resizeObserver.observe(el);
+      if (el) {
+        resizeObserver.observe(el.parentElement);
+      }
       internalData.resizeObserver = resizeObserver;
     }
+    _ui.globalEvents.on($xeList, 'resize', $xeList.recalculate);
   },
   activated: function activated() {
     var $xeList = this;

package/lib/list/src/list.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn"),_loading=_interopRequireDefault(require("../../loading/src/loading"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _typeof(t){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _defineProperty(t,e,r){return(e=_toPropertyKey(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function _toPropertyKey(t){t=_toPrimitive(t,"string");return"symbol"==_typeof(t)?t:t+""}function _toPrimitive(t,e){if("object"!=_typeof(t)||!t)return t;var r=t[Symbol.toPrimitive];if(void 0===r)return("string"===e?String:Number)(t);r=r.call(t,e||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeList",mixins:[_ui.globalMixins.sizeMixin],props:{data:Array,height:[Number,String],maxHeight:[Number,String],loading:Boolean,className:[String,Function],size:{type:String,default:function(){return(0,_ui.getConfig)().list.size||(0,_ui.getConfig)().size}},autoResize:{type:Boolean,default:function(){return(0,_ui.getConfig)().list.autoResize}},syncResize:[Boolean,String,Number],scrollY:Object},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{scrollYLoad:!1,bodyHeight:0,rowHeight:0,topSpaceHeight:0,items:[]},internalData:{resizeObserver:void 0,fullData:[],lastScrollLeft:0,lastScrollTop:0,scrollYStore:{startIndex:0,endIndex:0,visibleSize:0,offsetSize:0,rowHeight:0}}}},computed:Object.assign(Object.assign({},{}),{computeSYOpts:function(){return Object.assign({},(0,_ui.getConfig)().list.scrollY,this.scrollY)},computeStyles:function(){var t=this.height,e=this.maxHeight,r={};return t?r.height="".concat(isNaN(t)?t:"".concat(t,"px")):e&&(r.height="auto",r.maxHeight="".concat(isNaN(e)?e:"".concat(e,"px"))),r}}),methods:{dispatchEvent:function(t,e,r){this.$emit(t,(0,_ui.createEvent)(r,{$list:this},e))},callSlot:function(t,e,r){var i=this.$scopedSlots;return t&&(_xeUtils.default.isString(t)&&(t=i[t]||null),_xeUtils.default.isFunction(t))?(0,_vn.getSlotVNs)(t.call(this,e,r)):[]},loadData:function(t){var e=this,r=e.reactData,i=e.internalData,a=i.scrollYStore,o=e.computeSYOpts,t=t||[];return Object.assign(a,{startIndex:0,endIndex:1,visibleSize:0}),i.fullData=t,r.scrollYLoad=!!o.enabled&&-1<o.gt&&(0===o.gt||o.gt<=t.length),e.handleData(),e.computeScrollLoad().then(function(){e.refreshScroll()})},reloadData:function(t){return this.clearScroll(),this.loadData(t)},updateYSpace:function(){var t=this.reactData,e=this.internalData,r=t.scrollYLoad,i=e.scrollYStore;t.bodyHeight=r?e.fullData.length*i.rowHeight:0,t.topSpaceHeight=r?Math.max(i.startIndex*i.rowHeight,0):0},handleData:function(){var t=this.reactData,e=this.internalData,r=t.scrollYLoad,i=e.fullData,e=e.scrollYStore;return t.items=r?i.slice(e.startIndex,e.endIndex):i.slice(0),this.$nextTick()},updateYData:function(){this.handleData(),this.updateYSpace()},computeScrollLoad:function(){var l=this,n=l.reactData,s=l.internalData;return l.$nextTick().then(function(){var t,e=n.scrollYLoad,r=s.scrollYStore,i=l.$refs.refVirtualBody,a=l.computeSYOpts,o=0;(t=i?(t=a.sItem?i.querySelector(a.sItem):t)||i.children[0]:t)&&(o=t.offsetHeight),o=Math.max(20,o),r.rowHeight=o,e?(i=l.$refs.refVirtualWrapper,t=Math.max(8,Math.ceil(i.clientHeight/o)),e=a.oSize?_xeUtils.default.toNumber(a.oSize):_dom.browse.edge?10:0,r.offsetSize=e,r.visibleSize=t,r.endIndex=Math.max(r.startIndex,t+e,r.endIndex),l.updateYData()):l.updateYSpace(),n.rowHeight=o})},clearScroll:function(){var t=this.$refs.refVirtualWrapper;return t&&(t.scrollTop=0),this.$nextTick()},scrollTo:function(t,e){var r=this,i=r.reactData,a=r.$refs.refVirtualWrapper;return _xeUtils.default.isNumber(t)&&(a.scrollLeft=t),_xeUtils.default.isNumber(e)&&(a.scrollTop=e),i.scrollYLoad?new Promise(function(t){setTimeout(function(){r.$nextTick(function(){t()})},50)}):r.$nextTick()},refreshScroll:function(){var t=this.internalData,e=t.lastScrollLeft,r=t.lastScrollTop;return this.clearScroll().then(function(){if(e||r)return t.lastScrollLeft=0,t.lastScrollTop=0,scrollTo(e,r)})},recalculate:function(){var t=this.$refs.refElem;return t.clientWidth&&t.clientHeight?this.computeScrollLoad():Promise.resolve()},loadYData:function(t){var e=this.internalData.scrollYStore,r=e.startIndex,i=e.endIndex,a=e.visibleSize,o=e.offsetSize,t=t.target.scrollTop,t=Math.floor(t/e.rowHeight),l=Math.max(0,t-1-o),o=t+a+o;!(t<=r||i-a-1<=t)||r===l&&i===o||(e.startIndex=l,e.endIndex=o,this.updateYData())},scrollEvent:function(t){var e=this.reactData,r=this.internalData,i=t.target,a=i.scrollTop,i=i.scrollLeft,o=i!==r.lastScrollLeft,l=a!==r.lastScrollTop;r.lastScrollTop=a,r.lastScrollLeft=i,e.scrollYLoad&&this.loadYData(t),this.dispatchEvent("scroll",{scrollLeft:i,scrollTop:a,isX:o,isY:l},t)},renderVN:function(t){var e=this,r=e.reactData,i=e.className,a=e.loading,o=r.bodyHeight,l=r.topSpaceHeight,r=r.items,n=e.$scopedSlots.default,s=e.computeSize,c=e.computeStyles;return t("div",{ref:"refElem",class:["vxe-list",i?_xeUtils.default.isFunction(i)?i({$list:e}):i:"",_defineProperty(_defineProperty({},"size--".concat(s),s),"is--loading",a)]},[t("div",{ref:"refVirtualWrapper",class:"vxe-list--virtual-wrapper",style:c,on:{scroll:e.scrollEvent}},[t("div",{class:"vxe-list--y-space",style:{height:o?"".concat(o,"px"):""}}),t("div",{ref:"refVirtualBody",class:"vxe-list--body",style:{marginTop:l?"".concat(l,"px"):""}},n?e.callSlot(n,{items:r},t):[])]),t(_loading.default,{class:"vxe-list--loading",props:{value:a}})])}},watch:{data:function(){this.loadData(this.data||[])},syncResize:function(t){var e=this;t&&(e.recalculate(),e.$nextTick(function(){return setTimeout(function(){return e.recalculate()})}))}},created:function(){var t=this,e=t;_ui.globalEvents.on(t,"resize",function(){t.recalculate()}),t.loadData(e.data||[])},mounted:function(){var t,e,r=this,i=r.internalData;r.autoResize&&(t=r.$refs.refElem,(e=_ui.globalResize.create(function(){return r.recalculate()})).observe(t),i.resizeObserver=e)},activated:function(){var t=this;t.recalculate().then(function(){return t.refreshScroll()})},beforeDestroy:function(){var t=this.internalData.resizeObserver;t&&t.disconnect(),_ui.globalEvents.off(this,"resize")},render:function(t){return this.renderVN(t)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn"),_loading=_interopRequireDefault(require("../../loading/src/loading"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _typeof(t){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _defineProperty(t,e,i){return(e=_toPropertyKey(e))in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function _toPropertyKey(t){t=_toPrimitive(t,"string");return"symbol"==_typeof(t)?t:t+""}function _toPrimitive(t,e){if("object"!=_typeof(t)||!t)return t;var i=t[Symbol.toPrimitive];if(void 0===i)return("string"===e?String:Number)(t);i=i.call(t,e||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeList",mixins:[_ui.globalMixins.sizeMixin],props:{data:Array,height:[Number,String],maxHeight:[Number,String],loading:Boolean,className:[String,Function],size:{type:String,default:function(){return(0,_ui.getConfig)().list.size||(0,_ui.getConfig)().size}},autoResize:{type:Boolean,default:function(){return(0,_ui.getConfig)().list.autoResize}},syncResize:[Boolean,String,Number],scrollY:Object},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{scrollYLoad:!1,bodyHeight:0,customHeight:0,customMaxHeight:0,parentHeight:0,topSpaceHeight:0,items:[]},internalData:{resizeObserver:void 0,fullData:[],lastScrollLeft:0,lastScrollTop:0,scrollYStore:{startIndex:0,endIndex:0,visibleSize:0,offsetSize:0,rowHeight:0}}}},computed:Object.assign(Object.assign({},{}),{computeSYOpts:function(){return Object.assign({},(0,_ui.getConfig)().list.scrollY,this.scrollY)},computeStyles:function(){var t=this.reactData,e=this.height,i=this.maxHeight,r=t.customHeight,t=t.customMaxHeight,a={};return e?a.height="".concat(r,"px"):i&&(a.height="auto",a.maxHeight="".concat(t,"px")),a}}),methods:{dispatchEvent:function(t,e,i){this.$emit(t,(0,_ui.createEvent)(i,{$list:this},e))},callSlot:function(t,e,i){var r=this.$scopedSlots;return t&&(_xeUtils.default.isString(t)&&(t=r[t]||null),_xeUtils.default.isFunction(t))?(0,_vn.getSlotVNs)(t.call(this,e,i)):[]},loadData:function(t){var e=this,i=e.reactData,r=e.internalData,a=r.scrollYStore,l=e.computeSYOpts,t=t||[];return Object.assign(a,{startIndex:0,endIndex:1,visibleSize:0}),r.fullData=t,i.scrollYLoad=!!l.enabled&&-1<l.gt&&(0===l.gt||l.gt<=t.length),e.handleData(),e.computeScrollLoad().then(function(){e.refreshScroll()})},reloadData:function(t){return this.clearScroll(),this.loadData(t)},calcTableHeight:function(t){var e=this.reactData.parentHeight,t=this[t],i=0;return i=t?"100%"===t||"auto"===t?e:(i=(0,_dom.isScale)(t)?Math.floor((_xeUtils.default.toInteger(t)||1)/100*e):_xeUtils.default.toNumber(t),Math.max(40,i)):i},updateHeight:function(){var t=this.reactData;t.customHeight=this.calcTableHeight("height"),t.customMaxHeight=this.calcTableHeight("maxHeight")},updateYSpace:function(){var t=this.reactData,e=this.internalData,i=t.scrollYLoad,r=e.scrollYStore;t.bodyHeight=i?e.fullData.length*r.rowHeight:0,t.topSpaceHeight=i?Math.max(r.startIndex*r.rowHeight,0):0},handleData:function(){var t=this.reactData,e=this.internalData,i=t.scrollYLoad,r=e.fullData,e=e.scrollYStore;return t.items=i?r.slice(e.startIndex,e.endIndex):r.slice(0),this.$nextTick()},updateYData:function(){this.handleData(),this.updateYSpace()},computeScrollLoad:function(){var o=this,n=o.reactData,s=o.internalData;return o.$nextTick().then(function(){var t,e=n.scrollYLoad,i=s.scrollYStore,r=o.$refs.refVirtualBody,a=o.computeSYOpts,l=0;(t=r?(t=a.sItem?r.querySelector(a.sItem):t)||r.children[0]:t)&&(l=t.offsetHeight),l=Math.max(20,l),i.rowHeight=l,e?(r=o.$refs.refVirtualWrapper,t=Math.max(8,Math.ceil(r.clientHeight/l)),e=a.oSize?_xeUtils.default.toNumber(a.oSize):_dom.browse.edge?10:0,i.offsetSize=e,i.visibleSize=t,i.endIndex=Math.max(i.startIndex+t+e,i.endIndex),o.updateYData()):o.updateYSpace()})},clearScroll:function(){var t=this.$refs.refVirtualWrapper;return t&&(t.scrollTop=0),this.$nextTick()},scrollTo:function(t,e){var i=this,r=i.reactData,a=i.$refs.refVirtualWrapper;return _xeUtils.default.isNumber(t)&&(a.scrollLeft=t),_xeUtils.default.isNumber(e)&&(a.scrollTop=e),r.scrollYLoad?new Promise(function(t){setTimeout(function(){i.$nextTick(function(){t()})},50)}):i.$nextTick()},refreshScroll:function(){var t=this.internalData,e=t.lastScrollLeft,i=t.lastScrollTop;return this.clearScroll().then(function(){if(e||i)return t.lastScrollLeft=0,t.lastScrollTop=0,scrollTo(e,i)})},recalculate:function(){var t=this,e=t.reactData,i=t.$refs.refElem;if(i){var r=i.parentElement;if(e.parentHeight=r?r.clientHeight:0,t.updateHeight(),i.clientWidth&&i.clientHeight)return t.computeScrollLoad()}return t.$nextTick()},loadYData:function(t){var e=this.internalData.scrollYStore,i=e.startIndex,r=e.endIndex,a=e.visibleSize,l=e.offsetSize,t=t.target.scrollTop,t=Math.floor(t/e.rowHeight),o=Math.max(0,t-1-l),l=t+a+l;!(t<=i||r-a-1<=t)||i===o&&r===l||(e.startIndex=o,e.endIndex=l,this.updateYData())},scrollEvent:function(t){var e=this.reactData,i=this.internalData,r=t.target,a=r.scrollTop,r=r.scrollLeft,l=r!==i.lastScrollLeft,o=a!==i.lastScrollTop;i.lastScrollTop=a,i.lastScrollLeft=r,e.scrollYLoad&&this.loadYData(t),this.dispatchEvent("scroll",{scrollLeft:r,scrollTop:a,isX:l,isY:o},t)},renderVN:function(t){var e=this,i=e.reactData,r=e.className,a=e.loading,l=i.bodyHeight,o=i.topSpaceHeight,i=i.items,n=e.$scopedSlots.default,s=e.computeSize,c=e.computeStyles;return t("div",{ref:"refElem",class:["vxe-list",r?_xeUtils.default.isFunction(r)?r({$list:e}):r:"",_defineProperty(_defineProperty({},"size--".concat(s),s),"is--loading",a)]},[t("div",{ref:"refVirtualWrapper",class:"vxe-list--virtual-wrapper",style:c,on:{scroll:e.scrollEvent}},[t("div",{class:"vxe-list--y-space",style:{height:l?"".concat(l,"px"):""}}),t("div",{ref:"refVirtualBody",class:"vxe-list--body",style:{marginTop:o?"".concat(o,"px"):""}},n?e.callSlot(n,{items:i},t):[])]),t(_loading.default,{class:"vxe-list--loading",props:{value:a}})])}},watch:{data:function(){this.loadData(this.data||[])},height:function(){this.recalculate()},maxHeight:function(){this.recalculate()},syncResize:function(t){var e=this;t&&(e.recalculate(),e.$nextTick(function(){return setTimeout(function(){return e.recalculate()})}))}},created:function(){this.loadData(this.data||[])},mounted:function(){var t,e=this,i=e,r=e.internalData;e.recalculate(),i.autoResize&&(i=e.$refs.refElem,(t=_ui.globalResize.create(function(){return e.recalculate()})).observe(i),i&&t.observe(i.parentElement),r.resizeObserver=t),_ui.globalEvents.on(e,"resize",e.recalculate)},activated:function(){var t=this;t.recalculate().then(function(){return t.refreshScroll()})},beforeDestroy:function(){var t=this.internalData.resizeObserver;t&&t.disconnect(),_ui.globalEvents.off(this,"resize")},render:function(t){return this.renderVN(t)}});