vxe-pc-ui 4.9.0 → 4.9.2

package/packages/tabs/src/tabs.ts

@@ -292,6 +292,10 @@ export default defineVxeComponent({
       emit(type, createEvent(evnt, { $tabs: $xeTabs }, params))
     }
 
+    const emitModel = (value: any) => {
+      emit('update:modelValue', value)
+    }
+
     const addInitName = (name: VxeTabsPropTypes.ModelValue, evnt: Event | null) => {
       const { initNames } = reactData
       if (name && !initNames.includes(name)) {
@@ -327,7 +331,7 @@ export default defineVxeComponent({
         if (!validVal) {
           activeName = list[0].name
           addInitName(activeName, null)
-          emit('update:modelValue', activeName)
+          emitModel(activeName)
         }
       }
       reactData.activeName = activeName
@@ -350,7 +354,7 @@ export default defineVxeComponent({
         ).then((status) => {
           if (status) {
             reactData.activeName = name
-            emit('update:modelValue', value)
+            emitModel(value)
             addInitName(name, evnt)
             dispatchEvent('change', { value, name, oldName: activeName, newName: name, option: item }, evnt)
             dispatchEvent('tab-change', { value, name, oldName: activeName, newName: name, option: item }, evnt)
@@ -550,7 +554,7 @@ export default defineVxeComponent({
           const name = item.name
           const value = name
           reactData.activeName = name
-          emit('update:modelValue', value)
+          emitModel(value)
           addInitName(name, null)
         }
       }

package/packages/upload/src/upload.ts

@@ -453,6 +453,10 @@ export default defineVxeComponent({
       emit(type, createEvent(evnt, { $upload: $xeUpload }, params))
     }
 
+    const emitModel = (value: any) => {
+      emit('update:modelValue', value)
+    }
+
     const handleChange = (value: VxeUploadDefines.FileObjItem[]) => {
       const { singleMode, urlMode } = props
       const urlProp = computeUrlProp.value
@@ -464,13 +468,15 @@ export default defineVxeComponent({
           if (url) {
             const urlObj = XEUtils.parseUrl(url)
             if (!urlObj.searchQuery[nameProp]) {
-              return `${url}${url.indexOf('?') === -1 ? '?' : '&'}${nameProp}=${encodeURIComponent(item[nameProp] || '')}`
+              if (url.indexOf('blob:') === -1) {
+                return `${url}${url.indexOf('?') === -1 ? '?' : '&'}${nameProp}=${encodeURIComponent(item[nameProp] || '')}`
+              }
             }
           }
           return url
         })
       }
-      emit('update:modelValue', singleMode ? (restList[0] || null) : restList)
+      emitModel(singleMode ? (restList[0] || null) : restList)
     }
 
     const getThumbnailFileUrl = (item: VxeUploadDefines.FileObjItem) => {

package/styles/components/split.scss

@@ -118,6 +118,7 @@
 }
 
 .vxe-split-pane-handle {
+  display: flex;
   position: relative;
   flex-shrink: 0;
   user-select: none;
@@ -143,18 +144,22 @@
     background-color: var(--vxe-ui-split-handle-bar-hover-background-color);
   }
 }
-.vxe-split-pane-action-btn {
+
+.vxe-split-pane-action-btn-wrapper {
   position: absolute;
+  display: flex;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 2;
+}
+.vxe-split-pane-action-btn {
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
   font-size: 0.5em;
   border-radius: var(--vxe-ui-base-border-radius);
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 2;
   color: var(--vxe-ui-layout-background-color);
   background-color: var(--vxe-ui-split-handle-button-background-color);
   border: 1px solid var(--vxe-ui-input-border-color);
@@ -165,7 +170,86 @@
     background-color: var(--vxe-ui-font-primary-color);
   }
   &:active {
-    transform: translate(-50%, -50%) scale(0.9);
+    transform: scale(0.9);
+  }
+}
+.vxe-split-pane-handle {
+  &.is--horizontal {
+    flex-direction: row;
+    &.is--border {
+      border-width: 1px 0 1px 0;
+    }
+    .vxe-split-pane-action-btn-wrapper {
+      flex-direction: column;
+      & div {
+        margin-top: 1em;
+        &:first-child {
+          margin-top: 0;
+        }
+      }
+    }
+    .vxe-split-pane-handle-bar {
+      width: var(--vxe-ui-split-handle-bar-horizontal-width);
+      height: 100%;
+    }
+    .vxe-split-pane-action-btn {
+      width: var(--vxe-ui-split-handle-bar-horizontal-width);
+      height: var(--vxe-ui-split-handle-bar-horizontal-height);
+    }
+  }
+  &.is--vertical {
+    flex-direction: column;
+    &.is--border {
+      border-width: 0 1px 0 1px;
+    }
+    .vxe-split-pane-action-btn-wrapper {
+      flex-direction: row;
+      & div {
+        margin-left: 1em;
+        &:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+    .vxe-split-pane-handle-bar {
+      height: var(--vxe-ui-split-handle-bar-vertical-height);
+      width: 100%;
+    }
+    .vxe-split-pane-action-btn {
+      width: var(--vxe-ui-split-handle-bar-vertical-width);
+      height: var(--vxe-ui-split-handle-bar-vertical-height);
+    }
+  }
+  &.is--resize {
+    &.is-resize--immediate {
+      &.is--horizontal {
+        .vxe-split-pane-handle-bar {
+          cursor: w-resize;
+        }
+      }
+      &.is--vertical {
+        .vxe-split-pane-handle-bar {
+          cursor: n-resize;
+        }
+      }
+      & > .vxe-split-pane-handle-bar {
+        &:active {
+          background-color: var(--vxe-ui-font-primary-color);
+        }
+      }
+    }
+    &.is-resize--lazy {
+      &.is--horizontal {
+        .vxe-split-pane-handle-bar {
+          cursor: col-resize;
+        }
+      }
+      &.is--vertical {
+        .vxe-split-pane-handle-bar {
+          cursor: row-resize;
+        }
+      }
+    }
   }
 }
 
@@ -173,17 +257,23 @@
   display: flex;
   position: relative;
   overflow: hidden;
+  &.is--fill {
+    flex-grow: 1;
+  }
   &.is--hidden {
-    width: 0;
+    &.is--horizontal {
+      width: 0;
+    }
+    &.is--vertical {
+      height: 0;
+    }
   }
   &.is--padding {
     & > .vxe-split-pane--wrapper {
       padding: var(--vxe-ui-layout-padding-default);
     }
   }
-  &.is--fill {
-    flex-grow: 1;
-  }
+  &.is--hidden,
   &.is--width, 
   &.is--height {
     flex-shrink: 0;
@@ -193,84 +283,15 @@
       border: 1px solid var(--vxe-ui-base-popup-border-color);
     }
   }
-  &.is--resize {
-    &.is--expand {
-      &.is-resize--immediate {
-        &.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;
-            }
-          }
-        }
-        & > .vxe-split-pane-handle {
-          & > .vxe-split-pane-handle-bar {
-            &:active {
-              background-color: var(--vxe-ui-font-primary-color);
-            }
-          }
-        }
-      }
-      &.is-resize--lazy {
-        &.is--horizontal {
-          & > .vxe-split-pane-handle {
-            .vxe-split-pane-handle-bar {
-              cursor: col-resize;
-            }
-          }
-        }
-        &.is--vertical {
-          & > .vxe-split-pane-handle {
-            .vxe-split-pane-handle-bar {
-              cursor: row-resize;
-            }
-          }
-        }
-      }
-    }
-  }
-  &.is--horizontal {
-    flex-direction: row;
-    & > .vxe-split-pane-handle {
-      .vxe-split-pane-handle-bar {
-        width: var(--vxe-ui-split-handle-bar-horizontal-width);
-        height: 100%;
-      }
-      .vxe-split-pane-action-btn {
-        width: var(--vxe-ui-split-handle-bar-horizontal-width);
-        height: var(--vxe-ui-split-handle-bar-horizontal-height);
-      }
-    }
-    &.is--border {
-      & > .vxe-split-pane-handle {
-        border-width: 1px 0 1px 0;
-      }
-    }
-  }
-  &.is--vertical {
-    flex-direction: column;
-    & > .vxe-split-pane-handle {
-      .vxe-split-pane-handle-bar {
-        height: var(--vxe-ui-split-handle-bar-vertical-height);
-        width: 100%;
-      }
-      .vxe-split-pane-action-btn {
-        width: var(--vxe-ui-split-handle-bar-vertical-width);
-        height: var(--vxe-ui-split-handle-bar-vertical-height);
-      }
-    }
-    &.is--border {
-      & > .vxe-split-pane-handle {
-        border-width: 0 1px 0 1px;
-      }
-    }
+}
+
+.vxe-split--render-vars {
+  width: 0;
+  height: 0;
+  overflow: hidden;
+  .vxe-split--handle-bar-info {
+    width: var(--vxe-ui-split-handle-bar-horizontal-width);
+    height: var(--vxe-ui-split-handle-bar-vertical-height);
   }
 }
 

package/types/components/split-pane.d.ts

@@ -28,6 +28,11 @@ export namespace VxeSplitPanePropTypes {
   export type Height = string | number
   export type MinWidth = string | number
   export type MinHeight = string | number
+
+  /**
+   * 已废弃
+   * @deprecated
+   */
   export type ShowAction = boolean
 }
 
@@ -37,11 +42,15 @@ export interface VxeSplitPaneProps {
   height?: VxeSplitPanePropTypes.Height
   minWidth?: VxeSplitPanePropTypes.MinWidth
   minHeight?: VxeSplitPanePropTypes.MinHeight
-  showAction?: VxeSplitPanePropTypes.ShowAction
-
   slots?: {
     default?: string | ((params: VxeSplitPaneSlotTypes.DefaultSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
   }
+
+  /**
+   * 已废弃
+   * @deprecated
+   */
+  showAction?: VxeSplitPanePropTypes.ShowAction
 }
 
 export interface SplitItemPrivateComputed {

package/types/components/split.d.ts

@@ -59,10 +59,13 @@ export namespace VxeSplitPropTypes {
      */
     trigger?: 'click' | 'dblclick' | '' | null
     /**
-     * 折叠方向
-     * 支持向前和向后折叠
+     * 显示往向前折叠按钮
      */
-    direction?: 'prev' | 'next' | '' | null
+    showPrevButton?: boolean
+    /**
+     * 显示往向后折叠按钮
+     */
+    showNextButton?: boolean
     /**
      * 自定义展开图标
      */
@@ -71,6 +74,13 @@ export namespace VxeSplitPropTypes {
      * 自定义关闭图标
      */
     closeIcon?: string
+
+    /**
+     * 折叠方向
+     * 支持向前和向后折叠
+     * @deprecated
+     */
+    direction?: 'prev' | 'next' | '' | null
   }
 }
 
@@ -125,13 +135,14 @@ export interface SplitPrivateComputed {
   computeItemOpts: ComputedRef<VxeSplitPropTypes.ItemConfig>
   computeBarOpts: ComputedRef<VxeSplitPropTypes.BarConfig>
   computeActionOpts: ComputedRef<VxeSplitPropTypes.ActionConfig>
-  computeIsFoldNext: ComputedRef<boolean>
 }
 export interface VxeSplitPrivateComputed extends SplitPrivateComputed { }
 
 export interface SplitReactData {
   staticItems: VxeSplitDefines.PaneConfig[]
   itemList: VxeSplitDefines.PaneConfig[]
+  barWidth: number
+  barHeight: number
 }
 
 export interface SplitInternalData {
@@ -179,7 +190,6 @@ export namespace VxeSplitDefines {
 
   export interface PaneConfig extends VxeSplitPaneProps {
     id: string
-    isVisible: boolean
     isExpand: boolean
     renderWidth: number
     foldWidth: number
@@ -190,34 +200,29 @@ export namespace VxeSplitDefines {
   }
 
   export interface ActionClickEventParams extends SplitEventParams {
-    item: PaneConfig
-    name: VxeSplitPanePropTypes.Name
+    prevItem: PaneConfig
+    nextItem: PaneConfig
   }
   export interface ActionDblclickEventParams extends ActionClickEventParams {}
   export interface ToggleExpandEventParams extends SplitEventParams {
-    item: PaneConfig
-    name: VxeSplitPanePropTypes.Name
-    targetItem: PaneConfig
-    targetName: VxeSplitPanePropTypes.Name
+    prevItem: PaneConfig
+    nextItem: PaneConfig
     expanded: boolean
+    item: PaneConfig
   }
   export interface ResizeStartEventParams extends SplitEventParams {
-    item: PaneConfig
-    name: VxeSplitPanePropTypes.Name
+    prevItem: PaneConfig
+    nextItem: PaneConfig
   }
   export interface ResizeDragEventParams extends SplitEventParams {
-    item: PaneConfig
-    name: VxeSplitPanePropTypes.Name
-    offsetHeight: number
-    resizeHeight: number
-    offsetWidth: number
-    resizeWidth: number
+    prevItem: PaneConfig
+    nextItem: PaneConfig
   }
   export interface ResizeEndEventParams extends SplitEventParams {
     item: PaneConfig
     name: VxeSplitPanePropTypes.Name
-    resizeHeight: number
-    resizeWidth: number
+    offsetHeight: number
+    offsetWidth: number
   }
 }
 
@@ -259,7 +264,6 @@ export interface VxeSplitSlots {
    */
   [key: string]: ((params: {
     name: VxeSplitPanePropTypes.Name
-    isVisible: boolean
     isExpand: boolean
   }) => any) | undefined