优化样式

This commit is contained in:
xuliangzhan
2021-06-25 20:44:22 +08:00
parent 8a4f75ad15
commit da48922795
5 changed files with 35 additions and 13 deletions

View File

@@ -183,6 +183,7 @@ export default defineComponent({
class: ['vxe-pager--prev-btn', {
'is--disabled': props.currentPage <= 1
}],
type: 'button',
title: GlobalConfig.i18n('vxe.pager.prevPage'),
onClick: handlePrevPage
}, [
@@ -199,6 +200,7 @@ export default defineComponent({
'is--fixed': !tagName,
'is--disabled': props.currentPage <= 1
}],
type: 'button',
title: GlobalConfig.i18n('vxe.pager.prevJump'),
onClick: handlePrevJump
}, [
@@ -219,6 +221,7 @@ export default defineComponent({
'is--fixed': !tagName,
'is--disabled': props.currentPage >= pageCount
}],
type: 'button',
title: GlobalConfig.i18n('vxe.pager.nextJump'),
onClick: handleNextJump
}, [
@@ -238,6 +241,7 @@ export default defineComponent({
class: ['vxe-pager--next-btn', {
'is--disabled': props.currentPage >= pageCount
}],
type: 'button',
title: GlobalConfig.i18n('vxe.pager.nextPage'),
onClick: handleNextPage
}, [
@@ -269,6 +273,7 @@ export default defineComponent({
nums.push(
h('button', {
class: 'vxe-pager--num-btn',
type: 'button',
onClick: (evnt: Event) => jumpPageEvent(evnt, 1)
}, 1),
renderPrevJump('span')
@@ -283,6 +288,7 @@ export default defineComponent({
class: ['vxe-pager--num-btn', {
'is--active': currentPage === number
}],
type: 'button',
onClick: (evnt: Event) => jumpPageEvent(evnt, number)
}, number)
)
@@ -293,6 +299,7 @@ export default defineComponent({
renderNextJump('button'),
h('button', {
class: 'vxe-pager--num-btn',
type: 'button',
onClick: (evnt: Event) => jumpPageEvent(evnt, pageCount)
}, pageCount)
)

View File

@@ -756,6 +756,7 @@ export default defineComponent({
[`size--${vSize}`]: vSize,
'is--visivle': visiblePanel,
'is--disabled': disabled,
'is--loading': loading,
'is--active': isActivated
}]
}, [

View File

@@ -4727,6 +4727,7 @@ export default defineComponent({
const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-tree--btn-wrapper').flag
const triggerExpandNode = isExpandType && getEventTargetNode(evnt, cell, 'vxe-table--expanded').flag
params = Object.assign({ cell, triggerRadio, triggerCheckbox, triggerTreeNode, triggerExpandNode }, params)
debugger
if (!triggerCheckbox && !triggerRadio) {
// 如果是展开行
if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {

View File

@@ -55,17 +55,6 @@ $btnThemeList: (
user-select: none;
appearance: none;
@include animatTransition(border, .2s);
&.is--disabled {
color: $vxe-disabled-color;
.vxe-button--icon {
&.vxe-icon--zoomin {
border-color: $vxe-disabled-color;
}
}
&:not(.is--loading) {
cursor: no-drop;
}
}
&:not(.is--disabled) {
color: $vxe-font-color;
cursor: pointer;
@@ -76,6 +65,7 @@ $btnThemeList: (
}
}
&.is--loading {
cursor: progress;
&:before {
content: "";
position: absolute;
@@ -88,6 +78,17 @@ $btnThemeList: (
pointer-events: none;
}
}
&.is--disabled {
color: $vxe-disabled-color;
.vxe-button--icon {
&.vxe-icon--zoomin {
border-color: $vxe-disabled-color;
}
}
&:not(.is--loading) {
cursor: no-drop;
}
}
&.type--text {
text-decoration: none;
border: 0;

View File

@@ -8,10 +8,22 @@
width: 180px;
color: $vxe-font-color;
text-align: left;
&:not(.is--disabled) {
& > .vxe-input {
.vxe-input--inner {
cursor: pointer;
}
}
&.is--disabled {
& > .vxe-input {
.vxe-input--inner {
cursor: pointer;
cursor: no-drop;
}
}
}
&.is--loading {
& > .vxe-input {
.vxe-input--inner {
cursor: progress;
}
}
}