From 453dbee73597ac3ac7a518f8609fadb1758f885c Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 21 Feb 2024 10:42:19 +0800
Subject: [PATCH 1/3] =?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-=E7=BC=96=E8=BE=91=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=9A=84=E5=BA=94=E7=94=A8=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B5=81=E8=BD=AC=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=BB=98=E8=AE=A4=E5=80=BC=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E9=80=89=E5=B1=9E=E6=80=A7=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E4=B8=BA=E7=A9=BA=20=20=20=20-=20[=E5=85=B3=E8=81=94]?=
 =?UTF-8?q?#[1029012963426304]=E7=A0=94=E5=8F=91=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E7=8A=B6=E6=80=81=E7=9A=84=E5=B1=9E=E6=80=A7=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947?=
 =?UTF-8?q?543040/939050947543057/1029012963426304?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edittab/components/app-status-edit.vue    | 15 ++++++++++--
 .../app-statusrel-config-dialog.vue           | 24 ++++++++++++++-----
 .../rdm/template/edittab/story/story.vue      |  7 +++++-
 3 files changed, 37 insertions(+), 9 deletions(-)

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 3fab1e81..b48cfdbe 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
@@ -115,7 +115,12 @@
       </div>
     </div>
     <StatusEditDialog v-if="isStatusEditShow" :statusData="currentStatusData" @close="closeStatusEditDialog"></StatusEditDialog>
-    <AppStatusRelConfigDialog v-if="isStatusRelConfigEditShow" :statusrel="currentStatusRel" @close="closeStatusRelConfigDialog"></AppStatusRelConfigDialog>
+    <AppStatusRelConfigDialog
+      v-if="isStatusRelConfigEditShow"
+      :appType="appType"
+      :statusrel="currentStatusRel"
+      @close="closeStatusRelConfigDialog"
+    ></AppStatusRelConfigDialog>
   </div>
 </template>
 <script>
