vxe-pc-ui 4.20.15 → 4.20.17

package/packages/language/hu-HU.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Megy',
       gotoTitle: 'Oldalak száma',

package/packages/language/hy-AM.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '前往',
       gotoTitle: '页数',

package/packages/language/id-ID.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Pergi',
       gotoTitle: 'Jumlah halaman',

package/packages/language/it-IT.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Andare',
       gotoTitle: 'Numero di pagine',

package/packages/language/ja-JP.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: 'すべて拡張します',
       clearExpand: 'すべてを閉じます',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '検索',
       emptyText: 'まだデータはありません'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '行く',
       gotoTitle: 'ページ数',

package/packages/language/ko-KR.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '모든 것을 확장하십시오',
       clearExpand: '모두 닫으십시오',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '찾다',
       emptyText: '아직 데이터가 없습니다'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '가다',
       gotoTitle: '페이지 수',

package/packages/language/ms-MY.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Pergi',
       gotoTitle: 'Bilangan halaman',

package/packages/language/nb-NO.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Gå',
       gotoTitle: 'Antall sider',

package/packages/language/pt-BR.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Ir',
       gotoTitle: 'Número de páginas',

package/packages/language/ru-RU.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: 'Расширить все',
       clearExpand: 'Закрыть все',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: 'поиск',
       emptyText: 'Нет данных пока'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Идти',
       gotoTitle: 'Количество страниц',

package/packages/language/th-TH.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'ไป',
       gotoTitle: 'จำนวนหน้า',

package/packages/language/ug-CN.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'ئالغا',
       gotoTitle: 'بەت سانى',

package/packages/language/uk-UA.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Йти',
       gotoTitle: 'Кількість сторінок',

package/packages/language/uz-UZ.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Bormoq',
       gotoTitle: 'Sahifalar soni',

package/packages/language/vi-VN.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: 'Mở rộng tất cả',
       clearExpand: 'Đóng tất cả',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: 'tìm kiếm',
       emptyText: 'Chưa có dữ liệu'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: 'Đi',
       gotoTitle: 'Số lượng trang',

package/packages/language/zh-CHT.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展開',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜尋',
       emptyText: '暫無數據'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '前往',
       gotoTitle: '頁數',

package/packages/language/zh-CN.ts

@@ -129,10 +129,14 @@ export default {
       allExpand: '全部展开',
       clearExpand: '全部收起',
       total: '已选 {0} 项',
+      filterCount: '共找到 {0} 条记录',
       close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
+    tableSelect: {
+      filterCount: '共找到 {0} 条记录'
+    },
     pager: {
       goto: '前往',
       gotoTitle: '页数',

package/packages/list/src/list.ts

@@ -1,7 +1,7 @@
 import { h, PropType, ref, Ref, computed, onBeforeUnmount, watch, reactive, nextTick, onActivated, onMounted, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
-import { VxeUI, createEvent, renderEmptyElement } from '../../ui'
+import { VxeUI } from '../../ui'
 import { getCrossListDragRowInfo } from './store'
 import { isScale, removeClass, addClass, getTpImg, toCssUnit, hasClass } from '../../ui/src/dom'
 import { isEnableConf, getText, enModelValue, deModelValue, getDefaultConfig } from '../../ui/src/utils'
@@ -12,7 +12,7 @@ import VxeLoadingComponent from '../../loading'
 
 import type { VxeListConstructor, VxeListPropTypes, VxeListEmits, ListReactData, VxeListPrivateMethods, ListInternalData, VxeListDefines, ValueOf, ListMethods, ListPrivateMethods, ListPrivateRef, VxeComponentStyleType } from '../../../types'
 
-const { getConfig, getIcon, getI18n, domUtils, useFns, menus, globalEvents, globalResize } = VxeUI
+const { getConfig, getIcon, getI18n, domUtils, useFns, menus, globalEvents, globalResize, createEvent, renderEmptyElement } = VxeUI
 
 const { warnLog, errLog } = createComponentLog('tree')
 

package/packages/modal/src/modal.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getEventTargetNode, getPopupContainer, getPopupWrapperElement, isScale, toCssUnit } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, getSubLastZIndex, nextSubZIndex, getFuncText, handleBooleanDefaultValue, getDefaultConfig } from '../../ui/src/utils'
-import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useFns, renderEmptyElement } from '../../ui'
+import { VxeUI } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
 import { allActiveModals } from './store'
