From 69ed56e344e9d976b1dc4d9760e53d56f2706746 Mon Sep 17 00:00:00 2001 From: my_key <70793915+q8018414@users.noreply.github.com> Date: Wed, 14 May 2025 11:12:40 +0800 Subject: [PATCH 1/2] Update baTable.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修改initComSearch合并form的先后顺序.以保证初始化前可以使用setComSearchData,保证首屏加载数据搜索条件生效 2.修改mount中对于filter!.search的合并,保证setComSearchData与原始数据能有效合并生效 --- web/src/utils/baTable.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/utils/baTable.ts b/web/src/utils/baTable.ts index 23db8f427..bbf22258c 100644 --- a/web/src/utils/baTable.ts +++ b/web/src/utils/baTable.ts @@ -497,10 +497,10 @@ export default class baTable { if (this.table.acceptQuery && !isEmpty(route.query)) { // 根据当前 URL 的 query 初始化公共搜索默认值 this.setComSearchData(route.query) - - // 获取公共搜索数据合并至表格筛选条件 - this.table.filter!.search = this.getComSearchData().concat(this.table.filter?.search ?? []) } + + // 获取公共搜索数据合并至表格筛选条件 + this.table.filter!.search = this.getComSearchData().concat(this.table.filter?.search ?? []) } /** @@ -546,7 +546,7 @@ export default class baTable { } } - this.comSearch.form = Object.assign(this.comSearch.form, form) + this.comSearch.form = Object.assign(form, this.comSearch.form) } /** From dad8aed09948b50135d830df93c8dafef17aef7e Mon Sep 17 00:00:00 2001 From: key <495214601@qq.com> Date: Fri, 16 May 2025 10:10:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84loading=E6=8E=A7=E5=88=B6=20?= =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=BE=83=E9=95=BF=E6=97=B6=E9=97=B4=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/table/fieldRender/buttons.vue | 5 +++++ web/types/table.d.ts | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/web/src/components/table/fieldRender/buttons.vue b/web/src/components/table/fieldRender/buttons.vue index 96dca8a19..87b17ea25 100644 --- a/web/src/components/table/fieldRender/buttons.vue +++ b/web/src/components/table/fieldRender/buttons.vue @@ -10,6 +10,7 @@ :class="btn.class" class="ba-table-render-buttons-item" :type="btn.type" + :loading="btn.loading && btn.loading(row, field)" :disabled="btn.disabled && btn.disabled(row, field)" v-bind="btn.attr" > @@ -31,6 +32,7 @@ :class="btn.class" class="ba-table-render-buttons-item" :type="btn.type" + :loading="btn.loading && btn.loading(row, field)" :disabled="btn.disabled && btn.disabled(row, field)" v-bind="btn.attr" > @@ -42,6 +44,7 @@ @@ -82,6 +86,7 @@ :class="btn.class" class="ba-table-render-buttons-item move-button" :type="btn.type" + :loading="btn.loading && btn.loading(row, field)" :disabled="btn.disabled && btn.disabled(row, field)" v-bind="btn.attr" > diff --git a/web/types/table.d.ts b/web/types/table.d.ts index 637d2aa56..cba41ae03 100644 --- a/web/types/table.d.ts +++ b/web/types/table.d.ts @@ -392,6 +392,13 @@ declare global { */ disabled?: (row: TableRow, field: TableColumn) => boolean + /** + * 按钮点击是否在加载中（请返回布尔值） + * @param row 当前行数据 + * @param field 当前列数据 + */ + loading?: (row: TableRow, field: TableColumn) => boolean + /** * 自定义 el-button 的其他属性 */