@@ -129,7 +134,13 @@ export default {
   },
   props: {
     statusList: { type: Array, default: () => { return []; } },
-    statusRelList: { type: Array }
+    statusRelList: { type: Array },
+    appType: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    }
   },
   data() {
     return {
diff --git a/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue b/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
index 5d96f094..6c26c154 100644
--- a/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
+++ b/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
@@ -94,7 +94,13 @@ export default {
     TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve)
   },
   props: {
-    statusrel: { type: Object }
+    statusrel: { type: Object },
+    appType: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    }
   },
   data() {
     return {
@@ -131,7 +137,7 @@ export default {
     if (this.statusrel.config) {
       this.config = this.statusrel.config;
     }
-    this.getAttrByAppId();
+    this.getPrivateAttrList();
   },
   beforeMount() {},
   mounted() {},
@@ -167,10 +173,16 @@ export default {
       const other = this.config.requiredAttrList.filter(d => d !== row);
       return this.attrList.filter(d => !other.find(dd => dd.attrId === d.id));
     },
-    getAttrByAppId() {
-      if (this.statusrel?.appId) {
-        this.$api.rdm.app.getAppById(this.statusrel.appId).then(res => {
-          this.attrList = res.Return.attrList;
+    getPrivateAttrList() {
+      if (this.appType?.appType) {
+        this.attrList = this.$utils.deepClone(this.appType?.config?.attrList || []);
+        this.$api.rdm.attr.getPrivateAttrList({ appType: this.appType.appType }).then(res => {
+          const privateAttrList = res.Return || [];
+          privateAttrList.forEach(attr => {
+            if (this.appType.config.attrList && !this.appType.config.attrList.find(d => d.type === attr.type)) {
+              this.attrList.push({ ...attr, isPrivate: 1 });
+            }
+          });
         });
       }
     },
diff --git a/src/views/pages/rdm/template/edittab/story/story.vue b/src/views/pages/rdm/template/edittab/story/story.vue
index 4cc931c1..54209f0e 100644
--- a/src/views/pages/rdm/template/edittab/story/story.vue
+++ b/src/views/pages/rdm/template/edittab/story/story.vue
@@ -5,7 +5,12 @@
         <AttrEdit v-if="currentTab === 'attr'" :appType="appType"></AttrEdit>
       </TabPane>
       <TabPane :label="$t('term.rdm.statussets')" name="objectstatus" class="pl-md">
-        <AppStatus v-if="currentTab === 'objectstatus'" :statusList="appType.config && appType.config.statusList" :statusRelList="appType.config && appType.config.statusRelList"></AppStatus>
+        <AppStatus
+          v-if="currentTab === 'objectstatus'"
+          :appType="appType"
+          :statusList="appType.config && appType.config.statusList"
+          :statusRelList="appType.config && appType.config.statusRelList"
+        ></AppStatus>
       </TabPane>
     </Tabs>
   </div>
-- 
Gitee


From 3e8deadce958729e7166d98f01bf5ecaa61c0978 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 21 Feb 2024 14:11:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=84=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edittab/components/app-statusrel-config-dialog.vue      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue b/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
index 6c26c154..2e7d6be3 100644
--- a/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
+++ b/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
@@ -175,8 +175,10 @@ export default {
     },
     getPrivateAttrList() {
       if (this.appType?.appType) {
-        this.attrList = this.$utils.deepClone(this.appType?.config?.attrList || []);
-        this.$api.rdm.attr.getPrivateAttrList({ appType: this.appType.appType }).then(res => {
+        let {appType = '', config = {}} = this.appType || {};
+        let {attrList = []} = config || {};
+        this.attrList = this.$utils.deepClone(attrList || []);
+        this.$api.rdm.attr.getPrivateAttrList({ appType: appType }).then(res => {
           const privateAttrList = res.Return || [];
           privateAttrList.forEach(attr => {
             if (this.appType.config.attrList && !this.appType.config.attrList.find(d => d.type === attr.type)) {
-- 
Gitee


From 6896b71bf7050f3f4902097cc72c4a446f8f72a7 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 21 Feb 2024 15:06:22 +0800
Subject: [PATCH 3/3] =?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-=E7=BC=96=E8=BE=91=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=9A=84=E5=BA=94=E7=94=A8=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B5=81=E8=BD=AC=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=BB=98=E8=AE=A4=E5=80=BC=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E9=80=89=E5=B1=9E=E6=80=A7=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E4=B8=BA=E7=A9=BA=20=20=20=20-=20[=E5=85=B3=E8=81=94]?=
 =?UTF-8?q?#[1029012963426304]=E7=A0=94=E5=8F=91=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E7=8A=B6=E6=80=81=E7=9A=84=E5=B1=9E=E6=80=A7=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947?=
 =?UTF-8?q?543040/939050947543057/1029012963426304?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edittab/components/app-status-edit.vue    | 18 +++----------
 .../app-statusrel-config-dialog.vue           | 26 +++++--------------
 .../rdm/template/edittab/story/story.vue      |  7 +----
 3 files changed, 11 insertions(+), 40 deletions(-)

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 b48cfdbe..a01b549a 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
@@ -85,7 +85,8 @@
                   </span>
                 </div>
                 <div class="padding-sm" style="word-break: break-all; white-space: normal">
-                  <span class="tsfont-setting cursor text-href" @click="editStatusRelConfig(statusrel)">{{ $t('page.setting') }}</span>
+                  <!-- 设置先注释，因为属性下拉列表，迭代属性依赖项目Id才能获取数据， 目录属性依赖应用Id才能获取数据-->
+                  <!-- <span class="tsfont-setting cursor text-href" @click="editStatusRelConfig(statusrel)">{{ $t('page.setting') }}</span> -->
                   <span v-if="getRequiredAttrList(statusrel).length > 0">
                     <Divider type="vertical" />
                     <span class="text-grey mr-sm">{{ $t('term.rdm.requiredattribute') }}</span>
@@ -115,12 +116,7 @@
       </div>
     </div>
     <StatusEditDialog v-if="isStatusEditShow" :statusData="currentStatusData" @close="closeStatusEditDialog"></StatusEditDialog>
-    <AppStatusRelConfigDialog
-      v-if="isStatusRelConfigEditShow"
-      :appType="appType"
-      :statusrel="currentStatusRel"
-      @close="closeStatusRelConfigDialog"
-    ></AppStatusRelConfigDialog>
+    <AppStatusRelConfigDialog v-if="isStatusRelConfigEditShow" :statusrel="currentStatusRel" @close="closeStatusRelConfigDialog"></AppStatusRelConfigDialog>
   </div>
 </template>
 <script>
@@ -134,13 +130,7 @@ export default {
   },
   props: {
     statusList: { type: Array, default: () => { return []; } },
-    statusRelList: { type: Array },
-    appType: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    }
+    statusRelList: { type: Array }
   },
   data() {
     return {
diff --git a/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue b/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
index 2e7d6be3..5d96f094 100644
--- a/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
+++ b/src/views/pages/rdm/template/edittab/components/app-statusrel-config-dialog.vue
@@ -94,13 +94,7 @@ export default {
     TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve)
   },
   props: {
-    statusrel: { type: Object },
-    appType: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    }
+    statusrel: { type: Object }
   },
   data() {
     return {
@@ -137,7 +131,7 @@ export default {
     if (this.statusrel.config) {
       this.config = this.statusrel.config;
     }
-    this.getPrivateAttrList();
+    this.getAttrByAppId();
   },
   beforeMount() {},
   mounted() {},
@@ -173,18 +167,10 @@ export default {
       const other = this.config.requiredAttrList.filter(d => d !== row);
       return this.attrList.filter(d => !other.find(dd => dd.attrId === d.id));
     },
-    getPrivateAttrList() {
-      if (this.appType?.appType) {
-        let {appType = '', config = {}} = this.appType || {};
-        let {attrList = []} = config || {};
-        this.attrList = this.$utils.deepClone(attrList || []);
-        this.$api.rdm.attr.getPrivateAttrList({ appType: appType }).then(res => {
-          const privateAttrList = res.Return || [];
-          privateAttrList.forEach(attr => {
-            if (this.appType.config.attrList && !this.appType.config.attrList.find(d => d.type === attr.type)) {
-              this.attrList.push({ ...attr, isPrivate: 1 });
-            }
-          });
+    getAttrByAppId() {
+      if (this.statusrel?.appId) {
+        this.$api.rdm.app.getAppById(this.statusrel.appId).then(res => {
+          this.attrList = res.Return.attrList;
         });
       }
     },
diff --git a/src/views/pages/rdm/template/edittab/story/story.vue b/src/views/pages/rdm/template/edittab/story/story.vue
index 54209f0e..4cc931c1 100644
--- a/src/views/pages/rdm/template/edittab/story/story.vue
+++ b/src/views/pages/rdm/template/edittab/story/story.vue
@@ -5,12 +5,7 @@
         <AttrEdit v-if="currentTab === 'attr'" :appType="appType"></AttrEdit>
       </TabPane>
       <TabPane :label="$t('term.rdm.statussets')" name="objectstatus" class="pl-md">
-        <AppStatus
-          v-if="currentTab === 'objectstatus'"
-          :appType="appType"
-          :statusList="appType.config && appType.config.statusList"
-          :statusRelList="appType.config && appType.config.statusRelList"
-        ></AppStatus>
+        <AppStatus v-if="currentTab === 'objectstatus'" :statusList="appType.config && appType.config.statusList" :statusRelList="appType.config && appType.config.statusRelList"></AppStatus>
       </TabPane>
     </Tabs>
   </div>
-- 
Gitee