vxe-pc-ui 4.10.27 → 4.10.29

package/packages/language/uz-UZ.ts

@@ -665,7 +665,8 @@ export default {
           fixedRight: "O'ng tomonni muzlatib qo'ying",
           clearFilter: 'Filtrni tozalash',
           textOption: 'Matnli filtrlash',
-          numberOption: 'Raqamli filtrlash'
+          numberOption: 'Raqamli filtrlash',
+          dateOption: '日期筛选'
         },
         popup: {
           title: 'Maxsus filtrlash usullari',
@@ -688,6 +689,28 @@ export default {
           include: "Qo'shmoq",
           exclude: "Qo'shilmagan",
           between: 'Orasida',
+          isAfter: '在以下日期之后',
+          eqAfter: '在以下日期之后或与之相同',
+          isBefore: '在以下日期之前',
+          eqBefore: '在以下日期之前或与之相同',
+          top10: '前10项',
+          aboveAverage: '高于平均值',
+          belowAverage: '低于平均值',
+          before: '之前',
+          after: '之后',
+          tomorrow: '明天',
+          today: '今天',
+          yesterday: '昨天',
+          nextWeek: '下周',
+          thisWeek: '本周',
+          lastWeek: '上周',
+          nextMonth: '下月',
+          thisMonth: '本月',
+          lastMonth: '上月',
+          nextYear: '明年',
+          thisYear: '今年',
+          lastYear: '去年',
+          yearToDate: '本年度截止到现在',
           custom: 'Custom filtrlash',
           insensitive: 'Ishni sezgir',
           isSensitive: 'harflar katta-kichikligiga sezgir'
@@ -753,6 +776,9 @@ export default {
         include: "Qo'shmoq",
         exclude: "Qo'shilmagan",
         between: 'Orasida',
+        top10: '前10项',
+        aboveAverage: '高于平均值',
+        belowAverage: '低于平均值',
         custom: 'Custom filtrlash',
         insensitive: 'Ishni sezgir',
         isSensitive: 'harflar katta-kichikligiga sezgir'
@@ -770,7 +796,8 @@ export default {
           fixedRight: "O'ng tomonga muzlatib qo'ying",
           clearFilter: 'Filtrni tozalash',
           textOption: 'Matnli filtrlash',
-          numberOption: 'Raqamli filtrlash'
+          numberOption: 'Raqamli filtrlash',
+          dateOption: '日期筛选'
         },
         popup: {
           title: 'Maxsus filtrlash usullari',

package/packages/language/vi-VN.ts

@@ -665,7 +665,8 @@ export default {
           fixedRight: 'Đóng băng bên phải',
           clearFilter: 'Xóa bộ lọc',
           textOption: 'Lọc văn bản',
-          numberOption: 'Lọc số'
+          numberOption: 'Lọc số',
+          dateOption: '日期筛选'
         },
         popup: {
           title: 'Phương pháp lọc tùy chỉnh',
@@ -688,6 +689,28 @@ export default {
           include: 'Bao gồm',
           exclude: 'Không bao gồm',
           between: 'Giữa',
+          isAfter: '在以下日期之后',
+          eqAfter: '在以下日期之后或与之相同',
+          isBefore: '在以下日期之前',
+          eqBefore: '在以下日期之前或与之相同',
+          top10: '前10项',
+          aboveAverage: '高于平均值',
+          belowAverage: '低于平均值',
+          before: '之前',
+          after: '之后',
+          tomorrow: '明天',
+          today: '今天',
+          yesterday: '昨天',
+          nextWeek: '下周',
+          thisWeek: '本周',
+          lastWeek: '上周',
+          nextMonth: '下月',
+          thisMonth: '本月',
+          lastMonth: '上月',
+          nextYear: '明年',
+          thisYear: '今年',
+          lastYear: '去年',
+          yearToDate: '本年度截止到现在',
           custom: 'Lọc tùy chỉnh',
           insensitive: 'Trường hợp không nhạy cảm',
           isSensitive: 'trường hợp nhạy cảm'
@@ -753,6 +776,9 @@ export default {
         include: 'Bao gồm',
         exclude: 'Không bao gồm',
         between: 'Giữa',
+        top10: '前10项',
+        aboveAverage: '高于平均值',
+        belowAverage: '低于平均值',
         custom: 'Lọc tùy chỉnh',
         insensitive: 'Trường hợp không nhạy cảm',
         isSensitive: 'trường hợp nhạy cảm'
@@ -770,7 +796,8 @@ export default {
           fixedRight: 'Đóng băng ở bên phải',
           clearFilter: 'Xóa bộ lọc',
           textOption: 'Lọc văn bản',
-          numberOption: 'Lọc số'
+          numberOption: 'Lọc số',
+          dateOption: '日期筛选'
         },
         popup: {
           title: 'Phương pháp lọc tùy chỉnh',

package/packages/language/zh-CHT.ts

@@ -665,11 +665,12 @@ export default {
           fixedRight: '凍結右側',
           clearFilter: '清除篩選',
           textOption: '文本篩選',
-          numberOption: '數值篩選'
+          numberOption: '數值篩選',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定義篩選的方式',
-          currColumnTitle: '當前列：',
+          currColumnTitle: '显示行：',
           and: '與',
           or: '或',
           describeHtml: '可用 ? 代表單個字符<br/>用 * 代表任意多個字符'
@@ -688,6 +689,28 @@ export default {
           include: '包含',
           exclude: '不包含',
           between: '介於',
+          isAfter: '在以下日期之后',
+          eqAfter: '在以下日期之后或与之相同',
+          isBefore: '在以下日期之前',
+          eqBefore: '在以下日期之前或与之相同',
+          top10: '前10项',
+          aboveAverage: '高于平均值',
+          belowAverage: '低于平均值',
+          before: '之前',
+          after: '之后',
+          tomorrow: '明天',
+          today: '今天',
+          yesterday: '昨天',
+          nextWeek: '下周',
+          thisWeek: '本周',
+          lastWeek: '上周',
+          nextMonth: '下月',
+          thisMonth: '本月',
+          lastMonth: '上月',
+          nextYear: '明年',
+          thisYear: '今年',
+          lastYear: '去年',
+          yearToDate: '本年度截止到现在',
           custom: '自定義篩選',
           insensitive: '不區分大小寫',
           isSensitive: '區分大小寫'
@@ -753,6 +776,9 @@ export default {
         include: '包含',
         exclude: '不包含',
         between: '介於',
+        top10: '前10项',
+        aboveAverage: '高于平均值',
+        belowAverage: '低于平均值',
         custom: '自定義篩選',
         insensitive: '不區分大小寫',
         isSensitive: '區分大小寫'
@@ -770,11 +796,12 @@ export default {
           fixedRight: '凍結到右側',
           clearFilter: '清除篩選',
           textOption: '文本篩選',
-          numberOption: '數值篩選'
+          numberOption: '數值篩選',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定義篩選的方式',
-          currColumnTitle: '當前列：',
+          currColumnTitle: '显示行：',
           and: '與',
           or: '或',
           describeHtml: '可用 ? 代表單個字符<br/>用 * 代表任意多個字符'

package/packages/language/zh-CN.ts

@@ -667,11 +667,12 @@ export default {
           fixedRight: '冻结右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
-          numberOption: '数值筛选'
+          numberOption: '数值筛选',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定义筛选的方式',
-          currColumnTitle: '当前列：',
+          currColumnTitle: '显示行：',
           and: '与',
           or: '或',
           describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
@@ -690,6 +691,28 @@ export default {
           include: '包含',
           exclude: '不包含',
           between: '介于',
+          isAfter: '在以下日期之后',
+          eqAfter: '在以下日期之后或与之相同',
+          isBefore: '在以下日期之前',
+          eqBefore: '在以下日期之前或与之相同',
+          top10: '前10项',
+          aboveAverage: '高于平均值',
+          belowAverage: '低于平均值',
+          before: '之前',
+          after: '之后',
+          tomorrow: '明天',
+          today: '今天',
+          yesterday: '昨天',
+          nextWeek: '下周',
+          thisWeek: '本周',
+          lastWeek: '上周',
+          nextMonth: '下月',
+          thisMonth: '本月',
+          lastMonth: '上月',
+          nextYear: '明年',
+          thisYear: '今年',
+          lastYear: '去年',
+          yearToDate: '本年度截止到现在',
           custom: '自定义筛选',
           insensitive: '不区分大小写',
           isSensitive: '区分大小写'
@@ -755,6 +778,9 @@ export default {
         include: '包含',
         exclude: '不包含',
         between: '介于',
+        top10: '前10项',
+        aboveAverage: '高于平均值',
+        belowAverage: '低于平均值',
         custom: '自定义筛选',
         insensitive: '不区分大小写',
         isSensitive: '区分大小写'
@@ -772,11 +798,12 @@ export default {
           fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
-          numberOption: '数值筛选'
+          numberOption: '数值筛选',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定义筛选的方式',
-          currColumnTitle: '当前列：',
+          currColumnTitle: '显示行：',
           and: '与',
           or: '或',
           describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'

package/packages/modal/src/modal.ts

@@ -363,6 +363,12 @@ export default defineVxeComponent({
       })
     }
 
+    const removeActiveQueue = () => {
+      if (allActiveModals.indexOf($xeModal) > -1) {
+        XEUtils.remove(allActiveModals, item => item === $xeModal)
+      }
+    }
+
     const removeMsgQueue = () => {
       const { type } = props
       const queueList = type === 'notification' ? notifyQueue : msgQueue
@@ -388,7 +394,7 @@ export default defineVxeComponent({
             if (!remember) {
               handleRevert()
             }
-            XEUtils.remove(allActiveModals, item => item === $xeModal)
+            removeActiveQueue()
             dispatchEvent('before-hide', params, null)
             setTimeout(() => {
               reactData.visible = false
@@ -1463,6 +1469,7 @@ export default defineVxeComponent({
     onUnmounted(() => {
       globalEvents.off($xeModal, 'keydown')
       removeMsgQueue()
+      removeActiveQueue()
       removeBodyLockScroll()
     })
 

package/packages/ui/src/dom.ts

@@ -43,11 +43,11 @@ function getNodeOffset (elem: any, container: any, rest: any): any {
 }
 
 export function isPx (val: any) {
-  return val && /^\d+(px)?$/.test(val)
+  return val && /^\d+(\.\d+)?px?$/.test(val)
 }
 
 export function isScale (val: any) {
-  return val && /^\d+%$/.test(val)
+  return val && /^\d+(\.\d+)?%$/.test(val)
 }
 
 export function hasClass (elem: any, cls: any) {

package/types/components/column.d.ts

@@ -220,7 +220,7 @@ export namespace VxeColumnPropTypes {
   export type TitlePrefix = VxeTooltipDefines.TooltipHelperOption
   export type TitleSuffix = VxeTooltipDefines.TooltipHelperOption
 
-  export type CellType = 'auto' | 'number' | 'string' | '' | null
+  export type CellType = 'auto' | 'number' | 'string' | 'date' | '' | null
 
   export interface CellRender<D = any, P = Record<string, any>> {
     /**