From 76d7d384741f5d1e7f2cd8564aba13974d983ee1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 18:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/base/BaseTable.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/base/BaseTable.vue b/admin/src/components/base/BaseTable.vue
index ccdafc0..e5d5f9d 100644
--- a/admin/src/components/base/BaseTable.vue
+++ b/admin/src/components/base/BaseTable.vue
@@ -39,7 +39,8 @@
pageSize: 10,
total: 0
}
- }
+ },
+ tableHeight: 400
}
},
methods: {
@@ -51,7 +52,13 @@
if (extParams.api == null) {
throw new Error('Missing config option \'api\'.')
}
- this.api = require('@/api' + extParams.api)
+
+ if(extParams.api.indexOf('@/',0) === 0){
+ this.api = require(extParams.api)
+ }else {
+ this.api = require('@/api' + extParams.api)
+ }
+ // this.api = require('@/api' + extParams.api)
extParams.module && (this.module = extParams.module)
extParams['field.id'] && (this.configData['field.id'] = extParams['field.id'])
extParams['field.main'] && (this.configData['field.main'] = extParams['field.main'])
@@ -126,7 +133,7 @@
this.tableData.pagination.total = data.total
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.search = false
@@ -150,7 +157,7 @@
this.__afterDelete()
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
@@ -189,7 +196,7 @@
this.__afterDelete(this.tableData.selectedRows.length)
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
@@ -214,4 +221,4 @@
}
}
}
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3