mirror of
https://gitee.com/xuliangzhan_admin/vxe-table.git
synced 2026-01-21 05:27:57 +08:00
releases 4.7.24
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vxe-table",
|
||||
"version": "4.7.22",
|
||||
"version": "4.7.24",
|
||||
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
|
||||
"scripts": {
|
||||
"update": "npm install --legacy-peer-deps",
|
||||
@@ -28,7 +28,7 @@
|
||||
"style": "lib/style.css",
|
||||
"typings": "types/index.d.ts",
|
||||
"dependencies": {
|
||||
"vxe-pc-ui": "^4.0.20"
|
||||
"vxe-pc-ui": "^4.0.22"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/resize-observer-browser": "^0.1.11",
|
||||
|
||||
@@ -760,7 +760,7 @@ hooks.add('tableEditModule', {
|
||||
let { autofocus, autoselect } = editRender
|
||||
let inputElem
|
||||
if (!autofocus && compRender) {
|
||||
autofocus = compRender.tableAutofocus || compRender.autofocus
|
||||
autofocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus
|
||||
}
|
||||
if (!autoselect && compRender) {
|
||||
autoselect = compRender.tableAutoSelect || compRender.autoselect
|
||||
|
||||
@@ -1287,7 +1287,11 @@ hooks.add('tableExportModule', {
|
||||
const { treeConfig, importConfig } = props
|
||||
const { initStore, importStore, importParams } = reactData
|
||||
const importOpts = computeImportOpts.value
|
||||
const defOpts = Object.assign({ mode: 'insert', message: true, types: XEUtils.keys(importOpts._typeMaps) }, options, importOpts)
|
||||
const defOpts = Object.assign({
|
||||
mode: 'insert',
|
||||
message: true,
|
||||
types: XEUtils.keys(importOpts._typeMaps)
|
||||
}, importOpts, options)
|
||||
const { types } = defOpts
|
||||
const isTree = !!treeConfig
|
||||
if (isTree) {
|
||||
@@ -1327,21 +1331,29 @@ hooks.add('tableExportModule', {
|
||||
},
|
||||
openExport (options: any) {
|
||||
const exportOpts = computeExportOpts.value
|
||||
const defOpts = Object.assign({
|
||||
mode: 'insert',
|
||||
message: true,
|
||||
types: XEUtils.keys(exportOpts._typeMaps)
|
||||
}, exportOpts, options)
|
||||
if (process.env.VUE_APP_VXE_ENV === 'development') {
|
||||
if (!props.exportConfig) {
|
||||
errLog('vxe.error.reqProp', ['export-config'])
|
||||
}
|
||||
}
|
||||
handleExportAndPrint(Object.assign({}, exportOpts, options))
|
||||
handleExportAndPrint(defOpts)
|
||||
},
|
||||
openPrint (options: any) {
|
||||
const printOpts = computePrintOpts.value
|
||||
const defOpts = Object.assign({
|
||||
message: true
|
||||
}, printOpts, options)
|
||||
if (process.env.VUE_APP_VXE_ENV === 'development') {
|
||||
if (!props.printConfig) {
|
||||
errLog('vxe.error.reqProp', ['print-config'])
|
||||
}
|
||||
}
|
||||
handleExportAndPrint(Object.assign({}, printOpts, options), true)
|
||||
handleExportAndPrint(defOpts, true)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -795,7 +795,7 @@ export default defineComponent({
|
||||
emptyContent = $xeTable.callSlot(emptySlot, { $table: $xeTable, $grid: $xeTable.xegrid })
|
||||
} else {
|
||||
const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null
|
||||
const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null
|
||||
const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null
|
||||
if (rtEmptyView) {
|
||||
emptyContent = getSlotVNs(rtEmptyView(emptyOpts, { $table: $xeTable }))
|
||||
} else {
|
||||
|
||||
@@ -6392,7 +6392,7 @@ export default defineComponent({
|
||||
return slots.empty(params)
|
||||
} else {
|
||||
const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null
|
||||
const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null
|
||||
const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null
|
||||
if (rtEmptyView) {
|
||||
return getSlotVNs(rtEmptyView(emptyOpts, params))
|
||||
}
|
||||
|
||||
@@ -3,7 +3,9 @@ import { getFuncText } from './src/utils'
|
||||
|
||||
import type { VxeUploadDefines, VxeGlobalConfig } from 'vxe-pc-ui'
|
||||
|
||||
VxeUI.version = process.env.VUE_APP_VXE_VERSION as string
|
||||
export const version = process.env.VUE_APP_VXE_VERSION as string
|
||||
|
||||
VxeUI.version = version
|
||||
VxeUI.tableVersion = process.env.VUE_APP_VXE_VERSION as string
|
||||
|
||||
VxeUI.setConfig({
|
||||
|
||||
Reference in New Issue
Block a user