1
0
mirror of synced 2025-12-08 06:38:39 +08:00

releases 4.7.41

This commit is contained in:
xuliangzhan
2024-07-03 16:57:43 +08:00
parent 136c68ad48
commit 38964833e3
7 changed files with 16 additions and 14 deletions

View File

@@ -134,10 +134,10 @@ export default {
},
import: {
modes: {
covering: 'Overwrite mode (directly overwrite table data)',
insert: 'Bottom append (appends new data to the bottom of the table)',
insertTop: 'Top append (appends new data to the top of the table)',
insertBottom: 'Bottom append (appends new data to the bottom of the table)'
covering: '覆盖方式(直接覆盖表格数据)',
insert: '底部追加(在表格的底部追加新数据)',
insertTop: '顶部追加(在表格的顶部追加新数据)',
insertBottom: '底部追加(在表格的底部追加新数据)'
},
impTitle: '导入数据',
impFile: '文件名',

View File

@@ -279,7 +279,7 @@ function checkImportData (columns: any[], fields: string[]) {
return fields.some(field => tableFields.indexOf(field) > -1)
}
const tableExportMethodKeys: (keyof TableExportMethods)[] = ['exportData', 'importByFile', 'importData', 'saveFile', 'readFile', 'print', 'openImport', 'openExport', 'openPrint']
const tableExportMethodKeys: (keyof TableExportMethods)[] = ['exportData', 'importByFile', 'importData', 'saveFile', 'readFile', 'print', 'getPrintHtml', 'openImport', 'openExport', 'openPrint']
hooks.add('tableExportModule', {
setupTable ($xeTable) {

View File

@@ -3,6 +3,7 @@ import XEUtils from 'xe-utils'
import { VxeUI } from '../../../ui'
import { toFilters, handleFieldOrColumn } from '../../src/util'
import { getDomNode, triggerEvent } from '../../../ui/src/dom'
import { isEnableConf } from '../../../ui/src/utils'
import type { TableFilterMethods, TableFilterPrivateMethods } from '../../../../types'
@@ -39,7 +40,7 @@ hooks.add('tableFilterModule', {
const { target: targetElem, pageX } = evnt
const { visibleWidth } = getDomNode()
const { filters, filterMultiple, filterRender } = column
const compConf = filterRender ? renderer.get(filterRender.name) : null
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null)
internalData._currFilterParams = params
Object.assign(filterStore, {
@@ -118,7 +119,7 @@ hooks.add('tableFilterModule', {
if (column) {
const { filters, filterRender } = column
if (filters) {
const compConf = filterRender ? renderer.get(filterRender.name) : null
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
const frMethod = column.filterResetMethod || (compConf ? (compConf.tableFilterResetMethod || compConf.filterResetMethod) : null)
filters.forEach((item: any) => {
item._checked = false

View File

@@ -1,6 +1,6 @@
import { defineComponent, h, computed, inject } from 'vue'
import { VxeUI } from '../../../ui'
import { formatText } from '../../../ui/src/utils'
import { formatText, isEnableConf } from '../../../ui/src/utils'
import { getPropClass } from '../../../ui/src/dom'
import { getSlotVNs } from '../../../ui/src/vn'
@@ -190,8 +190,8 @@ export default defineComponent({
const { column, multiple } = filterStore
const filterOpts = computeFilterOpts.value
const hasCheckOption = computeHasCheckOption.value
const filterRender = column.filterRender
const compConf = filterRender ? renderer.get(filterRender.name) : null
const { filterRender } = column
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate
return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true)
? [
@@ -218,7 +218,7 @@ export default defineComponent({
const { initStore } = tableReactData
const { column } = filterStore
const filterRender = column ? column.filterRender : null
const compConf = filterRender ? renderer.get(filterRender.name) : null
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : ''
const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable })
return h('div', {

View File

@@ -119,6 +119,7 @@ export default defineComponent({
$xeTable.saveCustomStore('update:visible')
$xeTable.updateCellAreas()
$xeTable.dispatchEvent('resizable-change', { ...params, resizeWidth }, evnt)
setTimeout(() => $xeTable.recalculate(true), 300)
})
removeClass(tableEl, 'drag--resize')
}

View File

@@ -1364,7 +1364,7 @@ export default defineComponent({
const handleFilter = (row: any) => {
return filterColumns.every(({ column, valueList, itemList }) => {
const { filterMethod, filterRender } = column
const compConf = filterRender ? renderer.get(filterRender.name) : null
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
const compFilterMethod = compConf ? (compConf.tableFilterMethod || compConf.filterMethod) : null
const tdFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
const cellValue = getCellValue(row, column)