From 6844f69c2068807eb0bd876d30f7b7de447c841a Mon Sep 17 00:00:00 2001
From: WYH <18639003229@163.com>
Date: Wed, 16 Nov 2022 17:19:27 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddemo=E4=B8=ADfor?=
 =?UTF-8?q?mTable=E5=87=A0=E4=B8=AA=E7=A9=BA=E6=8C=87=E9=92=88=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=92=8CselectedRowKeys=E4=B8=A2=E5=A4=B1=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98=20(#2386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 王一骅 <wangyihua@yazuishou.com>
---
 src/components/Table/src/hooks/useCustomRow.ts    |  2 +-
 src/components/Table/src/hooks/useRowSelection.ts |  4 ++--
 src/views/demo/table/FormTable.vue                | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/Table/src/hooks/useCustomRow.ts b/src/components/Table/src/hooks/useCustomRow.ts
index 56187208e83..1a5aac85891 100644
--- a/src/components/Table/src/hooks/useCustomRow.ts
+++ b/src/components/Table/src/hooks/useCustomRow.ts
@@ -40,7 +40,7 @@ export function useCustomRow(
         function handleClick() {
           const { rowSelection, rowKey, clickToRowSelect } = unref(propsRef);
           if (!rowSelection || !clickToRowSelect) return;
-          const keys = getSelectRowKeys();
+          const keys = getSelectRowKeys() || [];
           const key = getKey(record, rowKey, unref(getAutoCreateKey));
           if (!key) return;
 
diff --git a/src/components/Table/src/hooks/useRowSelection.ts b/src/components/Table/src/hooks/useRowSelection.ts
index 3439a223bba..ed19b072a67 100644
--- a/src/components/Table/src/hooks/useRowSelection.ts
+++ b/src/components/Table/src/hooks/useRowSelection.ts
@@ -66,13 +66,13 @@ export function useRowSelection(
     selectedRowKeysRef.value = rowKeys;
     const allSelectedRows = findNodeAll(
       toRaw(unref(tableData)).concat(toRaw(unref(selectedRowRef))),
-      (item) => rowKeys.includes(item[unref(getRowKey) as string]),
+      (item) => rowKeys?.includes(item[unref(getRowKey) as string]),
       {
         children: propsRef.value.childrenColumnName ?? 'children',
       },
     );
     const trueSelectedRows: any[] = [];
-    rowKeys.forEach((key: string) => {
+    rowKeys?.forEach((key: string) => {
       const found = allSelectedRows.find((item) => item[unref(getRowKey) as string] === key);
       found && trueSelectedRows.push(found);
     });
diff --git a/src/views/demo/table/FormTable.vue b/src/views/demo/table/FormTable.vue
index 23300aa7c92..fc565edfe12 100644
--- a/src/views/demo/table/FormTable.vue
+++ b/src/views/demo/table/FormTable.vue
@@ -1,8 +1,5 @@
 <template>
-  <BasicTable
-    @register="registerTable"
-    :rowSelection="{ type: 'checkbox', selectedRowKeys: checkedKeys, onChange: onSelectChange }"
-  >
+  <BasicTable @register="registerTable">
     <template #form-custom> custom-slot </template>
     <template #headerTop>
       <a-alert type="info" show-icon>
@@ -44,6 +41,11 @@
         tableSetting: { fullScreen: true },
         showIndexColumn: false,
         rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+          selectedRowKeys: checkedKeys,
+          onChange: onSelectChange,
+        },
       });
 
       function getFormValues() {

From d01c1b4d054f98d6876e06ff544d4dd7c0d267f5 Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 18:02:57 +0800
Subject: [PATCH 02/11] chore: update ci

---
 .github/workflows/deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2eed5ee56fd..6d899c7c21b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -108,11 +108,12 @@ jobs:
           git push origin --delete gh-pages
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v2.5.0
+        uses: peaceiris/actions-gh-pages@v3
         env:
           ACTIONS_DEPLOY_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
+          cname: vben.vvbin.cn
         with:
           forceOrphan: true
 

From 6d1adce4626e4cbe72a486eb325308f608b3c60a Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 18:12:16 +0800
Subject: [PATCH 03/11] chore: update ci

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6d899c7c21b..c4ec388e43f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -110,7 +110,7 @@ jobs:
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         env:
-          ACTIONS_DEPLOY_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
+          deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
           cname: vben.vvbin.cn

From 750a50ebfd343c72f6a5f0b0c303a801b83a97e3 Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 18:46:42 +0800
Subject: [PATCH 04/11] chore: update ci

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c4ec388e43f..228e7eae093 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -108,7 +108,7 @@ jobs:
           git push origin --delete gh-pages
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v2.5
         env:
           deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
           PUBLISH_BRANCH: gh-pages

From e74a9ed3376b2e8cc543f6d60fa4ed5a4c060c77 Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 18:49:38 +0800
Subject: [PATCH 05/11] chore: update ci

---
 .github/workflows/deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 228e7eae093..4b7ea5f4fe2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -108,12 +108,12 @@ jobs:
           git push origin --delete gh-pages
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v2.5
+        uses: peaceiris/actions-gh-pages@v2.5.0
         env:
-          deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
+          ACTIONS_DEPLOY_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
-          cname: vben.vvbin.cn
+          CNAME: vben.vvbin.cn
         with:
           forceOrphan: true
 

From 3948ba1b01f2aafee963ec7b1b759018c63565e4 Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 19:02:24 +0800
Subject: [PATCH 06/11] chore: update ci

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4b7ea5f4fe2..15f88a19735 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -108,9 +108,9 @@ jobs:
           git push origin --delete gh-pages
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v2.5.0
+        uses: peaceiris/actions-gh-pages@v3
         env:
-          ACTIONS_DEPLOY_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
+          github_token: ${{secrets.OPER_TOKEN}}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
           CNAME: vben.vvbin.cn

From e013f04151585aaa3eefed2237b4c8063f4a7ae5 Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 19:09:44 +0800
Subject: [PATCH 07/11] chore: update ci

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 15f88a19735..06eb91df103 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -110,7 +110,7 @@ jobs:
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         env:
-          github_token: ${{secrets.OPER_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
           CNAME: vben.vvbin.cn

From be4c98b9804fffa307c54b4e2132e80e854c9bc0 Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 19:28:57 +0800
Subject: [PATCH 08/11] chore: update ci

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 06eb91df103..4ae991ecf4e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -110,7 +110,7 @@ jobs:
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
           CNAME: vben.vvbin.cn

From e7ac09cf39d1f23c11f0830f6628d23dd57f268f Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 20:31:00 +0800
Subject: [PATCH 09/11] chore: update ci

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4ae991ecf4e..67e01c20953 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -108,9 +108,9 @@ jobs:
           git push origin --delete gh-pages
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v3.9.0
         env:
-          deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}}
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
           CNAME: vben.vvbin.cn

From c5713c75ec6431f50a78859297de3fedc0ed8305 Mon Sep 17 00:00:00 2001
From: JinMao <jinmao88@qq.com>
Date: Wed, 16 Nov 2022 20:48:58 +0800
Subject: [PATCH 10/11] chore: update ci

---
 .github/workflows/deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 67e01c20953..95f8211f3f2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -109,13 +109,13 @@ jobs:
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3.9.0
-        env:
+        with:
           deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
           CNAME: vben.vvbin.cn
-        with:
-          forceOrphan: true
+
+
 
 
 

From 4e16438494df58fbd44d85a2916bd6b0f82ed9e4 Mon Sep 17 00:00:00 2001
From: tnnevol <greecenew@foxmail.com>
Date: Thu, 17 Nov 2022 23:51:34 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix:=20#2390=20[Preview]=E7=BC=A9?=
 =?UTF-8?q?=E5=B0=8F=E5=90=8Escale=E4=B8=BA=E8=B4=9F=E5=80=BC=20(#2391)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Preview/src/Functional.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Preview/src/Functional.vue b/src/components/Preview/src/Functional.vue
index 1c91929786f..2fcf7e39fbb 100644
--- a/src/components/Preview/src/Functional.vue
+++ b/src/components/Preview/src/Functional.vue
@@ -141,8 +141,16 @@
       }
       // 缩放函数
       function scaleFunc(num: number) {
+        // 最小缩放
+        const MIN_SCALE = 0.02;
+        // 放大缩小的颗粒度
+        const GRA = 0.1;
         if (imgState.imgScale <= 0.2 && num < 0) return;
-        imgState.imgScale += num;
+        imgState.imgScale += num * GRA;
+        // scale 不能 < 0，否则图片会倒置放大
+        if (imgState.imgScale < 0) {
+          imgState.imgScale = MIN_SCALE;
+        }
       }
 
       // 旋转图片