Skip to content

Commit 270ac6e

Browse files
xuliangzhanxuliangzhan
committed
releases 4.7.42
1 parent 3896483 commit 270ac6e

File tree

12 files changed

+59
-65
lines changed

12 files changed

+59
-65
lines changed

‎examples/main.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { createApp } from 'vue'
22
import App from './App.vue'
33
import router from './router'
44

5-
// import VxeUI from 'vxe-pc-ui'
6-
// import 'vxe-pc-ui/lib/style.css'
5+
import VxeUI from 'vxe-pc-ui'
6+
import 'vxe-pc-ui/lib/style.css'
77

88
// import enUS from 'vxe-pc-ui/packages/language/en-US'
99

@@ -16,6 +16,6 @@ import './style/index.scss'
1616

1717
createApp(App)
1818
.use(router)
19-
// .use(VxeUI)
19+
.use(VxeUI)
2020
.use(VxeTable)
2121
.mount('#app')

‎examples/views/table/TableTest3.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
:data="demo1.tableData">
2121
<vxe-column type="seq" width="60"></vxe-column>
2222
<vxe-column type="checkbox" title="ID" width="140"></vxe-column>
23-
<vxe-colgroup title="分组1">
23+
<vxe-colgroup title="分组1" field="g1">
2424
<vxe-column type="expand" field="role" title="Role">
2525
<template #content="{ row }">
2626
<div>{{ row.name }}</div>

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vxe-table",
3-
"version": "4.7.41",
3+
"version": "4.7.42",
44
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
55
"scripts": {
66
"update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
2828
"style": "lib/style.css",
2929
"typings": "types/index.d.ts",
3030
"dependencies": {
31-
"vxe-pc-ui": "^4.0.45"
31+
"vxe-pc-ui": "^4.0.46"
3232
},
3333
"devDependencies": {
3434
"@types/resize-observer-browser": "^0.1.11",

‎packages/locale/lang/en-US.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/**
2-
* v4保留兼容，已废弃，即将删除文件
3-
* @deprecated
4-
*/
51
export default {
62
vxe: {
73
base: {
@@ -126,7 +122,8 @@ export default {
126122
colTitle: 'Title',
127123
colResizable: 'Column width (px)',
128124
colVisible: 'Display',
129-
colFixed: 'Freeze columns (Max. {0})',
125+
colFixed: 'Freeze columns',
126+
colFixedMax: 'Freeze columns (Max. {0})',
130127
fixedLeft: 'Left',
131128
fixedUnset: 'Unset',
132129
fixedRight: 'Right'

‎packages/locale/lang/es-ES.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/**
2-
* v4保留兼容，已废弃，即将删除文件
3-
* @deprecated
4-
*/
51
export default {
62
vxe: {
73
base: {
@@ -126,7 +122,8 @@ export default {
126122
colTitle: 'Title',
127123
colResizable: 'Column width (px)',
128124
colVisible: 'Display',
129-
colFixed: 'Freeze columns (Max {0})',
125+
colFixed: 'Freeze columns',
126+
colFixedMax: 'Freeze columns (Max {0})',
130127
fixedLeft: 'Left',
131128
fixedUnset: 'Unset',
132129
fixedRight: 'Right'

‎packages/locale/lang/ja-JP.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/**
2-
* v4保留兼容，已废弃，即将删除文件
3-
* @deprecated
4-
*/
51
export default {
62
vxe: {
73
base: {
@@ -126,7 +122,8 @@ export default {
126122
colTitle: 'タイトル',
127123
colResizable: 'Column width (px)',
128124
colVisible: 'Display',
129-
colFixed: '冻结列（最多 {0} 列）',
125+
colFixed: '冻结列',
126+
colFixedMax: '冻结列（最多 {0} 列）',
130127
fixedLeft: '左側',
131128
fixedUnset: '指定しない',
132129
fixedRight: '右側'

‎packages/locale/lang/pt-BR.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/**
2-
* v4保留兼容，已废弃，即将删除文件
3-
* @deprecated
4-
*/
51
export default {
62
vxe: {
73
base: {
@@ -126,7 +122,8 @@ export default {
126122
colTitle: 'Title',
127123
colResizable: 'Column width (px)',
128124
colVisible: 'Display',
129-
colFixed: 'Freeze columns (Max {0})',
125+
colFixed: 'Freeze columns',
126+
colFixedMax: 'Freeze columns (Max {0})',
130127
fixedLeft: 'Left',
131128
fixedUnset: 'Unset',
132129
fixedRight: 'Right'

‎packages/locale/lang/zh-CN.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/**
2-
* v4保留兼容，已废弃，即将删除文件
3-
* @deprecated
4-
*/
51
export default {
62
vxe: {
73
base: {
@@ -126,7 +122,8 @@ export default {
126122
colTitle: '标题',
127123
colResizable: '列宽（像素）',
128124
colVisible: '是否显示',
129-
colFixed: '冻结列（最多 {0} 列）',
125+
colFixed: '冻结列',
126+
colFixedMax: '冻结列（最多 {0} 列）',
130127
fixedLeft: '左侧',
131128
fixedUnset: '不设置',
132129
fixedRight: '右侧'

‎packages/locale/lang/zh-TC.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/**
2-
* v4保留兼容，已废弃，即将删除文件
3-
* @deprecated
4-
*/
51
export default {
62
vxe: {
73
base: {
@@ -23,7 +19,7 @@ export default {
2319
useErr: '安裝 "{0}" 模組時發生錯誤，可能順序不正確，依賴的模組需要在Table之前安裝',
2420
barUnableLink: '工具欄無法關聯表格',
2521
expandContent: '展開行的插槽應該是 “content”，請檢查是否正確',
26-
reqComp: '缺少 "{0}" 組件，請檢查是否正確安裝',
22+
reqComp: '缺少 "{0}" 組件，请检查是否正确安装',
2723
reqModule: '缺少 "{0}" 模組',
2824
reqProp: '缺少必要的 "{0}" 參數，可能會導致出現錯誤',
2925
emptyProp: '參數 "{0}" 不允許為空',
@@ -126,7 +122,8 @@ export default {
126122
colTitle: '標題',
127123
colResizable: '列宽（像素）',
128124
colVisible: '是否顯示',
129-
colFixed: '冻结列（最多 {0} 列）',
125+
colFixed: '冻结列',
126+
colFixedMax: '冻结列（最多 {0} 列）',
130127
fixedLeft: '左側',
131128
fixedUnset: '不設定',
132129
fixedRight: '右側'

‎packages/table/module/custom/panel.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ export default defineComponent({
495495
const customOpts = computeCustomOpts.value
496496
const { modalOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts
497497
const columnOpts = computeColumnOpts.value
498+
const { maxFixedSize } = columnOpts
498499
const modalOpts = Object.assign({}, modalOptions)
499500
const isMaxFixedColumn = computeIsMaxFixedColumn.value
500501
const trVNs: VNode[] = []
@@ -630,12 +631,15 @@ export default defineComponent({
630631
minWidth: modalOpts.minWidth || 700,
631632
height: modalOpts.height || '50vh',
632633
minHeight: modalOpts.minHeight || 400,
633-
mask: true,
634-
lockView: true,
635-
showFooter: true,
636-
resize: true,
637-
escClosable: true,
634+
showZoom: modalOpts.showZoom,
635+
showMaximize: modalOpts.showMaximize,
636+
showMinimize: modalOpts.showMinimize,
637+
mask: modalOpts.mask,
638+
lockView: modalOpts.lockView,
639+
resize: modalOpts.resize,
640+
escClosable: !!modalOpts.escClosable,
638641
destroyOnClose: true,
642+
showFooter: true,
639643
'onUpdate:modelValue' (value: any) {
640644
customStore.visible = value
641645
}
@@ -729,7 +733,7 @@ export default defineComponent({
729733
? h('th', {}, getI18n('vxe.custom.setting.colResizable'))
730734
: createCommentVNode(),
731735
allowFixed
732-
? h('th', {}, getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))
736+
? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize]))
733737
: createCommentVNode()
734738
])
735739
]),

0 commit comments

Comments
 (0)