|
|
@@ -2,7 +2,7 @@
|
|
|
* @Author: fxs bjnsfxs@163.com
|
|
|
* @Date: 2024-08-20 18:16:18
|
|
|
* @LastEditors: fxs bjnsfxs@163.com
|
|
|
- * @LastEditTime: 2024-09-18 12:00:45
|
|
|
+ * @LastEditTime: 2024-09-18 14:45:33
|
|
|
* @FilePath: \Game-Backstage-Management-System\src\components\Table.vue
|
|
|
* @Description:
|
|
|
*
|
|
|
@@ -136,7 +136,6 @@ const handleSizeChange = (val: number) => {
|
|
|
const getData = () => {
|
|
|
return new Promise(async (resolve, reject) => {
|
|
|
try {
|
|
|
- Object.assign(queryFormData, JSON.parse(JSON.stringify(backupQueryFormData)))
|
|
|
const loadTableData = async () => {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
if (props.dataList) {
|
|
|
@@ -263,9 +262,17 @@ const queryTableData = () => {
|
|
|
*/
|
|
|
const resetQueryForm = (formEl: FormInstance | undefined) => {
|
|
|
if (!formEl) return
|
|
|
- // clearReactiveData(queryFormData)
|
|
|
- // queryFormData
|
|
|
- Object.assign(queryFormData, JSON.parse(JSON.stringify(backupQueryFormData)))
|
|
|
+
|
|
|
+ // 使用函数返回保存的备份信息，这样可以正确的给queryformdata赋值
|
|
|
+ // JSON.stringify()第二个参数可以用来处理undefined的情况，第一个参数设置为_可以避免ts检查
|
|
|
+ function resetFormData() {
|
|
|
+ let data = JSON.parse(
|
|
|
+ JSON.stringify(backupQueryFormData, (_, v) => (typeof v === 'undefined' ? '' : v))
|
|
|
+ )
|
|
|
+ return data
|
|
|
+ }
|
|
|
+ Object.assign(queryFormData, resetFormData())
|
|
|
+
|
|
|
queryTableData()
|
|
|
}
|
|
|
|
|
|
@@ -423,9 +430,8 @@ const initReqConfig = () => {
|
|
|
const initFormData = () => {
|
|
|
props.queryInfo?.map((item: any) => {
|
|
|
queryFormData[item.name] = item.default
|
|
|
+ backupQueryFormData[item.name] = item.default
|
|
|
})
|
|
|
- // backupQueryFormData = JSON.parse(JSON.stringify(queryFormData))
|
|
|
- Object.assign(backupQueryFormData, JSON.parse(JSON.stringify(queryFormData)))
|
|
|
}
|
|
|
|
|
|
/**
|
