releases 4.6.6

2026-01-21 05:27:57 +08:00 · 2024-04-28 17:09:24 +08:00
parent 76d32cbe5c
commit 7bbe344c4e
22 changed files with 70 additions and 70 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vxe-table",
-  "version": "4.6.5",
+  "version": "4.6.6",
  "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
  "scripts": {
    "update": "npm install --legacy-peer-deps",
--- a/packages/custom/src/panel.ts
+++ b/packages/custom/src/panel.ts
@@ -179,7 +179,7 @@ export default defineComponent({
      if (prevDropTrEl) {
        // 判断是否有拖动
        if (prevDropTrEl !== trEl) {
-          const dragOffset = prevDropTrEl.getAttribute('dragoffset')
+          const dragOffset = prevDropTrEl.getAttribute('drag-pos')
          const colid = trEl.getAttribute('colid')
          const column = $xetable.getColumnById(colid)
          if (!column) {
@@ -198,12 +198,12 @@ export default defineComponent({
          customColumnList.splice(tcIndex + (dragOffset === 'bottom' ? 1 : 0), 0, column)
        }
        prevDropTrEl.draggable = false
-        prevDropTrEl.removeAttribute('dragoffset')
+        prevDropTrEl.removeAttribute('drag-pos')
        removeClass(prevDropTrEl, 'active--drag-target')
      }
      dragColumn.value = null
      trEl.draggable = false
-      trEl.removeAttribute('dragoffset')
+      trEl.removeAttribute('drag-pos')
      if (dragHintEl) {
        dragHintEl.style.display = ''
      }
@@ -228,7 +228,7 @@ export default defineComponent({
        const offsetY = evnt.clientY - trEl.getBoundingClientRect().y
        const dragOffset = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom'
        addClass(trEl, 'active--drag-target')
-        trEl.setAttribute('dragoffset', dragOffset)
+        trEl.setAttribute('drag-pos', dragOffset)
        prevDropTrEl = trEl
      }
      updateDropHint(evnt)
@@ -473,7 +473,7 @@ export default defineComponent({
      })
      return h(VxeModalComponent as ComponentOptions, {
        key: 'popup',
-        className: 'vxe-table-custom-popup-warpper vxe-table--ignore-clear',
+        className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
        modelValue: customStore.visible,
        title: GlobalConfig.i18n('vxe.custom.cstmTitle'),
        width: '40vw',
@@ -496,7 +496,7 @@ export default defineComponent({
            class: 'vxe-table-custom-popup--body'
          }, [
            h('div', {
-              class: 'vxe-table-custom-popup--table-warpper'
+              class: 'vxe-table-custom-popup--table-wrapper'
            }, [
              h('table', {}, [
                h('colgroup', {}, [
--- a/packages/export/src/export-panel.ts
+++ b/packages/export/src/export-panel.ts
@@ -193,7 +193,7 @@ export default defineComponent({
      return h(VxeModalComponent, {
        modelValue: storeData.visible,
        title: GlobalConfig.i18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
-        className: 'vxe-table-export-popup-warpper',
+        className: 'vxe-table-export-popup-wrapper',
        width: 660,
        mask: true,
        lockView: true,
--- a/packages/export/src/import-panel.ts
+++ b/packages/export/src/import-panel.ts
@@ -96,7 +96,7 @@ export default defineComponent({
      return h(VxeModalComponent, {
        modelValue: storeData.visible,
        title: GlobalConfig.i18n('vxe.import.impTitle'),
-        className: 'vxe-table-import-popup-warpper',
+        className: 'vxe-table-import-popup-wrapper',
        width: 440,
        mask: true,
        lockView: true,
--- a/packages/loading/src/loading.ts
+++ b/packages/loading/src/loading.ts
@@ -27,7 +27,7 @@ export default defineComponent({
        }]
      }, slots.default ? [
        h('div', {
-          class: 'vxe-loading--warpper'
+          class: 'vxe-loading--wrapper'
        }, slots.default({}))
      ] : [
        h('div', {
--- a/packages/locale/lang/en-US.ts
+++ b/packages/locale/lang/en-US.ts
@@ -8,7 +8,7 @@ export default {
      text: 'Loading...'
    },
    error: {
-      groupFixed: 'If you use group headers, the fixed columns must be set by group.',
+      groupFixed: 'If you use group headers, the freeze columns must be set by group.',
      groupMouseRange: 'Grouping headers and "{0}" cannot be used at the same time, which may cause errors.',
      groupTag: 'Grouping column header should use "{0}" instead of "{1}", which may cause errors.',
      scrollErrProp: 'The parameter "{0}" is not supported when virtual scrolling is enabled.',
@@ -61,7 +61,7 @@ export default {
      customAll: 'All',
      customConfirm: 'Confirm',
      customRestore: 'Reset',
-      maxFixedCol: 'The maximum number of fixed columns cannot exceed {0}'
+      maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}'
    },
    grid: {
      selectOneRecord: 'Please choose at least one piece of record!',
@@ -116,7 +116,7 @@ export default {
        colSort: 'Sort',
        colTitle: 'Title',
        colVisible: 'Visible',
-        colFixed: 'Fixed',
+        colFixed: 'Freeze column',
        fixedLeft: 'Left',
        fixedUnset: 'Unset',
        fixedRight: 'Right'
@@ -199,9 +199,9 @@ export default {
      customAll: 'All',
      customConfirm: 'Confirm',
      customRestore: 'Reset',
-      fixedLeft: 'Fixed on the left side',
-      fixedRight: 'Fixed on the right side',
-      cancelfixed: 'Unfixed'
+      fixedLeft: 'Freeze on the left',
+      fixedRight: 'Freeze on the right',
+      cancelfixed: 'Unfreeze column'
    },
    input: {
      date: {
--- a/packages/locale/lang/es-ES.ts
+++ b/packages/locale/lang/es-ES.ts
@@ -8,7 +8,7 @@ export default {
      text: 'Cargando...'
    },
    error: {
-      groupFixed: 'Si se utilizan encabezados de grupo, las columnas fijas deben ser establecidas por grupo.',
+      groupFixed: 'If you use group headers, the freeze columns must be set by group.',
      groupMouseRange: 'Los encabezados de agrupación y "{0}" no pueden ser utilizados al mismo tiempo, lo que puede causar errores.',
      groupTag: 'El encabezado de columna de agrupación debería utilizar "{0}" en lugar de "{1}", lo que puede causar errores.',
      scrollErrProp: 'El parámetro "{0}" no es compatible cuando el desplazamiento virtual está habilitado.',
@@ -61,7 +61,7 @@ export default {
      customAll: 'Todo',
      customConfirm: 'Confirmar',
      customRestore: 'Restaurar',
-      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
+      maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}'
    },
    grid: {
      selectOneRecord: '¡Seleccione al menos un registro!',
@@ -108,7 +108,7 @@ export default {
        colSort: 'Sort',
        colTitle: 'Title',
        colVisible: 'Visible',
-        colFixed: 'Fixed',
+        colFixed: 'Freeze column',
        fixedLeft: 'Left',
        fixedUnset: 'Unset',
        fixedRight: 'Right'
@@ -191,9 +191,9 @@ export default {
      customAll: 'Todo',
      customConfirm: 'Confirmar',
      customRestore: 'Restaurar',
-      fixedLeft: '固定在左侧',
-      fixedRight: '固定在右侧',
-      cancelfixed: '取消固定'
+      fixedLeft: 'Freeze on the left',
+      fixedRight: 'Freeze on the right',
+      cancelfixed: 'Unfreeze column'
    },
    entrada: {
      fecha: {
--- a/packages/locale/lang/ja-JP.ts
+++ b/packages/locale/lang/ja-JP.ts
@@ -8,7 +8,7 @@ export default {
      text: 'Loading...'
    },
    error: {
-      groupFixed: 'グループのヘッダを使用すると、固定列はグループで設定しなければなりません',
+      groupFixed: 'If you use group headers, the freeze columns must be set by group.',
      groupMouseRange: 'グループ化ヘッダーと「{0}」は同時に使用できません。これによりエラーが発生する可能性があります',
      groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
      scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
@@ -61,7 +61,7 @@ export default {
      customAll: '全部',
      customConfirm: '确认',
      customRestore: 'リセット',
-      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
+      maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}'
    },
    grid: {
      selectOneRecord: '少なくとも1つのレコードを選択してください',
@@ -116,7 +116,7 @@ export default {
        colSort: 'Sort',
        colTitle: 'Title',
        colVisible: 'Visible',
-        colFixed: 'Fixed',
+        colFixed: 'Freeze column',
        fixedLeft: 'Left',
        fixedUnset: 'Unset',
        fixedRight: 'Right'
@@ -199,8 +199,9 @@ export default {
      customAll: '全部',
      customConfirm: '確定',
      customRestore: 'リセット',
-      fixedLeft: '固定在左侧',
-      fixedRight: '固定在右侧'
+      fixedLeft: 'Freeze on the left',
+      fixedRight: 'Freeze on the right',
+      cancelfixed: 'Unfreeze column'
    },
    input: {
      date: {
--- a/packages/locale/lang/pt-BR.ts
+++ b/packages/locale/lang/pt-BR.ts
@@ -8,7 +8,7 @@ export default {
      text: 'Carregando...'
    },
    error: {
-      groupFixed: 'Se você estiver usando cabeçalhos de grupo, as colunas fixas devem ser definidas por grupo.',
+      groupFixed: 'If you use group headers, the freeze columns must be set by group.',
      groupMouseRange: 'Agrupar cabeçalhos e "{0}" não podem ser usados ao mesmo tempo, o que pode causar erros.',
      groupTag: 'O cabeçalho da coluna de agrupamento deve usar "{0}" em vez de "{1}", o que pode causar erros.',
      scrollErrProp: 'O parâmetro "{0}" não é suportado quando a rolagem virtual está habilitada.',
@@ -147,7 +147,7 @@ export default {
      customAll: 'Todos',
      customConfirm: 'Confirmar',
      customRestore: 'Redefinir',
-      maxFixedCol: 'O número máximo de colunas fixas não pode exceder {0}'
+      maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}'
    },
    grid: {
      selectOneRecord: 'Por favor, selecione pelo menos um registro!',
@@ -191,7 +191,7 @@ export default {
        colSort: 'Sort',
        colTitle: 'Title',
        colVisible: 'Visible',
-        colFixed: 'Fixed',
+        colFixed: 'Freeze column',
        fixedLeft: 'Left',
        fixedUnset: 'Unset',
        fixedRight: 'Right'
@@ -274,9 +274,9 @@ export default {
      customAll: 'Todos',
      customConfirm: 'Confirmar',
      customRestore: 'Redefinir',
-      fixedLeft: 'Fixar à esquerda',
-      fixedRight: 'Fixar à direita',
-      cancelfixed: 'Não fixar'
+      fixedLeft: 'Freeze on the left',
+      fixedRight: 'Freeze on the right',
+      cancelfixed: 'Unfreeze column'
    },
    input: {
      date: {
--- a/packages/locale/lang/zh-CN.ts
+++ b/packages/locale/lang/zh-CN.ts
@@ -8,7 +8,7 @@ export default {
      text: '加载中...'
    },
    error: {
-      groupFixed: '如果使用分组表头，固定列必须按组设置',
+      groupFixed: '如果使用分组表头，冻结列必须按组设置',
      groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
      groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
      scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
@@ -61,7 +61,7 @@ export default {
      customAll: '全部',
      customConfirm: '确认',
      customRestore: '重置',
-      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
+      maxFixedCol: '最大冻结列的数量不能超过 {0} 个'
    },
    grid: {
      selectOneRecord: '请至少选择一条记录！',
@@ -116,7 +116,7 @@ export default {
        colSort: '排序',
        colTitle: '标题',
        colVisible: '是否显示',
-        colFixed: '是否固定',
+        colFixed: '冻结列',
        fixedLeft: '左侧',
        fixedUnset: '不设置',
        fixedRight: '右侧'
@@ -199,9 +199,9 @@ export default {
      customAll: '全部',
      customConfirm: '确认',
      customRestore: '重置',
-      fixedLeft: '固定在左侧',
-      fixedRight: '固定在右侧',
-      cancelfixed: '取消固定'
+      fixedLeft: '冻结在左侧',
+      fixedRight: '冻结在右侧',
+      cancelfixed: '取消冻结列'
    },
    input: {
      date: {
--- a/packages/locale/lang/zh-TC.ts
+++ b/packages/locale/lang/zh-TC.ts
@@ -8,7 +8,7 @@ export default {
      text: '加載中...'
    },
    error: {
-      groupFixed: '如果使用分組表頭，固定列必須按組設定',
+      groupFixed: '如果使用分組表頭，固冻结列必須按組設定',
      groupMouseRange: '分组表頭與 "{0}" 不能同時使用，這可能會出現錯誤',
      groupTag: '分組列頭應該使用 "{0}" 而不是 "{1}"，這可能會出現錯誤',
      scrollErrProp: '啟用虛擬滾動後不支持該參數 "{0}"',
@@ -61,7 +61,7 @@ export default {
      customAll: '全部',
      customConfirm: '確認',
      customRestore: '重置',
-      maxFixedCol: '最大固定列的數量不能超過 {0} 個'
+      maxFixedCol: '最大冻结列的數量不能超過 {0} 個'
    },
    grid: {
      selectOneRecord: '請至少選擇一條記錄！',
@@ -116,7 +116,7 @@ export default {
        colSort: '排序',
        colTitle: '標題',
        colVisible: '是否顯示',
-        colFixed: '是否固定',
+        colFixed: '冻结列',
        fixedLeft: '左側',
        fixedUnset: '不設定',
        fixedRight: '右側'
@@ -199,9 +199,9 @@ export default {
      customAll: '全部',
      customConfirm: '確認',
      customRestore: '重置',
-      fixedLeft: '固定在左側',
-      fixedRight: '固定在右側',
-      cancelfixed: '取消固定'
+      fixedLeft: '冻结在左側',
+      fixedRight: '冻结在右側',
+      cancelfixed: '取消冻结列'
    },
    input: {
      date: {
--- a/packages/modal/src/modal.ts
+++ b/packages/modal/src/modal.ts
@@ -698,7 +698,7 @@ export default defineComponent({
      if (cornerSlot) {
        rightVNs.push(
          h('span', {
-            class: 'vxe-modal--corner-warpper'
+            class: 'vxe-modal--corner-wrapper'
          }, getSlotVNs(cornerSlot({ $modal: $xemodal })))
        )
      }
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -6707,7 +6707,7 @@ export default defineComponent({
        ref: refElem,
        class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
          [`size--${vSize}`]: vSize,
-          [`vaild-msg--${validOpts.msgMode}`]: !!editRules,
+          [`valid-msg--${validOpts.msgMode}`]: !!editRules,
          'vxe-editable': !!editConfig,
          'old-cell-valid': editRules && GlobalConfig.cellVaildMode === 'obsolete',
          'cell--highlight': highlightCell,
--- a/styles/base/common.scss
+++ b/styles/base/common.scss
@@ -65,23 +65,23 @@
  .vxe-filter--btn {
    &:before,
    &:after {
-      @include animatTransition(border);
+      @include createAnimationTransition(border);
    }
  }
  .vxe-input--wrapper {
    .vxe-input {
-      @include animatTransition(border);
+      @include createAnimationTransition(border);
    }
  }
  .vxe-table--expand-btn,
  .vxe-tree--node-btn {
-    @include animatTransition(transform);
+    @include createAnimationTransition(transform);
  }
  .vxe-checkbox,
  .vxe-radio {
    > input {
      &:checked+span {
-        @include animatTransition(background-color);
+        @include createAnimationTransition(background-color);
      }
    }
  }
--- a/styles/button.scss
+++ b/styles/button.scss
@@ -66,7 +66,7 @@ $btnThemeList: (
  white-space: nowrap;
  user-select: none;
  appearance: none;
-  @include animatTransition(border, .2s);
+  @include createAnimationTransition(border, .2s);
  &:not(.is--disabled) {
    color: var(--vxe-font-color);
    cursor: pointer;
@@ -236,8 +236,8 @@ $btnThemeList: (
 }
 .vxe-input,
 .vxe-button,
-.vxe-button-warpper {
-  &+.vxe-button-warpper,
+.vxe-button-wrapper {
+  &+.vxe-button-wrapper,
  &+.vxe-button.type--button,
  &+.vxe-button--dropdown {
    margin-left: 12px;
@@ -256,7 +256,7 @@ $btnThemeList: (
 }
 .vxe-button--dropdown {
  position: relative;
-  &+.vxe-button-warpper,
+  &+.vxe-button-wrapper,
  &+.vxe-button.type--button,
  &+.vxe-button--dropdown {
    margin-left: 12px;
@@ -306,7 +306,7 @@ $btnThemeList: (
  display: inline-block;
  font-size: 12px;
  margin-left: 4px;
-  @include animatTransition(transform, .2s);
+  @include createAnimationTransition(transform, .2s);
 }

 .vxe-button--dropdown-panel {
--- a/styles/custom.scss
+++ b/styles/custom.scss
@@ -120,7 +120,7 @@
  height: 100%;
 }

-.vxe-table-custom-popup--table-warpper {
+.vxe-table-custom-popup--table-wrapper {
  border-bottom: 1px solid var(--vxe-table-border-color);
  table {
    width: 100%;
@@ -205,7 +205,7 @@

 .vxe-table-custom-popup--row {
  &.active--drag-target {
-    &[dragoffset="top"] {
+    &[drag-pos="top"] {
      .vxe-table-custom-popup--column-item {
        &::after {
          display: block;
@@ -213,7 +213,7 @@
        }
      }
    }
-    &[dragoffset="bottom"] {
+    &[drag-pos="bottom"] {
      .vxe-table-custom-popup--column-item {
        &::after {
          display: block;
@@ -223,7 +223,7 @@
    }
  }
  &:first-child {
-    &[dragoffset="top"] {
+    &[drag-pos="top"] {
      .vxe-table-custom-popup--column-item {
        &::after {
          top: 0;
@@ -232,7 +232,7 @@
    }
  }
  &:last-child {
-    &[dragoffset="bottom"] {
+    &[drag-pos="bottom"] {
      .vxe-table-custom-popup--column-item {
        &::after {
          bottom: 0;
--- a/styles/helpers/mixin.scss
+++ b/styles/helpers/mixin.scss
@@ -1,4 +1,4 @@
-@mixin animatTransition ($property, $duration: .1s, $func: ease-in-out) {
+@mixin createAnimationTransition ($property, $duration: .1s, $func: ease-in-out) {
  transition: $property $duration $func;
 }

--- a/styles/input.scss
+++ b/styles/input.scss
@@ -272,7 +272,7 @@ $iconWidth: 1.6em;
    align-items: center;
    justify-content: center;
    .vxe-input--panel-icon {
-      @include animatTransition(transform, .2s);
+      @include createAnimationTransition(transform, .2s);
    }
  }

@@ -463,7 +463,6 @@ $iconWidth: 1.6em;
 }
 .vxe-input--date-picker-label,
 .vxe-input--date-picker-btn {
-  display: inline-block;
  display: flex;
  align-items: center;
  justify-content: center;
--- a/styles/loading.scss
+++ b/styles/loading.scss
@@ -15,7 +15,7 @@
    display: block;
  }
  & > .vxe-loading--chunk,
-  & > .vxe-loading--warpper {
+  & > .vxe-loading--wrapper {
    width: 100%;
    position: absolute;
    top: 50%;
--- a/styles/modal.scss
+++ b/styles/modal.scss
@@ -82,13 +82,13 @@
  &.is--animat {
    &.is--mask {
      &:before {
-        @include animatTransition(background-color, .2s);
+        @include createAnimationTransition(background-color, .2s);
      }
    }
    &.type--message {
      .vxe-modal--box {
        &:not(.is--drag) {
-          @include animatTransition(all, .4s, ease-out);
+          @include createAnimationTransition(all, .4s, ease-out);
        }
      }
    }
--- a/styles/select.scss
+++ b/styles/select.scss
@@ -30,7 +30,7 @@
    width: 100%;
    .vxe-input--suffix-icon {
      display: inline-block;
-      @include animatTransition(transform, .2s);
+      @include createAnimationTransition(transform, .2s);
    }
  }
  &.is--active {
--- a/styles/table.scss
+++ b/styles/table.scss
@@ -1210,7 +1210,7 @@

    }
  }
-  &.vaild-msg--single {
+  &.valid-msg--single {
    .vxe-body--row {
      &:last-child {
        .vxe-cell--valid-error-hint {
@@ -1224,7 +1224,7 @@
      }
    }
  }
-  &.vaild-msg--full {
+  &.valid-msg--full {
    .vxe-body--row {
      &:last-child {
        .vxe-cell--valid-error-hint {