|
|
@@ -332,25 +332,26 @@
|
|
|
}
|
|
|
}
|
|
|
/** 查询按钮 */
|
|
|
- function handleQuery() {
|
|
|
+ function handleQuery(query?: any) {
|
|
|
+ query = query || tableRef.value?.getQueryParams() || queryParams.value
|
|
|
{{- range .Columns -}}
|
|
|
{{- if ( eq .GoField "CreatedAt")}}
|
|
|
- addDateRange(queryParams.value, queryParams.value.dateRange)
|
|
|
+ addDateRange(query, query.dateRange)
|
|
|
{{- else if and (eq .IsQuery "1") (eq .HtmlType "datetime")}}
|
|
|
- addDateRange(queryParams.value, queryParams.value.dateRange{{.BJsonField}})
|
|
|
+ addDateRange(query, query.dateRange{{.BJsonField}})
|
|
|
{{- end -}}
|
|
|
{{- end }}
|
|
|
- tableRef.value?.search()
|
|
|
+ tableRef.value?.query(query)
|
|
|
}
|
|
|
/** 查询重置按钮 */
|
|
|
- function resetQuery() {
|
|
|
+ function resetQuery(query?: any) {
|
|
|
{{- range .Columns -}}
|
|
|
{{- if ( eq .GoField "CreatedAt")}}
|
|
|
- queryParams.value.dateRange = []
|
|
|
- addDateRange(queryParams.value, queryParams.value.dateRange)
|
|
|
+ query.dateRange = []
|
|
|
+ addDateRange(query, query.dateRange)
|
|
|
{{- else if and (eq .IsQuery "1") (eq .HtmlType "datetime")}}
|
|
|
- queryParams.value.dateRange{{.BJsonField}} = []
|
|
|
- addDateRange(queryParams.value, queryParams.value.dateRange{{.BJsonField}})
|
|
|
+ query.dateRange{{.BJsonField}} = []
|
|
|
+ addDateRange(query, query.dateRange{{.BJsonField}})
|
|
|
{{- end -}}
|
|
|
{{- end }}
|
|
|
}
|