From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/packages/components/zt-dialog/src/zt-dialog.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/web/packages/components/zt-dialog/src/zt-dialog.vue b/web/packages/components/zt-dialog/src/zt-dialog.vue
index 513cb98..edfeda4 100644
--- a/web/packages/components/zt-dialog/src/zt-dialog.vue
+++ b/web/packages/components/zt-dialog/src/zt-dialog.vue
@@ -82,10 +82,13 @@
computed: {
_title() {
if (this.title) {
+ console.log(this.title,'this.title')
return this.title
- } else if (!this.editAble) {
+ } else if (this.isView) {
+ console.log(this.editAble,'this.editAble')
return this.$t('view')
} else if (this.$parent.dataForm !== undefined) {
+ console.log(this.$parent.dataForm,'this.$parent.dataForm')
return !this.$parent.dataForm.id ? this.$t('add') : this.$t('update')
}
}
--
Gitblit v1.9.1