vxe-pc-ui 4.5.11 → 4.5.14

package/styles/components/split.scss

@@ -34,7 +34,7 @@
   height: 100%;
   display: flex;
   flex-direction: row;
-  overflow: hidden;
+  overflow: auto;
 }
 
 .vxe-split-slots {
@@ -103,29 +103,31 @@
       border: 1px solid var(--vxe-ui-base-popup-border-color);
     }
   }
-  &.is--expand {
-    &.is--horizontal {
-      & > .vxe-split-pane-handle {
-        .vxe-split-pane-handle-bar {
-          cursor: w-resize;
+  &.is--resize {
+    &.is--expand {
+      &.is--horizontal {
+        & > .vxe-split-pane-handle {
+          .vxe-split-pane-handle-bar {
+            cursor: w-resize;
+          }
         }
       }
-    }
-    &.is--vertical {
-      & > .vxe-split-pane-handle {
-        .vxe-split-pane-handle-bar {
-          cursor: n-resize;
+      &.is--vertical {
+        & > .vxe-split-pane-handle {
+          .vxe-split-pane-handle-bar {
+            cursor: n-resize;
+          }
         }
       }
-    }
-    & > .vxe-split-pane-handle {
-      & > .vxe-split-pane-handle-bar {
-        background-color: var(--vxe-split-handle-bar-background-color);
-        &:hover {
-          background-color: var(--vxe-ui-font-primary-lighten-color);
-        }
-        &:active {
-          background-color: var(--vxe-ui-font-primary-darken-color);
+      & > .vxe-split-pane-handle {
+        & > .vxe-split-pane-handle-bar {
+          background-color: var(--vxe-split-handle-bar-background-color);
+          &:hover {
+            background-color: var(--vxe-ui-font-primary-lighten-color);
+          }
+          &:active {
+            background-color: var(--vxe-ui-font-primary-darken-color);
+          }
         }
       }
     }
@@ -194,4 +196,10 @@
       }
     }
   }
+}
+
+.vxe-modal--content {
+  & > .vxe-split {
+    height: 100%;
+  }
 }

package/types/components/drawer.d.ts

@@ -111,6 +111,7 @@ export interface DrawerReactData {
   visible: boolean
   contentVisible: boolean
   drawerZIndex: number
+  resizeFlag: number
 }
 
 export interface DrawerMethods {

package/types/components/modal.d.ts

@@ -207,6 +207,7 @@ export interface ModalReactData {
     height: number
   } | null
   firstOpen: boolean
+  resizeFlag: number
 }
 
 export interface ModalInternalData {

package/types/components/split.d.ts

@@ -29,6 +29,7 @@ export namespace VxeSplitPropTypes {
   export type Padding = boolean
   export type Vertical = boolean
   export type Border = boolean
+  export type Resize = boolean
   export type Items = VxeSplitPaneProps[]
   export interface ItemConfig {
     minWidth?: string | number
@@ -84,6 +85,10 @@ export type VxeSplitProps = {
    * 是否带有边框
    */
   border?: VxeSplitPropTypes.Border
+  /**
+   * 是否允许拖拽
+   */
+  resize?: VxeSplitPropTypes.Resize
   /**
    * 面板列表
    */

package/types/components/table.d.ts

@@ -1749,6 +1749,8 @@ export namespace VxeTablePropTypes {
      */
     findMethod?(params: {
       cellValue: any
+      row: DT
+      column: VxeTableDefines.ColumnInfo<DT>
       isWhole: boolean
       isRE: boolean
       isSensitive: boolean
@@ -5696,11 +5698,33 @@ export namespace VxeTableSlotTypes {
   export interface EmptySlotParams<D = any> extends BaseSlotParams<D> {}
   export interface LoadingSlotParams<D = any> extends BaseSlotParams<D> {}
 
-  export interface RowDragIconSlotParams<D = any> extends BaseSlotParams<D>, VxeTableDefines.CellRenderBodyParams<D> {}
-  export interface ColumnDragIconSlotParams<D = any> extends BaseSlotParams<D>, VxeTableDefines.CellRenderHeaderParams<D> {}
+  export interface RowDragIconSlotParams<D = any> extends BaseSlotParams<D> {
+    row: D
+    column: VxeTableDefines.ColumnInfo<D>
+  }
+  export interface ColumnDragIconSlotParams<D = any> extends BaseSlotParams<D> {
+    column: VxeTableDefines.ColumnInfo<D>
+  }
 }
 
 export interface VxeTableSlots<D = any> {
+  /**
+   * 自定义插槽模板
+   */
+  // [key: string]: ((params: {
+  //   $table: VxeTableConstructor<D>
+  //   $grid: VxeGridConstructor<D> | null | undefined
+  //   row: D
+  //   rowIndex: number
+  //   $rowIndex: number
+  //   _rowIndex: number
+  //   column: VxeTableDefines.ColumnInfo<D>
+  //   columnIndex: number
+  //   $columnIndex: number
+  //   _columnIndex: number
+  //   [key: string]: any
+  // }) => any) | undefined
+
   /**
    * 自定义空数据时显示模板
    */

package/types/components/upload.d.ts

@@ -63,6 +63,7 @@ export namespace VxeUploadPropTypes {
   export type TypeField = string
   export type UrlField = string
   export type SizeField = string
+  export type ShowTip = boolean
   export type TipText = string
   export type ButtonText = string
   export type ButtonIcon = string
@@ -162,6 +163,7 @@ export interface VxeUploadProps {
   showProgress?: VxeUploadPropTypes.ShowProgress
   progressText?: VxeUploadPropTypes.ProgressText
   autoHiddenButton?: VxeUploadPropTypes.AutoHiddenButton
+  showTip?: VxeUploadPropTypes.ShowTip
   tipText?: VxeUploadPropTypes.TipText
   previewMethod?: VxeUploadPropTypes.PreviewMethod
   uploadMethod?: VxeUploadPropTypes.UploadMethod