修复调用清除筛选函数报错问题

This commit is contained in:
xuliangzhan
2021-08-12 23:22:48 +08:00
parent 5066cf1390
commit 29490a4e98
23 changed files with 68 additions and 62 deletions

View File

@@ -82,7 +82,12 @@ gulp.task('build_modules', () => {
}))
.pipe(gulp.dest('es'))
.pipe(babel({
presets: ['@babel/env']
presets: [
'@babel/env'
],
plugins: [
'@babel/plugin-proposal-class-properties'
]
}))
.pipe(gulp.dest('lib'))
.pipe(uglify())

View File

@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.0.25",
"version": "4.0.26",
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
"scripts": {
"serve": "vue-cli-service serve",
@@ -29,9 +29,9 @@
"style": "lib/style.css",
"typings": "types/index.d.ts",
"devDependencies": {
"@types/qrcode": "^1.4.0",
"@types/resize-observer-browser": "^0.1.5",
"@types/sortablejs": "^1.10.6",
"@types/qrcode": "^1.4.1",
"@types/resize-observer-browser": "^0.1.6",
"@types/sortablejs": "^1.10.7",
"@typescript-eslint/eslint-plugin": "^4.18.0",
"@typescript-eslint/parser": "^4.18.0",
"@vue/cli-plugin-babel": "~4.5.0",
@@ -40,13 +40,13 @@
"@vue/cli-plugin-typescript": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/compiler-sfc": "^3.1.4",
"@vue/compiler-sfc": "^3.2.2",
"@vue/eslint-config-standard": "^5.1.2",
"@vue/eslint-config-typescript": "^7.0.0",
"ant-design-vue": "^2.1.6",
"ant-design-vue": "^2.2.6",
"core-js": "^3.6.5",
"dayjs": "^1.10.4",
"element-plus": "^1.0.2-beta.48",
"dayjs": "^1.10.6",
"element-plus": "^1.0.2-beta.70",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
@@ -67,18 +67,18 @@
"gulp-sourcemaps": "^2.6.5",
"gulp-typescript": "^5.0.1",
"gulp-uglify": "^3.0.2",
"highlight.js": "^10.5.0",
"highlight.js": "^11.2.0",
"jsbarcode": "^3.11.0",
"jspdf": "^2.1.1",
"jspdf": "^2.3.1",
"node-sass": "^4.14.0",
"qrcode": "^1.4.4",
"sass-loader": "^8.0.2",
"sortablejs": "^1.13.0",
"typescript": "~4.1.5",
"vue": "^3.1.4",
"vue-i18n": "^9.0.0",
"vue-router": "^4.0.4",
"vuex": "^4.0.0",
"sortablejs": "^1.14.0",
"typescript": "~4.3.5",
"vue": "^3.2.2",
"vue-i18n": "^9.1.7",
"vue-router": "^4.0.11",
"vuex": "^4.0.2",
"vxe-table-plugin-antd": "^3.0.3",
"vxe-table-plugin-element": "^3.0.3",
"vxe-table-plugin-export-pdf": "^3.0.2",
@@ -92,7 +92,7 @@
"xlsx": "^0.17.0"
},
"peerDependencies": {
"vue": "^3.1.1",
"vue": "^3.2.2",
"xe-utils": "^3.2.0"
},
"vetur": {

View File

@@ -76,14 +76,14 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<ButtonReactData>({
inited: false,
showPanel: false,
animatVisible: false,
panelIndex: 0,
panelStyle: {},
panelPlacement: ''
} as ButtonReactData)
})
const internalData: ButtonInternalData = {
showTime: null
@@ -104,7 +104,7 @@ export default defineComponent({
reactData,
internalData,
getRefMaps: () => refMaps
} as VxeButtonConstructor
} as unknown as VxeButtonConstructor
let buttonMethods = {} as ButtonMethods

View File

@@ -32,7 +32,7 @@ export default defineComponent({
xID,
props,
context
} as VxeCheckboxConstructor
} as unknown as VxeCheckboxConstructor
let checkboxMethods = {} as CheckboxMethods

View File

@@ -25,7 +25,7 @@ export default defineComponent({
xID,
props,
context
} as VxeCheckboxGroupConstructor & VxeCheckboxGroupPrivateMethods
} as unknown as VxeCheckboxGroupConstructor & VxeCheckboxGroupPrivateMethods
useSize(props)

View File

@@ -220,7 +220,7 @@ export default defineComponent({
'is--active': filterStore.visible
}],
style: filterStore.style
}, initStore.filter ? renderOptions(filterRender, compConf).concat(renderFooters()) : [])
}, initStore.filter && filterStore.visible ? renderOptions(filterRender, compConf).concat(renderFooters()) : [])
}
return renderVN

