From 8284d106e2ea1c286e634904bac270dc13734468 Mon Sep 17 00:00:00 2001
From: luocong2016 <luocong2016@126.com>
Date: Thu, 23 Feb 2023 22:57:38 +0800
Subject: [PATCH 01/14] =?UTF-8?q?refactor<useForm>:=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E6=A1=88=E4=BE=8B=20(#2577)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/form/UseForm.vue | 320 +++++++++++++++++++++-----------
 1 file changed, 208 insertions(+), 112 deletions(-)

diff --git a/src/views/demo/form/UseForm.vue b/src/views/demo/form/UseForm.vue
index 95e8fb9c0..d8fedf37b 100644
--- a/src/views/demo/form/UseForm.vue
+++ b/src/views/demo/form/UseForm.vue
@@ -1,80 +1,53 @@
 <template>
   <PageWrapper title="UseForm操作示例">
-    <div class="mb-4">
-      <a-button @click="setProps({ labelWidth: 150 })" class="mr-2"> 更改labelWidth </a-button>
-      <a-button @click="setProps({ labelWidth: 120 })" class="mr-2"> 还原labelWidth </a-button>
-      <a-button @click="setProps({ size: 'large' })" class="mr-2"> 更改Size </a-button>
-      <a-button @click="setProps({ size: 'default' })" class="mr-2"> 还原Size </a-button>
-      <a-button @click="setProps({ disabled: true })" class="mr-2"> 禁用表单 </a-button>
-      <a-button @click="setProps({ disabled: false })" class="mr-2"> 解除禁用 </a-button>
-      <a-button @click="setProps({ compact: true })" class="mr-2"> 紧凑表单 </a-button>
-      <a-button @click="setProps({ compact: false })" class="mr-2"> 还原正常间距 </a-button>
-      <a-button @click="setProps({ actionColOptions: { span: 8 } })" class="mr-2">
-        操作按钮位置
-      </a-button>
-    </div>
-    <div class="mb-4">
-      <a-button @click="setProps({ showActionButtonGroup: false })" class="mr-2">
-        隐藏操作按钮
-      </a-button>
-      <a-button @click="setProps({ showActionButtonGroup: true })" class="mr-2">
-        显示操作按钮
-      </a-button>
-      <a-button @click="setProps({ showResetButton: false })" class="mr-2"> 隐藏重置按钮 </a-button>
-      <a-button @click="setProps({ showResetButton: true })" class="mr-2"> 显示重置按钮 </a-button>
-      <a-button @click="setProps({ showSubmitButton: false })" class="mr-2">
-        隐藏查询按钮
-      </a-button>
-      <a-button @click="setProps({ showSubmitButton: true })" class="mr-2"> 显示查询按钮 </a-button>
-      <a-button
-        @click="
-          setProps({
-            resetButtonOptions: {
-              disabled: true,
-              text: '重置New',
-            },
-          })
-        "
-        class="mr-2"
-      >
+    <Space class="mb-4">
+      <a-button type="primary" @click="showDrawer"> 更改设置 </a-button>
+      <a-button @click="setProps({ resetButtonOptions: { disabled: true, text: '重置New' } })">
         修改重置按钮
       </a-button>
-      <a-button
-        @click="
-          setProps({
-            submitButtonOptions: {
-              disabled: true,
-              loading: true,
-            },
-          })
-        "
-        class="mr-2"
-      >
+      <a-button @click="setProps({ submitButtonOptions: { disabled: true, loading: true } })">
         修改查询按钮
       </a-button>
       <a-button @click="handleLoad" class="mr-2"> 联动回显 </a-button>
-    </div>
+    </Space>
+
+    <Drawer v-model:visible="visible" title="更改设置" placement="right">
+      <BasicForm ref="settingFormRef" @register="registerSetting" @submit="handleSubmitSetting" />
+      <template #extra>
+        <Space>
+          <a-button @click="resetSettings">重置设置</a-button>
+          <a-button type="primary" @click="onSettings">应用</a-button>
+        </Space>
+      </template>
+    </Drawer>
+
     <CollapseContainer title="useForm示例">
       <BasicForm @register="register" @submit="handleSubmit" />
     </CollapseContainer>
   </PageWrapper>
 </template>
+
 <script lang="ts">
-  import { defineComponent } from 'vue';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
-  import { CollapseContainer } from '/@/components/Container/index';
-  import { useMessage } from '/@/hooks/web/useMessage';
+  import { defineComponent, ref } from 'vue';
+  import { Drawer, Space } from 'ant-design-vue';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { CollapseContainer } from '/@/components/Container';
   import { PageWrapper } from '/@/components/Page';
   import { areaRecord } from '/@/api/demo/cascader';
 
+  const sizeList = [
+    { value: 'large', label: 'large' },
+    { value: 'middle', label: 'middle' },
+    { value: 'small', label: 'small' },
+    { value: 'default', label: 'defualt' },
+  ];
+
   const schemas: FormSchema[] = [
     {
       field: 'field1',
       component: 'Input',
       label: '字段1',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
       componentProps: {
         placeholder: '自定义placeholder',
         onChange: (e: any) => {
@@ -86,45 +59,29 @@
       field: 'field2',
       component: 'Input',
       label: '字段2',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
     },
     {
       field: 'field3',
       component: 'DatePicker',
       label: '字段3',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
     },
     {
       field: 'fieldTime',
       component: 'RangePicker',
       label: '时间字段',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
     },
     {
       field: 'field4',
       component: 'Select',
       label: '字段4',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
       componentProps: {
         options: [
-          {
-            label: '选项1',
-            value: '1',
-            key: '1',
-          },
-          {
-            label: '选项2',
-            value: '2',
-            key: '2',
-          },
+          { label: '选项1', value: '1', key: '1' },
+          { label: '选项2', value: '2', key: '2' },
         ],
       },
     },
@@ -137,14 +94,8 @@
       },
       componentProps: {
         options: [
-          {
-            label: '选项1',
-            value: '1',
-          },
-          {
-            label: '选项2',
-            value: '2',
-          },
+          { label: '选项1', value: '1' },
+          { label: '选项2', value: '2' },
         ],
       },
     },
@@ -152,19 +103,11 @@
       field: 'field7',
       component: 'RadioGroup',
       label: '字段7',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
       componentProps: {
         options: [
-          {
-            label: '选项1',
-            value: '1',
-          },
-          {
-            label: '选项2',
-            value: '2',
-          },
+          { label: '选项1', value: '1' },
+          { label: '选项2', value: '2' },
         ],
       },
     },
@@ -172,9 +115,7 @@
       field: 'field8',
       component: 'ApiCascader',
       label: '联动',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
       componentProps: {
         api: areaRecord,
         apiParamKey: 'parentCode',
@@ -193,9 +134,7 @@
       field: 'field9',
       component: 'ApiCascader',
       label: '联动回显',
-      colProps: {
-        span: 8,
-      },
+      colProps: { span: 8 },
       componentProps: {
         api: areaRecord,
         apiParamKey: 'parentCode',
@@ -212,17 +151,161 @@
     },
   ];
 
+  const formSchemas: FormSchema[] = [
+    {
+      field: '',
+      component: 'Divider',
+      label: '基础属性',
+      colProps: { span: 24 },
+      componentProps: {
+        orientation: 'center',
+      },
+    },
+    {
+      field: 'labelWidth',
+      defaultValue: 120,
+      component: 'InputNumber',
+      label: 'labelWidth',
+      colProps: { span: 24 },
+      componentProps: {
+        size: 'small',
+      },
+    },
+    {
+      field: 'size',
+      defaultValue: 'default',
+      component: 'Select',
+      label: 'size',
+      colProps: { span: 24 },
+      componentProps: {
+        options: sizeList,
+        size: 'small',
+      },
+    },
+    {
+      field: 'disabled',
+      defaultValue: false,
+      component: 'Switch',
+      label: 'disabled',
+      colProps: { span: 24 },
+      componentProps: {
+        size: 'small',
+      },
+    },
+    {
+      field: 'compact',
+      defaultValue: false,
+      component: 'Switch',
+      label: 'compact',
+      colProps: { span: 24 },
+      componentProps: {
+        size: 'small',
+      },
+    },
+    {
+      field: '',
+      component: 'Divider',
+      label: '网格布局',
+      colProps: { span: 24 },
+      componentProps: {
+        orientation: 'center',
+      },
+    },
+    {
+      field: 'actionColOptions.span',
+      component: 'Slider',
+      defaultValue: 24,
+      label: 'span',
+      colProps: { span: 24 },
+      componentProps: {
+        min: 1,
+        max: 24,
+      },
+    },
+    {
+      field: '',
+      component: 'Divider',
+      label: '操作按钮',
+      colProps: { span: 24 },
+      componentProps: {
+        orientation: 'center',
+      },
+    },
+    {
+      field: 'showActionButtonGroup',
+      defaultValue: true,
+      component: 'Switch',
+      label: '操作按钮',
+      colProps: { span: 24 },
+      componentProps: ({ formActionType }) => {
+        return {
+          size: 'small',
+          onChange: async (val: boolean) => {
+            formActionType.updateSchema([
+              { field: 'showResetButton', componentProps: { disabled: !val } },
+              {
+                field: 'showSubmitButton',
+                componentProps: { disabled: !val },
+              },
+            ]);
+          },
+        };
+      },
+    },
+    {
+      field: 'showResetButton',
+      defaultValue: true,
+      component: 'Switch',
+      label: '重置按钮',
+      colProps: { span: 24 },
+      componentProps: {
+        size: 'small',
+      },
+    },
+    {
+      field: 'showSubmitButton',
+      defaultValue: true,
+      component: 'Switch',
+      label: '提交按钮',
+      colProps: { span: 24 },
+      componentProps: {
+        size: 'small',
+      },
+    },
+  ];
+
   export default defineComponent({
-    components: { BasicForm, CollapseContainer, PageWrapper },
+    components: {
+      BasicForm,
+      CollapseContainer,
+      PageWrapper,
+      Drawer,
+      Space,
+    },
     setup() {
-      const { createMessage } = useMessage();
+      const visible = ref<boolean>(false);
+      const settingFormRef = ref();
+      const [registerSetting] = useForm({
+        labelWidth: 80,
+        schemas: formSchemas,
+        compact: true,
+        actionColOptions: { span: 24 },
+        showActionButtonGroup: false,
+      });
+
+      const resetSettings = async () => {
+        await settingFormRef.value?.resetFields();
+      };
+
+      const handleSubmitSetting = async (values: Recordable) => {
+        await setProps(values);
+        visible.value = false;
+      };
 
       const [register, { setProps, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 120,
         schemas,
-        actionColOptions: {
-          span: 24,
-        },
+        actionColOptions: { span: 24 },
         fieldMapToTime: [['fieldTime', ['startTime', 'endTime'], 'YYYY-MM']],
       });
 
@@ -249,19 +332,32 @@
             displayRenderArray: [province, city, district],
           },
         });
-        await setFieldsValue({
-          field9,
-        });
+        await setFieldsValue({ field9 });
       }
 
