From 85aeb4f4cd57567f91a87ea082f6c622065f2fac Mon Sep 17 00:00:00 2001 From: xuliangzhan Date: Sun, 28 Apr 2024 15:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- packages/custom/src/panel.js | 4 ++-- packages/loading/src/loading.js | 2 +- packages/locale/lang/en-US.js | 12 ++++++------ packages/locale/lang/es-ES.js | 12 ++++++------ packages/locale/lang/ja-JP.js | 11 ++++++----- packages/locale/lang/pt-BR.js | 12 ++++++------ packages/locale/lang/zh-CN.js | 12 ++++++------ packages/locale/lang/zh-TC.js | 12 ++++++------ packages/modal/src/modal.js | 2 +- styles/button.scss | 6 +++--- styles/custom.scss | 2 +- styles/input.scss | 1 - styles/loading.scss | 2 +- 14 files changed, 46 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index c4f9016c9..fe6e51a5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "3.8.2", + "version": "3.8.3-beta.0", "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", diff --git a/packages/custom/src/panel.js b/packages/custom/src/panel.js index 7195265b3..a7aceaba2 100644 --- a/packages/custom/src/panel.js +++ b/packages/custom/src/panel.js @@ -277,7 +277,7 @@ function renderPopupPanel (h, _vm) { props: { value: customStore.visible, title: GlobalConfig.i18n('vxe.custom.cstmTitle'), - className: 'vxe-table-custom-popup-warpper vxe-table--ignore-clear', + className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear', width: '40vw', minWidth: 500, height: '50vh', @@ -301,7 +301,7 @@ function renderPopupPanel (h, _vm) { 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', {}, [ diff --git a/packages/loading/src/loading.js b/packages/loading/src/loading.js index c7c203ab0..3299c0b84 100644 --- a/packages/loading/src/loading.js +++ b/packages/loading/src/loading.js @@ -25,7 +25,7 @@ export default { }] }, defaultSlot ? [ h('div', { - class: 'vxe-loading--warpper' + class: 'vxe-loading--wrapper' }, defaultSlot.call(this, {})) ] : [ h('div', { diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js index ac860b889..ebe427b3f 100644 --- a/packages/locale/lang/en-US.js +++ b/packages/locale/lang/en-US.js @@ -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: { diff --git a/packages/locale/lang/es-ES.js b/packages/locale/lang/es-ES.js index 6e1ee7071..d7ecab7a2 100644 --- a/packages/locale/lang/es-ES.js +++ b/packages/locale/lang/es-ES.js @@ -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: { diff --git a/packages/locale/lang/ja-JP.js b/packages/locale/lang/ja-JP.js index e4863e1dd..f9e369977 100644 --- a/packages/locale/lang/ja-JP.js +++ b/packages/locale/lang/ja-JP.js @@ -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: { diff --git a/packages/locale/lang/pt-BR.js b/packages/locale/lang/pt-BR.js index 7934c0274..606aac80d 100644 --- a/packages/locale/lang/pt-BR.js +++ b/packages/locale/lang/pt-BR.js @@ -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.', @@ -61,7 +61,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!', @@ -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: '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: { diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js index 0741e687c..1cdf2f4eb 100644 --- a/packages/locale/lang/zh-CN.js +++ b/packages/locale/lang/zh-CN.js @@ -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: { diff --git a/packages/locale/lang/zh-TC.js b/packages/locale/lang/zh-TC.js index 996bc9521..6f20075dd 100644 --- a/packages/locale/lang/zh-TC.js +++ b/packages/locale/lang/zh-TC.js @@ -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: { diff --git a/packages/modal/src/modal.js b/packages/modal/src/modal.js index 4df16f4af..6ac7dc5f4 100644 --- a/packages/modal/src/modal.js +++ b/packages/modal/src/modal.js @@ -178,7 +178,7 @@ export default { class: 'vxe-modal--header-right' }, [ cornerSlot ? h('span', { - class: 'vxe-modal--corner-warpper' + class: 'vxe-modal--corner-wrapper' }, getSlotVNs(cornerSlot({ $modal: this }))) : _e(), showZoom ? h('i', { class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN], diff --git a/styles/button.scss b/styles/button.scss index bb45b86cf..43b040c31 100644 --- a/styles/button.scss +++ b/styles/button.scss @@ -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; diff --git a/styles/custom.scss b/styles/custom.scss index 7897872d4..deb7e192e 100644 --- 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 $vxe-table-border-color; table { width: 100%; diff --git a/styles/input.scss b/styles/input.scss index 5cc88600b..d9c70fb12 100644 --- a/styles/input.scss +++ b/styles/input.scss @@ -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; diff --git a/styles/loading.scss b/styles/loading.scss index 9efad652e..60a7f65ff 100644 --- 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%;