From 33880145617845479c6e3ba9d069eb9935d8d2ce Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 14 十一月 2023 16:27:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/packages/components/zt-dialog/src/zt-dialog.vue | 3 ++-
1 files changed, 2 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 d7c970f..092aec8 100644
--- a/web/packages/components/zt-dialog/src/zt-dialog.vue
+++ b/web/packages/components/zt-dialog/src/zt-dialog.vue
@@ -16,7 +16,7 @@
<el-button type="primary" @click="formSubmit()" v-preventReClick v-show="editAble && hasConfirm">{{ $t('confirm')
}}
</el-button>
- <el-button type="primary" @click="close()" v-show="!editAble">{{ $t('close') }}</el-button>
+ <el-button type="info" @click="close()" v-show="!editAble">{{ $t('close') }}</el-button>
<slot name="footer"></slot>
</template>
</el-dialog>
@@ -85,6 +85,7 @@
}
if (this.$parent.init) {
+ console.log(id,row,'id row')
this.$parent.init(id, row)
}
if (id && this.$parent.getInfo) {
--
Gitblit v1.9.1