releases 4.3.0

x-extends · Nov 18, 2024 · ffb300a · ffb300a
1 parent 6b3773f
commit ffb300a
Show file tree

Hide file tree

Showing 8 changed files with 214 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.2.55",
+  "version": "4.3.0",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -63,7 +63,7 @@
     "vue": "3.5.5",
     "vue-i18n": "^9.13.1",
     "vue-router": "^4.3.2",
-    "vxe-table": "^4.8.0"
+    "vxe-table": "^4.8.16"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

diff --git a/packages/number-input/src/number-input.ts b/packages/number-input/src/number-input.ts
@@ -259,7 +259,7 @@ export default defineComponent({
     }
 
     const handleChange = (val: number | null, inputValue: string, evnt: Event | { type: string }) => {
-      const value = XEUtils.eqNull(val) ? null : Number(val)
+      const value = (val as any) === '' || XEUtils.eqNull(val) ? null : Number(val)
       const isChange = Number(value) !== props.modelValue
       if (isChange) {
         reactData.inputValue = inputValue || ''
@@ -277,7 +277,7 @@ export default defineComponent({
 
     const emitInputEvent = (inputValue: any, evnt: Event) => {
       const inpImmediate = computeInpImmediate.value
-      const value = inputValue ? XEUtils.toNumber(inputValue) : null
+      const value = inputValue === '' || XEUtils.eqNull(inputValue) ? null : XEUtils.toNumber(inputValue)
       reactData.inputValue = inputValue
       if (inpImmediate) {
         handleChange(value, inputValue, evnt)

diff --git a/packages/ui/index.ts b/packages/ui/index.ts
@@ -109,7 +109,8 @@ setConfig({
     // colon: false,
     validConfig: {
       showMessage: true,
-      autoPos: true
+      autoPos: true,
+      theme: 'normal'
     },
     tooltipConfig: {
       enterable: true

diff --git a/types/components/form.d.ts b/types/components/form.d.ts
@@ -69,6 +69,10 @@ export namespace VxeFormPropTypes {
   export type ValidConfig = {
     autoPos?: boolean
     showMessage?: boolean
+    /**
+     * 提示消息主题样式
+     */
+    theme?: 'normal' | 'beautify' | ''
   }
 
   /**

diff --git a/types/components/grid.d.ts b/types/components/grid.d.ts
@@ -465,6 +465,9 @@ export interface VxeGridEventProps<D = any> {
   onRowDragstart?: VxeGridEvents.RowDragstart<D>
   onRowDragover?: VxeGridEvents.RowDragover<D>
   onRowDragend?: VxeGridEvents.RowDragend<D>
+  onColumnDragstart?: VxeGridEvents.ColumnDragstart<D>
+  onColumnDragover?: VxeGridEvents.ColumnDragover<D>
+  onColumnDragend?: VxeGridEvents.ColumnDragend<D>
 
   // grid
   onProxyQuery?: VxeGridEvents.ProxyQuery<D>
@@ -526,6 +529,9 @@ export interface VxeGridListeners<D = any> {
   rowDragstart?: VxeGridEvents.RowDragstart<D>
   rowDragover?: VxeGridEvents.RowDragover<D>
   rowDragend?: VxeGridEvents.RowDragend<D>
+  columnDragstart?: VxeGridEvents.ColumnDragstart<D>
+  columnDragover?: VxeGridEvents.ColumnDragover<D>
+  columnDragend?: VxeGridEvents.ColumnDragend<D>
 
   // grid
   proxyQuery?: VxeGridEvents.ProxyQuery<D>
@@ -587,6 +593,9 @@ export namespace VxeGridEvents {
   export type RowDragstart<D = any> = (params: VxeGridDefines.RowDragstartEventParams<D>) => void
   export type RowDragover<D = any> = (params: VxeGridDefines.RowDragoverEventParams<D>) => void
   export type RowDragend<D = any> = (params: VxeGridDefines.RowDragendEventParams<D>) => void
+  export type ColumnDragstart<D = any> = (params: VxeGridDefines.ColumnDragstartEventParams<D>) => void
+  export type ColumnDragover<D = any> = (params: VxeGridDefines.ColumnDragoverEventParams<D>) => void
+  export type ColumnDragend<D = any> = (params: VxeGridDefines.ColumnDragendEventParams<D>) => void
 
   export type ProxyQuery<D = any> = (params: VxeGridDefines.ProxyQueryEventParams<D>) => void
   export type ProxyDelete<D = any> = (params: VxeGridDefines.ProxyDeleteEventParams<D>) => void

diff --git a/types/components/table-plugins/extend-cell-area.d.ts b/types/components/table-plugins/extend-cell-area.d.ts
@@ -77,12 +77,12 @@ export interface VxeTableProMethods<D = any> {
 export type VxeProPluginMethods<D = any> = VxeTableProMethods<D>
 
 export interface VxeTableProPrivateMethods<D = any> {
-  handleKeyboardEvent(evnt: KeyboardEvent): void
-  handleHeaderCellAreaEvent(evnt: KeyboardEvent, params: VxeTableDefines.HeaderCellClickEventParams<D>): void
+  handleKeyboardCellAreaEvent(evnt: KeyboardEvent): void
+  handleHeaderCellAreaEvent(evnt: MouseEvent, params: VxeTableDefines.HeaderCellClickEventParams<D>): void
   handleCellAreaEvent(evnt: MouseEvent, params: VxeTableDefines.CellClickEventParams<D>): void
   handleFilterEvent(evnt: Event, params: VxeTableDefines.FilterChangeEventParams<D>): any
   handleSortEvent(evnt: Event, params: VxeTableDefines.SortChangeEventParams<D>): any
-  handleUpdateCellAreas(): any
+  handleRecalculateCellAreas(): any
   handleCopyCellAreaEvent(evnt: ClipboardEvent): void
   handlePasteCellAreaEvent(evnt: ClipboardEvent): void
   handleCutCellAreaEvent(evnt: ClipboardEvent): void