|
@@ -2,7 +2,7 @@
|
|
|
* @Author: fxs bjnsfxs@163.com
|
|
|
* @Date: 2024-08-20 18:16:18
|
|
|
* @LastEditors: fxs bjnsfxs@163.com
|
|
|
- * @LastEditTime: 2024-11-28
|
|
|
+ * @LastEditTime: 2024-11-29
|
|
|
* @Description:
|
|
|
*
|
|
|
-->
|
|
@@ -33,14 +33,18 @@ type CustomFilterRef = InstanceType<typeof CustomFilter>
|
|
|
const customFilterRef = ref<CustomFilterRef>()
|
|
|
|
|
|
const { analysisResCode } = useRequest()
|
|
|
-
|
|
|
+/**
|
|
|
+ * 自定义筛选重置有问题!!!!!!!!!!!!!!!
|
|
|
+ * */
|
|
|
const {
|
|
|
customFilterDialog,
|
|
|
customFilterInfo,
|
|
|
customFilterList,
|
|
|
activeCustomFilterKey,
|
|
|
initCustomFilterInfo,
|
|
|
+ resetCustomFilterList,
|
|
|
openCustomFilter,
|
|
|
+ openedInit,
|
|
|
confirmCustomFilter
|
|
|
} = useCustomFilter(customFilterRef)
|
|
|
// 节流的延迟时间
|
|
@@ -256,13 +260,11 @@ const resetTableData = () => {
|
|
|
* @description 按条件查询,如果开启了分页查询,那么会直接重新查询数据,否则,会根据现有数据进行查询
|
|
|
*/
|
|
|
const queryTableData = () => {
|
|
|
- console.log(props.openRemoteQuery, props.requestConfig)
|
|
|
if (props.openRemoteQuery && props.requestConfig) {
|
|
|
reqConfig.otherOptions = { ...props.requestConfig.otherOptions, ...queryFormData }
|
|
|
// 需要在查询前清除掉目前的数据,不然会导致之前缓存的数据混入
|
|
|
// 比如第一页已经缓存了,在第二页重新查询,在切回第一页,还是显示查询前的数据,因为缓存没被清除
|
|
|
tableData.splice(0, tableData.length)
|
|
|
- console.log('执行')
|
|
|
getData()
|
|
|
} else {
|
|
|
let filteredTable: any[]
|
|
@@ -301,7 +303,8 @@ const resetQueryFormData = () => {
|
|
|
* @description: 重置整个查询表单,重置后,再请求一次全部表格
|
|
|
*/
|
|
|
const resetQueryForm = () => {
|
|
|
- resetQueryFormData()
|
|
|
+ resetQueryFormData() // 重置查询表单
|
|
|
+ initCustomFilterInfo(customFieldsList) // 重置自定义表单数据
|
|
|
throttleQueryTableData()
|
|
|
}
|
|
|
|
|
@@ -314,7 +317,6 @@ const throttleResetQueryForm = throttleFunc(resetQueryForm, throttleTime)
|
|
|
* @param rowData 插入的数据
|
|
|
*/
|
|
|
const insertRow = (start: number, rowData: any) => {
|
|
|
- console.log(tableData)
|
|
|
if (props.openRemoteQuery) {
|
|
|
tableData[start].splice(0, 0, rowData)
|
|
|
} else {
|
|
@@ -562,6 +564,13 @@ const numberInput = (key: string) => {
|
|
|
queryFormData[key] = val
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+ * 接收重置表单命令
|
|
|
+ */
|
|
|
+const resetCustomFilterData = () => {
|
|
|
+ resetCustomFilterList(FormData)
|
|
|
+}
|
|
|
+
|
|
|
// 定义暴露出去的方法
|
|
|
defineExpose({
|
|
|
getData,
|
|
@@ -707,10 +716,16 @@ onMounted(() => {
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-dialog v-model="customFilterDialog" title="自定义筛选条件" width="800">
|
|
|
+ <el-dialog
|
|
|
+ v-model="customFilterDialog"
|
|
|
+ title="自定义筛选条件"
|
|
|
+ width="800"
|
|
|
+ @open="openedInit"
|
|
|
+ >
|
|
|
<CustomFilter
|
|
|
:custom-filter-list="customFilterList[activeCustomFilterKey]"
|
|
|
:filter="customFilterInfo[activeCustomFilterKey]"
|
|
|
+ @reset-filter-list="resetCustomFilterData"
|
|
|
ref="customFilterRef"
|
|
|
></CustomFilter>
|
|
|
<template #footer>
|