Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Jun 14, 2024
1 parent 8a9c82c commit af22f2a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.7.14",
"version": "4.7.15",
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down Expand Up @@ -28,7 +28,7 @@
"style": "lib/style.css",
"typings": "types/index.d.ts",
"dependencies": {
"vxe-pc-ui": "^4.0.12"
"vxe-pc-ui": "^4.0.13"
},
"devDependencies": {
"@types/resize-observer-browser": "^0.1.11",
Expand Down
3 changes: 3 additions & 0 deletions packages/table/src/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3768,6 +3768,9 @@ export default defineComponent({
return nextTick()
},
hasPendingByRow (row) {
return tableMethods.isPendingByRow(row)
},
isPendingByRow (row) {
const { pendingRowMaps } = reactData
const rowid = getRowid($xeTable, row)
return !!pendingRowMaps[rowid]
Expand Down
26 changes: 20 additions & 6 deletions packages/ui/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { VxeUI } from '@vxe-ui/core'

import type { VxeUploadDefines, VxeGlobalConfig } from 'vxe-pc-ui'

VxeUI.version = process.env.VUE_APP_VXE_VERSION as string
VxeUI.tableVersion = process.env.VUE_APP_VXE_VERSION as string

Expand Down Expand Up @@ -267,31 +269,43 @@ export const use = VxeUI.use
* 已废弃
* @deprecated
*/
export const setup = VxeUI.setup
export const setup = (options?: VxeGlobalConfig) => {
return VxeUI.setup(options)
}
/**
* 已废弃
* @deprecated
*/
export const config = VxeUI.config
export const config = (options?: VxeGlobalConfig) => {
return VxeUI.config(options)
}
/**
* 已废弃
* @deprecated
*/
export const t = VxeUI.t
export const t = (key: string, args?: any) => {
return VxeUI.t(key, args)
}
/**
* 已废弃
* @deprecated
*/
export const _t = VxeUI._t
export const _t = (key: string, args?: any) => {
return VxeUI._t(key, args)
}

/**
* 已废弃,兼容老版本
* @deprecated
*/
export const VXETable = VxeUI

export const saveFile = VxeUI.readFile
export const readFile = VxeUI.readFile
export const saveFile: VxeUploadDefines.SaveFileFunction = (options) => {
return VxeUI.saveFile(options)
}
export const readFile: VxeUploadDefines.ReadFileFunction = (options) => {
return VxeUI.readFile(options)
}

export {
VxeUI
Expand Down

0 comments on commit af22f2a

Please sign in to comment.