Merge branch 'xym' into dev

src/components/apass-list.vue

@@ -3,9 +3,12 @@
     <div class="apass_breadcrumb">
       <slot name="breadcrumb"></slot>
     </div>
-    <div class="main-container">
+
+    <div class="main-container top_container" v-if="$slots.top">
       <slot name="top"></slot>
+    </div>
 
+    <div class="main-container">
       <div class="header-container" v-if="!hideHeader">
         <div class="header-left apass_button">
           <el-button
@@ -257,4 +260,8 @@ export default {
 .list-container {
   flex-grow: 1;
 }
+.top_container {
+  flex-grow: 0;
+  margin-bottom: 20px;
+}
 </style>

src/pages/workbench/app_build.vue

@@ -94,7 +94,7 @@
             下一步
           </el-button>
         </div>
-        <image-detail ref="imageDetail" :image="selectedImage"></image-detail>
+        <image-detail ref="imageDetail"></image-detail>
       </app-build-step>
       <app-build-step
         title="上传部署文件"
@@ -360,7 +360,6 @@ export default {
       msg: "",
       submit: null,
     },
-    selectedImage: null,
   }),
   methods: {
     preStep() {
@@ -575,8 +574,7 @@ export default {
       }
     },
     showImageDetail(item) {
-      this.selectedImage = item;
-      this.$refs.imageDetail.showDialog();
+      this.$refs.imageDetail.showDialog(item);
     },
   },
   mounted() {