vxe-pc-ui 4.10.27 → 4.10.29

package/lib/index.umd.js

@@ -3596,14 +3596,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.10.27"}`;
+const log_version = `ui v${"4.10.29"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.10.27";
+const ui_version = "4.10.29";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -4879,11 +4879,12 @@ setIcon({
           fixedRight: '冻结右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
-          numberOption: '数值筛选'
+          numberOption: '数值筛选',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定义筛选的方式',
-          currColumnTitle: '当前列：',
+          currColumnTitle: '显示行：',
           and: '与',
           or: '或',
           describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
@@ -4902,6 +4903,28 @@ setIcon({
           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: '区分大小写'
@@ -4967,6 +4990,9 @@ setIcon({
         include: '包含',
         exclude: '不包含',
         between: '介于',
+        top10: '前10项',
+        aboveAverage: '高于平均值',
+        belowAverage: '低于平均值',
         custom: '自定义筛选',
         insensitive: '不区分大小写',
         isSensitive: '区分大小写'
@@ -4984,11 +5010,12 @@ setIcon({
           fixedRight: '冻结到右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
-          numberOption: '数值筛选'
+          numberOption: '数值筛选',
+          dateOption: '日期筛选'
         },
         popup: {
           title: '自定义筛选的方式',
-          currColumnTitle: '当前列：',
+          currColumnTitle: '显示行：',
           and: '与',
           or: '或',
           describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
@@ -5181,10 +5208,10 @@ function getNodeOffset(elem, container, rest) {
   return rest;
 }
 function isPx(val) {
-  return val && /^\d+(px)?$/.test(val);
+  return val && /^\d+(\.\d+)?px?$/.test(val);
 }
 function isScale(val) {
-  return val && /^\d+%$/.test(val);
+  return val && /^\d+(\.\d+)?%$/.test(val);
 }
 function hasClass(elem, cls) {
   return !!(elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls)));
@@ -20056,6 +20083,7 @@ const DatePicker = VxeDatePicker;
         }
         if (visiblePanel) {
           if (isEsc || isTab) {
+            checkValue();
             hidePanel();
           }
         }
@@ -20072,6 +20100,7 @@ const DatePicker = VxeDatePicker;
           if (getEventTargetNode(evnt, panelWrapperElem).flag) {
             updatePlacement();
           } else {
+            checkValue();
             hidePanel();
           }
         }
@@ -20083,6 +20112,7 @@ const DatePicker = VxeDatePicker;
         isActivated
       } = reactData;
       if (visiblePanel) {
+        checkValue();
         hidePanel();
       }
       if (isActivated) {
@@ -20422,7 +20452,7 @@ const DatePicker = VxeDatePicker;
         class: 'vxe-date-range-picker--layout-footer-wrapper'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-range-picker--layout-footer-label'
-      }, startLabel || endLabel ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', startLabel), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', `${separator || ''}`), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', endLabel)] : []), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, startLabel || endLabel ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', startLabel), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', `${separator || ''}`), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', endLabel)] : `${separator || ''}`), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-range-picker--layout-footer-custom'
       }, footerSlot ? footerSlot({}) : [renderShortcutBtn('footer')]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-date-range-picker--layout-footer-btns'
@@ -20833,6 +20863,11 @@ const allActiveDrawers = [];
         reactData.drawerZIndex = nextZIndex();
       }
     };
+    const removeActiveQueue = () => {
+      if (allActiveDrawers.indexOf($xeDrawer) > -1) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(allActiveDrawers, item => item === $xeDrawer);
+      }
+    };
     const closeDrawer = type => {
       const {
         beforeHideMethod
@@ -20847,7 +20882,7 @@ const allActiveDrawers = [];
         Promise.resolve(beforeHideMethod ? beforeHideMethod(params) : null).then(rest => {
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(rest)) {
             reactData.contentVisible = false;
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(allActiveDrawers, item => item === $xeDrawer);
+            removeActiveQueue();
             dispatchEvent('before-hide', params, null);
             setTimeout(() => {
               reactData.visible = false;
@@ -21265,6 +21300,7 @@ const allActiveDrawers = [];
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(() => {
       globalEvents.off($xeDrawer, 'keydown');
+      removeActiveQueue();
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeDrawer', $xeDrawer);
     $xeDrawer.renderVN = renderVN;
@@ -27903,6 +27939,11 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         });
       });
     };
+    const removeActiveQueue = () => {
+      if (allActiveModals.indexOf($xeModal) > -1) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(allActiveModals, item => item === $xeModal);
+      }
+    };
     const removeMsgQueue = () => {
       const {
         type
@@ -27935,7 +27976,7 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             if (!remember) {
               handleRevert();
             }
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(allActiveModals, item => item === $xeModal);
+            removeActiveQueue();
             dispatchEvent('before-hide', params, null);
             setTimeout(() => {
               reactData.visible = false;
@@ -29032,6 +29073,7 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(() => {
       globalEvents.off($xeModal, 'keydown');
       removeMsgQueue();
+      removeActiveQueue();
       removeBodyLockScroll();
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeModal', $xeModal);