vxe-pc-ui 4.12.3 → 4.12.5

package/packages/list/src/list.ts

@@ -1,4 +1,4 @@
-import { h, PropType, ref, Ref, computed, onUnmounted, watch, reactive, nextTick, onActivated, onMounted } from 'vue'
+import { h, PropType, ref, Ref, computed, onBeforeUnmount, watch, reactive, nextTick, onActivated, onMounted } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getConfig, globalEvents, globalResize, createEvent, useSize } from '../../ui'
@@ -7,6 +7,18 @@ import VxeLoadingComponent from '../../loading/src/loading'
 
 import type { VxeListConstructor, VxeListPropTypes, VxeListEmits, ListReactData, ListInternalData, ValueOf, ListMethods, ListPrivateRef, VxeListMethods } from '../../../types'
 
+function createReactData (): ListReactData {
+  return {
+    scrollYLoad: false,
+    bodyHeight: 0,
+    customHeight: 0,
+    customMaxHeight: 0,
+    parentHeight: 0,
+    topSpaceHeight: 0,
+    items: []
+  }
+}
+
 function createInternalData (): ListInternalData {
   return {
     resizeObserver: undefined,
@@ -55,15 +67,7 @@ export default defineVxeComponent({
 
     const { computeSize } = useSize(props)
 
-    const reactData = reactive<ListReactData>({
-      scrollYLoad: false,
-      bodyHeight: 0,
-      customHeight: 0,
-      customMaxHeight: 0,
-      parentHeight: 0,
-      topSpaceHeight: 0,
-      items: []
-    })
+    const reactData = reactive(createReactData())
 
     const internalData = createInternalData()
 
@@ -418,12 +422,13 @@ export default defineVxeComponent({
       globalEvents.on($xeList, 'resize', recalculate)
     })
 
-    onUnmounted(() => {
+    onBeforeUnmount(() => {
       const { resizeObserver } = internalData
       if (resizeObserver) {
         resizeObserver.disconnect()
       }
       globalEvents.off($xeList, 'resize')
+      XEUtils.assign(reactData, createReactData())
       XEUtils.assign(internalData, createInternalData())
     })
 

package/packages/tree/src/tree.ts

@@ -608,7 +608,7 @@ export default defineVxeComponent({
               })
             }
           : (item: any) => {
-              return String(item[titleField]).toLowerCase().indexOf(filterStr) > -1
+              return String(item[titleField]).toLowerCase().indexOf(filterStr.toLowerCase()) > -1
             }
         const bafParams = { $tree: $xeTree, filterValue: filterStr }
         if (beforeFilterMethod) {

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

@@ -1,4 +1,4 @@
-import { ref, computed, h, PropType, nextTick, inject, provide, reactive, Teleport, onMounted, onUnmounted, watch, VNode } from 'vue'
+import { ref, computed, h, PropType, nextTick, inject, provide, reactive, Teleport, onMounted, onBeforeUnmount, watch, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import { getConfig, getI18n, getIcon, globalEvents, createEvent, useSize, renderEmptyElement } from '../../ui'
 import { getEventTargetNode, updatePanelPlacement, toCssUnit } from '../../ui/src/dom'
@@ -18,6 +18,21 @@ function getOptUniqueId () {
   return XEUtils.uniqueId('node_')
 }
 
+function createReactData (): TreeSelectReactData {
+  return {
+    initialized: false,
+    searchValue: '',
+    searchLoading: false,
+    panelIndex: 0,
+    panelStyle: {},
+    panelPlacement: null,
+    triggerFocusPanel: false,
+    visiblePanel: false,
+    isAniVisible: false,
+    isActivated: false
+  }
+}
+
 function createInternalData (): TreeSelectInternalData {
   return {
     // hpTimeout: undefined,
@@ -134,18 +149,7 @@ export default defineVxeComponent({
     const refOptionPanel = ref<HTMLDivElement>()
     const refTree = ref<VxeTreeConstructor>()
 
-    const reactData = reactive<TreeSelectReactData>({
-      initialized: false,
-      searchValue: '',
-      searchLoading: false,
-      panelIndex: 0,
-      panelStyle: {},
-      panelPlacement: null,
-      triggerFocusPanel: false,
-      visiblePanel: false,
-      isAniVisible: false,
-      isActivated: false
-    })
+    const reactData = reactive(createReactData())
 
     const internalData = createInternalData()
 
@@ -935,11 +939,12 @@ export default defineVxeComponent({
       globalEvents.on($xeTreeSelect, 'resize', handleGlobalResizeEvent)
     })
 
-    onUnmounted(() => {
+    onBeforeUnmount(() => {
       globalEvents.off($xeTreeSelect, 'mousewheel')
       globalEvents.off($xeTreeSelect, 'mousedown')
       globalEvents.off($xeTreeSelect, 'blur')
       globalEvents.off($xeTreeSelect, 'resize')
+      XEUtils.assign(reactData, createReactData())
       XEUtils.assign(internalData, createInternalData())
     })
 

package/packages/ui/index.ts

@@ -206,7 +206,6 @@ setConfig({
   layoutAside: {},
   layoutBody: {
     backtopConfig: {
-      position: 'fixed'
     }
   },
   layoutContainer: {},

package/packages/upload/src/upload.ts

@@ -1,4 +1,4 @@
-import { ref, h, reactive, watch, computed, TransitionGroup, PropType, inject, onUnmounted, onMounted, nextTick } from 'vue'
+import { ref, h, reactive, watch, computed, TransitionGroup, PropType, inject, onBeforeUnmount, onMounted, nextTick } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI, getConfig, getI18n, getIcon, useSize, createEvent, globalEvents, renderEmptyElement } from '../../ui'
@@ -11,6 +11,28 @@ import VxeButtonComponent from '../../button/src/button'
 import type { VxeUploadDefines, VxeUploadPropTypes, UploadReactData, UploadInternalData, UploadPrivateMethods, UploadMethods, VxeUploadEmits, UploadPrivateRef, VxeUploadPrivateComputed, VxeUploadConstructor, VxeUploadPrivateMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, ValueOf, VxeComponentEventParams } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
+function createReactData (): UploadReactData {
+  return {
+    isDragUploadStatus: false,
+    showMorePopup: false,
+    isActivated: false,
+    fileList: [],
+    fileCacheMaps: {},
+    isDragMove: false,
+    dragIndex: -1,
+    dragTipText: ''
+  }
+}
+
+function createInternalData (): UploadInternalData {
+  return {
+    moreId: XEUtils.uniqueId('upload'),
+    imagePreviewTypes: ['jpg', 'jpeg', 'png', 'gif'],
+    prevDragIndex: -1
+    // prevDragPos: ''
+  }
+}
+
 export default defineVxeComponent({
   name: 'VxeUpload',
   props: {
@@ -217,23 +239,9 @@ export default defineVxeComponent({
     const refDragLineElem = ref<HTMLDivElement>()
     const refModalDragLineElem = ref<HTMLDivElement>()
 
-    const reactData = reactive<UploadReactData>({
-      isDragUploadStatus: false,
-      showMorePopup: false,
-      isActivated: false,
-      fileList: [],
-      fileCacheMaps: {},
-      isDragMove: false,
-      dragIndex: -1,
-      dragTipText: ''
-    })
+    const reactData = reactive(createReactData())
 
-    const internalData: UploadInternalData = {
-      moreId: XEUtils.uniqueId('upload'),
-      imagePreviewTypes: ['jpg', 'jpeg', 'png', 'gif'],
-      prevDragIndex: -1
-      // prevDragPos: ''
-    }
+    const internalData = createInternalData()
 
     const refMaps: UploadPrivateRef = {
       refElem
@@ -1854,11 +1862,13 @@ export default defineVxeComponent({
       globalEvents.on($xeUpload, 'blur', handleGlobalBlurEvent)
     })
 
-    onUnmounted(() => {
+    onBeforeUnmount(() => {
       reactData.isDragUploadStatus = false
       globalEvents.off($xeUpload, 'paste')
       globalEvents.off($xeUpload, 'mousedown')
       globalEvents.off($xeUpload, 'blur')
+      XEUtils.assign(reactData, createReactData())
+      XEUtils.assign(internalData, createInternalData())
     })
 
     updateFileList()

package/styles/components/checkbox.scss

@@ -2,7 +2,7 @@
 
 /*checkbox-group*/
 .vxe-checkbox-group {
-  display: inline-block;
+  display: inline-flex;
   vertical-align: middle;
   line-height: 1;
 }
@@ -17,7 +17,7 @@
 
 /*checkbox*/
 .vxe-checkbox {
-  display: inline-block;
+  display: inline-flex;
   vertical-align: middle;
   white-space: nowrap;
   line-height: 1;

package/styles/components/link.scss

@@ -99,6 +99,10 @@ $btnThemeList: (
   padding: 0 0.1em;
 }
 
+.vxe-checkbox+.vxe-link {
+  vertical-align: middle;
+}
+
 .vxe-link {
   &.size--medium {
     font-size: var(--vxe-ui-font-size-medium);

package/styles/components/number-input.scss

@@ -94,6 +94,18 @@
   flex-shrink: 0;
   background-color: var(--vxe-ui-layout-background-color);
 }
+.vxe-number-input--prefix {
+  border-radius: var(--vxe-ui-base-border-radius) 0 0 var(--vxe-ui-base-border-radius);
+}
+.vxe-number-input--suffix {
+  border-radius: 0 var(--vxe-ui-base-border-radius) var(--vxe-ui-base-border-radius) 0;
+}
+.vxe-number-input--prefix-icon,
+.vxe-number-input--suffix-icon,
+.vxe-number-input--clear-icon,
+.vxe-number-input--control-icon {
+  color: var(--vxe-ui-input-placeholder-color);
+}
 .vxe-number-input--prefix-icon {
   padding-left: 0.5em;
 }
@@ -103,7 +115,6 @@
 }
 .vxe-number-input--clear-icon {
   height: 100%;
-  color: var(--vxe-ui-input-placeholder-color);
   cursor: pointer;
 }
 .vxe-number-input--clear-icon {

package/styles/components/password-input.scss

@@ -19,28 +19,18 @@
   border-radius: var(--vxe-ui-base-border-radius);
   background-color: var(--vxe-ui-layout-background-color);
   box-shadow: none;
-  &::placeholder {
-    color: var(--vxe-ui-input-placeholder-color);
-  }
-  &::-webkit-autofill {
-    background-color: var(--vxe-ui-layout-background-color);
-  }
-  &[type="number"] {
-    appearance: none;
-    -moz-appearance: textfield;
-  }
-  &[type="search"],
-  &[type="search"]::-webkit-search-cancel-button,
-  &[type="number"]::-webkit-outer-spin-button,
-  &[type="number"]::-webkit-inner-spin-button {
-    appearance: none;
-  }
   &[disabled] {
     cursor: not-allowed;
     color: var(--vxe-ui-font-disabled-color);
     background-color: var(--vxe-ui-input-disabled-background-color);
   }
 }
+.vxe-password-input--inner::placeholder {
+  color: var(--vxe-ui-input-placeholder-color);
+}
+.vxe-password-input--inner::-webkit-autofill {
+  background-color: var(--vxe-ui-layout-background-color);
+}
 
 // 禁用
 .vxe-password-input {
@@ -86,6 +76,18 @@
   flex-shrink: 0;
   background-color: var(--vxe-ui-layout-background-color);
 }
+.vxe-password-input--prefix {
+  border-radius: var(--vxe-ui-base-border-radius) 0 0 var(--vxe-ui-base-border-radius);
+}
+.vxe-password-input--suffix {
+  border-radius: 0 var(--vxe-ui-base-border-radius) var(--vxe-ui-base-border-radius) 0;
+}
+.vxe-password-input--prefix-icon,
+.vxe-password-input--suffix-icon,
+.vxe-password-input--clear-icon,
+.vxe-password-input--control-icon {
+  color: var(--vxe-ui-input-placeholder-color);
+}
 .vxe-password-input--prefix-icon {
   padding-left: 0.5em;
 }
@@ -97,7 +99,6 @@
 .vxe-password-input--clear-icon,
 .vxe-password-input--control-icon {
   height: 100%;
-  color: var(--vxe-ui-input-placeholder-color);
   cursor: pointer;
 }
 .vxe-password-input--clear-icon {
@@ -200,54 +201,20 @@
   font-size: var(--vxe-ui-font-size-default);
   height: var(--vxe-ui-input-height-default);
   line-height: var(--vxe-ui-input-height-default);
-  .vxe-password-input--inner {
-    &[type="date"]::-webkit-inner-spin-button,
-    &[type="month"]::-webkit-inner-spin-button,
-    &[type="week"]::-webkit-inner-spin-button {
-      margin-top: 6px;
-    }
-    &[type="date"]::-webkit-inner-spin-button,
-    &[type="month"]::-webkit-inner-spin-button,
-    &[type="week"]::-webkit-inner-spin-button,
-    &[type="number"]::-webkit-inner-spin-button {
-      height: 24px;
-    }
-  }
   &.size--medium {
     font-size: var(--vxe-ui-font-size-medium);
     height: var(--vxe-ui-input-height-medium);
     line-height: var(--vxe-ui-input-height-medium);
-    .vxe-password-input--inner {
-      &[type="date"]::-webkit-inner-spin-button,
-      &[type="month"]::-webkit-inner-spin-button,
-      &[type="week"]::-webkit-inner-spin-button {
-        margin-top: 4px;
-      }
-    }
   }
   &.size--small {
     font-size: var(--vxe-ui-font-size-small);
     height: var(--vxe-ui-input-height-small);
     line-height: var(--vxe-ui-input-height-small);
-    .vxe-password-input--inner {
-      &[type="date"]::-webkit-inner-spin-button,
-      &[type="month"]::-webkit-inner-spin-button,
-      &[type="week"]::-webkit-inner-spin-button {
-        margin-top: 2px;
-      }
-    }
   }
   &.size--mini {
     font-size: var(--vxe-ui-font-size-mini);
     height: var(--vxe-ui-input-height-mini);
     line-height: var(--vxe-ui-input-height-mini);
-    .vxe-password-input--inner {
-      &[type="date"]::-webkit-inner-spin-button,
-      &[type="month"]::-webkit-inner-spin-button,
-      &[type="week"]::-webkit-inner-spin-button {
-        margin-top: 0;
-      }
-    }
   }
 }
 

package/styles/components/row.scss

@@ -44,8 +44,6 @@
 }
 
 .vxe-col--inner {
-  display: flex;
-  flex-direction: column;
   width: 100%;
 }
 

package/styles/components/text.scss

@@ -107,6 +107,10 @@ $btnThemeList: (
   }
 }
 
+.vxe-checkbox+.vxe-text {
+  vertical-align: middle;
+}
+
 .vxe-text {
   &.size--medium {
     font-size: var(--vxe-ui-font-size-medium);

package/types/components/table.d.ts

@@ -1274,9 +1274,22 @@ export namespace VxeTablePropTypes {
     transfer?: boolean
     iconNone?: string
     iconMatch?: string
+    /**
+     * 弹出层在关闭时是否销毁
+     */
     destroyOnClose?: boolean
+    /**
+     * 自定义确认按钮内容
+     */
     confirmButtonText?: string
+    /**
+     * 自定义重置按钮内容
+     */
     resetButtonText?: string
+    /**
+     * 是否显示底部按钮
+     */
+    showFooter?: boolean
   }
   export interface FilterOpts<D = VxeTablePropTypes.Row> extends FilterConfig<D> { }