vxe-table 3.3.15 → 3.3.16
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.
- package/lib/filter/src/mixin.js +8 -2
- package/lib/filter/src/mixin.min.js +1 -1
- package/lib/header/style/style.css +3 -10
- package/lib/header/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +126 -16
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/methods.js +34 -1
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/style/style.css +13 -10
- package/lib/table/style/style.min.css +1 -1
- package/lib/v-x-e-table/src/conf.js +2 -0
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/lib/v-x-e-table/src/renderer.js +4 -4
- package/lib/v-x-e-table/src/renderer.min.js +1 -1
- package/package.json +5 -5
- package/packages/filter/src/mixin.js +2 -2
- package/packages/table/src/methods.js +18 -2
- package/packages/v-x-e-table/src/conf.js +2 -0
- package/packages/v-x-e-table/src/renderer.js +4 -4
- package/styles/header.scss +9 -12
- package/styles/table.scss +9 -3
- package/styles/variable.scss +1 -1
package/lib/filter/src/mixin.js
CHANGED
|
@@ -122,7 +122,7 @@ var _default = {
|
|
|
122
122
|
var maxHeight = null;
|
|
123
123
|
|
|
124
124
|
if (filterHeight >= bodyElem.clientHeight) {
|
|
125
|
-
maxHeight = bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0);
|
|
125
|
+
maxHeight = Math.max(40, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
|
|
126
126
|
}
|
|
127
127
|
|
|
128
128
|
if (column.fixed === 'left') {
|
|
@@ -155,6 +155,13 @@ var _default = {
|
|
|
155
155
|
filterStore.maxHeight = maxHeight;
|
|
156
156
|
});
|
|
157
157
|
}
|
|
158
|
+
|
|
159
|
+
this.emitEvent('filter-visible', {
|
|
160
|
+
column: column,
|
|
161
|
+
property: column.property,
|
|
162
|
+
filterList: this.getCheckedFilters(),
|
|
163
|
+
visible: filterStore.visible
|
|
164
|
+
}, evnt);
|
|
158
165
|
},
|
|
159
166
|
_getCheckedFilters: function _getCheckedFilters() {
|
|
160
167
|
var tableFullColumn = this.tableFullColumn;
|
|
@@ -208,7 +215,6 @@ var _default = {
|
|
|
208
215
|
datas.push(item.data);
|
|
209
216
|
}
|
|
210
217
|
});
|
|
211
|
-
filterStore.visible = false;
|
|
212
218
|
var filterList = this.getCheckedFilters(); // 如果是服务端筛选，则跳过本地筛选处理
|
|
213
219
|
|
|
214
220
|
if (!filterOpts.remote) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_util=require("../../table/src/util"),_vXETable=_interopRequireDefault(require("../../v-x-e-table"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default={methods:{_setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(this,e);return e&&e.filters&&t&&(e.filters=_tools.UtilTools.getFilters(t)),this.$nextTick()},checkFilterOptions:function(){var e=this.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,u,t){var h,d,l,i,r,p,v=this,m=this.filterStore;m.column===u&&m.visible?m.visible=!1:(h=e.target,d=e.pageX,l=u.filters,i=u.filterMultiple,
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_util=require("../../table/src/util"),_vXETable=_interopRequireDefault(require("../../v-x-e-table"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default={methods:{_setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(this,e);return e&&e.filters&&t&&(e.filters=_tools.UtilTools.getFilters(t)),this.$nextTick()},checkFilterOptions:function(){var e=this.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,u,t){var h,d,l,i,r,o,p,v=this,m=this.filterStore;m.column===u&&m.visible?m.visible=!1:(h=e.target,d=e.pageX,l=u.filters,i=u.filterMultiple,r=(r=u.filterRender)?_vXETable.default.renderer.get(r.name):null,o=u.filterRecoverMethod||(r?r.filterRecoverMethod:null),p=_tools.DomTools.getDomNode().visibleWidth,Object.assign(m,{args:t,multiple:i,options:l,column:u,style:null,visible:!0}),m.options.forEach(function(e){var t=e._checked,l=e.checked;(e._checked=l)||t===l||o&&o({option:e,column:u,$table:v})}),this.checkFilterOptions(),this.initStore.filter=!0,this.$nextTick(function(){var e=v.$refs,t=e.tableBody.$el,l=e.filterWrapper.$el,i=0,r=0,o=null,s=null;l&&(i=l.offsetWidth,r=l.offsetHeight,o=l.querySelector(".vxe-table--filter-header"),s=l.querySelector(".vxe-table--filter-footer"));var n,f,a=i/2,c=t.clientWidth-i-10,e={top:"".concat(h.offsetTop+h.offsetParent.offsetTop+h.offsetHeight+8,"px")},l=null;r>=t.clientHeight&&(l=Math.max(40,t.clientHeight-(s?s.offsetHeight:0)-(o?o.offsetHeight:0))),"left"===u.fixed?n=h.offsetLeft+h.offsetParent.offsetLeft-a:"right"===u.fixed?f=h.offsetParent.offsetWidth-h.offsetLeft+(h.offsetParent.offsetParent.offsetWidth-h.offsetParent.offsetLeft)-u.renderWidth-a:n=h.offsetLeft+h.offsetParent.offsetLeft-a-t.scrollLeft,n?(0<(t=d+i-a+10-p)&&(n-=t),e.left="".concat(Math.min(c,Math.max(10,n)),"px")):f&&(0<(a=d+i-a+10-p)&&(f+=a),e.right="".concat(Math.max(10,f),"px")),m.style=e,m.maxHeight=l})),this.emitEvent("filter-visible",{column:u,property:u.property,filterList:this.getCheckedFilters(),visible:m.visible},e)},_getCheckedFilters:function(){var e=this.tableFullColumn,o=[];return e.filter(function(e){var t=e.property,l=e.filters,i=[],r=[];l&&l.length&&(l.forEach(function(e){e.checked&&(i.push(e.value),r.push(e.data))}),i.length&&o.push({column:e,property:t,values:i,datas:r}))}),o},confirmFilterEvent:function(e){var t=this,l=this.filterStore,i=this.filterOpts,r=this.scrollXLoad,o=this.scrollYLoad,s=l.column,n=s.property,f=[],a=[];s.filters.forEach(function(e){e.checked&&(f.push(e.value),a.push(e.data))});l=this.getCheckedFilters();i.remote||(this.handleTableData(!0),this.checkSelectionStatus(),this.updateFooter(),(r||o)&&(this.refreshScroll(),o&&this.updateScrollYSpace())),this.emitEvent("filter-change",{column:s,property:n,values:f,datas:a,filters:l,filterList:l},e),this.closeFilter(),this.$nextTick(function(){t.recalculate(),t.updateCellAreas()})},handleClearFilter:function(e){var t,l,i;e&&(t=e.filters,l=e.filterRender,t&&(l=l?_vXETable.default.renderer.get(l.name):null,i=e.filterResetMethod||(l?l.filterResetMethod:null),t.forEach(function(e){e._checked=!1,e.checked=!1,i||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),i&&i({options:t,column:e,$table:this})))},resetFilterEvent:function(e){this.handleClearFilter(this.filterStore.column),this.confirmFilterEvent(e)},_clearFilter:function(e){var t,l=this.filterStore;return e?(t=(0,_util.handleFieldOrColumn)(this,e))&&this.handleClearFilter(t):this.visibleColumn.forEach(this.handleClearFilter),e&&t===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),this.updateData()}}};exports.default=_default;
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
border-bottom: 1px solid #e8eaec; }
|
|
37
37
|
.vxe-table .vxe-cell--sort {
|
|
38
38
|
width: 1.5em;
|
|
39
|
-
height: 1.
|
|
39
|
+
height: 1.35em;
|
|
40
40
|
vertical-align: middle;
|
|
41
41
|
text-align: center;
|
|
42
42
|
display: inline-block;
|
|
@@ -56,9 +56,9 @@
|
|
|
56
56
|
.vxe-table .vxe-sort--desc-btn.sort--active {
|
|
57
57
|
color: #409eff; }
|
|
58
58
|
.vxe-table .vxe-sort--asc-btn {
|
|
59
|
-
top: -0.
|
|
59
|
+
top: -0.15em; }
|
|
60
60
|
.vxe-table .vxe-sort--desc-btn {
|
|
61
|
-
bottom: -0.
|
|
61
|
+
bottom: -0.15em; }
|
|
62
62
|
|
|
63
63
|
.vxe-header--column {
|
|
64
64
|
position: relative;
|
|
@@ -96,11 +96,6 @@
|
|
|
96
96
|
position: absolute;
|
|
97
97
|
left: 0;
|
|
98
98
|
top: 0.2em; }
|
|
99
|
-
.vxe-header--column .vxe-cell--required-icon,
|
|
100
|
-
.vxe-header--column .vxe-cell--edit-icon,
|
|
101
|
-
.vxe-header--column .vxe-cell-help-icon,
|
|
102
|
-
.vxe-header--column .vxe-cell--title {
|
|
103
|
-
vertical-align: middle; }
|
|
104
99
|
.vxe-header--column .vxe-cell--required-icon {
|
|
105
100
|
margin-right: 0.1em; }
|
|
106
101
|
.vxe-header--column .vxe-cell--edit-icon,
|
|
@@ -108,8 +103,6 @@
|
|
|
108
103
|
margin-right: 0.2em; }
|
|
109
104
|
.vxe-header--column .vxe-cell-help-icon {
|
|
110
105
|
cursor: help; }
|
|
111
|
-
.vxe-header--column .vxe-cell--title {
|
|
112
|
-
line-height: 1.5; }
|
|
113
106
|
.vxe-header--column .vxe-resizable {
|
|
114
107
|
position: absolute;
|
|
115
108
|
right: -7px;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";.vxe-table .vxe-table--header-wrapper{color:#606266}.vxe-table .vxe-table--header-wrapper .vxe-table--header-border-line{position:absolute;left:0;bottom:0;height:0;border-bottom:1px solid #e8eaec}.vxe-table .vxe-cell--sort{width:1.5em;height:1.
|
|
1
|
+
@charset "UTF-8";.vxe-table .vxe-table--header-wrapper{color:#606266}.vxe-table .vxe-table--header-wrapper .vxe-table--header-border-line{position:absolute;left:0;bottom:0;height:0;border-bottom:1px solid #e8eaec}.vxe-table .vxe-cell--sort{width:1.5em;height:1.35em;vertical-align:middle;text-align:center;display:inline-block;position:relative}.vxe-table .vxe-sort--asc-btn,.vxe-table .vxe-sort--desc-btn{position:absolute;left:.35em;color:#c0c4cc;width:1em;text-align:center;cursor:pointer}.vxe-table .vxe-sort--asc-btn:hover,.vxe-table .vxe-sort--desc-btn:hover{color:#606266}.vxe-table .vxe-sort--asc-btn.sort--active,.vxe-table .vxe-sort--desc-btn.sort--active{color:#409eff}.vxe-table .vxe-sort--asc-btn{top:-.15em}.vxe-table .vxe-sort--desc-btn{bottom:-.15em}.vxe-header--column{position:relative;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-header--column.col--ellipsis>.vxe-cell{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.vxe-header--column.col--ellipsis>.vxe-cell .vxe-cell--title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-header--column.col--ellipsis>.vxe-cell>i:not(.vxe-cell--title),.vxe-header--column.col--ellipsis>.vxe-cell>span:not(.vxe-cell--title){-ms-flex-negative:0;flex-shrink:0}.vxe-header--column .vxe-cell--required-icon{display:inline-block;color:#f56c6c;width:.8em;height:1em;line-height:1em;font-family:Verdana,Arial,Tahoma;font-weight:400;position:relative}.vxe-header--column .vxe-cell--required-icon:before{content:"*";position:absolute;left:0;top:.2em}.vxe-header--column .vxe-cell--required-icon{margin-right:.1em}.vxe-header--column .vxe-cell--edit-icon,.vxe-header--column .vxe-cell-help-icon{margin-right:.2em}.vxe-header--column .vxe-cell-help-icon{cursor:help}.vxe-header--column .vxe-resizable{position:absolute;right:-7px;bottom:0;width:14px;height:100%;text-align:center;z-index:1;cursor:col-resize}.vxe-header--column .vxe-resizable.is--line:after,.vxe-header--column .vxe-resizable.is--line:before{content:"";display:inline-block;vertical-align:middle}.vxe-header--column .vxe-resizable.is--line:before{width:1px;height:50%;background-color:#d9dddf}.vxe-header--column .vxe-resizable.is--line:after{width:0;height:100%}.vxe-table--fixed-right-wrapper .vxe-header--column .vxe-resizable{right:auto;left:-7px}
|