vxe-table 4.18.0-beta.2 → 4.18.0-beta.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -10
- package/es/colgroup/style.css +0 -0
- package/es/colgroup/style.min.css +0 -0
- package/es/column/style.css +0 -0
- package/es/column/style.min.css +0 -0
- package/es/grid/src/grid.js +23 -19
- package/es/grid/style.css +86 -0
- package/es/grid/style.min.css +1 -0
- package/es/iconfont.1770109263422.ttf +0 -0
- package/es/iconfont.1770109263422.woff +0 -0
- package/es/iconfont.1770109263422.woff2 +0 -0
- package/es/index.css +1 -1
- package/es/index.min.css +1 -1
- package/es/locale/lang/ar-EG.d.ts +2 -0
- package/es/locale/lang/ar-EG.js +6 -0
- package/es/locale/lang/de-DE.d.ts +2 -0
- package/es/locale/lang/de-DE.js +6 -0
- package/es/locale/lang/en-US.d.ts +2 -0
- package/es/locale/lang/en-US.js +6 -0
- package/es/locale/lang/es-ES.d.ts +2 -0
- package/es/locale/lang/es-ES.js +6 -0
- package/es/locale/lang/fr-FR.d.ts +2 -0
- package/es/locale/lang/fr-FR.js +6 -0
- package/es/locale/lang/hu-HU.d.ts +2 -0
- package/es/locale/lang/hu-HU.js +6 -0
- package/es/locale/lang/hy-AM.d.ts +2 -0
- package/es/locale/lang/hy-AM.js +6 -0
- package/es/locale/lang/id-ID.d.ts +2 -0
- package/es/locale/lang/id-ID.js +6 -0
- package/es/locale/lang/it-IT.d.ts +2 -0
- package/es/locale/lang/it-IT.js +6 -0
- package/es/locale/lang/ja-JP.d.ts +2 -0
- package/es/locale/lang/ja-JP.js +6 -0
- package/es/locale/lang/ko-KR.d.ts +2 -0
- package/es/locale/lang/ko-KR.js +6 -0
- package/es/locale/lang/ms-MY.d.ts +2 -0
- package/es/locale/lang/ms-MY.js +6 -0
- package/es/locale/lang/nb-NO.d.ts +2 -0
- package/es/locale/lang/nb-NO.js +6 -0
- package/es/locale/lang/pt-BR.d.ts +2 -0
- package/es/locale/lang/pt-BR.js +6 -0
- package/es/locale/lang/ru-RU.d.ts +2 -0
- package/es/locale/lang/ru-RU.js +6 -0
- package/es/locale/lang/th-TH.d.ts +2 -0
- package/es/locale/lang/th-TH.js +6 -0
- package/es/locale/lang/ug-CN.d.ts +2 -0
- package/es/locale/lang/ug-CN.js +6 -0
- package/es/locale/lang/uk-UA.d.ts +2 -0
- package/es/locale/lang/uk-UA.js +6 -0
- package/es/locale/lang/uz-UZ.d.ts +2 -0
- package/es/locale/lang/uz-UZ.js +6 -0
- package/es/locale/lang/vi-VN.d.ts +2 -0
- package/es/locale/lang/vi-VN.js +6 -0
- package/es/locale/lang/zh-CHT.d.ts +2 -0
- package/es/locale/lang/zh-CHT.js +6 -0
- package/es/locale/lang/zh-CN.d.ts +2 -0
- package/es/locale/lang/zh-CN.js +6 -0
- package/es/locale/lang/zh-HK.d.ts +2 -0
- package/es/locale/lang/zh-MO.d.ts +2 -0
- package/es/locale/lang/zh-TW.d.ts +2 -0
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/module/custom/hook.js +25 -9
- package/es/table/module/custom/panel.js +14 -13
- package/es/table/module/edit/hook.js +3 -3
- package/es/table/module/export/hook.js +15 -1
- package/es/table/module/filter/panel.js +11 -3
- package/es/table/module/validator/hook.js +7 -6
- package/es/table/render/index.js +14 -0
- package/es/table/src/body.js +12 -5
- package/es/table/src/emits.js +1 -0
- package/es/table/src/props.js +2 -0
- package/es/table/src/table.js +235 -54
- package/es/table/src/util.js +23 -9
- package/es/table/style.css +3887 -0
- package/es/table/style.min.css +1 -0
- package/es/toolbar/src/toolbar.js +11 -7
- package/es/toolbar/style.css +110 -0
- package/es/toolbar/style.min.css +1 -0
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/es/ui/style.css +0 -0
- package/es/ui/style.min.css +0 -0
- package/es/v-x-e-table/style.css +0 -0
- package/es/v-x-e-table/style.min.css +0 -0
- package/es/vxe-colgroup/style.css +0 -0
- package/es/vxe-colgroup/style.min.css +0 -0
- package/es/vxe-column/style.css +0 -0
- package/es/vxe-column/style.min.css +0 -0
- package/es/vxe-grid/style.css +86 -0
- package/es/vxe-grid/style.min.css +1 -0
- package/es/vxe-table/style.css +3887 -0
- package/es/vxe-table/style.min.css +1 -0
- package/es/vxe-toolbar/style.css +110 -0
- package/es/vxe-toolbar/style.min.css +1 -0
- package/es/vxe-ui/style.css +0 -0
- package/es/vxe-ui/style.min.css +0 -0
- package/es/vxe-v-x-e-table/style.css +0 -0
- package/es/vxe-v-x-e-table/style.min.css +0 -0
- package/lib/colgroup/style/index.js +1 -0
- package/lib/colgroup/style/style.css +0 -0
- package/lib/colgroup/style/style.min.css +0 -0
- package/lib/column/style/index.js +1 -0
- package/lib/column/style/style.css +0 -0
- package/lib/column/style/style.min.css +0 -0
- package/lib/grid/src/grid.js +22 -18
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/grid/style/index.js +1 -0
- package/lib/grid/style/style.css +86 -0
- package/lib/grid/style/style.min.css +1 -0
- package/lib/iconfont.1770109263422.ttf +0 -0
- package/lib/iconfont.1770109263422.woff +0 -0
- package/lib/iconfont.1770109263422.woff2 +0 -0
- package/lib/index.common.js +22 -0
- package/lib/index.css +1 -1
- package/lib/index.min.css +1 -1
- package/lib/index.umd.js +224 -106
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/ar-EG.d.ts +2 -0
- package/lib/locale/lang/ar-EG.js +6 -0
- package/lib/locale/lang/ar-EG.min.js +1 -1
- package/lib/locale/lang/ar-EG.umd.js +848 -0
- package/lib/locale/lang/de-DE.d.ts +2 -0
- package/lib/locale/lang/de-DE.js +6 -0
- package/lib/locale/lang/de-DE.min.js +1 -1
- package/lib/locale/lang/de-DE.umd.js +848 -0
- package/lib/locale/lang/en-US.d.ts +2 -0
- package/lib/locale/lang/en-US.js +6 -0
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +848 -0
- package/lib/locale/lang/es-ES.d.ts +2 -0
- package/lib/locale/lang/es-ES.js +6 -0
- package/lib/locale/lang/es-ES.min.js +1 -1
- package/lib/locale/lang/es-ES.umd.js +848 -0
- package/lib/locale/lang/fr-FR.d.ts +2 -0
- package/lib/locale/lang/fr-FR.js +6 -0
- package/lib/locale/lang/fr-FR.min.js +1 -1
- package/lib/locale/lang/fr-FR.umd.js +848 -0
- package/lib/locale/lang/hu-HU.d.ts +2 -0
- package/lib/locale/lang/hu-HU.js +6 -0
- package/lib/locale/lang/hu-HU.min.js +1 -1
- package/lib/locale/lang/hu-HU.umd.js +848 -0
- package/lib/locale/lang/hy-AM.d.ts +2 -0
- package/lib/locale/lang/hy-AM.js +6 -0
- package/lib/locale/lang/hy-AM.min.js +1 -1
- package/lib/locale/lang/hy-AM.umd.js +848 -0
- package/lib/locale/lang/id-ID.d.ts +2 -0
- package/lib/locale/lang/id-ID.js +6 -0
- package/lib/locale/lang/id-ID.min.js +1 -1
- package/lib/locale/lang/id-ID.umd.js +848 -0
- package/lib/locale/lang/it-IT.d.ts +2 -0
- package/lib/locale/lang/it-IT.js +6 -0
- package/lib/locale/lang/it-IT.min.js +1 -1
- package/lib/locale/lang/it-IT.umd.js +848 -0
- package/lib/locale/lang/ja-JP.d.ts +2 -0
- package/lib/locale/lang/ja-JP.js +6 -0
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +848 -0
- package/lib/locale/lang/ko-KR.d.ts +2 -0
- package/lib/locale/lang/ko-KR.js +6 -0
- package/lib/locale/lang/ko-KR.min.js +1 -1
- package/lib/locale/lang/ko-KR.umd.js +848 -0
- package/lib/locale/lang/ms-MY.d.ts +2 -0
- package/lib/locale/lang/ms-MY.js +6 -0
- package/lib/locale/lang/ms-MY.min.js +1 -1
- package/lib/locale/lang/ms-MY.umd.js +848 -0
- package/lib/locale/lang/nb-NO.d.ts +2 -0
- package/lib/locale/lang/nb-NO.js +6 -0
- package/lib/locale/lang/nb-NO.min.js +1 -1
- package/lib/locale/lang/nb-NO.umd.js +848 -0
- package/lib/locale/lang/pt-BR.d.ts +2 -0
- package/lib/locale/lang/pt-BR.js +6 -0
- package/lib/locale/lang/pt-BR.min.js +1 -1
- package/lib/locale/lang/pt-BR.umd.js +848 -0
- package/lib/locale/lang/ru-RU.d.ts +2 -0
- package/lib/locale/lang/ru-RU.js +6 -0
- package/lib/locale/lang/ru-RU.min.js +1 -1
- package/lib/locale/lang/ru-RU.umd.js +848 -0
- package/lib/locale/lang/th-TH.d.ts +2 -0
- package/lib/locale/lang/th-TH.js +6 -0
- package/lib/locale/lang/th-TH.min.js +1 -1
- package/lib/locale/lang/th-TH.umd.js +848 -0
- package/lib/locale/lang/ug-CN.d.ts +2 -0
- package/lib/locale/lang/ug-CN.js +6 -0
- package/lib/locale/lang/ug-CN.min.js +1 -1
- package/lib/locale/lang/ug-CN.umd.js +848 -0
- package/lib/locale/lang/uk-UA.d.ts +2 -0
- package/lib/locale/lang/uk-UA.js +6 -0
- package/lib/locale/lang/uk-UA.min.js +1 -1
- package/lib/locale/lang/uk-UA.umd.js +848 -0
- package/lib/locale/lang/uz-UZ.d.ts +2 -0
- package/lib/locale/lang/uz-UZ.js +6 -0
- package/lib/locale/lang/uz-UZ.min.js +1 -1
- package/lib/locale/lang/uz-UZ.umd.js +848 -0
- package/lib/locale/lang/vi-VN.d.ts +2 -0
- package/lib/locale/lang/vi-VN.js +6 -0
- package/lib/locale/lang/vi-VN.min.js +1 -1
- package/lib/locale/lang/vi-VN.umd.js +848 -0
- package/lib/locale/lang/zh-CHT.d.ts +2 -0
- package/lib/locale/lang/zh-CHT.js +6 -0
- package/lib/locale/lang/zh-CHT.min.js +1 -1
- package/lib/locale/lang/zh-CHT.umd.js +848 -0
- package/lib/locale/lang/zh-CN.d.ts +2 -0
- package/lib/locale/lang/zh-CN.js +6 -0
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +848 -0
- package/lib/locale/lang/zh-HK.d.ts +2 -0
- package/lib/locale/lang/zh-HK.min.js +1 -1
- package/lib/locale/lang/zh-HK.umd.js +23 -0
- package/lib/locale/lang/zh-MO.d.ts +2 -0
- package/lib/locale/lang/zh-MO.min.js +1 -1
- package/lib/locale/lang/zh-MO.umd.js +23 -0
- package/lib/locale/lang/zh-TW.d.ts +2 -0
- package/lib/locale/lang/zh-TW.min.js +1 -1
- package/lib/locale/lang/zh-TW.umd.js +23 -0
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/module/custom/hook.js +29 -9
- package/lib/table/module/custom/hook.min.js +1 -1
- package/lib/table/module/custom/panel.js +12 -8
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/edit/hook.js +3 -3
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/module/export/hook.js +18 -6
- package/lib/table/module/export/hook.min.js +1 -1
- package/lib/table/module/filter/panel.js +14 -3
- package/lib/table/module/filter/panel.min.js +1 -1
- package/lib/table/module/validator/hook.js +8 -6
- package/lib/table/module/validator/hook.min.js +1 -1
- package/lib/table/render/index.js +18 -0
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/body.js +13 -4
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/emits.js +1 -1
- package/lib/table/src/emits.min.js +1 -1
- package/lib/table/src/props.js +2 -0
- package/lib/table/src/props.min.js +1 -1
- package/lib/table/src/table.js +37 -32
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +31 -11
- package/lib/table/src/util.min.js +1 -1
- package/lib/table/style/index.js +1 -0
- package/lib/table/style/style.css +3887 -0
- package/lib/table/style/style.min.css +1 -0
- package/lib/toolbar/src/toolbar.js +10 -6
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/toolbar/style/index.js +1 -0
- package/lib/toolbar/style/style.css +110 -0
- package/lib/toolbar/style/style.min.css +1 -0
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/lib/ui/style/index.js +1 -0
- package/lib/ui/style/style.css +0 -0
- package/lib/ui/style/style.min.css +0 -0
- package/lib/v-x-e-table/style/index.js +1 -0
- package/lib/v-x-e-table/style/style.css +0 -0
- package/lib/v-x-e-table/style/style.min.css +0 -0
- package/lib/vxe-colgroup/style/index.js +1 -0
- package/lib/vxe-colgroup/style/style.css +0 -0
- package/lib/vxe-colgroup/style/style.min.css +0 -0
- package/lib/vxe-column/style/index.js +1 -0
- package/lib/vxe-column/style/style.css +0 -0
- package/lib/vxe-column/style/style.min.css +0 -0
- package/lib/vxe-grid/style/index.js +1 -0
- package/lib/vxe-grid/style/style.css +86 -0
- package/lib/vxe-grid/style/style.min.css +1 -0
- package/lib/vxe-table/style/index.js +1 -0
- package/lib/vxe-table/style/style.css +3887 -0
- package/lib/vxe-table/style/style.min.css +1 -0
- package/lib/vxe-toolbar/style/index.js +1 -0
- package/lib/vxe-toolbar/style/style.css +110 -0
- package/lib/vxe-toolbar/style/style.min.css +1 -0
- package/lib/vxe-ui/style/index.js +1 -0
- package/lib/vxe-ui/style/style.css +0 -0
- package/lib/vxe-ui/style/style.min.css +0 -0
- package/lib/vxe-v-x-e-table/style/index.js +1 -0
- package/lib/vxe-v-x-e-table/style/style.css +0 -0
- package/lib/vxe-v-x-e-table/style/style.min.css +0 -0
- package/package.json +2 -2
- package/packages/grid/src/grid.ts +23 -18
- package/packages/locale/lang/ar-EG.ts +6 -0
- package/packages/locale/lang/de-DE.ts +6 -0
- package/packages/locale/lang/en-US.ts +6 -0
- package/packages/locale/lang/es-ES.ts +6 -0
- package/packages/locale/lang/fr-FR.ts +6 -0
- package/packages/locale/lang/hu-HU.ts +6 -0
- package/packages/locale/lang/hy-AM.ts +6 -0
- package/packages/locale/lang/id-ID.ts +6 -0
- package/packages/locale/lang/it-IT.ts +6 -0
- package/packages/locale/lang/ja-JP.ts +6 -0
- package/packages/locale/lang/ko-KR.ts +6 -0
- package/packages/locale/lang/ms-MY.ts +6 -0
- package/packages/locale/lang/nb-NO.ts +6 -0
- package/packages/locale/lang/pt-BR.ts +6 -0
- package/packages/locale/lang/ru-RU.ts +6 -0
- package/packages/locale/lang/th-TH.ts +6 -0
- package/packages/locale/lang/ug-CN.ts +6 -0
- package/packages/locale/lang/uk-UA.ts +6 -0
- package/packages/locale/lang/uz-UZ.ts +6 -0
- package/packages/locale/lang/vi-VN.ts +6 -0
- package/packages/locale/lang/zh-CHT.ts +6 -0
- package/packages/locale/lang/zh-CN.ts +6 -0
- package/packages/table/module/custom/hook.ts +24 -9
- package/packages/table/module/custom/panel.ts +15 -14
- package/packages/table/module/edit/hook.ts +3 -3
- package/packages/table/module/export/hook.ts +13 -1
- package/packages/table/module/filter/panel.ts +10 -3
- package/packages/table/module/validator/hook.ts +7 -6
- package/packages/table/render/index.ts +16 -0
- package/packages/table/src/body.ts +12 -5
- package/packages/table/src/emits.ts +1 -0
- package/packages/table/src/props.ts +5 -3
- package/packages/table/src/table.ts +235 -53
- package/packages/table/src/util.ts +25 -9
- package/packages/toolbar/src/toolbar.ts +12 -7
- package/styles/components/table-module/custom.scss +3 -0
- package/styles/components/table-module/filter.scss +1 -1
- package/styles/components/table.scss +8 -2
- package/styles/components/toolbar.scss +5 -1
- package/styles/theme/base.scss +4 -0
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'A feltöltés sikertelen',
|
|
369
373
|
uploadSuccess: 'Töltse fel sikeresen',
|
|
370
374
|
moreBtnText: 'Tovább ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Kattintson a megtekintéshez',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Lista megtekintése',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: '上传失败',
|
|
369
373
|
uploadSuccess: '上传成功',
|
|
370
374
|
moreBtnText: '更多({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: '点击查看',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: '查看列表',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Unggah gagal',
|
|
369
373
|
uploadSuccess: 'Unggah berhasil',
|
|
370
374
|
moreBtnText: 'Lebih ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Klik untuk dilihat',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Daftar Lihat',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Caricamento non riuscito',
|
|
369
373
|
uploadSuccess: 'Carica correttamente',
|
|
370
374
|
moreBtnText: 'Altro ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Fare clic per visualizzare',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Visualizza elenco',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'アップロードに失敗しました',
|
|
369
373
|
uploadSuccess: '正常にアップロードします',
|
|
370
374
|
moreBtnText: 'その他({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'クリックして表示します',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'リストを表示します',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: '업로드 실패',
|
|
369
373
|
uploadSuccess: '성공적으로 업로드하십시오',
|
|
370
374
|
moreBtnText: 'more ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: '보려면 클릭하십시오',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: '목록을보십시오',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Muat naik gagal',
|
|
369
373
|
uploadSuccess: 'Muat naik dengan jayanya',
|
|
370
374
|
moreBtnText: 'Lebih ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Klik untuk Lihat',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Lihat senarai',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Opplasting mislyktes',
|
|
369
373
|
uploadSuccess: 'Last opp vellykket',
|
|
370
374
|
moreBtnText: 'Mer ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Klikk for å se',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Vis liste',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Falha no upload',
|
|
369
373
|
uploadSuccess: 'Carregar com sucesso',
|
|
370
374
|
moreBtnText: 'Mais ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Clique para visualizar',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Lista de visualização',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Загрузка не удалась',
|
|
369
373
|
uploadSuccess: 'Загрузить успешно',
|
|
370
374
|
moreBtnText: 'Больше ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Нажмите, чтобы просмотреть',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Просмотреть список',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'การอัปโหลดล้มเหลว',
|
|
369
373
|
uploadSuccess: 'อัปโหลดสำเร็จ',
|
|
370
374
|
moreBtnText: 'เพิ่มเติม ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'คลิกเพื่อดู',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'รายการดู',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'چىقىرىش مەغلۇپ بولدى',
|
|
369
373
|
uploadSuccess: 'چىقىرىش ئوڭۇشلۇق بولدى',
|
|
370
374
|
moreBtnText: 'تىخىمۇ كۆپ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'بىسىپ كۆرۈڭ',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'توپلامنى كۆرۈش',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Завантаження не вдалося',
|
|
369
373
|
uploadSuccess: 'Завантажте успішно',
|
|
370
374
|
moreBtnText: 'Більше ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Клацніть, щоб переглянути',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Переглянути список',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '¥'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Yuklash muvaffaqiyatsiz tugadi',
|
|
369
373
|
uploadSuccess: 'Muvaffaqiyatli yuklang',
|
|
370
374
|
moreBtnText: "Ko'proq ({0})",
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: "Ko'rish uchun bosing",
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: "Ro'yxatni ko'rish",
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '$'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: 'Tải lên không thành công',
|
|
369
373
|
uploadSuccess: 'Tải lên thành công',
|
|
370
374
|
moreBtnText: 'Thêm ({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: 'Bấm để xem',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: 'Xem danh sách',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '¥'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: '上傳失敗',
|
|
369
373
|
uploadSuccess: '上傳成功',
|
|
370
374
|
moreBtnText: '更多({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: '點擊查看',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: '查看列表',
|
|
@@ -333,6 +333,10 @@ export default {
|
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
},
|
|
336
|
+
calendar: {
|
|
337
|
+
yearLabel: '{0} 年',
|
|
338
|
+
monthLabel: '{0} 月'
|
|
339
|
+
},
|
|
336
340
|
numberInput: {
|
|
337
341
|
currencySymbol: '¥'
|
|
338
342
|
},
|
|
@@ -368,6 +372,8 @@ export default {
|
|
|
368
372
|
uploadErr: '上传失败',
|
|
369
373
|
uploadSuccess: '上传成功',
|
|
370
374
|
moreBtnText: '更多({0})',
|
|
375
|
+
moreImgBtnText: '图片({0})',
|
|
376
|
+
moreFileBtnText: '文件({0})',
|
|
371
377
|
viewItemTitle: '点击查看',
|
|
372
378
|
morePopup: {
|
|
373
379
|
readTitle: '查看列表',
|
|
@@ -10,16 +10,21 @@ const tableCustomMethodKeys: (keyof TableCustomMethods)[] = ['openCustom', 'clos
|
|
|
10
10
|
VxeUI.hooks.add('tableCustomModule', {
|
|
11
11
|
setupTable ($xeTable) {
|
|
12
12
|
const { reactData, internalData } = $xeTable
|
|
13
|
-
const { computeCustomOpts, computeRowGroupFields } = $xeTable.getComputeMaps()
|
|
13
|
+
const { computeCustomOpts, computeRowGroupFields, computeCustomSimpleMode } = $xeTable.getComputeMaps()
|
|
14
14
|
const { refElem } = $xeTable.getRefMaps()
|
|
15
15
|
|
|
16
16
|
const $xeGantt = $xeTable.xeGantt
|
|
17
17
|
|
|
18
|
-
const
|
|
18
|
+
const updatePopupStyle = () => {
|
|
19
19
|
const { customStore } = reactData
|
|
20
|
+
const customOpts = computeCustomOpts.value
|
|
21
|
+
const customSimpleMode = computeCustomSimpleMode.value
|
|
22
|
+
const showCustomSimpleOutside = customSimpleMode === 'outside'
|
|
23
|
+
const { popupOptions } = customOpts
|
|
24
|
+
const { maxHeight } = popupOptions || {}
|
|
20
25
|
let wrapperEl = refElem.value
|
|
21
|
-
|
|
22
|
-
let
|
|
26
|
+
let popupTop = 0
|
|
27
|
+
let popupMaxHeight: string | number = 0
|
|
23
28
|
if ($xeGantt) {
|
|
24
29
|
const { refGanttContainerElem } = $xeGantt.getRefMaps()
|
|
25
30
|
const ganttContainerElem = refGanttContainerElem.value
|
|
@@ -27,10 +32,20 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
27
32
|
wrapperEl = ganttContainerElem
|
|
28
33
|
}
|
|
29
34
|
}
|
|
30
|
-
if (
|
|
31
|
-
|
|
35
|
+
if (showCustomSimpleOutside) {
|
|
36
|
+
if (wrapperEl) {
|
|
37
|
+
popupTop = wrapperEl.offsetTop
|
|
38
|
+
}
|
|
39
|
+
popupMaxHeight = XEUtils.eqNull(maxHeight) ? 360 : maxHeight
|
|
40
|
+
} else {
|
|
41
|
+
// 判断面板不能大于表格高度
|
|
42
|
+
if (wrapperEl) {
|
|
43
|
+
popupMaxHeight = wrapperEl.clientHeight - 22
|
|
44
|
+
}
|
|
45
|
+
popupMaxHeight = Math.max(88, popupMaxHeight)
|
|
32
46
|
}
|
|
33
|
-
customStore.
|
|
47
|
+
customStore.popupTop = popupTop
|
|
48
|
+
customStore.maxHeight = XEUtils.eqNull(maxHeight) ? popupMaxHeight : maxHeight
|
|
34
49
|
}
|
|
35
50
|
|
|
36
51
|
const openCustom = () => {
|
|
@@ -39,8 +54,8 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
39
54
|
initStore.custom = true
|
|
40
55
|
handleUpdateCustomColumn()
|
|
41
56
|
checkCustomStatus()
|
|
42
|
-
|
|
43
|
-
return nextTick().then(() =>
|
|
57
|
+
updatePopupStyle()
|
|
58
|
+
return nextTick().then(() => updatePopupStyle())
|
|
44
59
|
}
|
|
45
60
|
|
|
46
61
|
const handleUpdateCustomColumn = () => {
|
|
@@ -2,11 +2,11 @@ import { h, inject, ref, Ref, provide, VNode, PropType, nextTick, TransitionGrou
|
|
|
2
2
|
import { defineVxeComponent } from '../../../ui/src/comp'
|
|
3
3
|
import { VxeUI } from '../../../ui'
|
|
4
4
|
import { formatText } from '../../../ui/src/utils'
|
|
5
|
-
import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
|
|
5
|
+
import { getTpImg, addClass, removeClass, hasControlKey, toCssUnit } from '../../../ui/src/dom'
|
|
6
6
|
import { errLog } from '../../../ui/src/log'
|
|
7
7
|
import XEUtils from 'xe-utils'
|
|
8
8
|
|
|
9
|
-
import type { VxeButtonEvents } from 'vxe-pc-ui'
|
|
9
|
+
import type { VxeButtonEvents, VxeComponentStyleType } from 'vxe-pc-ui'
|
|
10
10
|
import type { VxeTableDefines, VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeColumnPropTypes, VxeTableCustomPanelConstructor, TableCustomPanelReactData, TableCustomPanelInternalData, TableCustomPanelPrivateRef, TableCustomPanelPrivateComputed } from '../../../../types'
|
|
11
11
|
|
|
12
12
|
const { getI18n, getIcon, renderEmptyElement } = VxeUI
|
|
@@ -616,7 +616,7 @@ export default defineVxeComponent({
|
|
|
616
616
|
const customOpts = computeCustomOpts.value
|
|
617
617
|
const { immediate } = customOpts
|
|
618
618
|
const columnDragOpts = computeColumnDragOpts.value
|
|
619
|
-
const { maxHeight } = customStore
|
|
619
|
+
const { maxHeight, popupTop } = customStore
|
|
620
620
|
const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, trigger, placement } = customOpts
|
|
621
621
|
const isMaxFixedColumn = computeIsMaxFixedColumn.value
|
|
622
622
|
const { isCrossDrag } = columnDragOpts
|
|
@@ -754,17 +754,18 @@ export default defineVxeComponent({
|
|
|
754
754
|
)
|
|
755
755
|
}
|
|
756
756
|
})
|
|
757
|
+
const popupStys: VxeComponentStyleType = {}
|
|
758
|
+
if (maxHeight && !['left', 'right'].includes(placement || '')) {
|
|
759
|
+
popupStys.top = toCssUnit(popupTop)
|
|
760
|
+
popupStys.maxHeight = toCssUnit(maxHeight)
|
|
761
|
+
}
|
|
757
762
|
return h('div', {
|
|
758
763
|
ref: refElem,
|
|
759
764
|
key: 'simple',
|
|
760
765
|
class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
|
|
761
766
|
'is--active': customStore.visible
|
|
762
767
|
}],
|
|
763
|
-
style:
|
|
764
|
-
? {
|
|
765
|
-
maxHeight: `${maxHeight}px`
|
|
766
|
-
}
|
|
767
|
-
: {}
|
|
768
|
+
style: popupStys
|
|
768
769
|
}, customStore.visible
|
|
769
770
|
? [
|
|
770
771
|
h('div', {
|
|
@@ -1099,6 +1100,11 @@ export default defineVxeComponent({
|
|
|
1099
1100
|
}, defaultSlot
|
|
1100
1101
|
? $xeTable.callSlot(defaultSlot, params)
|
|
1101
1102
|
: [
|
|
1103
|
+
!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
|
|
1104
|
+
? h($xeTable.getPivotTableAggregatePopupPanel(), {
|
|
1105
|
+
customStore
|
|
1106
|
+
})
|
|
1107
|
+
: renderEmptyElement($xeTable),
|
|
1102
1108
|
h('div', {
|
|
1103
1109
|
ref: refCustomBodyElem,
|
|
1104
1110
|
class: 'vxe-table-custom-popup--handle-wrapper'
|
|
@@ -1177,12 +1183,7 @@ export default defineVxeComponent({
|
|
|
1177
1183
|
}, $xeTable.callSlot(bottomSlot, params))
|
|
1178
1184
|
: renderEmptyElement($xeTable),
|
|
1179
1185
|
renderDragTip()
|
|
1180
|
-
])
|
|
1181
|
-
!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
|
|
1182
|
-
? h($xeTable.getPivotTableAggregatePopupPanel(), {
|
|
1183
|
-
customStore
|
|
1184
|
-
})
|
|
1185
|
-
: renderEmptyElement($xeTable)
|
|
1186
|
+
])
|
|
1186
1187
|
])
|
|
1187
1188
|
},
|
|
1188
1189
|
footer: () => {
|
|
@@ -139,7 +139,7 @@ hooks.add('tableEditModule', {
|
|
|
139
139
|
if (treeConfig) {
|
|
140
140
|
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
141
141
|
}
|
|
142
|
-
|
|
142
|
+
errLog(getI18n('vxe.error.noGroup', ['insert']))
|
|
143
143
|
// insertGroupRow(newRecords, false)
|
|
144
144
|
} else {
|
|
145
145
|
newRecords.forEach(item => {
|
|
@@ -168,7 +168,7 @@ hooks.add('tableEditModule', {
|
|
|
168
168
|
if (treeConfig) {
|
|
169
169
|
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
170
170
|
}
|
|
171
|
-
|
|
171
|
+
errLog(getI18n('vxe.error.noGroup', ['insert']))
|
|
172
172
|
// insertGroupRow(newRecords, true)
|
|
173
173
|
} else {
|
|
174
174
|
newRecords.forEach(item => {
|
|
@@ -239,7 +239,7 @@ hooks.add('tableEditModule', {
|
|
|
239
239
|
if (treeConfig) {
|
|
240
240
|
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
241
241
|
}
|
|
242
|
-
|
|
242
|
+
errLog(getI18n('vxe.error.noGroup', ['insert']))
|
|
243
243
|
} else {
|
|
244
244
|
if (treeConfig) {
|
|
245
245
|
throw new Error(getI18n('vxe.error.noTree', ['insert']))
|
|
@@ -1382,7 +1382,19 @@ hooks.add('tableExportModule', {
|
|
|
1382
1382
|
return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
|
|
1383
1383
|
.then(rest => {
|
|
1384
1384
|
const listProp = resConfigs.list
|
|
1385
|
-
|
|
1385
|
+
let tdData: any[] = []
|
|
1386
|
+
if (listProp) {
|
|
1387
|
+
if (XEUtils.isFunction(listProp)) {
|
|
1388
|
+
tdData = listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
|
|
1389
|
+
} else {
|
|
1390
|
+
tdData = XEUtils.isArray(rest) ? rest : XEUtils.get(rest, listProp)
|
|
1391
|
+
}
|
|
1392
|
+
} else {
|
|
1393
|
+
if (XEUtils.isArray(rest)) {
|
|
1394
|
+
tdData = rest
|
|
1395
|
+
}
|
|
1396
|
+
}
|
|
1397
|
+
handleOptions.data = tdData
|
|
1386
1398
|
if (afterQueryAll) {
|
|
1387
1399
|
afterQueryAll(params)
|
|
1388
1400
|
}
|
|
@@ -223,9 +223,16 @@ export default defineVxeComponent({
|
|
|
223
223
|
const filterOpts = computeFilterOpts.value
|
|
224
224
|
const hasCheckOption = computeHasCheckOption.value
|
|
225
225
|
const { filterRender, filterMultiple } = column
|
|
226
|
+
const { confirmButtonText, resetButtonText, showFooter } = filterOpts
|
|
226
227
|
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
|
|
227
228
|
const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate
|
|
228
|
-
|
|
229
|
+
let showFlFoot = !!filterMultiple
|
|
230
|
+
if (XEUtils.isBoolean(showFooter)) {
|
|
231
|
+
showFlFoot = showFooter
|
|
232
|
+
} else if (compConf) {
|
|
233
|
+
showFlFoot = !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false)
|
|
234
|
+
}
|
|
235
|
+
return showFlFoot
|
|
229
236
|
? [
|
|
230
237
|
h('div', {
|
|
231
238
|
class: 'vxe-table--filter-footer'
|
|
@@ -236,10 +243,10 @@ export default defineVxeComponent({
|
|
|
236
243
|
},
|
|
237
244
|
disabled: isDisabled,
|
|
238
245
|
onClick: confirmFilter
|
|
239
|
-
},
|
|
246
|
+
}, confirmButtonText || getI18n('vxe.table.confirmFilter')),
|
|
240
247
|
h('button', {
|
|
241
248
|
onClick: resetFilter
|
|
242
|
-
},
|
|
249
|
+
}, resetButtonText || getI18n('vxe.table.resetFilter'))
|
|
243
250
|
])
|
|
244
251
|
]
|
|
245
252
|
: []
|
|
@@ -123,19 +123,20 @@ function validRuleValue (rule: VxeTableDefines.ValidatorRule, val: any, required
|
|
|
123
123
|
return true
|
|
124
124
|
}
|
|
125
125
|
|
|
126
|
-
function checkRuleStatus (rule: VxeTableDefines.ValidatorRule, val: any) {
|
|
127
|
-
const { required } = rule
|
|
128
|
-
const
|
|
126
|
+
function checkRuleStatus (rule: VxeTableDefines.ValidatorRule, row: any, val: any) {
|
|
127
|
+
const { required, field } = rule
|
|
128
|
+
const currVal = field ? XEUtils.get(row, field) : val
|
|
129
|
+
const isEmptyVal = XEUtils.isArray(currVal) ? !currVal.length : eqEmptyValue(currVal)
|
|
129
130
|
if (required) {
|
|
130
131
|
if (isEmptyVal) {
|
|
131
132
|
return false
|
|
132
133
|
}
|
|
133
|
-
if (!validRuleValue(rule,
|
|
134
|
+
if (!validRuleValue(rule, currVal, required)) {
|
|
134
135
|
return false
|
|
135
136
|
}
|
|
136
137
|
} else {
|
|
137
138
|
if (!isEmptyVal) {
|
|
138
|
-
if (!validRuleValue(rule,
|
|
139
|
+
if (!validRuleValue(rule, currVal, required)) {
|
|
139
140
|
return false
|
|
140
141
|
}
|
|
141
142
|
}
|
|
@@ -519,7 +520,7 @@ hooks.add('tableValidatorModule', {
|
|
|
519
520
|
}
|
|
520
521
|
}
|
|
521
522
|
} else {
|
|
522
|
-
if (!checkRuleStatus(rule, cellValue)) {
|
|
523
|
+
if (!checkRuleStatus(rule, row, cellValue)) {
|
|
523
524
|
internalData.validRuleErr = true
|
|
524
525
|
errorRules.push(new Rule(rule))
|
|
525
526
|
}
|
|
@@ -764,6 +764,9 @@ function handleNumberCell (renderOpts: VxeGlobalRendererHandles.RenderTableDefau
|
|
|
764
764
|
cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`
|
|
765
765
|
}
|
|
766
766
|
} else {
|
|
767
|
+
if (type === 'integer') {
|
|
768
|
+
cellValue = XEUtils.toInteger(cellValue)
|
|
769
|
+
}
|
|
767
770
|
if (showNegativeStatus) {
|
|
768
771
|
if (XEUtils.toNumber(cellValue) < 0) {
|
|
769
772
|
isNegative = true
|
|
@@ -778,6 +781,17 @@ function handleNumberCell (renderOpts: VxeGlobalRendererHandles.RenderTableDefau
|
|
|
778
781
|
: {})
|
|
779
782
|
}
|
|
780
783
|
|
|
784
|
+
function handleFormatDatePicker (renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.TableCellFormatterParams) {
|
|
785
|
+
const { props = {} } = renderOpts
|
|
786
|
+
const { cellValue } = params
|
|
787
|
+
if (cellValue) {
|
|
788
|
+
if (props.type !== 'time') {
|
|
789
|
+
return getLabelFormatDate(cellValue, props)
|
|
790
|
+
}
|
|
791
|
+
}
|
|
792
|
+
return cellValue
|
|
793
|
+
}
|
|
794
|
+
|
|
781
795
|
function handleFormatSelect (renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.TableCellFormatterParams | VxeGlobalRendererHandles.TableCellCopyMethodParams) {
|
|
782
796
|
const { cellValue } = params
|
|
783
797
|
return handleSelectCellValue(cellValue, renderOpts)
|
|
@@ -1007,8 +1021,10 @@ renderer.mixin({
|
|
|
1007
1021
|
cellValue = getLabelFormatDate(cellValue, props)
|
|
1008
1022
|
}
|
|
1009
1023
|
}
|
|
1024
|
+
|
|
1010
1025
|
return getCellLabelVNs(renderOpts, params, cellValue)
|
|
1011
1026
|
},
|
|
1027
|
+
tableCellFormatter: handleFormatDatePicker,
|
|
1012
1028
|
renderTableDefault: defaultEditRender,
|
|
1013
1029
|
createTableFilterOptions: defaultFilterOptions,
|
|
1014
1030
|
renderTableFilter: defaultFilterRender,
|