vxe-pc-ui 4.11.34 → 4.11.36

package/lib/index.umd.js

@@ -2390,7 +2390,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/core.js
-const coreVersion = "4.2.19";
+const coreVersion = "4.2.20";
 const VxeCore = {
   coreVersion,
   uiVersion: '',
@@ -2990,7 +2990,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-const version = "4.2.19";
+const version = "4.2.20";
 const log = {
   create: createLog,
   warn: createLog('warn', `v${version}`),
@@ -3636,6 +3636,8 @@ const VxeDynamics = defineVxeComponent({
               optionClick(params);
             }
           }
+        }, {
+          events: undefined
         });
       }
       return [modals.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -3659,14 +3661,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.11.34"}`;
+const log_version = `ui v${"4.11.36"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.11.34";
+const ui_version = "4.11.36";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -3736,7 +3738,9 @@ setConfig({
     }
   },
   collapsePane: {},
-  contextMenu: {},
+  contextMenu: {
+    autoLocate: true
+  },
   countdown: {},
   colorPicker: {
     type: 'rgb',
@@ -8265,16 +8269,15 @@ function parseDateObj(val, type, options) {
     // '2024-12-31' 'yyyy-MM-dd W' >> '2024-12-31 1'
     // '2025-01-01' 'yyyy-MM-dd W' >> '2025-01-01 1'
     if (labelFormat && type === 'week') {
-      const weekNum = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(dValue, firstDay);
-      const weekDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(dValue, 0, weekNum === 1 ? (6 + firstDay) % 7 : firstDay, firstDay);
-      const weekFullYear = weekDate.getFullYear();
-      if (weekFullYear !== dValue.getFullYear()) {
-        const yyIndex = labelFormat.indexOf('yyyy');
+      const oldYyyy = dValue.getFullYear();
+      const M = dValue.getMonth() + 1;
+      const W = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(dValue, firstDay);
+      if (checkWeekOfsetYear(W, M)) {
+        const formatY = 'yyyy';
+        const newYyyy = oldYyyy + 1;
+        const yyIndex = labelFormat.indexOf(formatY);
         if (yyIndex > -1) {
-          const yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4));
-          if (yyNum && !isNaN(yyNum)) {
-            dLabel = dLabel.replace(`${yyNum}`, `${weekFullYear}`);
-          }
+          dLabel = dLabel.substring(0, yyIndex) + newYyyy + dLabel.substring(yyIndex + formatY.length);
         }
       }
     }
@@ -8392,6 +8395,12 @@ function getRangeDateByCode(code, val, type, options) {
     endValue
   };
 }
+/**
+ * 判断周的年份是否跨年
+ */
+const checkWeekOfsetYear = (W, M) => {
+  return `${W}` === '1' && `${M}` === '12';
+};
 ;// CONCATENATED MODULE: ./packages/calendar/src/calendar.ts
 
 
@@ -17450,7 +17459,7 @@ function context_menu_createReactData() {
       left: '',
       zIndex: 0
     },
-    childPos: ''
+    childOffsetX: 0
   };
 }
 /* harmony default export */ var context_menu = (defineVxeComponent({
@@ -17465,6 +17474,10 @@ function context_menu_createReactData() {
     options: Array,
     x: [Number, String],
     y: [Number, String],
+    autoLocate: {
+      type: Boolean,
+      default: () => getConfig().contextMenu.autoLocate
+    },
     zIndex: [Number, String],
     position: {
       type: String,
@@ -17547,7 +17560,7 @@ function context_menu_createReactData() {
       } = reactData;
       const value = true;
       reactData.visible = value;
-      updateLocate();
+      handleLocate();
       updateZindex();
       if (modelValue !== value) {
         emitModel(value);
@@ -17560,7 +17573,9 @@ function context_menu_createReactData() {
           visible: value
         }, null);
       }
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+        updateLocate();
+      });
     };
     const close = () => {
       const {
@@ -17584,7 +17599,7 @@ function context_menu_createReactData() {
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
-    const updateLocate = () => {
+    const handleLocate = () => {
       const {
         x,
         y
@@ -17594,6 +17609,7 @@ function context_menu_createReactData() {
       } = reactData;
       popupStyle.left = toCssUnit(x || 0);
       popupStyle.top = toCssUnit(y || 0);
+      updateLocate();
     };
     const updateZindex = () => {
       const {
@@ -17612,6 +17628,67 @@ function context_menu_createReactData() {
         }
       }
     };
+    const updateLocate = () => {
+      const {
+        autoLocate,
+        position
+      } = props;
+      const {
+        popupStyle
+      } = reactData;
+      if (autoLocate) {
+        const wrapperEl = refElem.value;
+        if (wrapperEl) {
+          const {
+            visibleWidth,
+            visibleHeight
+          } = getDomNode();
+          const wrapperStyle = getComputedStyle(wrapperEl);
+          const offsetTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(wrapperStyle.top);
+          const offsetLeft = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(wrapperStyle.left);
+          const wrapperWidth = wrapperEl.offsetWidth;
+          const wrapperHeight = wrapperEl.offsetHeight;
+          if (position === 'absolute') {
+            //
+          } else {
+            if (offsetTop + wrapperHeight > visibleHeight) {
+              popupStyle.top = `${Math.max(0, offsetTop - wrapperHeight)}px`;
+            }
+            if (offsetLeft + wrapperWidth > visibleWidth) {
+              popupStyle.left = `${Math.max(0, offsetLeft - wrapperWidth)}px`;
+            }
+          }
+        }
+      }
+      updateChildLocate();
+    };
+    const updateChildLocate = () => {
+      const wrapperEl = refElem.value;
+      if (wrapperEl) {
+        const {
+          visibleWidth
+        } = getDomNode();
+        const owSize = 2;
+        const handleStyle = () => {
+          const wrapperStyle = getComputedStyle(wrapperEl);
+          const offsetLeft = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(wrapperStyle.left);
+          const wrapperWidth = wrapperEl.offsetWidth;
+          const childEl = wrapperEl.querySelector('.vxe-context-menu--children-wrapper');
+          const childWidth = childEl ? childEl.offsetWidth : wrapperWidth;
+          if (offsetLeft + wrapperWidth > visibleWidth - childWidth) {
+            // 往左
+            reactData.childOffsetX = -childWidth + owSize;
+          } else {
+            // 往右
+            reactData.childOffsetX = wrapperWidth - owSize;
+          }
+        };
+        handleStyle();
+        (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+          handleStyle();
+        });
+      }
+    };
     const handleVisible = () => {
       const {
         modelValue
@@ -17650,6 +17727,9 @@ function context_menu_createReactData() {
         reactData.activeOption = item;
         if (hasChildMenu(item)) {
           reactData.activeChildOption = findFirstChildItem(item);
+          (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+            updateChildLocate();
+          });
         } else {
           reactData.activeChildOption = null;
         }
@@ -17764,17 +17844,21 @@ function context_menu_createReactData() {
     const handleGlobalKeydownEvent = evnt => {
       const {
         visible,
-        childPos,
         activeOption,
         activeChildOption
       } = reactData;
       const allFirstMenuList = computeAllFirstMenuList.value;
       if (visible) {
-        const isLeftArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_LEFT);
         const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
-        const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
         const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
+        const isLeftArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_LEFT);
+        const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
         const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
+        const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
+        if (isEsc) {
+          close();
+          return;
+        }
         // 回车选中
         if (isEnter) {
           if (activeOption || activeChildOption) {
@@ -17782,6 +17866,7 @@ function context_menu_createReactData() {
             evnt.stopPropagation();
             if (!activeChildOption && hasChildMenu(activeOption)) {
               reactData.activeChildOption = findFirstChildItem(activeOption);
+              updateChildLocate();
               return;
             }
             handleItemClickEvent(evnt, activeChildOption || activeOption);
@@ -17793,23 +17878,14 @@ function context_menu_createReactData() {
           if (isUpArrow) {
             evnt.preventDefault();
             reactData.activeChildOption = findPrevChildItem(activeOption, activeChildOption);
+            updateChildLocate();
           } else if (isDwArrow) {
             evnt.preventDefault();
             reactData.activeChildOption = findNextChildItem(activeOption, activeChildOption);
+            updateChildLocate();
           } else if (isLeftArrow) {
             evnt.preventDefault();
-            if (childPos === 'left') {
-              // 无操作
-            } else {
-              reactData.activeChildOption = null;
-            }
-          } else if (isRightArrow) {
-            evnt.preventDefault();
-            if (childPos === 'left') {
-              reactData.activeChildOption = null;
-            } else {
-              // 无操作
-            }
+            reactData.activeChildOption = null;
           }
         } else if (activeOption) {
           evnt.preventDefault();
@@ -17819,14 +17895,9 @@ function context_menu_createReactData() {
             reactData.activeOption = findNextFirstItem(allFirstMenuList, activeOption);
           } else {
             if (hasChildMenu(activeOption)) {
-              if (childPos === 'left') {
-                if (isLeftArrow) {
-                  reactData.activeChildOption = findFirstChildItem(activeOption);
-                }
-              } else {
-                if (isRightArrow) {
-                  reactData.activeChildOption = findFirstChildItem(activeOption);
-                }
+              if (isRightArrow) {
+                reactData.activeChildOption = findFirstChildItem(activeOption);
+                updateChildLocate();
               }
             }
           }
@@ -17918,7 +17989,8 @@ function context_menu_createReactData() {
     const renderMenus = () => {
       const {
         activeOption,
-        activeChildOption
+        activeChildOption,
+        childOffsetX
       } = reactData;
       const menuGroups = computeMenuGroups.value;
       const mgVNs = [];
@@ -17930,14 +18002,18 @@ function context_menu_createReactData() {
           } = firstItem;
           const hasChildMenus = children && children.some(child => child.visible !== false);
           const isActiveFirst = activeOption === firstItem;
+          const showChild = isActiveFirst && !!activeChildOption;
           moVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             key: `${gIndex}_${i}`,
             class: ['vxe-context-menu--item-wrapper vxe-context-menu--first-item', firstItem.className || '', {
               'is--active': isActiveFirst,
               'is--subactive': isActiveFirst && !!activeChildOption
             }]
-          }, [hasChildMenus ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-            class: 'vxe-context-menu--children-wrapper'
+          }, [hasChildMenus && showChild ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-context-menu--children-wrapper',
+            style: {
+              transform: `translate(${childOffsetX}px, -5px)`
+            }
           }, children.map(twoItem => {
             return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
               class: ['vxe-context-menu--item-wrapper vxe-context-menu--child-item', twoItem.className || '', {
@@ -17961,13 +18037,12 @@ function context_menu_createReactData() {
       } = props;
       const {
         visible,
-        popupStyle,
-        childPos
+        popupStyle
       } = reactData;
       const vSize = computeSize.value;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
-        class: ['vxe-context-menu vxe-context-menu--wrapper', position === 'absolute' ? 'is--' + position : 'is--fixed', `cp--${childPos === 'left' ? childPos : 'right'}`, className || '', {
+        class: ['vxe-context-menu vxe-context-menu--wrapper', position === 'absolute' ? 'is--' + position : 'is--fixed', className || '', {
           [`size--${vSize}`]: vSize,
           'is--visible': visible
         }],
@@ -17975,7 +18050,10 @@ function context_menu_createReactData() {
       }, (destroyOnClose ? visible : true) ? renderMenus() : []);
     };
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(computeTopAndLeft, () => {
-      updateLocate();
+      handleLocate();
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+        updateLocate();
+      });
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.modelValue, () => {
       handleVisible();
@@ -18039,8 +18117,8 @@ const ContextMenuController = {
     evnt.preventDefault();
     evnt.stopPropagation();
     const opts = Object.assign({}, options);
-    const x = evnt.clientX;
-    const y = evnt.clientY;
+    const x = evnt.clientX + 1;
+    const y = evnt.clientY + 1;
     openMenu(opts, x, y);
   },
   close() {