From fecc7305a48f8ce6e283434718da33e143885c75 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 09 四月 2024 10:03:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue index 9d7d32f..c15d92f 100644 --- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue +++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue @@ -1,6 +1,13 @@ <template> <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid"> - <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡</div> + <el-alert + class="alert" + v-if="isError" + title="鑷畾涔夌粍浠堕厤缃俊鎭敊璇紒" + type="error" + show-icon + description="杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡"> + </el-alert> <component v-else :is="currentComponent" :btmType="btmType" :content="content" @@ -115,6 +122,6 @@ } </script> -<style scoped> +<style scoped lang="scss"> </style> -- Gitblit v1.9.3