View File

@@ -95,20 +95,20 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<FormReactData>({
collapseAll: true,
staticItems: [],
formItems: []
} as FormReactData)
})
const internalData = reactive({
const internalData = reactive<FormInternalData>({
tooltipTimeout: null,
tooltipActive: false,
tooltipStore: {
item: null,
visible: false
}
} as FormInternalData)
})
const refElem = ref() as Ref<HTMLFormElement>
const refTooltip = ref() as Ref<VxeTooltipInstance>
@@ -123,7 +123,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxeFormConstructor & VxeFormPrivateMethods
} as unknown as VxeFormConstructor & VxeFormPrivateMethods
let formMethods = {} as FormMethods

View File

@@ -157,7 +157,7 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<InputReactData>({
inited: false,
panelIndex: 0,
showPwd: false,
@@ -173,7 +173,7 @@ export default defineComponent({
datePanelType: 'day',
selectMonth: null,
currentDate: null
} as InputReactData)
})
const refElem = ref() as Ref<HTMLDivElement>
const refInputTarget = ref() as Ref<HTMLInputElement>
@@ -191,7 +191,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxeInputConstructor
} as unknown as VxeInputConstructor
let inputMethods = {} as InputMethods

View File

@@ -67,7 +67,7 @@ export default defineComponent({
reactData,
internalData,
getRefMaps: () => refMaps
} as VxeListConstructor & VxeListMethods
} as unknown as VxeListConstructor & VxeListMethods
let listMethods = {} as ListMethods

View File

@@ -76,7 +76,7 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<ModalReactData>({
inited: false,
visible: false,
contentVisible: false,
@@ -84,7 +84,7 @@ export default defineComponent({
modalZindex: 0,
zoomLocat: null,
firstOpen: false
} as ModalReactData)
})
const refElem = ref() as Ref<HTMLDivElement>
const refModalBox = ref() as Ref<HTMLDivElement>
@@ -101,7 +101,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxeModalConstructor & VxeModalMethods
} as unknown as VxeModalConstructor & VxeModalMethods
let modalMethods = {} as ModalMethods

View File

@@ -68,7 +68,7 @@ export default defineComponent({
props,
context,
getRefMaps: () => refMaps
} as VxePagerConstructor & VxePagerPrivateMethods
} as unknown as VxePagerConstructor & VxePagerPrivateMethods
let pagerMethods = {} as PagerMethods
let pagerPrivateMethods = {} as PagerPrivateMethods

View File

@@ -27,7 +27,7 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<PulldownReactData>({
inited: false,
panelIndex: 0,
panelStyle: null,
@@ -35,7 +35,7 @@ export default defineComponent({
visiblePanel: false,
animatVisible: false,
isActivated: false
} as PulldownReactData)
})
const refElem = ref() as Ref<HTMLDivElement>
const refPulldowContent = ref() as Ref<HTMLDivElement>
@@ -51,7 +51,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxePulldownConstructor & VxePulldownMethods
} as unknown as VxePulldownConstructor & VxePulldownMethods
let pulldownMethods = {} as PulldownMethods

View File

@@ -31,7 +31,7 @@ export default defineComponent({
xID,
props,
context
} as VxeRadioButtonConstructor
} as unknown as VxeRadioButtonConstructor
let radioButtonMethods = {} as RadioButtonMethods

View File

@@ -26,7 +26,7 @@ export default defineComponent({
props,
context,
name: XEUtils.uniqueId('xegroup_')
} as VxeRadioGroupConstructor & VxeRadioGroupPrivateMethods
} as unknown as VxeRadioGroupConstructor & VxeRadioGroupPrivateMethods
let radioGroupMethods = {} as RadioGroupMethods

View File

