From d08c4789d528c2abd7c2b63144c9512312e8d637 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Thu, 4 Nov 2021 13:02:33 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=9A=82=E6=97=B6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E5=BA=94=E8=AF=A5=E8=BF=98=E6=9C=89=E5=A4=A7?=
 =?UTF-8?q?=E9=87=8F=E7=BB=84=E4=BB=B6=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/form.ts        | 14 +++++++-------
 packages/input/src/input.ts      | 18 +++++++++---------
 packages/v-x-e-table/src/conf.ts |  8 ++++++--
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/packages/form/src/form.ts b/packages/form/src/form.ts
index 9fbf1b4b5..58ae4a3b8 100644
--- a/packages/form/src/form.ts
+++ b/packages/form/src/form.ts
@@ -69,9 +69,9 @@ function getResetValue (value: any, resetValue: any) {
 export default defineComponent({
   name: 'VxeForm',
   props: {
-    collapseStatus: { type: Boolean as PropType<VxeFormPropTypes.CollapseStatus>, default: true },
-    loading: Boolean as PropType<VxeFormPropTypes.Loading>,
-    data: Object as PropType<VxeFormPropTypes.Data>,
+    collapseStatus: { type: Boolean as PropType<VxeFormPropTypes.CollapseStatus>, default: () => GlobalConfig.form.collapseStatus },
+    loading: { type: Boolean as PropType<VxeFormPropTypes.Loading>, default: () => GlobalConfig.form.loading },
+    data: { type: Object as PropType<VxeFormPropTypes.Data>},
     size: { type: String as PropType<VxeFormPropTypes.Size>, default: () => GlobalConfig.form.size || GlobalConfig.size },
     span: { type: [String, Number] as PropType<VxeFormPropTypes.Span>, default: () => GlobalConfig.form.span },
     align: { type: String as PropType<VxeFormPropTypes.Align>, default: () => GlobalConfig.form.align },
@@ -79,13 +79,13 @@ export default defineComponent({
     titleWidth: { type: [String, Number] as PropType<VxeFormPropTypes.TitleWidth>, default: () => GlobalConfig.form.titleWidth },
     titleColon: { type: Boolean as PropType<VxeFormPropTypes.TitleColon>, default: () => GlobalConfig.form.titleColon },
     titleAsterisk: { type: Boolean as PropType<VxeFormPropTypes.TitleAsterisk>, default: () => GlobalConfig.form.titleAsterisk },
-    titleOverflow: { type: [Boolean, String] as PropType<VxeFormPropTypes.TitleOverflow>, default: null },
-    className: [String, Function] as PropType<VxeFormPropTypes.ClassName>,
+    titleOverflow: { type: [Boolean, String] as PropType<VxeFormPropTypes.TitleOverflow>, default: () => GlobalConfig.form.titleOverflow },
+    className: { type: [String, Function] as PropType<VxeFormPropTypes.ClassName>, default: () => GlobalConfig.form.className },
     items: Array as PropType<VxeFormPropTypes.Items>,
     rules: Object as PropType<VxeFormPropTypes.Rules>,
     preventSubmit: { type: Boolean as PropType<VxeFormPropTypes.PreventSubmit>, default: () => GlobalConfig.form.preventSubmit },
-    validConfig: Object as PropType<VxeFormPropTypes.ValidConfig>,
-    tooltipConfig: Object as PropType<VxeFormPropTypes.TooltipConfig>,
+    validConfig: { type: Object as PropType<VxeFormPropTypes.ValidConfig>, default: () => GlobalConfig.form.validConfig },
+    tooltipConfig: { type: Object as PropType<VxeFormPropTypes.TooltipConfig>, default: () => GlobalConfig.form.tooltipConfig },
     customLayout: { type: Boolean as PropType<VxeFormPropTypes.CustomLayout>, default: () => GlobalConfig.form.customLayout }
   },
   emits: [
diff --git a/packages/input/src/input.ts b/packages/input/src/input.ts
index df475ca87..2cd7ff98e 100644
--- a/packages/input/src/input.ts
+++ b/packages/input/src/input.ts
@@ -83,18 +83,18 @@ export default defineComponent({
   name: 'VxeInput',
   props: {
     modelValue: [String, Number, Date] as PropType<VxeInputPropTypes.ModelValue>,
-    immediate: { type: Boolean as PropType<VxeInputPropTypes.Immediate>, default: true },
+    immediate: { type: Boolean as PropType<VxeInputPropTypes.Immediate>, default: () => GlobalConfig.input.immediate },
     name: String as PropType<VxeInputPropTypes.Name>,
-    type: { type: String as PropType<VxeInputPropTypes.Type>, default: 'text' },
+    type: { type: String as PropType<VxeInputPropTypes.Type>, default: () => GlobalConfig.input.type },
     clearable: { type: Boolean as PropType<VxeInputPropTypes.Clearable>, default: () => GlobalConfig.input.clearable },
-    readonly: Boolean as PropType<VxeInputPropTypes.Readonly>,
-    disabled: Boolean as PropType<VxeInputPropTypes.Disabled>,
-    placeholder: String as PropType<VxeInputPropTypes.Placeholder>,
-    maxlength: [String, Number] as PropType<VxeInputPropTypes.Maxlength>,
-    autocomplete: { type: String as PropType<VxeInputPropTypes.Autocomplete>, default: 'off' },
-    align: String as PropType<VxeInputPropTypes.Align>,
+    readonly: { type: Boolean as PropType<VxeInputPropTypes.Readonly>, default: () => GlobalConfig.input.readonly },
+    disabled: { type: Boolean as PropType<VxeInputPropTypes.Disabled>, default: () => GlobalConfig.input.disabled },
+    placeholder: { type: String as PropType<VxeInputPropTypes.Placeholder>, default: () => GlobalConfig.input.placeholder },
+    maxlength: { type: [String, Number] as PropType<VxeInputPropTypes.Maxlength>, default: () => GlobalConfig.input.maxlength },
+    autocomplete: { type: String as PropType<VxeInputPropTypes.Autocomplete>, default: () => GlobalConfig.input.autocomplete },
+    align: { type: String as PropType<VxeInputPropTypes.Align>, default: () => GlobalConfig.input.align },
     form: String as PropType<VxeInputPropTypes.Form>,
-    className: String as PropType<VxeInputPropTypes.ClassName>,
+    className: { type: String as PropType<VxeInputPropTypes.ClassName>, default: () => GlobalConfig.input.className },
     size: { type: String as PropType<VxeInputPropTypes.Size>, default: () => GlobalConfig.input.size || GlobalConfig.size },
 
     // number、integer、float
diff --git a/packages/v-x-e-table/src/conf.ts b/packages/v-x-e-table/src/conf.ts
index f05f5a29f..5b5723509 100644
--- a/packages/v-x-e-table/src/conf.ts
+++ b/packages/v-x-e-table/src/conf.ts
@@ -245,9 +245,11 @@ const GlobalConfig: VXETableGlobalConfig = {
     },
     // size: null,
     // colon: false,
-    titleAsterisk: true
+    titleAsterisk: true,
+    collapseStatus: true
   },
   input: {
+    type: 'text',
     // size: null,
     // transfer: false
     // parseFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
@@ -258,7 +260,9 @@ const GlobalConfig: VXETableGlobalConfig = {
     startDay: 1,
     selectDay: 1,
     digits: 2,
-    controls: true
+    controls: true,
+    immediate: true,
+    autocomplete: 'off'
   },
   textarea: {
     // size: null,
-- 
Gitee


From d2f4ac64e65a4ad39678d01969ffbd75aa403b27 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Sat, 6 Nov 2021 18:03:05 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=A4=A7?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=B8=B8=E7=94=A8=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE=E6=B2=A1=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/form.ts         |  2 +-
 packages/input/src/input.ts       | 14 ++++-----
 packages/radio/src/group.ts       | 11 +++++--
 packages/select/src/select.ts     | 39 +++++++++++++++---------
 packages/switch/src/switch.ts     | 14 ++++-----
 packages/table/src/props.ts       | 50 +++++++++++++++----------------
 packages/textarea/src/textarea.ts | 24 +++++++--------
 packages/toolbar/src/toolbar.ts   | 14 ++++-----
 packages/tooltip/src/tooltip.ts   |  8 ++---
 packages/v-x-e-table/src/conf.ts  |  7 ++++-
 types/table.d.ts                  |  3 +-
 11 files changed, 105 insertions(+), 81 deletions(-)

diff --git a/packages/form/src/form.ts b/packages/form/src/form.ts
index 58ae4a3b8..12513c1af 100644
--- a/packages/form/src/form.ts
+++ b/packages/form/src/form.ts
@@ -71,7 +71,7 @@ export default defineComponent({
   props: {
     collapseStatus: { type: Boolean as PropType<VxeFormPropTypes.CollapseStatus>, default: () => GlobalConfig.form.collapseStatus },
     loading: { type: Boolean as PropType<VxeFormPropTypes.Loading>, default: () => GlobalConfig.form.loading },
-    data: { type: Object as PropType<VxeFormPropTypes.Data>},
+    data: { type: Object as PropType<VxeFormPropTypes.Data> },
     size: { type: String as PropType<VxeFormPropTypes.Size>, default: () => GlobalConfig.form.size || GlobalConfig.size },
     span: { type: [String, Number] as PropType<VxeFormPropTypes.Span>, default: () => GlobalConfig.form.span },
     align: { type: String as PropType<VxeFormPropTypes.Align>, default: () => GlobalConfig.form.align },
diff --git a/packages/input/src/input.ts b/packages/input/src/input.ts
index 2cd7ff98e..228fcafe6 100644
--- a/packages/input/src/input.ts
+++ b/packages/input/src/input.ts
@@ -98,9 +98,9 @@ export default defineComponent({
     size: { type: String as PropType<VxeInputPropTypes.Size>, default: () => GlobalConfig.input.size || GlobalConfig.size },
 
     // number、integer、float
-    min: { type: [String, Number] as PropType<VxeInputPropTypes.Min>, default: null },
-    max: { type: [String, Number] as PropType<VxeInputPropTypes.Max>, default: null },
-    step: [String, Number] as PropType<VxeInputPropTypes.Step>,
+    min: { type: [String, Number] as PropType<VxeInputPropTypes.Min>, default: () => GlobalConfig.input.min },
+    max: { type: [String, Number] as PropType<VxeInputPropTypes.Max>, default: () => GlobalConfig.input.max },
+    step: { type: [String, Number] as PropType<VxeInputPropTypes.Step>, default: () => GlobalConfig.input.step },
     exponential: { type: Boolean as PropType<VxeInputPropTypes.Exponential>, default: () => GlobalConfig.input.exponential },
 
     // number、integer、float、password
@@ -117,16 +117,16 @@ export default defineComponent({
     startDay: { type: [String, Number] as PropType<VxeInputPropTypes.StartDay>, default: () => GlobalConfig.input.startDay },
     labelFormat: { type: String as PropType<VxeInputPropTypes.LabelFormat>, default: () => GlobalConfig.input.labelFormat },
     valueFormat: { type: String as PropType<VxeInputPropTypes.ValueFormat>, default: () => GlobalConfig.input.valueFormat },
-    editable: { type: Boolean as PropType<VxeInputPropTypes.Editable>, default: true },
+    editable: { type: Boolean as PropType<VxeInputPropTypes.Editable>, default: () => GlobalConfig.input.editable },
     festivalMethod: { type: Function as PropType<VxeInputPropTypes.FestivalMethod>, default: () => GlobalConfig.input.festivalMethod },
     disabledMethod: { type: Function as PropType<VxeInputPropTypes.DisabledMethod>, default: () => GlobalConfig.input.disabledMethod },
 
     // week
     selectDay: { type: [String, Number] as PropType<VxeInputPropTypes.SelectDay>, default: () => GlobalConfig.input.selectDay },
 
-    prefixIcon: String as PropType<VxeInputPropTypes.PrefixIcon>,
-    suffixIcon: String as PropType<VxeInputPropTypes.SuffixIcon>,
-    placement: String as PropType<VxeInputPropTypes.Placement>,
+    prefixIcon: { type: String as PropType<VxeInputPropTypes.PrefixIcon>, default: () => GlobalConfig.input.prefixIcon },
+    suffixIcon: { type: String as PropType<VxeInputPropTypes.SuffixIcon>, default: () => GlobalConfig.input.suffixIcon },
+    placement: { type: String as PropType<VxeInputPropTypes.Placement>, default: () => GlobalConfig.input.placement },
     transfer: { type: Boolean as PropType<VxeInputPropTypes.Transfer>, default: () => GlobalConfig.input.transfer }
   },
   emits: [
diff --git a/packages/radio/src/group.ts b/packages/radio/src/group.ts
index 1099d8866..f724bd83b 100644
--- a/packages/radio/src/group.ts
+++ b/packages/radio/src/group.ts
@@ -3,13 +3,20 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { useSize } from '../../hooks/size'
 
-import { VxeRadioGroupPropTypes, VxeRadioGroupConstructor, VxeRadioGroupEmits, VxeRadioGroupPrivateMethods, RadioGroupPrivateMethods, RadioGroupMethods } from '../../../types/all'
+import {
+  VxeRadioGroupPropTypes,
+  VxeRadioGroupConstructor,
+  VxeRadioGroupEmits,
+  VxeRadioGroupPrivateMethods,
+  RadioGroupPrivateMethods,
+  RadioGroupMethods
+} from '../../../types/all'
 
 export default defineComponent({
   name: 'VxeRadioGroup',
   props: {
     modelValue: [String, Number, Boolean] as PropType<VxeRadioGroupPropTypes.ModelValue>,
-    disabled: Boolean as PropType<VxeRadioGroupPropTypes.Disabled>,
+    disabled: { type: Boolean as PropType<VxeRadioGroupPropTypes.Disabled>, default: () => GlobalConfig.radio.disabled },
     size: { type: String as PropType<VxeRadioGroupPropTypes.Size>, default: () => GlobalConfig.radio.size || GlobalConfig.size }
   },
   emits: [
diff --git a/packages/select/src/select.ts b/packages/select/src/select.ts
index 5a8a7ac03..a7cc717ae 100644
--- a/packages/select/src/select.ts
+++ b/packages/select/src/select.ts
@@ -6,7 +6,18 @@ import { getEventTargetNode, getAbsolutePos } from '../../tools/dom'
 import { getLastZIndex, nextZIndex, getFuncText, formatText } from '../../tools/utils'
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event'
 
-import { VxeSelectPropTypes, VxeSelectConstructor, SelectReactData, VxeSelectEmits, SelectMethods, SelectPrivateRef, VxeSelectMethods, VxeInputConstructor, VxeOptgroupProps, VxeOptionProps } from '../../../types/all'
+import {
+  VxeSelectPropTypes,
+  VxeSelectConstructor,
+  SelectReactData,
+  VxeSelectEmits,
+  SelectMethods,
+  SelectPrivateRef,
+  VxeSelectMethods,
+  VxeInputConstructor,
+  VxeOptgroupProps,
+  VxeOptionProps
+} from '../../../types/all'
 
 function isOptionVisible (option: any) {
   return option.visible !== false
@@ -20,23 +31,23 @@ export default defineComponent({
   name: 'VxeSelect',
   props: {
     modelValue: null,
-    clearable: Boolean as PropType<VxeSelectPropTypes.Clearable>,
-    placeholder: String as PropType<VxeSelectPropTypes.Placeholder>,
+    clearable: { type: Boolean as PropType<VxeSelectPropTypes.Clearable>, default: () => GlobalConfig.select.clearable },
+    placeholder: { type: String as PropType<VxeSelectPropTypes.Placeholder>, default: () => GlobalConfig.select.placeholder },
     loading: Boolean as PropType<VxeSelectPropTypes.Loading>,
-    disabled: Boolean as PropType<VxeSelectPropTypes.Disabled>,
-    multiple: Boolean as PropType<VxeSelectPropTypes.Multiple>,
+    disabled: { type: Boolean as PropType<VxeSelectPropTypes.Disabled>, default: () => GlobalConfig.select.disabled },
+    multiple: { type: Boolean as PropType<VxeSelectPropTypes.Multiple>, default: () => GlobalConfig.select.multiple },
     multiCharOverflow: { type: [Number, String] as PropType<VxeSelectPropTypes.MultiCharOverflow>, default: () => GlobalConfig.select.multiCharOverflow },
-    prefixIcon: String as PropType<VxeSelectPropTypes.PrefixIcon>,
-    placement: String as PropType<VxeSelectPropTypes.Placement>,
-    options: Array as PropType<VxeSelectPropTypes.Options>,
-    optionProps: Object as PropType<VxeSelectPropTypes.OptionProps>,
-    optionGroups: Array as PropType<VxeSelectPropTypes.OptionGroups>,
-    optionGroupProps: Object as PropType<VxeSelectPropTypes.OptionGroupProps>,
-    className: [String, Function] as PropType<VxeSelectPropTypes.ClassName>,
+    prefixIcon: { type: String as PropType<VxeSelectPropTypes.PrefixIcon>, default: () => GlobalConfig.select.prefixIcon },
+    placement: { type: String as PropType<VxeSelectPropTypes.Placement>, default: () => GlobalConfig.select.placement },
+    options: { type: Array as PropType<VxeSelectPropTypes.Options>, default: () => GlobalConfig.select.options },
+    optionProps: { type: Object as PropType<VxeSelectPropTypes.OptionProps>, default: () => GlobalConfig.select.optionProps },
+    optionGroups: { type: Array as PropType<VxeSelectPropTypes.OptionGroups>, default: () => GlobalConfig.select.optionGroups },
+    optionGroupProps: { type: Object as PropType<VxeSelectPropTypes.OptionGroupProps>, default: () => GlobalConfig.select.optionGroupProps },
+    className: { type: [String, Function] as PropType<VxeSelectPropTypes.ClassName>, default: () => GlobalConfig.select.className },
     size: { type: String as PropType<VxeSelectPropTypes.Size>, default: () => GlobalConfig.select.size || GlobalConfig.size },
-    emptyText: String as PropType<VxeSelectPropTypes.EmptyText>,
+    emptyText: { type: String as PropType<VxeSelectPropTypes.EmptyText>, default: () => GlobalConfig.select.emptyText },
     optionId: { type: String as PropType<VxeSelectPropTypes.OptionId>, default: () => GlobalConfig.select.optionId },
-    optionKey: Boolean as PropType<VxeSelectPropTypes.OptionKey>,
+    optionKey: { type: Boolean as PropType<VxeSelectPropTypes.OptionKey>, default: () => GlobalConfig.select.optionKey },
     transfer: { type: Boolean as PropType<VxeSelectPropTypes.Transfer>, default: () => GlobalConfig.select.transfer }
   },
   emits: [
diff --git a/packages/switch/src/switch.ts b/packages/switch/src/switch.ts
index a8bb396e4..e27c60d78 100644
--- a/packages/switch/src/switch.ts
+++ b/packages/switch/src/switch.ts
@@ -10,14 +10,14 @@ export default defineComponent({
   name: 'VxeSwitch',
   props: {
     modelValue: [String, Number, Boolean] as PropType<VxeSwitchPropTypes.ModelValue>,
-    disabled: Boolean as PropType<VxeSwitchPropTypes.Disabled>,
+    disabled: { type: Boolean as PropType<VxeSwitchPropTypes.Disabled>, default: () => GlobalConfig.switch.disabled },
     size: { type: String as PropType<VxeSwitchPropTypes.Size>, default: () => GlobalConfig.switch.size || GlobalConfig.size },
-    openLabel: String as PropType<VxeSwitchPropTypes.OpenLabel>,
-    closeLabel: String as PropType<VxeSwitchPropTypes.CloseLabel>,
-    openValue: { type: [String, Number, Boolean] as PropType<VxeSwitchPropTypes.OpenValue>, default: true },
-    closeValue: { type: [String, Number, Boolean] as PropType<VxeSwitchPropTypes.CloseValue>, default: false },
-    openIcon: String as PropType<VxeSwitchPropTypes.OpenIcon>,
-    closeIcon: String as PropType<VxeSwitchPropTypes.CloseIcon>
+    openLabel: { type: String as PropType<VxeSwitchPropTypes.OpenLabel>, default: () => GlobalConfig.switch.openLabel },
+    closeLabel: { type: String as PropType<VxeSwitchPropTypes.CloseLabel>, default: () => GlobalConfig.switch.closeLabel },
+    openValue: { type: [String, Number, Boolean] as PropType<VxeSwitchPropTypes.OpenValue>, default: () => GlobalConfig.switch.openValue },
+    closeValue: { type: [String, Number, Boolean] as PropType<VxeSwitchPropTypes.CloseValue>, default: () => GlobalConfig.switch.closeValue },
+    openIcon: { type: String as PropType<VxeSwitchPropTypes.OpenIcon>, default: () => GlobalConfig.switch.openIcon },
+    closeIcon: { type: String as PropType<VxeSwitchPropTypes.CloseIcon>, default: () => GlobalConfig.switch.closeIcon }
   },
   emits: [
     'update:modelValue',
diff --git a/packages/table/src/props.ts b/packages/table/src/props.ts
index 586d8e207..9b33a3b64 100644
--- a/packages/table/src/props.ts
+++ b/packages/table/src/props.ts
@@ -9,9 +9,9 @@ export default {
   // 数据
   data: Array as PropType<any[]>,
   // 表格的高度
-  height: [Number, String] as PropType<VxeTablePropTypes.Height>,
+  height: { type: [Number, String] as PropType<VxeTablePropTypes.Height>, default: () => GlobalConfig.table.height },
   // 表格的最大高度
-  maxHeight: [Number, String] as PropType<VxeTablePropTypes.MaxHeight>,
+  maxHeight: { type: [Number, String] as PropType<VxeTablePropTypes.MaxHeight>, default: () => GlobalConfig.table.maxHeight },
   // 所有列是否允许拖动列宽调整大小
   resizable: { type: Boolean as PropType<VxeTablePropTypes.Resizable>, default: () => GlobalConfig.table.resizable },
   // 是否带有斑马纹
@@ -43,43 +43,43 @@ export default {
   // 鼠标移到列是否要高亮显示
   highlightHoverColumn: { type: Boolean as PropType<VxeTablePropTypes.HighlightHoverColumn>, default: () => GlobalConfig.table.highlightHoverColumn },
   // 激活单元格编辑时是否高亮显示
-  highlightCell: Boolean as PropType<VxeTablePropTypes.HighlightCell>,
+  highlightCell: { type: Boolean as PropType<VxeTablePropTypes.HighlightCell>, default: () => GlobalConfig.table.highlightCell },
   // 是否显示表尾合计
-  showFooter: Boolean as PropType<VxeTablePropTypes.ShowFooter>,
+  showFooter: { type: Boolean as PropType<VxeTablePropTypes.ShowFooter>, default: () => GlobalConfig.table.showFooter },
   // 表尾合计的计算方法
-  footerMethod: Function as PropType<VxeTablePropTypes.FooterMethod>,
+  footerMethod: { type: Function as PropType<VxeTablePropTypes.FooterMethod>, default: () => GlobalConfig.table.footerMethod },
   // 给行附加 className
-  rowClassName: [String, Function] as PropType<VxeTablePropTypes.RowClassName>,
+  rowClassName: { type: [String, Function] as PropType<VxeTablePropTypes.RowClassName>, default: () => GlobalConfig.table.rowClassName },
   // 给单元格附加 className
-  cellClassName: [String, Function] as PropType<VxeTablePropTypes.CellClassName>,
+  cellClassName: { type: [String, Function] as PropType<VxeTablePropTypes.CellClassName>, default: () => GlobalConfig.table.cellClassName },
   // 给表头的行附加 className
-  headerRowClassName: [String, Function] as PropType<VxeTablePropTypes.HeaderRowClassName>,
+  headerRowClassName: { type: [String, Function] as PropType<VxeTablePropTypes.HeaderRowClassName>, default: () => GlobalConfig.table.headerRowClassName },
   // 给表头的单元格附加 className
-  headerCellClassName: [String, Function] as PropType<VxeTablePropTypes.HeaderRowClassName>,
+  headerCellClassName: { type: [String, Function] as PropType<VxeTablePropTypes.HeaderRowClassName>, default: () => GlobalConfig.table.headerCellClassName },
   // 给表尾的行附加 className
-  footerRowClassName: [String, Function] as PropType<VxeTablePropTypes.FooterRowClassName>,
+  footerRowClassName: { type: [String, Function] as PropType<VxeTablePropTypes.FooterRowClassName>, default: () => GlobalConfig.table.footerRowClassName },
   // 给表尾的单元格附加 className
-  footerCellClassName: [String, Function] as PropType<VxeTablePropTypes.FooterCellClassName>,
+  footerCellClassName: { type: [String, Function] as PropType<VxeTablePropTypes.FooterCellClassName>, default: () => GlobalConfig.table.footerCellClassName },
   // 给单元格附加样式
-  cellStyle: [Object, Function] as PropType<VxeTablePropTypes.CellStyle>,
+  cellStyle: { type: [Object, Function] as PropType<VxeTablePropTypes.CellStyle>, default: () => GlobalConfig.table.cellStyle },
   // 给表头单元格附加样式
-  headerCellStyle: [Object, Function] as PropType<VxeTablePropTypes.HeaderCellStyle>,
+  headerCellStyle: { type: [Object, Function] as PropType<VxeTablePropTypes.HeaderCellStyle>, default: () => GlobalConfig.table.headerCellStyle },
   // 给表尾单元格附加样式
-  footerCellStyle: [Object, Function] as PropType<VxeTablePropTypes.FooterCellStyle>,
+  footerCellStyle: { type: [Object, Function] as PropType<VxeTablePropTypes.FooterCellStyle>, default: () => GlobalConfig.table.footerCellStyle },
   // 给行附加样式
-  rowStyle: [Object, Function] as PropType<VxeTablePropTypes.RowStyle>,
+  rowStyle: { type: [Object, Function] as PropType<VxeTablePropTypes.RowStyle>, default: () => GlobalConfig.table.rowStyle },
   // 给表头行附加样式
-  headerRowStyle: [Object, Function] as PropType<VxeTablePropTypes.HeaderRowStyle>,
+  headerRowStyle: { type: [Object, Function] as PropType<VxeTablePropTypes.HeaderRowStyle>, default: () => GlobalConfig.table.headerRowStyle },
   // 给表尾行附加样式
-  footerRowStyle: [Object, Function] as PropType<VxeTablePropTypes.FooterRowStyle>,
+  footerRowStyle: { type: [Object, Function] as PropType<VxeTablePropTypes.FooterRowStyle>, default: () => GlobalConfig.table.footerRowStyle },
   // 合并指定单元格
-  mergeCells: Array as PropType<VxeTablePropTypes.MergeCells>,
+  mergeCells: { type: Array as PropType<VxeTablePropTypes.MergeCells>, default: () => GlobalConfig.table.mergeCells },
   // 合并指定的表尾
-  mergeFooterItems: Array as PropType<VxeTablePropTypes.MergeFooterItems>,
+  mergeFooterItems: { type: Array as PropType<VxeTablePropTypes.MergeFooterItems>, default: () => GlobalConfig.table.mergeFooterItems },
   // 自定义合并行或列的方法
-  spanMethod: Function as PropType<VxeTablePropTypes.SpanMethod>,
+  spanMethod: { type: Function as PropType<VxeTablePropTypes.SpanMethod> },
   // 表尾合并行或列
-  footerSpanMethod: Function as PropType<VxeTablePropTypes.FooterSpanMethod>,
+  footerSpanMethod: { type: Function as PropType<VxeTablePropTypes.FooterSpanMethod> },
   // 设置所有内容过长时显示为省略号
   showOverflow: { type: [Boolean, String] as PropType<VxeTablePropTypes.ShowOverflow>, default: () => GlobalConfig.table.showOverflow },
   // 设置表头所有内容过长时显示为省略号
@@ -89,16 +89,16 @@ export default {
 
   /** 高级属性 */
   // 主键配置
-  columnKey: Boolean as PropType<VxeTablePropTypes.ColumnKey>,
-  rowKey: Boolean as PropType<VxeTablePropTypes.RowKey>,
+  columnKey: { type: Boolean as PropType<VxeTablePropTypes.ColumnKey>, default: () => GlobalConfig.table.columnKey },
+  rowKey: { type: Boolean as PropType<VxeTablePropTypes.RowKey>, default: () => GlobalConfig.table.rowKey },
   rowId: { type: String as PropType<VxeTablePropTypes.RowId>, default: () => GlobalConfig.table.rowId },
-  zIndex: Number as PropType<VxeTablePropTypes.ZIndex>,
+  zIndex: { type: Number as PropType<VxeTablePropTypes.ZIndex>, default: () => GlobalConfig.table.zIndex },
   emptyText: { type: String as PropType<VxeTablePropTypes.EmptyText>, default: () => GlobalConfig.table.emptyText },
   keepSource: { type: Boolean as PropType<VxeTablePropTypes.KeepSource>, default: () => GlobalConfig.table.keepSource },
   // 是否自动监听父容器变化去更新响应式表格宽高
   autoResize: { type: Boolean as PropType<VxeTablePropTypes.AutoResize>, default: () => GlobalConfig.table.autoResize },
   // 是否自动根据状态属性去更新响应式表格宽高
-  syncResize: [Boolean, String, Number],
+  syncResize: { type: [Boolean, String, Number], default: () => GlobalConfig.table.syncResize },
   // 列配置信息
   columnConfig: Object as PropType<VxeTablePropTypes.ColumnConfig>,
   // 行配置信息
diff --git a/packages/textarea/src/textarea.ts b/packages/textarea/src/textarea.ts
index 40220e7be..c003e7752 100644
--- a/packages/textarea/src/textarea.ts
+++ b/packages/textarea/src/textarea.ts
@@ -12,19 +12,19 @@ export default defineComponent({
   name: 'VxeTextarea',
   props: {
     modelValue: [String, Number] as PropType<VxeTextareaPropTypes.ModelValue>,
-    className: String as PropType<VxeTextareaPropTypes.ClassName>,
-    immediate: { type: Boolean as PropType<VxeTextareaPropTypes.Immediate>, default: true },
+    className: { type: String as PropType<VxeTextareaPropTypes.ClassName>, default: () => GlobalConfig.textarea.className },
+    immediate: { type: Boolean as PropType<VxeTextareaPropTypes.Immediate>, default: () => GlobalConfig.textarea.immediate },
     name: String as PropType<VxeTextareaPropTypes.Name>,
-    readonly: Boolean as PropType<VxeTextareaPropTypes.Readonly>,
-    disabled: Boolean as PropType<VxeTextareaPropTypes.Disabled>,
-    placeholder: String as PropType<VxeTextareaPropTypes.Placeholder>,
-    maxlength: [String, Number] as PropType<VxeTextareaPropTypes.Maxlength>,
-    rows: { type: [String, Number] as PropType<VxeTextareaPropTypes.Rows>, default: 2 },
-    cols: { type: [String, Number] as PropType<VxeTextareaPropTypes.Cols>, default: null },
-    showWordCount: Boolean as PropType<VxeTextareaPropTypes.ShowWordCount>,
-    countMethod: Function as PropType<VxeTextareaPropTypes.CountMethod>,
-    autosize: [Boolean, Object] as PropType<VxeTextareaPropTypes.Autosize>,
-    form: String as PropType<VxeTextareaPropTypes.Form>,
+    readonly: { type: Boolean as PropType<VxeTextareaPropTypes.Readonly>, default: () => GlobalConfig.textarea.readonly },
+    disabled: { type: Boolean as PropType<VxeTextareaPropTypes.Disabled>, default: () => GlobalConfig.textarea.disabled },
+    placeholder: { type: String as PropType<VxeTextareaPropTypes.Placeholder>, default: () => GlobalConfig.textarea.placeholder },
+    maxlength: { type: [String, Number] as PropType<VxeTextareaPropTypes.Maxlength>, default: () => GlobalConfig.textarea.maxlength },
+    rows: { type: [String, Number] as PropType<VxeTextareaPropTypes.Rows>, default: () => GlobalConfig.textarea.rows },
+    cols: { type: [String, Number] as PropType<VxeTextareaPropTypes.Cols>, default: () => GlobalConfig.textarea.cols },
+    showWordCount: { type: Boolean as PropType<VxeTextareaPropTypes.ShowWordCount>, default: () => GlobalConfig.textarea.showWordCount },
+    countMethod: { type: Function as PropType<VxeTextareaPropTypes.CountMethod>, default: () => GlobalConfig.textarea.countMethod },
+    autosize: { type: [Boolean, Object] as PropType<VxeTextareaPropTypes.Autosize>, default: () => GlobalConfig.textarea.autosize },
+    form: { type: String as PropType<VxeTextareaPropTypes.Form>, default: () => GlobalConfig.textarea.form },
     resize: { type: String as PropType<VxeTextareaPropTypes.Resize>, default: () => GlobalConfig.textarea.resize },
     size: { type: String as PropType<VxeTextareaPropTypes.Size>, default: () => GlobalConfig.textarea.size || GlobalConfig.size }
   },
diff --git a/packages/toolbar/src/toolbar.ts b/packages/toolbar/src/toolbar.ts
index c4516f4e8..dce256a69 100644
--- a/packages/toolbar/src/toolbar.ts
+++ b/packages/toolbar/src/toolbar.ts
@@ -13,17 +13,17 @@ export default defineComponent({
   name: 'VxeToolbar',
   props: {
     loading: Boolean,
-    refresh: [Boolean, Object] as PropType<VxeToolbarPropTypes.Refresh>,
-    import: [Boolean, Object] as PropType<VxeToolbarPropTypes.Import>,
-    export: [Boolean, Object] as PropType<VxeToolbarPropTypes.Export>,
-    print: [Boolean, Object] as PropType<VxeToolbarPropTypes.Print>,
-    zoom: [Boolean, Object] as PropType< VxeToolbarPropTypes.Zoom>,
-    custom: [Boolean, Object] as PropType<VxeToolbarPropTypes.Custom>,
+    refresh: { type: [Boolean, Object] as PropType<VxeToolbarPropTypes.Refresh>, default: () => GlobalConfig.toolbar.refresh },
+    import: { type: [Boolean, Object] as PropType<VxeToolbarPropTypes.Import>, default: () => GlobalConfig.toolbar.import },
+    export: { type: [Boolean, Object] as PropType<VxeToolbarPropTypes.Export>, default: () => GlobalConfig.toolbar.export },
+    print: { type: [Boolean, Object] as PropType<VxeToolbarPropTypes.Print>, default: () => GlobalConfig.toolbar.print },
+    zoom: { type: [Boolean, Object] as PropType< VxeToolbarPropTypes.Zoom>, default: () => GlobalConfig.toolbar.zoom },
+    custom: { type: [Boolean, Object] as PropType<VxeToolbarPropTypes.Custom>, default: () => GlobalConfig.toolbar.custom },
     buttons: { type: Array as PropType<VxeToolbarPropTypes.Buttons>, default: () => GlobalConfig.toolbar.buttons },
     tools: { type: Array as PropType<VxeToolbarPropTypes.Tools>, default: () => GlobalConfig.toolbar.tools },
     perfect: { type: Boolean as PropType<VxeToolbarPropTypes.Perfect>, default: () => GlobalConfig.toolbar.perfect },
     size: { type: String as PropType<VxeToolbarPropTypes.Size>, default: () => GlobalConfig.toolbar.size || GlobalConfig.size },
-    className: [String, Function] as PropType<VxeToolbarPropTypes.ClassName>
+    className: { type: [String, Function] as PropType<VxeToolbarPropTypes.ClassName>, default: () => GlobalConfig.toolbar.className }
   },
   emits: [
     'button-click',
diff --git a/packages/tooltip/src/tooltip.ts b/packages/tooltip/src/tooltip.ts
index 353475a0d..cdebb3edd 100644
--- a/packages/tooltip/src/tooltip.ts
+++ b/packages/tooltip/src/tooltip.ts
@@ -14,12 +14,12 @@ export default defineComponent({
     size: { type: String as PropType<VxeTooltipPropTypes.Size>, default: () => GlobalConfig.tooltip.size || GlobalConfig.size },
     trigger: { type: String as PropType<VxeTooltipPropTypes.Trigger>, default: () => GlobalConfig.tooltip.trigger },
     theme: { type: String as PropType<VxeTooltipPropTypes.Theme>, default: () => GlobalConfig.tooltip.theme },
-    content: [String, Number] as PropType<VxeTooltipPropTypes.Content>,
-    zIndex: [String, Number] as PropType<VxeTooltipPropTypes.ZIndex>,
+    content: { type: [String, Number] as PropType<VxeTooltipPropTypes.Content>, default: () => GlobalConfig.tooltip.content },
+    zIndex: { type: [String, Number] as PropType<VxeTooltipPropTypes.ZIndex>, default: () => GlobalConfig.tooltip.zIndex },
     isArrow: { type: Boolean as PropType<VxeTooltipPropTypes.IsArrow>, default: true },
-    enterable: Boolean as PropType<VxeTooltipPropTypes.Enterable>,
+    enterable: { type: Boolean as PropType<VxeTooltipPropTypes.Enterable>, default: () => GlobalConfig.tooltip.enterable },
     leaveDelay: { type: Number as PropType<VxeTooltipPropTypes.LeaveDelay>, default: () => GlobalConfig.tooltip.leaveDelay },
-    leaveMethod: Function as PropType<VxeTooltipPropTypes.LeaveMethod>
+    leaveMethod: { type: Function as PropType<VxeTooltipPropTypes.LeaveMethod>, default: () => GlobalConfig.tooltip.leaveMethod }
   },
   emits: [
     'update:modelValue'
diff --git a/packages/v-x-e-table/src/conf.ts b/packages/v-x-e-table/src/conf.ts
index 06d8df312..3b73655e2 100644
--- a/packages/v-x-e-table/src/conf.ts
+++ b/packages/v-x-e-table/src/conf.ts
@@ -262,7 +262,8 @@ const GlobalConfig: VXETableGlobalConfig = {
     digits: 2,
     controls: true,
     immediate: true,
-    autocomplete: 'off'
+    autocomplete: 'off',
+    editable: true
   },
   textarea: {
     // size: null,
@@ -270,6 +271,8 @@ const GlobalConfig: VXETableGlobalConfig = {
     //   minRows: 1,
     //   maxRows: 10
     // }
+    immediate: true,
+    rows: 2
   },
   select: {
     // size: null,
@@ -301,6 +304,8 @@ const GlobalConfig: VXETableGlobalConfig = {
   },
   switch: {
     // size: null
+    openValue: true,
+    closeValue: false
   },
   modal: {
     // size: null,
diff --git a/types/table.d.ts b/types/table.d.ts
index af4cd7b01..c08f99b88 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -1946,6 +1946,7 @@ export type VxeTableProps<D = any> = {
   columnKey?: VxeTablePropTypes.ColumnKey;
   rowKey?: VxeTablePropTypes.RowKey;
   rowId?: VxeTablePropTypes.RowId;
+  zIndex?:VxeTablePropTypes.ZIndex;
   keepSource?: VxeTablePropTypes.KeepSource;
   autoResize?: VxeTablePropTypes.AutoResize;
   syncResize?: VxeTablePropTypes.SyncResize;
@@ -2484,4 +2485,4 @@ export namespace VxeTableEvents {
   export type ValidError = (params: VxeTableDefines.ValidErrorEventParams) => void;
   export type Scroll = (params: VxeTableDefines.ScrollEventParams) => void;
   export type Custom = (params: VxeTableDefines.CustomEventParams) => void;
-}
\ No newline at end of file
+}
-- 
Gitee


From 7d903ee1006bee317ded8f19f10be030e9f3e9f9 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Sat, 6 Nov 2021 19:12:34 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9modal=E7=9A=84=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E9=85=8D=E7=BD=AE=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/modal/src/modal.ts      | 32 ++++++++++++++++----------------
 packages/v-x-e-table/src/conf.ts |  3 ++-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/packages/modal/src/modal.ts b/packages/modal/src/modal.ts
index 1c924084c..48cabafcb 100644
--- a/packages/modal/src/modal.ts
+++ b/packages/modal/src/modal.ts
@@ -17,37 +17,37 @@ export default defineComponent({
   props: {
     modelValue: Boolean as PropType<VxeModalPropTypes.ModelValue>,
     id: String as PropType<VxeModalPropTypes.ID>,
-    type: { type: String as PropType<VxeModalPropTypes.Type>, default: 'modal' },
-    loading: { type: Boolean as PropType<VxeModalPropTypes.Loading>, default: null },
-    status: String as PropType<VxeModalPropTypes.Status>,
-    iconStatus: String as PropType<VxeModalPropTypes.IconStatus>,
-    className: String as PropType<VxeModalPropTypes.ClassName>,
+    type: { type: String as PropType<VxeModalPropTypes.Type>, default: () => GlobalConfig.modal.type },
+    loading: { type: Boolean as PropType<VxeModalPropTypes.Loading>, default: () => GlobalConfig.modal.loading },
+    status: { type: String as PropType<VxeModalPropTypes.Status>, default: () => GlobalConfig.modal.status },
+    iconStatus: { type: String as PropType<VxeModalPropTypes.IconStatus>, default: () => GlobalConfig.modal.iconStatus },
+    className: { type: String as PropType<VxeModalPropTypes.ClassName>, default: () => GlobalConfig.modal.className },
     top: { type: [Number, String] as PropType<VxeModalPropTypes.Top>, default: () => GlobalConfig.modal.top },
-    position: [String, Object] as PropType<VxeModalPropTypes.Position>,
-    title: String as PropType<VxeModalPropTypes.Title>,
+    position: { type: [String, Object] as PropType<VxeModalPropTypes.Position>, default: () => GlobalConfig.modal.position },
+    title: { type: String as PropType<VxeModalPropTypes.Title>, default: () => GlobalConfig.modal.title },
     duration: { type: [Number, String] as PropType<VxeModalPropTypes.Duration>, default: () => GlobalConfig.modal.duration },
-    message: [Number, String] as PropType<VxeModalPropTypes.Message>,
-    content: [Number, String] as PropType<VxeModalPropTypes.Content>,
+    message: { type: [Number, String] as PropType<VxeModalPropTypes.Message>, default: () => GlobalConfig.modal.message },
+    content: { type: [Number, String] as PropType<VxeModalPropTypes.Content>, default: () => GlobalConfig.modal.content },
     cancelButtonText: { type: String as PropType<VxeModalPropTypes.CancelButtonText>, default: () => GlobalConfig.modal.cancelButtonText },
     confirmButtonText: { type: String as PropType<VxeModalPropTypes.ConfirmButtonText>, default: () => GlobalConfig.modal.confirmButtonText },
     lockView: { type: Boolean as PropType<VxeModalPropTypes.LockView>, default: () => GlobalConfig.modal.lockView },
-    lockScroll: Boolean as PropType<VxeModalPropTypes.LockScroll>,
+    lockScroll: { type: Boolean as PropType<VxeModalPropTypes.LockScroll>, default: () => GlobalConfig.modal.lockScroll },
     mask: { type: Boolean as PropType<VxeModalPropTypes.Mask>, default: () => GlobalConfig.modal.mask },
     maskClosable: { type: Boolean as PropType<VxeModalPropTypes.MaskClosable>, default: () => GlobalConfig.modal.maskClosable },
     escClosable: { type: Boolean as PropType<VxeModalPropTypes.EscClosable>, default: () => GlobalConfig.modal.escClosable },
-    resize: Boolean as PropType<VxeModalPropTypes.Resize>,
+    resize: { type: Boolean as PropType<VxeModalPropTypes.Resize>, default: () => GlobalConfig.modal.resize },
     showHeader: { type: Boolean as PropType<VxeModalPropTypes.ShowHeader>, default: () => GlobalConfig.modal.showHeader },
     showFooter: { type: Boolean as PropType<VxeModalPropTypes.ShowFooter>, default: () => GlobalConfig.modal.showFooter },
-    showZoom: Boolean as PropType<VxeModalPropTypes.ShowZoom>,
+    showZoom: { type: Boolean as PropType<VxeModalPropTypes.ShowZoom>, default: () => GlobalConfig.modal.showZoom },
     showClose: { type: Boolean as PropType<VxeModalPropTypes.ShowClose>, default: () => GlobalConfig.modal.showClose },
     dblclickZoom: { type: Boolean as PropType<VxeModalPropTypes.DblclickZoom>, default: () => GlobalConfig.modal.dblclickZoom },
-    width: [Number, String] as PropType<VxeModalPropTypes.Width>,
-    height: [Number, String] as PropType<VxeModalPropTypes.Height>,
+    width: { type: [Number, String] as PropType<VxeModalPropTypes.Width>, default: () => GlobalConfig.modal.width },
+    height: { type: [Number, String] as PropType<VxeModalPropTypes.Height>, default: () => GlobalConfig.modal.height },
     minWidth: { type: [Number, String] as PropType<VxeModalPropTypes.MinWidth>, default: () => GlobalConfig.modal.minWidth },
     minHeight: { type: [Number, String] as PropType<VxeModalPropTypes.MinHeight>, default: () => GlobalConfig.modal.minHeight },
-    zIndex: Number as PropType<VxeModalPropTypes.ZIndex>,
+    zIndex: { type: Number as PropType<VxeModalPropTypes.ZIndex>, default: () => GlobalConfig.modal.zIndex },
     marginSize: { type: [Number, String] as PropType<VxeModalPropTypes.MarginSize>, default: () => GlobalConfig.modal.marginSize },
-    fullscreen: Boolean as PropType<VxeModalPropTypes.Fullscreen>,
+    fullscreen: { type: Boolean as PropType<VxeModalPropTypes.Fullscreen>, default: () => GlobalConfig.modal.fullscreen },
     draggable: { type: Boolean as PropType<VxeModalPropTypes.Draggable>, default: () => GlobalConfig.modal.draggable },
     remember: { type: Boolean, default: () => GlobalConfig.modal.remember },
     destroyOnClose: { type: Boolean as PropType<VxeModalPropTypes.DestroyOnClose>, default: () => GlobalConfig.modal.destroyOnClose },
diff --git a/packages/v-x-e-table/src/conf.ts b/packages/v-x-e-table/src/conf.ts
index 3b73655e2..2f7645463 100644
--- a/packages/v-x-e-table/src/conf.ts
+++ b/packages/v-x-e-table/src/conf.ts
@@ -323,7 +323,8 @@ const GlobalConfig: VXETableGlobalConfig = {
     showClose: true,
     draggable: true,
     // storage: false,
-    storageKey: 'VXE_MODAL_POSITION'
+    storageKey: 'VXE_MODAL_POSITION',
+    type: 'modal'
   },
   list: {
     // size: null,
-- 
Gitee


From a229b2d1117e1d904f3a041b14d618f8d3da8006 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Sun, 7 Nov 2021 10:32:30 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E8=B0=83=E6=95=B4switch=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E5=9C=A8=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E4=B8=BAmini?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=A0=85=E6=A0=BC=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E4=B8=8B=E6=96=B9=E8=A2=AB=E6=8C=A4=E8=B5=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/switch.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/switch.scss b/styles/switch.scss
index 7a7149377..0d3a4c8fd 100644
--- a/styles/switch.scss
+++ b/styles/switch.scss
@@ -4,7 +4,7 @@
   display: inline-block;
   color: $vxe-font-color;
   vertical-align: middle;
-  padding: 0.4em;
+  padding: 0.3em;
   user-select: none;
   text-align: center;
   &.is--animat {
-- 
Gitee


From 300093ecabc7f42b06601dd63f716c95fca219d5 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Sun, 7 Nov 2021 14:36:50 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E7=BB=99=E6=8C=89=E9=92=AE=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=A1=B9=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/button/src/button.ts    | 24 ++++++++++++------------
 packages/form/src/form-item.ts   | 30 +++++++++++++++---------------
 packages/v-x-e-table/src/conf.ts |  3 +++
 types/v-x-e-table/setup.d.ts     |  2 ++
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/button/src/button.ts b/packages/button/src/button.ts
index 39053f44d..a388a2317 100644
--- a/packages/button/src/button.ts
+++ b/packages/button/src/button.ts
@@ -14,8 +14,8 @@ export default defineComponent({
     /**
      * 按钮类型
      */
-    type: String as PropType<VxeButtonPropTypes.Type>,
-    className: String as PropType<VxeButtonPropTypes.ClassName>,
+    type: { type: String as PropType<VxeButtonPropTypes.Type>, default: () => GlobalConfig.button.type },
+    className: { type: String as PropType<VxeButtonPropTypes.ClassName>, default: () => GlobalConfig.button.className },
     /**
      * 按钮尺寸
      */
@@ -23,43 +23,43 @@ export default defineComponent({
     /**
      * 用来标识这一项
      */
-    name: [String, Number] as PropType<VxeButtonPropTypes.Name>,
+    name: { type: [String, Number] as PropType<VxeButtonPropTypes.Name>, default: () => GlobalConfig.button.name },
     /**
      * 按钮内容
      */
-    content: String as PropType<VxeButtonPropTypes.Content>,
+    content: { type: String as PropType<VxeButtonPropTypes.Content>, default: () => GlobalConfig.button.content },
     /**
      * 固定显示下拉面板的方向
      */
-    placement: String as PropType<VxeButtonPropTypes.Placement>,
+    placement: { type: String as PropType<VxeButtonPropTypes.Placement>, default: () => GlobalConfig.button.placement },
     /**
      * 按钮状态
      */
-    status: String as PropType<VxeButtonPropTypes.Status>,
+    status: { type: String as PropType<VxeButtonPropTypes.Status>, default: () => GlobalConfig.button.status },
     /**
      * 按钮的图标
      */
-    icon: String as PropType<VxeButtonPropTypes.Icon>,
+    icon: { type: String as PropType<VxeButtonPropTypes.Icon>, default: () => GlobalConfig.button.icon },
     /**
      * 圆角边框
      */
-    round: Boolean as PropType<VxeButtonPropTypes.Round>,
+    round: { type: Boolean as PropType<VxeButtonPropTypes.Round>, default: () => GlobalConfig.button.round },
     /**
      * 圆角按钮
      */
-    circle: Boolean as PropType<VxeButtonPropTypes.Circle>,
+    circle: { type: Boolean as PropType<VxeButtonPropTypes.Circle>, default: () => GlobalConfig.button.circle },
     /**
      * 是否禁用
      */
-    disabled: Boolean as PropType<VxeButtonPropTypes.Disabled>,
+    disabled: { type: Boolean as PropType<VxeButtonPropTypes.Disabled>, default: () => GlobalConfig.button.disabled },
     /**
      * 是否加载中
      */
-    loading: Boolean as PropType<VxeButtonPropTypes.Loading>,
+    loading: { type: Boolean as PropType<VxeButtonPropTypes.Loading>, default: () => GlobalConfig.button.loading },
     /**
      * 在下拉面板关闭时销毁内容
      */
-    destroyOnClose: Boolean as PropType<VxeButtonPropTypes.DestroyOnClose>,
+    destroyOnClose: { type: Boolean as PropType<VxeButtonPropTypes.DestroyOnClose>, default: () => GlobalConfig.button.destroyOnClose },
     /**
      * 是否将弹框容器插入于 body 内
      */
diff --git a/packages/form/src/form-item.ts b/packages/form/src/form-item.ts
index 8ec55935d..fb52206be 100644
--- a/packages/form/src/form-item.ts
+++ b/packages/form/src/form-item.ts
@@ -9,22 +9,22 @@ import { renderTitle } from './render'
 import { VxeFormConstructor, VxeFormDefines, VxeFormItemPropTypes, VxeFormPrivateMethods } from '../../../types/all'
 
 export const formItemProps = {
-  title: String as PropType<VxeFormItemPropTypes.Title>,
+  title: { type: String as PropType<VxeFormItemPropTypes.Title>, default: () => GlobalConfig.formItem.title },
   field: String as PropType<VxeFormItemPropTypes.Field>,
-  span: [String, Number] as PropType<VxeFormItemPropTypes.Span>,
-  align: String as PropType<VxeFormItemPropTypes.Align>,
-  titleAlign: String as PropType<VxeFormItemPropTypes.TitleAlign>,
-  titleWidth: [String, Number] as PropType<VxeFormItemPropTypes.TitleWidth>,
-  className: [String, Function] as PropType<VxeFormItemPropTypes.ClassName>,
-  titleOverflow: { type: [Boolean, String] as PropType<VxeFormItemPropTypes.TitleOverflow>, default: null },
-  titlePrefix: Object as PropType<VxeFormItemPropTypes.TitlePrefix>,
-  titleSuffix: Object as PropType<VxeFormItemPropTypes.TitleSuffix>,
-  resetValue: { default: null },
-  visibleMethod: Function as PropType<VxeFormItemPropTypes.VisibleMethod>,
-  visible: { type: Boolean as PropType<VxeFormItemPropTypes.Visible>, default: null },
-  folding: Boolean as PropType<VxeFormItemPropTypes.Folding>,
-  collapseNode: Boolean as PropType<VxeFormItemPropTypes.CollapseNode>,
-  itemRender: Object as PropType<VxeFormItemPropTypes.ItemRender>
+  span: { type: [String, Number] as PropType<VxeFormItemPropTypes.Span>, default: () => GlobalConfig.formItem.span },
+  align: { type: String as PropType<VxeFormItemPropTypes.Align>, default: () => GlobalConfig.formItem.align },
+  titleAlign: { type: String as PropType<VxeFormItemPropTypes.TitleAlign>, default: () => GlobalConfig.formItem.titleAlign },
+  titleWidth: { type: [String, Number] as PropType<VxeFormItemPropTypes.TitleWidth>, default: () => GlobalConfig.formItem.titleWidth },
+  className: { type: [String, Function] as PropType<VxeFormItemPropTypes.ClassName>, default: () => GlobalConfig.formItem.className },
+  titleOverflow: { type: [Boolean, String] as PropType<VxeFormItemPropTypes.TitleOverflow>, default: () => GlobalConfig.formItem.titleOverflow },
+  titlePrefix: { type: Object as PropType<VxeFormItemPropTypes.TitlePrefix>, default: () => GlobalConfig.formItem.titlePrefix },
+  titleSuffix: { type: Object as PropType<VxeFormItemPropTypes.TitleSuffix>, default: () => GlobalConfig.formItem.titleSuffix },
+  resetValue: { type: Object as PropType<VxeFormItemPropTypes.ResetValue>, default: () => GlobalConfig.formItem.resetValue },
+  visibleMethod: { type: Function as PropType<VxeFormItemPropTypes.VisibleMethod>, default: () => GlobalConfig.formItem.visibleMethod },
+  visible: { type: Boolean as PropType<VxeFormItemPropTypes.Visible>, default: () => GlobalConfig.formItem.visible },
+  folding: { type: Boolean as PropType<VxeFormItemPropTypes.Folding>, default: () => GlobalConfig.formItem.folding },
+  collapseNode: { type: Boolean as PropType<VxeFormItemPropTypes.CollapseNode>, default: () => GlobalConfig.formItem.collapseNode },
+  itemRender: { type: Object as PropType<VxeFormItemPropTypes.ItemRender>, default: () => GlobalConfig.formItem.itemRender }
 }
 
 export default defineComponent({
diff --git a/packages/v-x-e-table/src/conf.ts b/packages/v-x-e-table/src/conf.ts
index 2f7645463..a95a2e449 100644
--- a/packages/v-x-e-table/src/conf.ts
+++ b/packages/v-x-e-table/src/conf.ts
@@ -248,6 +248,9 @@ const GlobalConfig: VXETableGlobalConfig = {
     titleAsterisk: true,
     collapseStatus: true
   },
+  formItem: {
+    // span: 8
+  },
   input: {
     type: 'text',
     // size: null,
diff --git a/types/v-x-e-table/setup.d.ts b/types/v-x-e-table/setup.d.ts
index 9b057a542..79cb5df80 100644
--- a/types/v-x-e-table/setup.d.ts
+++ b/types/v-x-e-table/setup.d.ts
@@ -14,6 +14,7 @@ import { VxeTextareaProps } from '../textarea'
 import { VxeButtonProps } from '../button'
 import { VxeCheckboxProps } from '../checkbox'
 import { VxeRadioProps } from '../radio'
+import {VxeFormItemProps, VxeFormItemPropTypes} from "../form-item";
 
 export interface VXETableSetupOptions {
   size?: SizeType;
@@ -68,6 +69,7 @@ export interface VXETableGlobalConfig extends VXETableSetupOptions {
   tooltip: VxeTooltipProps;
   pager: VxePagerProps;
   form: VxeFormProps;
+  formItem: VxeFormItemProps;
   input: VxeInputProps;
   textarea: VxeTextareaProps;
   select: VxeSelectProps;
-- 
Gitee


From 03ddfdca891e7c6211762f99ebbdcc886450bc66 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Tue, 9 Nov 2021 09:08:50 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E7=BB=99=E5=88=86=E9=A1=B5=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E4=B8=8A=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E3=80=82=20=E8=A7=A3=E5=86=B3=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=9C=A8item-render=E5=86=85=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E6=98=AF=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/pager/src/pager.ts      | 12 ++++++------
 packages/v-x-e-table/src/conf.ts |  8 ++++----
 styles/pager.scss                |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/pager/src/pager.ts b/packages/pager/src/pager.ts
index ab0a03445..f1c657b77 100644
--- a/packages/pager/src/pager.ts
+++ b/packages/pager/src/pager.ts
@@ -35,13 +35,13 @@ export default defineComponent({
     // 当只有一页时隐藏
     autoHidden: { type: Boolean as PropType<VxePagerPropTypes.AutoHidden>, default: () => GlobalConfig.pager.autoHidden },
     transfer: { type: Boolean as PropType<VxePagerPropTypes.Transfer>, default: () => GlobalConfig.pager.transfer },
-    className: [String, Function] as PropType<VxePagerPropTypes.ClassName>,
+    className: { type: [String, Function] as PropType<VxePagerPropTypes.ClassName>, default: () => GlobalConfig.pager.className },
     // 自定义图标
-    iconPrevPage: String as PropType<VxePagerPropTypes.IconPrevPage>,
-    iconJumpPrev: String as PropType<VxePagerPropTypes.IconJumpPrev>,
-    iconJumpNext: String as PropType<VxePagerPropTypes.IconJumpNext>,
-    iconNextPage: String as PropType<VxePagerPropTypes.IconNextPage>,
-    iconJumpMore: String as PropType<VxePagerPropTypes.IconJumpMore>
+    iconPrevPage: { type: String as PropType<VxePagerPropTypes.IconPrevPage>, default: () => GlobalConfig.pager.iconPrevPage },
+    iconJumpPrev: { type: String as PropType<VxePagerPropTypes.IconJumpPrev>, default: () => GlobalConfig.pager.iconJumpPrev },
+    iconJumpNext: { type: String as PropType<VxePagerPropTypes.IconJumpNext>, default: () => GlobalConfig.pager.iconJumpNext },
+    iconNextPage: { type: String as PropType<VxePagerPropTypes.IconNextPage>, default: () => GlobalConfig.pager.iconNextPage },
+    iconJumpMore: { type: String as PropType<VxePagerPropTypes.IconJumpMore>, default: () => GlobalConfig.pager.iconJumpMore }
   },
   emits: [
     'update:pageSize',
diff --git a/packages/v-x-e-table/src/conf.ts b/packages/v-x-e-table/src/conf.ts
index a95a2e449..0745ba62a 100644
--- a/packages/v-x-e-table/src/conf.ts
+++ b/packages/v-x-e-table/src/conf.ts
@@ -232,10 +232,10 @@ const GlobalConfig: VXETableGlobalConfig = {
     // size: null,
     // autoHidden: false,
     // perfect: true,
-    // pageSize: 10,
-    // pagerCount: 7,
-    // pageSizes: [10, 15, 20, 50, 100],
-    // layouts: ['PrevJump', 'PrevPage', 'Jump', 'PageCount', 'NextPage', 'NextJump', 'Sizes', 'Total']
+    pageSize: 10,
+    pagerCount: 7,
+    pageSizes: [10, 15, 20, 50, 100],
+    layouts: ['PrevJump', 'PrevPage', 'Jump', 'PageCount', 'NextPage', 'NextJump', 'Sizes', 'Total']
   },
   form: {
     // preventSubmit: false,
diff --git a/styles/pager.scss b/styles/pager.scss
index 0c6c0023d..eed708abf 100644
--- a/styles/pager.scss
+++ b/styles/pager.scss
@@ -221,7 +221,7 @@
       font-weight: 700;
     }
   }
-  .vxe-pager--sizes {
+  .vxe-select.size--mini.vxe-pager--sizes {
     width: 7em;
     text-align: center;
     cursor: pointer;
-- 
Gitee


From a966afb471e971a773c8cab3384abfc63fc3e9ea Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Tue, 9 Nov 2021 10:31:30 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/form.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/styles/form.scss b/styles/form.scss
index 86030c525..4dd11486d 100644
--- a/styles/form.scss
+++ b/styles/form.scss
@@ -179,6 +179,7 @@
     .vxe-form--item-content {
       position: relative;
       flex-grow: 1;
+      width: 100%;
     }
   }
   .vxe-default-input,
-- 
Gitee


From 43d67691ed3f73e6f769ac0b5678dc71de548243 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Wed, 10 Nov 2021 12:55:36 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=B9=E6=B3=95=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E5=BC=84=E4=B8=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/textarea/src/textarea.ts b/packages/textarea/src/textarea.ts
index c003e7752..754d79574 100644
--- a/packages/textarea/src/textarea.ts
+++ b/packages/textarea/src/textarea.ts
@@ -22,7 +22,7 @@ export default defineComponent({
     rows: { type: [String, Number] as PropType<VxeTextareaPropTypes.Rows>, default: () => GlobalConfig.textarea.rows },
     cols: { type: [String, Number] as PropType<VxeTextareaPropTypes.Cols>, default: () => GlobalConfig.textarea.cols },
     showWordCount: { type: Boolean as PropType<VxeTextareaPropTypes.ShowWordCount>, default: () => GlobalConfig.textarea.showWordCount },
-    countMethod: { type: Function as PropType<VxeTextareaPropTypes.CountMethod>, default: () => GlobalConfig.textarea.countMethod },
+    countMethod: { type: Function as PropType<VxeTextareaPropTypes.CountMethod> },
     autosize: { type: [Boolean, Object] as PropType<VxeTextareaPropTypes.Autosize>, default: () => GlobalConfig.textarea.autosize },
     form: { type: String as PropType<VxeTextareaPropTypes.Form>, default: () => GlobalConfig.textarea.form },
     resize: { type: String as PropType<VxeTextareaPropTypes.Resize>, default: () => GlobalConfig.textarea.resize },
-- 
Gitee


From b6fbc0ecd06939a98c7bfbe827eafb434a0aacfc Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Wed, 10 Nov 2021 23:00:46 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=BB=99=E6=8C=89=E9=92=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=82=B9=E5=87=BB=E5=9B=9E=E8=B0=83=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=BF=E4=BA=8Ejson=E9=85=8D=E7=BD=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=AE=BE=E7=BD=AE=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/button/src/button.ts | 10 +++++++++-
 types/button.d.ts             |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/button/src/button.ts b/packages/button/src/button.ts
index a388a2317..5a99fec20 100644
--- a/packages/button/src/button.ts
+++ b/packages/button/src/button.ts
@@ -63,7 +63,11 @@ export default defineComponent({
     /**
      * 是否将弹框容器插入于 body 内
      */
-    transfer: { type: Boolean as PropType<VxeButtonPropTypes.Transfer>, default: () => GlobalConfig.button.transfer }
+    transfer: { type: Boolean as PropType<VxeButtonPropTypes.Transfer>, default: () => GlobalConfig.button.transfer },
+    /**
+     * 按钮点击回调方法
+     */
+    click: { type: Function as PropType<VxeButtonPropTypes.click> }
   },
   emits: [
     'click',
@@ -199,6 +203,10 @@ export default defineComponent({
     }
 
     const clickEvent = (evnt: Event) => {
+      if (props.click) {
+        // 回调按钮点击事件
+        props.click({ $event: evnt }, evnt)
+      }
       buttonMethods.dispatchEvent('click', { $event: evnt }, evnt)
     }
 
diff --git a/types/button.d.ts b/types/button.d.ts
index 82502205f..155a73897 100644
--- a/types/button.d.ts
+++ b/types/button.d.ts
@@ -51,6 +51,7 @@ export namespace VxeButtonPropTypes {
   export type Loading = boolean;
   export type DestroyOnClose = boolean;
   export type Transfer = boolean;
+  export type Click = Function;
 }
 
 export type VxeButtonProps = {
@@ -104,6 +105,10 @@ export type VxeButtonProps = {
    * 是否将弹框容器插入于 body 内
    */
   transfer?: VxeButtonPropTypes.Transfer;
+  /**
+   * 按钮点击回调方法
+   */
+  click?: VxeButtonPropTypes.Click;
 }
 
 export interface ButtonMethods {
-- 
Gitee


From 25155d52c8b9a496cc37be2ac5f3a90f4f12ccf3 Mon Sep 17 00:00:00 2001
From: majinju <jinjuma@yeah.net>
Date: Wed, 10 Nov 2021 23:54:07 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/button/src/button.ts b/packages/button/src/button.ts
index 5a99fec20..981d3cd74 100644
--- a/packages/button/src/button.ts
+++ b/packages/button/src/button.ts
@@ -205,7 +205,7 @@ export default defineComponent({
     const clickEvent = (evnt: Event) => {
       if (props.click) {
         // 回调按钮点击事件
-        props.click({ $event: evnt }, evnt)
+        props.click({ $event: evnt, props: this.props }, evnt)
       }
       buttonMethods.dispatchEvent('click', { $event: evnt }, evnt)
     }
-- 
Gitee