+      const showDrawer = () => {
+        visible.value = true;
+      };
+
+      const onSettings = () => {
+        settingFormRef.value?.submit();
+      };
+
       return {
         register,
         schemas,
         handleSubmit: (values: Recordable) => {
-          createMessage.success('click search,values:' + JSON.stringify(values));
+          console.log(values);
         },
         setProps,
         handleLoad,
+        visible,
+        showDrawer,
+        settingFormRef,
+        onSettings,
+        resetSettings,
+        registerSetting,
+        handleSubmitSetting,
       };
     },
   });
-- 
Gitee


From ed8cffb2a186c9436a3aeeee755190116d43cc99 Mon Sep 17 00:00:00 2001
From: luocong2016 <luocong2016@126.com>
Date: Mon, 27 Feb 2023 12:50:11 +0800
Subject: [PATCH 02/14] =?UTF-8?q?fix:=20=E7=BB=84=E4=BB=B6=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=BC=98=E5=85=88=E9=BB=98=E8=AE=A4=20(#2581)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/components/FormItem.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
index 8ce579ab9..2142364cd 100644
--- a/src/components/Form/src/components/FormItem.vue
+++ b/src/components/Form/src/components/FormItem.vue
@@ -80,10 +80,14 @@
           componentProps = componentProps({ schema, tableAction, formModel, formActionType }) ?? {};
         }
         if (schema.component === 'Divider') {
-          componentProps = Object.assign({ type: 'horizontal' }, componentProps, {
-            orientation: 'left',
-            plain: true,
-          });
+          componentProps = Object.assign(
+            { type: 'horizontal' },
+            {
+              orientation: 'left',
+              plain: true,
+            },
+            componentProps,
+          );
         }
         return componentProps as Recordable;
       });
