From e3d908b68401a33143751da8e237b6d0cc01adcf Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 6 Sep 2023 18:36:37 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3178=20fix=EF=BC=9Asoftware=20asset=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=20=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/asset/assetBox.scss           |  7 +++++++
 .../common/rightBox/software/softwareAssetBox.vue | 15 ++++++++++++---
 .../common/rightBox/software/softwareTypeBox.vue  |  2 +-
 .../common/table/settings/softwareAssetTable.vue  | 14 ++++++++++----
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss
index 07e972381..7be28a88d 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/asset/assetBox.scss
@@ -41,3 +41,10 @@
     font-size: 12px;
   }
 }
+.right-box-editSoftwareAsset .right-box__container  {
+  .el-form .form__dotted-item {
+    padding: 0;
+    border: none;
+    margin-bottom: 15px;
+  }
+}
diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
index fe46264d4..0fe48e91b 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-clickoutside="{obj: editSoftwareAsset, func: esc}" class="right-box right-box-editSoftwareAsset right-box-edit-endpoint ">
+  <div v-clickoutside="{obj: editSoftwareAsset,oldData:oldData, func: esc}" class="right-box right-box-editSoftwareAsset right-box-edit-endpoint ">
     <div class="right-box__header">
       <div class="header__title">{{editSoftwareAsset.id ? $t('softwareAsset.edit') : $t('softwareAsset.create')}}</div>
       <div class="header__operation">
@@ -184,6 +184,7 @@ export default {
     return {
       assetConstants,
       disabled: false,
+      oldData: {},
       editSoftwareAsset: {
         id: '',
         name: '',
@@ -252,13 +253,17 @@ export default {
         this.isEdit = true
         const editSoftwareAsset = JSON.parse(JSON.stringify(n))
         editSoftwareAsset.paramObj = []
+        if (editSoftwareAsset.projectId === -1) {
+          editSoftwareAsset.projectId = ''
+        }
+        editSoftwareAsset.assetId = ''
         // if (editSoftwareAsset.params) {
         //   Object.keys(editSoftwareAsset.params).forEach(key => {
         //     editSoftwareAsset.paramObj.push(editSoftwareAsset.params[key])
         //   })
         // }
-        editSoftwareAsset.assetId = ''
         this.editSoftwareAsset = editSoftwareAsset
+        this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
       }
     }
   },
@@ -269,7 +274,10 @@ export default {
   },
   mounted () {
     setTimeout(() => {
-      this.editSoftwareAsset.assetId = this.obj.assetId + ''
+      if (this.obj.assetId && this.obj.assetId !== -1) {
+        this.editSoftwareAsset.assetId = this.obj.assetId + ''
+        this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
+      }
     }, 500)
   },
   methods: {
@@ -381,6 +389,7 @@ export default {
           }
           this.editSoftwareAsset.paramObj.push(findItem.params[key])
         })
+        this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
       }
     }
   }
diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
index d781c70df..05357786b 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
@@ -46,7 +46,7 @@
           </div>
           <el-form-item prop="paramObj">
             <div v-for="(label, i) in editSoftwareType.paramObj" :key="i" class="form__dotted-item form__dotted-item-required">
-              <el-form-item :prop="'paramObj.' + i + '.value.0'" :rules="[ { required: JSON.parse(label.param).required === '1', message: $t('validate.required'), trigger: 'blur' }]">
+              <el-form-item :prop="'paramObj.' + i + '.value.0'" :rules="[]">
                 <template v-slot:label>
                   <div class="form__labels-label">
                     <span>{{label.name}}</span>
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index 21dc31ed4..d04559cbf 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -44,7 +44,8 @@
             </copy>
           </template>
           <template v-else-if="item.prop === 'asset'">
-            <div class="document-copy-block">
+            <div>
+              <div class="document-copy-block" v-if="scope.row.asset">
               <span
                 class="document-copy-text"
                 :title="scope.row.asset&&scope.row.asset.name"
@@ -53,7 +54,9 @@
                 <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i>
                 {{scope.row.asset&&scope.row.asset.name}}
               </span>
-              <i v-if="scope.row.asset&&scope.row.asset.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row.asset.name)" :title="$t('overall.copyText')"></i>
+                <i v-if="scope.row.asset&&scope.row.asset.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row.asset.name)" :title="$t('overall.copyText')"></i>
+              </div>
+              <span v-else>--</span>
             </div>
           </template>
           <template v-else-if="item.prop === 'category'">
@@ -62,14 +65,17 @@
             </div>
           </template>
           <template v-else-if="item.prop === 'project'">
-            <div class="document-copy-block">
+            <div>
+              <div class="document-copy-block" v-if="scope.row.project">
               <span class="document-copy-text"
                     :title="scope.row[item.prop].name"
                     @mouseenter="labelHover(scope.row, item.prop, true,true, $event)"
                     @mouseleave="labelHover(scope.row, item.prop, false,true)">
               {{scope.row[item.prop].name}}
               </span>
-              <i v-if="scope.row[item.prop].name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row[item.prop].name)" :title="$t('overall.copyText')"></i>
+                <i v-if="scope.row[item.prop].name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row[item.prop].name)" :title="$t('overall.copyText')"></i>
+              </div>
+              <span v-else>--</span>
             </div>
           </template>
           <template v-else-if="item.prop === 'type'">