From 54bfb5266f87cf97bddca05924cdcd6014022ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <523037378@qq.com>
Date: Wed, 26 Feb 2020 16:51:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20asset=E4=BE=A7=E6=BB=91=E5=88=87?=
 =?UTF-8?q?=E5=9B=9E=E9=87=8D=E6=9E=84=E5=90=8E=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/header.vue    |  8 ++++----
 nezha-fronted/src/components/page/asset/asset.vue | 14 +++++++-------
 nezha-fronted/src/main.js                         |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 4cbbe7824..594e70f6e 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -121,12 +121,12 @@
     <panel-box :panel="editPanel" @reload="panelListReload" @reloadForDel="" ref="panelBox"></panel-box>
     <project-box :project="editProject" ref="projectBox"></project-box>
     <module-box :currentProject="currentProject" :module="editModule" @reload="" ref="moduleBox"></module-box>
-    <!--<asset-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
-                      ref="addEndpointBox"></asset-box>-->
     <add-endpoint-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
                       ref="addEndpointBox"></add-endpoint-box>
-    <asset-add-unit :add-unit-show='addUnitShow' @refreshData="refreshAsset" ref="assetAddUnit"
-                    @sendStateData="closeAsset"></asset-add-unit>
+    <!--<asset-add-unit :add-unit-show='addUnitShow' @refreshData="refreshAsset" ref="assetAddUnit"
+                    @sendStateData="closeAsset"></asset-add-unit>-->
+    <asset-box :edit-unit-show='addUnitShow' @refreshData="refreshAsset" @sendStateData="closeAsset"
+               ref="assetAddUnit"></asset-box>
     <alert-config-box :parentAlertRule="alertRule" @reload="" ref="alertConfigBox"></alert-config-box>
     <change-password :cur-user="username" :show-dialog="showChangePwd" @click="showPwdDialog" @dialogClosed="dialogClosed"></change-password>
   </div>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 1d89294ea..3519538fa 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -176,12 +176,12 @@
       <Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
     </div>
 
-    <asset-add-unit :add-unit-show='addUnitShow' @refreshData="flushData" ref="assetAddUnit"
+    <!--<asset-add-unit :add-unit-show='addUnitShow' @refreshData="flushData" ref="assetAddUnit"
                     @sendStateData="tabControl"></asset-add-unit>
     <asset-edit-unit :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
-               ref="assetEditUnit"></asset-edit-unit>
-    <!--<asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
-                     ref="assetEditUnit"></asset-box>-->
+               ref="assetEditUnit"></asset-edit-unit>-->
+    <asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
+                     ref="assetEditUnit"></asset-box>
     <element-set
       v-clickoutside="elementsetHide"
       :drop-col="dropCol"
@@ -632,9 +632,9 @@
       },
       tagShow(data, id, type) {
         if (data === 'showAdd') {
-          this.addUnitShow = true;
-          /*this.editUnitShow = true;
-          this.$refs['assetEditUnit'].getAssetData('');*/
+          //this.addUnitShow = true;
+          this.editUnitShow = true;
+          this.$refs['assetEditUnit'].getAssetData('');
         }
         if (data === 'showEdit') {
           this.editUnitShow = true;
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index bfcea9013..81f96adaa 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -65,7 +65,7 @@ Vue.use(ElementUI);
 Vue.use(Vuex);
 Vue.use(VueResource);
 
-const exceptClassName = [];
+const exceptClassName = []; //clickoutside排除的class
 const clickoutside = {
   // 初始化指令
   bind(el, binding, vnode) {
@@ -77,7 +77,7 @@ const clickoutside = {
         let attrs = e.target.attributes;
         for (let i = 0; i < attrs.length; i++) {
           if (attrs[i].name == 'class') {
-            console.info(attrs[i].value)
+
             if ((attrs[i].value + '').indexOf("el-select-dropdown") != -1) {
               flag = false;
               break;