From da4892279502cba00d2a85280d003c7bcfea63d8 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xu_liangzhan@163.com>
Date: Fri, 25 Jun 2021 20:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/pager/src/pager.ts   |  7 +++++++
 packages/select/src/select.ts |  1 +
 packages/table/src/table.ts   |  1 +
 styles/button.scss            | 23 ++++++++++++-----------
 styles/select.scss            | 16 ++++++++++++++--
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/packages/pager/src/pager.ts b/packages/pager/src/pager.ts
index 07566d678..91d2bb2ce 100644
--- a/packages/pager/src/pager.ts
+++ b/packages/pager/src/pager.ts
@@ -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)
         )
diff --git a/packages/select/src/select.ts b/packages/select/src/select.ts
index 4192e5210..f81ad4252 100644
--- a/packages/select/src/select.ts
+++ b/packages/select/src/select.ts
@@ -756,6 +756,7 @@ export default defineComponent({
           [`size--${vSize}`]: vSize,
           'is--visivle': visiblePanel,
           'is--disabled': disabled,
+          'is--loading': loading,
           'is--active': isActivated
         }]
       }, [
diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
index e8642fa83..2b55f2204 100644
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -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'))) {
diff --git a/styles/button.scss b/styles/button.scss
index 3fdb16a55..a75662a58 100644
--- a/styles/button.scss
+++ b/styles/button.scss
@@ -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;
diff --git a/styles/select.scss b/styles/select.scss
index 67884b3bd..de5c09349 100644
--- a/styles/select.scss
+++ b/styles/select.scss
@@ -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;
       }
     }
   }