-- 
Gitee


From f1678a7cc0a12c2f3bdc39d413ab9b2bbfaba28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8F=8D=E8=97=8F=E7=9A=84=E5=B0=8F=E6=9D=BF=E5=87=B3?=
 <574313000@qq.com>
Date: Mon, 27 Feb 2023 12:50:36 +0800
Subject: [PATCH 03/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DContainer?=
 =?UTF-8?q?=E4=B8=AD=E5=A4=B4=E9=83=A8=E7=BB=84=E4=BB=B6=E6=8F=92=E6=A7=BD?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84action=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#2582)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: xuyang.geng <xuyang.geng@gaea.com>
---
 src/components/Container/src/collapse/CollapseHeader.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Container/src/collapse/CollapseHeader.vue b/src/components/Container/src/collapse/CollapseHeader.vue
index ffc170c68..898adfee2 100644
--- a/src/components/Container/src/collapse/CollapseHeader.vue
+++ b/src/components/Container/src/collapse/CollapseHeader.vue
@@ -31,6 +31,7 @@
           </BasicTitle>
 
           <div class={`${unref(_prefixCls)}__action`}>
+            {slots.action ? slots.action() : null}
             {props.canExpan && <BasicArrow up expand={props.show} onClick={() => emit('expand')} />}
           </div>
         </div>
-- 
Gitee


From 491941e4c5d90681a52403a800099912ec42b9a0 Mon Sep 17 00:00:00 2001
From: luocong2016 <luocong2016@126.com>
Date: Mon, 27 Feb 2023 12:51:13 +0800
Subject: [PATCH 04/14] =?UTF-8?q?fix<CollapseContainer>:=20v-show=20?=
 =?UTF-8?q?=E6=89=8D=E4=B8=8D=E4=BC=9A=E4=B8=A2=E5=A4=B1=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=20(#2584)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Container/src/collapse/CollapseContainer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue
index a49be6636..6f3ff3136 100644
--- a/src/components/Container/src/collapse/CollapseContainer.vue
+++ b/src/components/Container/src/collapse/CollapseContainer.vue
@@ -73,7 +73,7 @@
               {props.loading ? (
                 <Skeleton active={props.loading} />
               ) : (
-                show.value && <div class={`${prefixCls}__body`}>{slots.default?.()}</div>
+                <div class={`${prefixCls}__body`} v-show={show.value}>{slots.default?.()}</div>
               )}
             </CollapseTransition>
           </div>
-- 
Gitee


From 4f4bec0c22f113ee7dccc3260d3dd48bca44c9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=88=B1=E7=A0=81=E5=A3=AB?=
 <a63149300@163.com>
Date: Mon, 27 Feb 2023 12:51:26 +0800
Subject: [PATCH 05/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AFhooks=20icon=E7=B1=BB=E5=9E=8B=20(#2585)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/web/useMessage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/web/useMessage.tsx b/src/hooks/web/useMessage.tsx
index 91112f34a..94ddab30a 100644
--- a/src/hooks/web/useMessage.tsx
+++ b/src/hooks/web/useMessage.tsx
@@ -91,7 +91,7 @@ function createSuccessModal(options: ModalOptionsPartial) {
 }
 
 function createErrorModal(options: ModalOptionsPartial) {
-  return Modal.error(createModalOptions(options, 'close'));
+  return Modal.error(createModalOptions(options, 'error'));
 }
 
 function createInfoModal(options: ModalOptionsPartial) {
-- 
Gitee


From c70cf3cace62416eea32a787b000cd9ed2055ed2 Mon Sep 17 00:00:00 2001
From: tttleon <66937093+tttleon@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:51:51 +0800
Subject: [PATCH 06/14] =?UTF-8?q?fix=20=E4=B8=BB=E5=8A=A8=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=20axioscancelToken=20=E7=9A=84=20cancel=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AF=B7=E6=B1=82=E6=97=B6=20=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#2586)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cancelToken 如果被深拷贝，会导致最外层无法使用cancel方法来取消请求
---
 src/utils/http/axios/Axios.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
index f683a8871..2a1b48ba1 100644
--- a/src/utils/http/axios/Axios.ts
+++ b/src/utils/http/axios/Axios.ts
@@ -193,6 +193,11 @@ export class VAxios {
 
   request<T = any>(config: AxiosRequestConfig, options?: RequestOptions): Promise<T> {
     let conf: CreateAxiosOptions = cloneDeep(config);
+    // cancelToken 如果被深拷贝，会导致最外层无法使用cancel方法来取消请求
+    if(config.cancelToken){
+        conf.cancelToken = config.cancelToken
+    }
+    
     const transform = this.getTransform();
 
     const { requestOptions } = this.options;
-- 
Gitee


From 256e0275fe8213852ea390c42ab2020aeeebcc42 Mon Sep 17 00:00:00 2001
From: jsong <32285893+jsong93@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:52:09 +0800
Subject: [PATCH 07/14] Feat/modify input excel (#2587)

* feat: optimize parameter

* Revert "feat: optimize parameter"

This reverts commit 957dfc95ddab598f260d3974732d56f802e7f0bd.

* feat: can input irregulate excel
---
 src/components/Excel/src/ImportExcel.vue | 38 ++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/components/Excel/src/ImportExcel.vue b/src/components/Excel/src/ImportExcel.vue
index 065968bc8..3ed98a987 100644
--- a/src/components/Excel/src/ImportExcel.vue
+++ b/src/components/Excel/src/ImportExcel.vue
@@ -42,6 +42,40 @@
       const inputRef = ref<HTMLInputElement | null>(null);
       const loadingRef = ref<Boolean>(false);
 
+      function shapeWorkSheel(sheet: XLSX.WorkSheet, range: XLSX.Range) {
+        let str = ' ',
+          char = 65,
+          customWorkSheet = {
+            t: 's',
+            v: str,
+            r: '<t> </t><phoneticPr fontId="1" type="noConversion"/>',
+            h: str,
+            w: str,
+          };
+        if (!sheet || !sheet['!ref']) return [];
+        let c = 0,
+          r = 1;
+        while (c < range.e.c + 1) {
+          while (r < range.e.r + 1) {
+            if (!sheet[String.fromCharCode(char) + r]) {
+              sheet[String.fromCharCode(char) + r] = customWorkSheet;
+            }
+            r++;
+          }
+          r = 1;
+          str += ' ';
+          customWorkSheet = {
+            t: 's',
+            v: str,
+            r: '<t> </t><phoneticPr fontId="1" type="noConversion"/>',
+            h: str,
+            w: str,
+          };
+          c++;
+          char++;
+        }
+      }
+
       /**
        * @description: 第一行作为头部
        */
@@ -49,8 +83,8 @@
         if (!sheet || !sheet['!ref']) return [];
         const headers: string[] = [];
         // A3:B7=>{s:{c:0, r:2}, e:{c:1, r:6}}
-        const range = XLSX.utils.decode_range(sheet['!ref']);
-
+        const range: XLSX.Range = XLSX.utils.decode_range(sheet['!ref']);
+        shapeWorkSheel(sheet, range);
         const R = range.s.r;
         /* start in the first row */
         for (let C = range.s.c; C <= range.e.c; ++C) {
-- 
Gitee


From dce3aba20d97d269d30993c4b9b01ae45b940338 Mon Sep 17 00:00:00 2001
From: luocong2016 <luocong2016@126.com>
Date: Thu, 2 Mar 2023 15:13:30 +0800
Subject: [PATCH 08/14] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8B=E4=BB=A3=E7=A0=81=20(#2589)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/form/UseForm.vue | 56 ++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/views/demo/form/UseForm.vue b/src/views/demo/form/UseForm.vue
index d8fedf37b..f03eac032 100644
--- a/src/views/demo/form/UseForm.vue
+++ b/src/views/demo/form/UseForm.vue
@@ -1,18 +1,25 @@
 <template>
   <PageWrapper title="UseForm操作示例">
-    <Space class="mb-4">
-      <a-button type="primary" @click="showDrawer"> 更改设置 </a-button>
-      <a-button @click="setProps({ resetButtonOptions: { disabled: true, text: '重置New' } })">
-        修改重置按钮
-      </a-button>
-      <a-button @click="setProps({ submitButtonOptions: { disabled: true, loading: true } })">
-        修改查询按钮
-      </a-button>
-      <a-button @click="handleLoad" class="mr-2"> 联动回显 </a-button>
-    </Space>
+    <a-button class="mb-4" type="primary" @click="showDrawer"> 更改设置 </a-button>
 
     <Drawer v-model:visible="visible" title="更改设置" placement="right">
-      <BasicForm ref="settingFormRef" @register="registerSetting" @submit="handleSubmitSetting" />
+      <BasicForm ref="settingFormRef" @register="registerSetting" @submit="handleSubmitSetting">
+        <template #other>
+          <Space>
+            <a-button
+              @click="() => withClose({ resetButtonOptions: { disabled: true, text: '重置New' } })"
+            >
+              修改重置按钮
+            </a-button>
+            <a-button
+              @click="() => withClose({ submitButtonOptions: { disabled: true, loading: true } })"
+            >
+              修改查询按钮
+            </a-button>
+            <a-button @click="handleLoad" class="mr-2"> 联动回显 </a-button>
+          </Space>
+        </template>
+      </BasicForm>
       <template #extra>
         <Space>
           <a-button @click="resetSettings">重置设置</a-button>
@@ -30,7 +37,7 @@
 <script lang="ts">
   import { defineComponent, ref } from 'vue';
   import { Drawer, Space } from 'ant-design-vue';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { BasicForm, FormSchema, useForm, type FormProps } from '/@/components/Form';
   import { CollapseContainer } from '/@/components/Container';
   import { PageWrapper } from '/@/components/Page';
   import { areaRecord } from '/@/api/demo/cascader';
@@ -272,6 +279,22 @@
         size: 'small',
       },
     },
+    {
+      field: '',
+      component: 'Divider',
+      label: '其他事件',
+      colProps: { span: 24 },
+      componentProps: {
+        orientation: 'center',
+      },
+    },
+    {
+      field: 'other',
+      component: 'Input',
+      label: '',
+      colProps: { span: 24 },
+      colSlot: 'other',
+    },
   ];
 
   export default defineComponent({
@@ -294,6 +317,9 @@
       });
 
       const resetSettings = async () => {
+        setProps({ resetButtonOptions: { disabled: false, text: '重置' } });
+        setProps({ submitButtonOptions: { disabled: false, loading: false } });
+        await setFieldsValue({ field9: [] });
         await settingFormRef.value?.resetFields();
       };
 
@@ -343,6 +369,11 @@
         settingFormRef.value?.submit();
       };
 
+      const withClose = (formProps: Partial<FormProps>) => {
+        setProps(formProps);
+        visible.value = false;
+      };
+
       return {
         register,
         schemas,
@@ -354,6 +385,7 @@
         visible,
         showDrawer,
         settingFormRef,
+        withClose,
         onSettings,
         resetSettings,
         registerSetting,
-- 
Gitee


From bb8c2dea40566d17d3de37761bed4cd14845299d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=88=B1=E7=A0=81=E5=A3=AB?=
 <a63149300@163.com>
Date: Thu, 2 Mar 2023 15:13:45 +0800
Subject: [PATCH 09/14] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3IconPicker?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=8B=B7=E8=B4=9D=E4=BA=86value=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=89=AA=E5=88=87=E6=9D=BF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A2=AB=E8=A6=86=E7=9B=96=20(#2591)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Icon/src/IconPicker.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/Icon/src/IconPicker.vue b/src/components/Icon/src/IconPicker.vue
index 40cfe7d17..141940177 100644
--- a/src/components/Icon/src/IconPicker.vue
+++ b/src/components/Icon/src/IconPicker.vue
@@ -124,7 +124,16 @@
   const { prefixCls } = useDesign('icon-picker');
 
   const debounceHandleSearchChange = useDebounceFn(handleSearchChange, 100);
-  const { clipboardRef, isSuccessRef } = useCopyToClipboard(props.value);
+
+  let clipboardRef;
+  let isSuccessRef;
+
+  if (props.copy) {
+    const clipboard = useCopyToClipboard(props.value);
+    clipboardRef = clipboard?.clipboardRef;
+    isSuccessRef = clipboard?.isSuccessRef;
+  }
+
   const { createMessage } = useMessage();
 
   const { getPaginationList, getTotal, setCurrentPage } = usePagination(
-- 
Gitee


From a78c3a305b495dbf72a99c13204d9e9cfd079923 Mon Sep 17 00:00:00 2001
From: luocong2016 <luocong2016@126.com>
Date: Thu, 2 Mar 2023 15:14:00 +0800
Subject: [PATCH 10/14] Update CollapseHeader.vue (#2583)

#2582
---
 src/components/Container/src/collapse/CollapseHeader.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/Container/src/collapse/CollapseHeader.vue b/src/components/Container/src/collapse/CollapseHeader.vue
index 898adfee2..6bfdcc0a4 100644
--- a/src/components/Container/src/collapse/CollapseHeader.vue
+++ b/src/components/Container/src/collapse/CollapseHeader.vue
@@ -31,8 +31,11 @@
           </BasicTitle>
 
           <div class={`${unref(_prefixCls)}__action`}>
-            {slots.action ? slots.action() : null}
-            {props.canExpan && <BasicArrow up expand={props.show} onClick={() => emit('expand')} />}
+             {slots.action
+              ? slots.action({ expand: props.show, onClick: () => emit('expand') })
+              : props.canExpan && (
+                  <BasicArrow up expand={props.show} onClick={() => emit('expand')} />
+                )}
           </div>
         </div>
       );
-- 
Gitee


From 714a351036042ae9883d821e99feed9802aa8d22 Mon Sep 17 00:00:00 2001
From: yx lin <colin.in@foxmail.com>
Date: Fri, 3 Mar 2023 13:14:01 +0800
Subject: [PATCH 11/14] Feat/cancel event (#2593)

* feat(excel): add cancel event for import excel

* feat(excel): add cancel emits
---
 src/components/Excel/src/ImportExcel.vue | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/components/Excel/src/ImportExcel.vue b/src/components/Excel/src/ImportExcel.vue
index 3ed98a987..59d7f578b 100644
--- a/src/components/Excel/src/ImportExcel.vue
+++ b/src/components/Excel/src/ImportExcel.vue
@@ -37,10 +37,11 @@
         default: false,
       },
     },
-    emits: ['success', 'error'],
+    emits: ['success', 'error', 'cancel'],
     setup(props, { emit }) {
       const inputRef = ref<HTMLInputElement | null>(null);
       const loadingRef = ref<Boolean>(false);
+      const cancelRef = ref<Boolean>(true);
 
       function shapeWorkSheel(sheet: XLSX.WorkSheet, range: XLSX.Range) {
         let str = ' ',
@@ -184,6 +185,7 @@
 
         if (!rawFile) return;
 
+        cancelRef.value = false;
         if (props.isReturnFile) {
           emit('success', rawFile);
           return;
@@ -191,12 +193,29 @@
         upload(rawFile);
       }
 
+      /**
+       * @description 文件选择器关闭后,判断取消状态
+       */
+       function handleFocusChange() {
+        const timeId = setInterval(() => {
+          if (cancelRef.value === true) {
+            emit('cancel');
+          }
+          clearInterval(timeId);
+          window.removeEventListener('focus', handleFocusChange);
+        }, 1000);
+      }
+
       /**
        * @description: 点击上传按钮
        */
       function handleUpload() {
         const inputRefDom = unref(inputRef);
-        inputRefDom && inputRefDom.click();
+        if (inputRefDom) {
+          cancelRef.value = true;
+          inputRefDom.click();
+          window.addEventListener('focus', handleFocusChange);
+        }
       }
 
       return { handleUpload, handleInputClick, inputRef };
-- 
Gitee


From 7f5e415da90d85a065409798fc74be69257995f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=88=B1=E7=A0=81=E5=A3=AB?=
 <a63149300@163.com>
Date: Sat, 4 Mar 2023 14:08:13 +0800
Subject: [PATCH 12/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DdeepMerge?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E9=97=AE=E9=A2=98=20(#2597)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 37526aa55..0e9b23fc4 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -38,7 +38,7 @@ export function deepMerge<T = any>(src: any = {}, target: any = {}): T {
   let key: string;
   const res: any = cloneDeep(src);
   for (key in target) {
-    res[key] = isObject(res[key]) ? deepMerge(res[key], target[key]) : (res[key] = target[key]);
+    res[key] = isObject(res[key]) ? deepMerge(res[key], target[key]) : target[key];
   }
   return res;
 }
-- 
Gitee


From ce480c5d664d03536c2077fdb469e57c0fbf79a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=88=B1=E7=A0=81=E5=A3=AB?=
 <a63149300@163.com>
Date: Sat, 4 Mar 2023 14:08:23 +0800
Subject: [PATCH 13/14] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3BasicModal?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=8A=A8=E6=80=81:wrapClassName=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E8=A2=ABuseFullScreen=20hooks=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#2598)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Modal/src/BasicModal.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue
index 89bc8798c..959e6db62 100644
--- a/src/components/Modal/src/BasicModal.vue
+++ b/src/components/Modal/src/BasicModal.vue
@@ -139,8 +139,9 @@
           ...attrs,
           ...unref(getMergeProps),
           visible: unref(visibleRef),
-          wrapClassName: unref(getWrapClassName),
         };
+        attr['wrapClassName'] = `${attr?.['wrapClassName'] || ''} ${unref(getWrapClassName)}`;
+
         if (unref(fullScreenRef)) {
           return omit(attr, ['height', 'title']);
         }
-- 
Gitee


From 4c91ac11e25d96b2f79e38037a5c92a795528d57 Mon Sep 17 00:00:00 2001
From: superlollipop <1769128867@qq.com>
Date: Sat, 4 Mar 2023 14:08:32 +0800
Subject: [PATCH 14/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E5=8A=A0=E8=BD=BD=E8=A1=A8=E6=A0=BC=E5=88=97=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E6=A0=BC=E8=AE=BE=E7=BD=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=88=97=E4=B8=BA=E7=A9=BA=20(#2599)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/BasicTable.vue                        | 2 +-
 src/components/Table/src/components/settings/ColumnSetting.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 2e600dabd..964addbad 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -75,7 +75,7 @@
   import { warn } from '/@/utils/log';
 
   export default defineComponent({
-    name:'BasicTable',
+    name: 'BasicTable',
     components: {
       Table,
       BasicForm,
diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue
index c9f17a521..5c578014d 100644
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -183,8 +183,8 @@
       });
 
       watchEffect(() => {
+        const columns = table.getColumns();
         setTimeout(() => {
-          const columns = table.getColumns();
           if (columns.length && !state.isInit) {
             init();
           }
-- 
Gitee