releases 4.2.9

x-extends · Sep 27, 2024 · f9d560a · f9d560a
1 parent 19910db
commit f9d560a
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 26 deletions.
diff --git a/examples/views/modal/ModalTest.vue b/examples/views/modal/ModalTest.vue
@@ -76,7 +76,7 @@
 
     <p>
       <vxe-button content="自定义模板" @click="demo1.value5 = true"></vxe-button>
-      <vxe-modal v-model="demo1.value5" width="600" :lock-view="false" :mask="false" show-zoom show-footer>
+      <vxe-modal v-model="demo1.value5" width="600" :lock-view="false" :mask="false" show-zoom>
         <template #title>
           <span style="color:red">自定义标题</span>
         </template>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.2.8",
+  "version": "4.2.9",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/language/en-US.ts b/packages/language/en-US.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: 'Maximize',
       zoomOut: 'Reduction',
       close: 'Close',
-      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.'
+      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.',
+      footPropErr: '"show-footer" is only used to enable table tails and needs to be used in conjunction with "show-confirm-button" | "show-cancel-button" | slots'
     },
     drawer: {
       close: 'Close'

diff --git a/packages/language/es-ES.ts b/packages/language/es-ES.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: 'Maximize',
       zoomOut: 'Reducir',
       close: 'Cerrar',
-      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.'
+      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.',
+      footPropErr: '"show-footer" is only used to enable table tails and needs to be used in conjunction with "show-confirm-button" | "show-cancel-button" | slots'
     },
     drawer: {
       close: 'Cerrar'

diff --git a/packages/language/hu-HU.ts b/packages/language/hu-HU.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: 'maximalizálni',
       zoomOut: 'csökkentés',
       close: 'bezárás',
-      miniMaxSize: 'A minimalizált ablakok száma nem haladhatja meg a következőt: {0}'
+      miniMaxSize: 'A minimalizált ablakok száma nem haladhatja meg a következőt: {0}',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: 'bezárás'

diff --git a/packages/language/ja-JP.ts b/packages/language/ja-JP.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: '最大化',
       zoomOut: '縮小',
       close: '閉じる',
-      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.'
+      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: '閉じる'

diff --git a/packages/language/ko-KR.ts b/packages/language/ko-KR.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: '最大化',
       zoomOut: '还原',
       close: '关闭',
-      miniMaxSize: '最小化窗口的数量不能超过 {0} 个'
+      miniMaxSize: '最小化窗口的数量不能超过 {0} 个',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: '关闭'

diff --git a/packages/language/pt-BR.ts b/packages/language/pt-BR.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: 'Maximize',
       zoomOut: 'Restaurar',
       close: 'Fechar',
-      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.'
+      miniMaxSize: 'The number of minimized Windows cannot exceed {0}.',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: 'Fechar'

diff --git a/packages/language/ru-RU.ts b/packages/language/ru-RU.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: 'максимизировать',
       zoomOut: 'снижение',
       close: 'закрытие',
-      miniMaxSize: 'Количество свернутых окон не может превышать {0}.'
+      miniMaxSize: 'Количество свернутых окон не может превышать {0}.',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: 'закрытие'

diff --git a/packages/language/uk-UA.ts b/packages/language/uk-UA.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: '最大化',
       zoomOut: '还原',
       close: '关闭',
-      miniMaxSize: '最小化窗口的数量不能超过 {0} 个'
+      miniMaxSize: '最小化窗口的数量不能超过 {0} 个',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: '关闭'

diff --git a/packages/language/vi-VN.ts b/packages/language/vi-VN.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: '最大化',
       zoomOut: '还原',
       close: '关闭',
-      miniMaxSize: '最小化窗口的数量不能超过 {0} 个'
+      miniMaxSize: '最小化窗口的数量不能超过 {0} 个',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: '关闭'

diff --git a/packages/language/zh-CHT.ts b/packages/language/zh-CHT.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: '最大化',
       zoomOut: '還原',
       close: '關閉',
-      miniMaxSize: '最小化視窗的數量不能超過 {0} 個'
+      miniMaxSize: '最小化視窗的數量不能超過 {0} 個',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: '關閉'

diff --git a/packages/language/zh-CN.ts b/packages/language/zh-CN.ts
@@ -200,7 +200,8 @@ export default {
       zoomIn: '最大化',
       zoomOut: '还原',
       close: '关闭',
-      miniMaxSize: '最小化窗口的数量不能超过 {0} 个'
+      miniMaxSize: '最小化窗口的数量不能超过 {0} 个',
+      footPropErr: 'show-footer 仅用于启用表尾，需配合 show-confirm-button | show-cancel-button | 插槽使用'
     },
     drawer: {
       close: '关闭'

diff --git a/packages/modal/src/modal.ts b/packages/modal/src/modal.ts
@@ -6,7 +6,7 @@ import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, cr
 import VxeButtonComponent from '../../button/src/button'
 import VxeLoadingComponent from '../../loading/index'
 import { getSlotVNs } from '../../ui/src/vn'
-import { errLog } from '../../ui/src/log'
+import { warnLog, errLog } from '../../ui/src/log'
 
 import type { VxeModalConstructor, VxeModalPropTypes, ModalReactData, ModalInternalData, VxeModalEmits, VxeModalPrivateComputed, ModalEventTypes, VxeButtonInstance, ModalMethods, ModalPrivateRef, VxeModalMethods, ValueOf } from '../../../types'
 
@@ -1359,6 +1359,11 @@ export default defineComponent({
     })
 
     onMounted(() => {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
+        if (props.type === 'modal' && props.showFooter && !(props.showConfirmButton || props.showCancelButton || slots.footer)) {
+          warnLog('vxe.modal.footPropErr')
+        }
+      }
       nextTick(() => {
         if (props.storage && !props.id) {
           errLog('vxe.error.reqProp', ['modal.id'])

diff --git a/packages/text-ellipsis/src/text-ellipsis.ts b/packages/text-ellipsis/src/text-ellipsis.ts
@@ -87,13 +87,13 @@ export default defineComponent({
       const el = refElem.value
       const ryEl = realityElem.value
       if (el && ryEl) {
-        let fontSize = 10
+        let fontSize = 12
         try {
           fontSize = Math.max(10, XEUtils.toNumber(getComputedStyle(ryEl).fontSize))
         } catch (e) {}
-        const ctextContent = computeTextContent.value
+        const textContent = computeTextContent.value
         let currIndex = Math.floor((targetWidth) / fontSize)
-        let currStr = ctextContent.slice(0, currIndex)
+        let currStr = textContent.slice(0, currIndex)
         ryEl.textContent = currStr
         reactData.visibleLen = currStr.length
         let maxCount = 0
@@ -102,20 +102,18 @@ export default defineComponent({
           const offsetIndex = Math.floor((targetWidth - ryEl.clientWidth) / fontSize)
           if (offsetIndex) {
             currIndex += offsetIndex
-            currStr = ctextContent.slice(0, currIndex)
+            currStr = textContent.slice(0, currIndex)
             ryEl.textContent = currStr
             reactData.visibleLen = currStr.length
           } else {
             break
           }
         }
-        Object.assign(ryEl.style, {
-          display: '',
-          position: '',
-          top: '',
-          left: ''
-        })
         ryEl.textContent = ''
+        ryEl.style.display = ''
+        ryEl.style.position = ''
+        ryEl.style.top = ''
+        ryEl.style.left = ''
       }
     }
 
@@ -158,9 +156,9 @@ export default defineComponent({
         const el = refElem.value
         if (el && textLineClamp > 1) {
           if (window.ResizeObserver) {
-            const observerObj = new window.ResizeObserver(() => {
+            const observerObj = new window.ResizeObserver(XEUtils.throttle(() => {
               updateStyle()
-            })
+            }, 300, { leading: true, trailing: true }))
             observerObj.observe(el)
             reactData.resizeObserver = observerObj
           }
@@ -215,7 +213,15 @@ export default defineComponent({
 
     onBeforeUnmount(() => {
       const { resizeObserver } = reactData
+      const el = refElem.value
+      const ryEl = realityElem.value
+      if (ryEl) {
+        ryEl.textContent = ''
+      }
       if (resizeObserver) {
+        if (el) {
+          resizeObserver.unobserve(el)
+        }
         resizeObserver.disconnect()
         reactData.resizeObserver = null
       }