@@ -30,7 +30,7 @@ export default defineComponent({
xID,
props,
context
} as VxeRadioConstructor
} as unknown as VxeRadioConstructor
const computeSize = useSize(props)

View File

@@ -51,7 +51,7 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<SelectReactData>({
inited: false,
staticOptions: [],
fullGroupList: [],
@@ -65,7 +65,7 @@ export default defineComponent({
visiblePanel: false,
animatVisible: false,
isActivated: false
} as SelectReactData)
})
const refElem = ref() as Ref<HTMLDivElement>
const refInput = ref() as Ref<VxeInputConstructor>
@@ -82,7 +82,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxeSelectConstructor & VxeSelectMethods
} as unknown as VxeSelectConstructor & VxeSelectMethods
let selectMethods = {} as SelectMethods

View File

@@ -32,18 +32,18 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<SwitchReactData>({
isActivated: false,
hasAnimat: false,
offsetLeft: 0
} as SwitchReactData)
})
const $xeswitch = {
xID,
props,
context,
reactData
} as VxeSwitchConstructor
} as unknown as VxeSwitchConstructor
const refButton = ref() as Ref<HTMLButtonElement>

View File

@@ -35,7 +35,7 @@ export default defineComponent({
const instance = getCurrentInstance()
const reactData = reactive({
const reactData = reactive<TableReactData>({
// 低性能的静态列
staticColumns: [],
// 渲染的列分组
@@ -213,7 +213,7 @@ export default defineComponent({
isHeader: false,
isFooter: false
}
} as TableReactData)
})
const internalData: TableInternalData = {
tZindex: 0,
@@ -578,7 +578,7 @@ export default defineComponent({
getComputeMaps: () => computeMaps,
xegrid: $xegrid
} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods
} as unknown as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods
const eqCellValue = (row1: any, row2: any, field: string) => {
const val1 = XEUtils.get(row1, field)

View File

@@ -44,9 +44,9 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<TextareaReactData>({
inputValue: props.modelValue
} as TextareaReactData)
})
const refElem = ref() as Ref<HTMLDivElement>
const refTextarea = ref() as Ref<HTMLTextAreaElement>
@@ -62,7 +62,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxeTextareaConstructor
} as unknown as VxeTextareaConstructor
let textareaMethods = {} as TextareaMethods

View File

@@ -36,10 +36,10 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<ToolbarReactData>({
isRefresh: false,
columns: []
} as ToolbarReactData)
})
const refElem = ref() as Ref<HTMLDivElement>
const refCustomWrapper = ref() as Ref<HTMLDivElement>
@@ -62,7 +62,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxeToolbarConstructor
} as unknown as VxeToolbarConstructor
let toolbarMethods = {} as ToolbarMethods

View File

@@ -31,7 +31,7 @@ export default defineComponent({
const computeSize = useSize(props)
const reactData = reactive({
const reactData = reactive<TooltipReactData>({
target: null,
isUpdate: false,
isHover: false,
@@ -44,7 +44,7 @@ export default defineComponent({
placement: '',
arrowStyle: {}
}
} as TooltipReactData)
})
const refElem = ref() as Ref<HTMLDivElement>
@@ -58,7 +58,7 @@ export default defineComponent({
context,
reactData,
getRefMaps: () => refMaps
} as VxeTooltipConstructor
} as unknown as VxeTooltipConstructor
let tooltipMethods = {} as TooltipMethods

1
types/pulldown.d.ts vendored
View File

@@ -27,7 +27,6 @@ export interface PulldownReactData {
panelIndex: number;
panelStyle: VNodeStyle | null;
panelPlacement: string | null;
currentValue: null;
visiblePanel: boolean;
animatVisible: boolean;
isActivated: boolean;

2
types/table.d.ts vendored
View File

@@ -872,6 +872,7 @@ export interface TableReactData {
isPrint: boolean;
hasFooter: boolean;
hasMerge: boolean;
hasTree: boolean;
hasColgroup: boolean;
visible: boolean;
},
@@ -882,6 +883,7 @@ export interface TableReactData {
type: any;
isColgroup: boolean;
isMerge: boolean;
isAllExpand: boolean;
useStyle: boolean;
original: boolean;
message: boolean;