From 8d1f2f2e82f3f7512930c536e91ee7c92315f3d6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 19:55:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/base/BaseTable.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/base/BaseTable.vue b/admin/src/components/base/BaseTable.vue
index ccdafc0..4425ae6 100644
--- a/admin/src/components/base/BaseTable.vue
+++ b/admin/src/components/base/BaseTable.vue
@@ -39,10 +39,12 @@
pageSize: 10,
total: 0
}
- }
+ },
+ tableHeight: 400
}
},
methods: {
+
// 閰嶇疆
config (extParams) {
if (extParams == null) {
@@ -51,7 +53,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 +134,7 @@
this.tableData.pagination.total = data.total
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.search = false
@@ -150,7 +158,7 @@
this.__afterDelete()
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
@@ -189,7 +197,7 @@
this.__afterDelete(this.tableData.selectedRows.length)
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
--
Gitblit v1.9.3