From ae54a2b98295a7bb806067d170fb67c236e0dd31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Tue, 27 Feb 2024 17:20:16 +0800
Subject: [PATCH] no message

---
 src/components/xFileExport/index.vue | 2 +-
 src/views/table/2/index.vue          | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/xFileExport/index.vue b/src/components/xFileExport/index.vue
index 2594801..3be9183 100644
--- a/src/components/xFileExport/index.vue
+++ b/src/components/xFileExport/index.vue
@@ -167,7 +167,7 @@ export default {
 					this.dialog = false
 					this.$msgbox({
 						title: "成功发起任务",
-						message: `<div><img style="height:200px" src="@/assets/img/tasks-example.png"/></div><p>已成功发起导出任务，您可以操作其他事务</p><p>稍后可在 <b>任务中心</b> 查看执行结果</p>`,
+						message: es.message || `<p>已成功发起导出任务，您可以操作其他事务</p><p>稍后可在 <b>任务中心</b> 查看执行结果</p>`,
 						type: "success",
 						confirmButtonText: "知道了",
 						dangerouslyUseHTMLString: true,
diff --git a/src/views/table/2/index.vue b/src/views/table/2/index.vue
index f6ed29c..6e2b4bf 100644
--- a/src/views/table/2/index.vue
+++ b/src/views/table/2/index.vue
@@ -12,7 +12,7 @@
 						</el-button>
 						<x-file-export v-if="displayHandle()" v-bind="operation.export" :data="exportdata">
 							<template #default="{ open }">
-								<el-button type="info" icon="x-icon-download" @click="open">导出</el-button>
+								<el-button type="info" icon="x-icon-download" @click="open">{{ operation.export.name || '导出'}}</el-button>
 							</template>
 							<template #form="{ formData }">
 								<el-form-item label="导出条数限制" v-if="formData.limit">
@@ -187,8 +187,11 @@ export default {
 	},
 	methods: {
 		displayHandle() {
-			if (this.$refs.table.total && this.operation.export && this.operation.export.showhandle) {
-				return eval(this.operation.export.showhandle.replace(/\$/g, "this.search")) // $.id==1  $.ids.includes("4")
+			if (this.$refs.table.total && this.operation.export) {
+				if (this.operation.export.showhandle) {
+					return eval(this.operation.export.showhandle.replace(/\$/g, "this.search")) // $.id==1  $.ids.includes("4")
+				}
+				return true;
 			}
 			return false;
 		},