vxe-pc-ui 3.2.0 → 3.2.3

package/packages/drawer/src/drawer.ts

@@ -148,8 +148,13 @@ export default defineVxeComponent({
     emitModel (value: any) {
       const $xeDrawer = this
 
-      $xeDrawer.$emit('modelValue', value)
+      const { _events } = $xeDrawer as any
       $xeDrawer.$emit('input', value)
+      if (_events && _events.modelValue) {
+        $xeDrawer.$emit('modelValue', value)
+      } else {
+        $xeDrawer.$emit('model-value', value)
+      }
     },
     callSlot  (slotFunc: ((params: any, h: CreateElement) => any) | string | null, params: any, h: CreateElement) {
       const $xeDrawer = this

package/packages/icon-picker/src/icon-picker.ts

@@ -194,9 +194,14 @@ export default defineVxeComponent({
       $xeIconPicker.$emit(type, createEvent(evnt, { $iconPicker: $xeIconPicker }, params))
     },
     emitModel (value: any) {
-      const $xeDrawer = this
+      const $xeIconPicker = this
 
-      $xeDrawer.$emit('modelValue', value)
+      const { _events } = $xeIconPicker as any
+      if (_events && _events.modelValue) {
+        $xeIconPicker.$emit('modelValue', value)
+      } else {
+        $xeIconPicker.$emit('model-value', value)
+      }
     },
     isPanelVisible () {
       const $xeIconPicker = this

package/packages/image/src/preview.ts

@@ -167,8 +167,13 @@ export default defineVxeComponent({
     emitModel  (value: VxeImagePreviewPropTypes.ModelValue) {
       const $xeImagePreview = this
 
+      const { _events } = $xeImagePreview as any
       $xeImagePreview.$emit('input', value)
-      $xeImagePreview.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeImagePreview.$emit('modelValue', value)
+      } else {
+        $xeImagePreview.$emit('model-value', value)
+      }
     },
     handleCloseEvent  (evnt: MouseEvent) {
       const $xeImagePreview = this

package/packages/input/src/input.ts

@@ -867,7 +867,12 @@ export default defineVxeComponent({
     emitModel (value: any) {
       const $xeInput = this
 
-      $xeInput.$emit('modelValue', value)
+      const { _events } = $xeInput as any
+      if (_events && _events.modelValue) {
+        $xeInput.$emit('modelValue', value)
+      } else {
+        $xeInput.$emit('model-value', value)
+      }
     },
     focus () {
       const $xeInput = this

package/packages/language/ja-JP.ts

@@ -607,11 +607,11 @@ export default {
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧',
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结到左侧',
+          fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
           numberOption: '数值筛选'

package/packages/language/ko-KR.ts

@@ -648,11 +648,11 @@ export default {
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧',
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结到左侧',
+          fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
           numberOption: '数值筛选'

package/packages/language/uk-UA.ts

@@ -648,11 +648,11 @@ export default {
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧',
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结到左侧',
+          fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
           numberOption: '数值筛选'

package/packages/language/vi-VN.ts

@@ -648,11 +648,11 @@ export default {
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧',
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结到左侧',
+          fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
           numberOption: '数值筛选'

package/packages/language/zh-CHT.ts

@@ -648,11 +648,11 @@ export default {
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
-          fixedColumn: '鎖定列',
-          fixedGroup: '鎖定組',
-          cancelFixed: '取消鎖定',
-          fixedLeft: '鎖定左側',
-          fixedRight: '鎖定右側',
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结到左侧',
+          fixedRight: '冻结到右侧',
           clearFilter: '清除篩選',
           textOption: '文字篩選',
           numberOption: '數值篩選'

package/packages/language/zh-CN.ts

@@ -648,11 +648,11 @@ export default {
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧',
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结到左侧',
+          fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
           numberOption: '数值筛选'

package/packages/loading/src/loading.ts

@@ -79,8 +79,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeLoading = this
 
+      const { _events } = $xeLoading as any
       $xeLoading.$emit('input', value)
-      $xeLoading.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeLoading.$emit('modelValue', value)
+      } else {
+        $xeLoading.$emit('model-value', value)
+      }
     },
     handleInit () {
       const $xeLoading = this

package/packages/menu/src/menu.ts

@@ -103,9 +103,14 @@ export default defineVxeComponent({
       const $xeMenu = this
       const reactData = $xeMenu.reactData
 
+      const { _events } = $xeMenu as any
       reactData.activeName = value
       $xeMenu.$emit('input', value)
-      $xeMenu.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeMenu.$emit('modelValue', value)
+      } else {
+        $xeMenu.$emit('model-value', value)
+      }
     },
     getMenuTitle  (item: VxeMenuPropTypes.MenuOption) {
       return `${item.title || item.name}`

package/packages/modal/src/modal.ts

@@ -274,8 +274,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeModal = this
 
+      const { _events } = $xeModal as any
       $xeModal.$emit('input', value)
-      $xeModal.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeModal.$emit('modelValue', value)
+      } else {
+        $xeModal.$emit('model-value', value)
+      }
     },
     callSlot  (slotFunc: ((params: any, h: CreateElement) => any) | string | null, params: any, h: CreateElement) {
       const $xeModal = this

package/packages/number-input/src/number-input.ts

@@ -266,9 +266,14 @@ export default defineVxeComponent({
       $xeNumberInput.$emit(type, createEvent(evnt, { $numberInput: $xeNumberInput }, params))
     },
     emitModel  (value: any) {
-      const $xeModal = this
+      const $xeNumberInput = this
 
-      $xeModal.$emit('modelValue', value)
+      const { _events } = $xeNumberInput as any
+      if (_events && _events.modelValue) {
+        $xeNumberInput.$emit('modelValue', value)
+      } else {
+        $xeNumberInput.$emit('model-value', value)
+      }
     },
     focus () {
       const $xeNumberInput = this

package/packages/password-input/src/password-input.ts

@@ -120,9 +120,14 @@ export default defineVxeComponent({
       $xePasswordInput.$emit(type, createEvent(evnt, { $passwordInput: $xePasswordInput }, params))
     },
     emitModel  (value: any) {
-      const $xeModal = this
+      const $xePasswordInput = this
 
-      $xeModal.$emit('modelValue', value)
+      const { _events } = $xePasswordInput as any
+      if (_events && _events.modelValue) {
+        $xePasswordInput.$emit('modelValue', value)
+      } else {
+        $xePasswordInput.$emit('model-value', value)
+      }
     },
     focus () {
       const $xePasswordInput = this

package/packages/pulldown/src/pulldown.ts

@@ -116,7 +116,12 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xePulldown = this
 
-      $xePulldown.$emit('modelValue', value)
+      const { _events } = $xePulldown as any
+      if (_events && _events.modelValue) {
+        $xePulldown.$emit('modelValue', value)
+      } else {
+        $xePulldown.$emit('model-value', value)
+      }
     },
     updateZindex () {
       const $xePulldown = this

package/packages/radio/src/button.ts

@@ -106,8 +106,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeRadioButton = this
 
+      const { _events } = $xeRadioButton as any
       $xeRadioButton.$emit('input', value)
-      $xeRadioButton.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeRadioButton.$emit('modelValue', value)
+      } else {
+        $xeRadioButton.$emit('model-value', value)
+      }
     },
     handleValue (label: VxeRadioButtonPropTypes.Label, evnt: Event) {
       const $xeRadioButton = this

package/packages/radio/src/group.ts

@@ -113,8 +113,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeRadioGroup = this
 
+      const { _events } = $xeRadioGroup as any
       $xeRadioGroup.$emit('input', value)
-      $xeRadioGroup.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeRadioGroup.$emit('modelValue', value)
+      } else {
+        $xeRadioGroup.$emit('model-value', value)
+      }
     },
     handleChecked (params: {
       label: any

package/packages/radio/src/radio.ts

@@ -108,8 +108,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeRadio = this
 
+      const { _events } = $xeRadio as any
       $xeRadio.$emit('input', value)
-      $xeRadio.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeRadio.$emit('modelValue', value)
+      } else {
+        $xeRadio.$emit('model-value', value)
+      }
     },
     handleValue  (label: VxeRadioPropTypes.Label, evnt: Event) {
       const $xeRadio = this

package/packages/select/src/select.ts

@@ -328,7 +328,12 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeSelect = this
 
-      $xeSelect.$emit('modelValue', value)
+      const { _events } = $xeSelect as any
+      if (_events && _events.modelValue) {
+        $xeSelect.$emit('modelValue', value)
+      } else {
+        $xeSelect.$emit('model-value', value)
+      }
     },
     isPanelVisible () {
       const $xeSelect = this

package/packages/slider/src/slider.ts

@@ -121,7 +121,12 @@ export default defineVxeComponent({
     emitModel (value: any) {
       const $xeSlider = this
 
-      $xeSlider.$emit('modelValue', value)
+      const { _events } = $xeSlider as any
+      if (_events && _events.modelValue) {
+        $xeSlider.$emit('modelValue', value)
+      } else {
+        $xeSlider.$emit('model-value', value)
+      }
     },
     getStartPercent (startValue: number) {
       const $xeSlider = this

package/packages/steps/src/steps.ts

@@ -26,6 +26,16 @@ export default defineVxeComponent({
       const $xeSteps = this
       $xeSteps.$emit(type, createEvent(evnt, { $steps: $xeSteps }, params))
     },
+    emitModel  (value: any) {
+      const $xeSteps = this
+
+      const { _events } = $xeSteps as any
+      if (_events && _events.modelValue) {
+        $xeSteps.$emit('modelValue', value)
+      } else {
+        $xeSteps.$emit('model-value', value)
+      }
+    },
 
     //
     // Render

package/packages/switch/src/switch.ts

@@ -111,8 +111,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeSwitch = this
 
+      const { _events } = $xeSwitch as any
       $xeSwitch.$emit('input', value)
-      $xeSwitch.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeSwitch.$emit('modelValue', value)
+      } else {
+        $xeSwitch.$emit('model-value', value)
+      }
     },
     focus () {
       const $xeSwitch = this

package/packages/table-select/src/table-select.ts

@@ -246,7 +246,12 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeTableSelect = this
 
-      $xeTableSelect.$emit('modelValue', value)
+      const { _events } = $xeTableSelect as any
+      if (_events && _events.modelValue) {
+        $xeTableSelect.$emit('modelValue', value)
+      } else {
+        $xeTableSelect.$emit('model-value', value)
+      }
     },
     getRowid (option: any) {
       const $xeTableSelect = this

package/packages/tabs/src/tabs.ts

@@ -113,8 +113,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeTabs = this
 
+      const { _events } = $xeTabs as any
       $xeTabs.$emit('input', value)
-      $xeTabs.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeTabs.$emit('modelValue', value)
+      } else {
+        $xeTabs.$emit('model-value', value)
+      }
     },
     prev () {
       const $xeTabs = this

package/packages/textarea/src/textarea.ts

@@ -174,7 +174,12 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeTextarea = this
 
-      $xeTextarea.$emit('modelValue', value)
+      const { _events } = $xeTextarea as any
+      if (_events && _events.modelValue) {
+        $xeTextarea.$emit('modelValue', value)
+      } else {
+        $xeTextarea.$emit('model-value', value)
+      }
     },
     focus () {
       const $xeTextarea = this

package/packages/tooltip/src/tooltip.ts

@@ -91,8 +91,13 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeTooltip = this
 
+      const { _events } = $xeTooltip as any
       $xeTooltip.$emit('input', value)
-      $xeTooltip.$emit('modelValue', value)
+      if (_events && _events.modelValue) {
+        $xeTooltip.$emit('modelValue', value)
+      } else {
+        $xeTooltip.$emit('model-value', value)
+      }
     },
     getSelectorEl  () {
       const $xeTooltip = this

package/packages/tree-select/src/tree-select.ts

@@ -284,7 +284,12 @@ export default defineVxeComponent({
     emitModel  (value: any) {
       const $xeTreeSelect = this
 
-      $xeTreeSelect.$emit('modelValue', value)
+      const { _events } = $xeTreeSelect as any
+      if (_events && _events.modelValue) {
+        $xeTreeSelect.$emit('modelValue', value)
+      } else {
+        $xeTreeSelect.$emit('model-value', value)
+      }
     },
     getNodeid (option: any) {
       const $xeTreeSelect = this

package/styles/theme/dark.scss

@@ -8,7 +8,7 @@
   --vxe-ui-font-tinge-color: #33353b;
   --vxe-ui-font-lighten-color: #797b80;
   --vxe-ui-font-darken-color: #47494c;
-  --vxe-ui-font-disabled-color: #BFBFBF;
+  --vxe-ui-font-disabled-color: #464646;
   
   /*font status color*/
   --vxe-ui-font-primary-color: #409eff;

package/types/components/table.d.ts

@@ -2108,6 +2108,10 @@ export interface TablePrivateComputed<D = any> {
   fixedColumnSize: number
   isMaxFixedColumn: boolean
   isAllCheckboxDisabled: boolean
+  computeVirtualScrollBars: {
+    x: boolean
+    y: boolean
+  }
 }
 export interface VxeTablePrivateComputed<D = any> extends TablePrivateComputed<D> { }
 
@@ -2513,7 +2517,7 @@ export interface TableMethods<DT = any> {
     item: VxeTableDefines.ColumnInfo<DT>
     items: VxeTableDefines.ColumnInfo<DT>[]
     index: number
-    parent?: VxeTableDefines.ColumnInfo<DT>
+    parent?: VxeTableDefines.ColumnInfo<DT> | null
   } | null
   /**
    * 根据 row 获取行的序号
@@ -3159,6 +3163,12 @@ export interface TablePrivateMethods<D = any> {
   triggerRowExpandEvent(evnt: Event, params: VxeTableDefines.CellRenderBodyParams<any>): void
   triggerTreeExpandEvent(evnt: Event, params: VxeTableDefines.CellRenderBodyParams<any>): void
   triggerSortEvent(evnt: Event, column: VxeTableDefines.ColumnInfo<any>, order: VxeTablePropTypes.SortOrder): void
+  handleScrollEvent(evnt: Event, isRollY: boolean, isRollX: boolean, params: {
+    type: string
+    fixed: VxeColumnPropTypes.Fixed
+    scrollTop: number
+    scrollLeft: number
+  }): void
   triggerScrollXEvent(evnt: Event): void
   triggerScrollYEvent(evnt: Event): void
   scrollToTreeRow(row: any): Promise<any>
@@ -3278,6 +3288,7 @@ export namespace VxeTableDefines {
     items: any[]
     parent: any
     level: number
+    height: number
     treeLoaded?: boolean
     expandLoaded?: boolean
     formatData?: {
@@ -3295,7 +3306,8 @@ export namespace VxeTableDefines {
     $index: number
     _index: number
     items: VxeTableDefines.ColumnInfo<D>[]
-    parent: VxeTableDefines.ColumnInfo<D>
+    parent: VxeTableDefines.ColumnInfo<D> | null
+    width: number
   }
 
   /**