From b39c8dcafbe0b169781d7033527919dc4b42beb1 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 22 Nov 2023 10:20:36 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=A8=A1=E6=9D=BF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=9A=84=E6=A0=87=E9=A2=98=E9=94=99=E8=AF=AF=20=20=20?=
 =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]#[1029000070135808]=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=A8=A1=E6=9D=BF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=9A=84=E6=A0=87=E9=A2=98=E9=94=99=E8=AF=AF=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1029000070135808=20-=20[=E4=BF=AE=E5=A4=8D]?=
 =?UTF-8?q?=E7=A0=94=E5=8F=91=E7=AE=A1=E7=90=86-=E5=9C=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E7=8A=B6=E6=80=81=E7=9A=84=E5=BC=B9=E7=AA=97=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=20=20-=20[=E5=85=B3=E8=81=94]#[1026026736418?=
 =?UTF-8?q?816]=E7=A0=94=E5=8F=91=E7=AE=A1=E7=90=86-=E5=9C=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E7=8A=B6=E6=80=81=E7=9A=84=E5=BC=B9=E7=AA=97=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=20http://192.168.0.96:8090/demo/rdm.html#/bu?=
 =?UTF-8?q?g-detail/939050947543040/939050947543057/1026026736418816?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/edittab/components/app-status-edit-dialog.vue    | 4 ++--
 .../pages/rdm/template/edittab/components/app-status-edit.vue | 2 +-
 src/views/pages/rdm/template/edittab/components/attr-edit.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/pages/rdm/template/edittab/components/app-status-edit-dialog.vue b/src/views/pages/rdm/template/edittab/components/app-status-edit-dialog.vue
index 23044ad7..59b8c257 100644
--- a/src/views/pages/rdm/template/edittab/components/app-status-edit-dialog.vue
+++ b/src/views/pages/rdm/template/edittab/components/app-status-edit-dialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <TsDialog v-bind="dialogConfig" @close="close">
+  <TsDialog v-bind="dialogConfig" @on-close="close">
     <template v-slot>
       <TsForm ref="form" :item-list="formConfig">
         <template v-slot:color>
@@ -39,7 +39,7 @@ export default {
     return {
       statusDataLocal: {},
       dialogConfig: {
-        title: this.statusData.uuid ? this.$t('dialog.title.edittarget', { target: this.$t('page.attribute') }) : this.$t('dialog.title.addtarget', { target: this.$t('page.attribute') }),
+        title: this.statusData.uuid ? this.$t('dialog.title.edittarget', { target: this.$t('page.status') }) : this.$t('dialog.title.addtarget', { target: this.$t('page.status') }),
         isShow: true,
         width: 'small',
         type: 'modal',
diff --git a/src/views/pages/rdm/template/edittab/components/app-status-edit.vue b/src/views/pages/rdm/template/edittab/components/app-status-edit.vue
index 295517e7..3fab1e81 100644
--- a/src/views/pages/rdm/template/edittab/components/app-status-edit.vue
+++ b/src/views/pages/rdm/template/edittab/components/app-status-edit.vue
@@ -128,7 +128,7 @@ export default {
     AppStatusRelConfigDialog: resolve => require(['@/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue'], resolve)
   },
   props: {
-    statusList: { type: Array },
+    statusList: { type: Array, default: () => { return []; } },
     statusRelList: { type: Array }
   },
   data() {
diff --git a/src/views/pages/rdm/template/edittab/components/attr-edit.vue b/src/views/pages/rdm/template/edittab/components/attr-edit.vue
index 2f91472d..fe5d041e 100644
--- a/src/views/pages/rdm/template/edittab/components/attr-edit.vue
+++ b/src/views/pages/rdm/template/edittab/components/attr-edit.vue
@@ -99,7 +99,7 @@ export default {
       this.$api.rdm.attr.getPrivateAttrList().then(res => {
         const privateAttrList = res.Return;
         privateAttrList.forEach(attr => {
-          if (!this.attrList.find(d => d.type === attr.type)) {
+          if (this.attrList && !this.attrList.find(d => d.type === attr.type)) {
             this.attrList.push({ ...attr, isPrivate: 1 });
           }
         });
-- 
Gitee