hrsass-components 2.1.3 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
65
65
  var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
66
66
  var saveSvgAsPng = require('save-svg-as-png');
67
67
 
68
- var version = "2.1.3";
68
+ var version = "2.1.5";
69
69
 
70
70
  /**
71
71
  * 版本号
@@ -7612,10 +7612,11 @@ var HrTableBase = {
7612
7612
  _getScroll: function _getScroll() {
7613
7613
  var _getOptionProps7 = getOptionProps(this),
7614
7614
  maxWidth = _getOptionProps7.maxWidth,
7615
- height = _getOptionProps7.height;
7615
+ height = _getOptionProps7.height,
7616
+ action = _getOptionProps7.action;
7616
7617
  var scroll = {};
7617
7618
  if (maxWidth) {
7618
- scroll.x = maxWidth;
7619
+ scroll.x = maxWidth - (this.$scopedSlots.action ? action.width || 100 : 0);
7619
7620
  }
7620
7621
  if (height) {
7621
7622
  scroll.y = height;
@@ -8290,7 +8291,7 @@ var index = {
8290
8291
  }
8291
8292
  }
8292
8293
  var tableWidth = this.$refs.tableBase ? this.$refs.tableBase.$el.clientWidth : 0;
8293
- var resultWidth = selectionWidth + width + actionWidth + widthLessColumns.length * 100;
8294
+ var resultWidth = selectionWidth + width + widthLessColumns.length * 100;
8294
8295
  result = resultWidth > tableWidth ? resultWidth : null;
8295
8296
  }
8296
8297
  this.setState({