@@ -14,6 +14,8 @@ import VxeScrollbarComponent from '../../scrollbar'
 import type { VxeModalConstructor, VxeModalPropTypes, ModalReactData, ModalInternalData, VxeModalEmits, VxeModalPrivateComputed, ModalEventTypes, VxeButtonInstance, ModalMethods, ModalPrivateRef, VxeModalMethods, ValueOf, VxeDrawerConstructor, VxeDrawerMethods, VxeFormConstructor, VxeFormPrivateMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
+const { getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useFns, renderEmptyElement } = VxeUI
+
 const { warnLog, errLog } = createComponentLog('modal')
 
 function createInternalData (): ModalInternalData {

package/packages/pager/src/pager.ts

@@ -1,7 +1,7 @@
 import { h, PropType, computed, inject, ref, Ref, reactive, nextTick, watch } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
-import { getIcon, getConfig, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize } from '../../ui'
+import { VxeUI } from '../../ui'
 import { createComponentLog } from '../../ui/src/log'
 import VxeSelectComponent from '../../select'
 import VxeNumberInputComponent from '../../number-input'
@@ -9,6 +9,8 @@ import VxeNumberInputComponent from '../../number-input'
 import type { VxePagerPropTypes, VxePagerConstructor, VxePagerEmits, VxeSelectEvents, ValueOf, PagerPrivateRef, PagerMethods, PagerPrivateMethods, VxePagerPrivateMethods, PagerReactData, VxeInputEvents, VxeSelectDefines } from '../../../types'
 import type { VxeGridConstructor, VxeGridPrivateMethods } from '../../../types/components/grid'
 
+const { getIcon, getConfig, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useFns } = VxeUI
+
 const { warnLog, errLog } = createComponentLog('pager')
 
 export default defineVxeComponent({
@@ -100,7 +102,7 @@ export default defineVxeComponent({
 
     const xID = XEUtils.uniqueId()
 
-    const { computeSize } = useSize(props)
+    const { computeSize } = useFns.useSize(props)
 
     const $xeGrid = inject<(VxeGridConstructor & VxeGridPrivateMethods) | null>('$xeGrid', null)
 

package/packages/select/src/select.ts

@@ -1,7 +1,7 @@
 import { h, Teleport, PropType, ref, inject, computed, provide, onUnmounted, reactive, nextTick, watch, onMounted, onBeforeUnmount } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
-import { VxeUI, useFns } from '../../ui'
+import { VxeUI } from '../../ui'
 import { getEventTargetNode, getPopupContainer, toCssUnit, updatePanelPlacement } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, getFuncText, eqEmptyValue } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -12,7 +12,7 @@ import VxeButtonComponent from '../../button'
 import type { VxeSelectPropTypes, VxeSelectConstructor, SelectInternalData, SelectReactData, VxeSelectDefines, VxeButtonEvents, ValueOf, VxeSelectEmits, VxeComponentSlotType, VxeInputConstructor, SelectMethods, SelectPrivateRef, VxeSelectMethods, VxeOptionProps, VxeDrawerConstructor, VxeDrawerMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, VxeModalConstructor, VxeModalMethods, VxeInputEvents, VxeComponentStyleType, VxeCardConstructor, VxeCardPrivateMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
-const { getConfig, getIcon, getI18n, baseUtils, domUtils, globalEvents, GLOBAL_EVENT_KEYS, globalResize, createEvent, renderEmptyElement } = VxeUI
+const { getConfig, getIcon, getI18n, baseUtils, domUtils, useFns, globalEvents, GLOBAL_EVENT_KEYS, globalResize, createEvent, renderEmptyElement } = VxeUI
 const { getDefVal } = baseUtils
 
 const { errLog } = createComponentLog('select')
@@ -165,6 +165,8 @@ export default defineVxeComponent({
     filterConfig: Object as PropType<VxeSelectPropTypes.FilterConfig>,
     remote: Boolean as PropType<VxeSelectPropTypes.Remote>,
     remoteConfig: Object as PropType<VxeSelectPropTypes.RemoteConfig>,
+    showBadge: Boolean as PropType<VxeSelectPropTypes.ShowBadge>,
+    badgeConfig: Object as PropType<VxeSelectPropTypes.BadgeConfig>,
     emptyText: String as PropType<VxeSelectPropTypes.EmptyText>,
     checkedClosable: {
       type: Boolean as PropType<VxeSelectPropTypes.CheckedClosable>,
@@ -390,6 +392,39 @@ export default defineVxeComponent({
       return Object.assign({}, getConfig().select.remoteConfig, props.remoteConfig)
     })
 
+    const computeBadgeOpts = computed(() => {
+      return Object.assign({}, getConfig().select.badgeConfig, props.badgeConfig)
+    })
+    const computeBadgeCountNum = computed(() => {
+      const { showBadge } = props
+      if (!showBadge) {
+        return 0
+      }
+      const badgeOpts = computeBadgeOpts.value
+      const { count } = badgeOpts
+      return count ? XEUtils.toNumber(count) : 0
+    })
+    const computeBadgeLabel = computed(() => {
+      const { showBadge } = props
+      if (!showBadge) {
+        return ''
+      }
+      const badgeOpts = computeBadgeOpts.value
+      const { dot, text, max } = badgeOpts
+      if (dot) {
+        return ''
+      }
+      if (text) {
+        return `${text}`
+      }
+      const countNum = computeBadgeCountNum.value
+      if (countNum) {
+        const maxNum = max ? XEUtils.toNumber(max) : 99
+        return countNum > maxNum ? `${maxNum}+` : `${countNum}`
+      }
+      return ''
+    })
+
     const computeFilterOpts = computed(() => {
       return Object.assign({}, getConfig().select.filterConfig, props.filterConfig)
     })
@@ -688,9 +723,20 @@ export default defineVxeComponent({
         avList = fullData.filter(isOptionVisible)
       } else {
         if (filterable && frMethod) {
-          avList = fullData.filter(option => isOptionVisible(option) && frMethod({ $select: $xeSelect, group: null, option, searchValue, value: modelValue }))
+          avList = searchValue
+            ? fullData.filter(option => {
+              return isOptionVisible(option) && frMethod({
+                $select: $xeSelect,
+                group: null,
+                option,
+                filterValue: searchValue,
+                searchValue: searchValue,
+                value: modelValue
+              })
+            })
+            : fullData
         } else if (filterable) {
-          avList = fullData.filter(option => isOptionVisible(option) && (!searchStr || `${option[labelField] || option[valueField]}`.toLowerCase().indexOf(searchStr) > -1))
+          avList = searchStr ? fullData.filter(option => isOptionVisible(option) && (`${option[labelField] || option[valueField]}`.toLowerCase().indexOf(searchStr) > -1)) : fullData
         } else {
           avList = fullData.filter(isOptionVisible)
         }
@@ -1787,7 +1833,7 @@ export default defineVxeComponent({
     }
 
     const renderVN = () => {
-      const { className, multiple, loading, filterable, showTotalButton, showCheckedButton, showClearButton, showCloseButton } = props
+      const { className, multiple, loading, filterable, showTotalButton, showCheckedButton, showClearButton, showCloseButton, showBadge } = props
       const { initialized, isActivated, isAniVisible, optList, visiblePanel, bodyHeight, topSpaceHeight, xThumbWidth, yThumbHeight } = reactData
       const vSize = computeSize.value
       const isVScrollbar = computeIsVScrollbar.value
@@ -1797,11 +1843,16 @@ export default defineVxeComponent({
       const btnTransfer = computeBtnTransfer.value
       const formReadonly = computeFormReadonly.value
       const inpPlaceholder = computeInpPlaceholder.value
+      const badgeOpts = computeBadgeOpts.value
+      const badgeLabel = computeBadgeLabel.value
       const defaultSlot = slots.default
       if (formReadonly) {
         return h('div', {
           ref: refElem,
-          class: ['vxe-select--readonly', className]
+          class: ['vxe-select--readonly', className, {
+            'is--badge': showBadge && badgeLabel,
+            'is--badge-dot': showBadge && badgeOpts.dot
+          }]
         }, [
           h('div', {
             class: 'vxe-select-slots',
@@ -1810,7 +1861,12 @@ export default defineVxeComponent({
           h('span', {
             class: 'vxe-select-label',
             title: fullLabel
-          }, selectLabel)
+          }, selectLabel),
+          showBadge && badgeLabel
+            ? h('div', {
+              class: 'vxe-badge--label'
+            }, badgeLabel)
+            : renderEmptyElement($xeSelect)
         ])
       }
       const currStyle = computeCurrStyle.value
@@ -1834,6 +1890,8 @@ export default defineVxeComponent({
         ref: refElem,
         class: ['vxe-select', className ? (XEUtils.isFunction(className) ? className({ $select: $xeSelect }) : className) : '', {
           [`size--${vSize}`]: vSize,
+          'is--badge': showBadge && badgeLabel,
+          'is--badge-dot': showBadge && badgeOpts.dot,
           'is--visible': visiblePanel,
           'is--disabled': isDisabled,
           'is--filter': filterable,
@@ -1868,6 +1926,11 @@ export default defineVxeComponent({
               prefix: () => prefixSlot({})
             }
           : {}),
+        showBadge && badgeLabel
+          ? h('div', {
+            class: 'vxe-badge--label'
+          }, badgeLabel)
+          : renderEmptyElement($xeSelect),
         h(Teleport, {
           to: getPopupContainer(appendTo),
           disabled: btnTransfer ? !initialized : true