feat : issue 编辑页面开发

nezha-fronted/package-lock.json

@@ -4071,7 +4071,7 @@
     },
     "clipboard": {
       "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+      "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
       "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
       "requires": {
         "good-listener": "^1.2.2",
@@ -6221,7 +6221,7 @@
     },
     "delegate": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
       "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
     },
     "delegates": {
@@ -8548,7 +8548,7 @@
     },
     "good-listener": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
       "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
       "requires": {
         "delegate": "^3.1.2"
@@ -16536,7 +16536,7 @@
     },
     "select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
       "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
     },
     "select-hose": {
@@ -18020,7 +18020,7 @@
     },
     "tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "tinycolor2": {
@@ -18719,7 +18719,7 @@
     },
     "vue-clipboard2": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
       "integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
       "requires": {
         "clipboard": "^2.0.0"

nezha-fronted/src/components/common/rightBox/issueBox.vue

@@ -62,21 +62,22 @@
           <el-form-item :label="$t('issue.relateAssets')" prop="assetIds">
                 <v-selectpage
                 ref="selectPage"
-                style="flex: 1"
+                :data="assetList"
-                data="asset/asset"
-                :params="selectPageParams"
                 :tb-columns="columns"
-                key-field="id"
+                :params="{
-                show-field="manageIp"
+                  varType: 1, panelId: 0,
-                search-field="manageIp"
+                   returnChildren:0,groupId:0,
-                v-model="editIssue.assetIds"
+                }"
-                @values="(data) => {editIssue.assetIds = data.map(d => d.id).join(',')}"
-                size="small"
-                :language="languages"
-                :placeholder="$t('dashboard.panel.chartForm.selectAsset')"
-                id="box-input-asset-id"
                 :multiple="true"
-                :result-format="resultFormat"></v-selectpage>
+                :language="languages"
+                key-field="id"
+                :width="640"
+                v-model="editIssue.assetIds"
+                show-field="manageIp"
+                class="form-control"
+                @values="(data) => {editIssue.assetIds = data.map(d => d.id).join(',')}"
+                :result-format="resultFormat"
+            ></v-selectpage>
           </el-form-item>
           <!-- Reporter -->
            <el-form-item :label='$t("issue.reporter")' prop="rid">
@@ -147,7 +148,6 @@
 </template>
 
 <script>
-import lodash from 'lodash'
 import editRigthBox from '../mixin/editRigthBox'
 import richTextEditor from '@/components/chart/richTextEditor'
 import { noSpecialChar } from '@/components/common/js/validate'
@@ -163,7 +163,8 @@ export default {
   },
   data () {
     return {
-      selectPageParams: {},
+      // selectPageParams: {},
+      assetList: [], // asset 列表数据
       issueTypeSelect: [],
       userData: [],
       editIssue: {
@@ -271,8 +272,15 @@ export default {
   mounted () {
     this.getTypeData()
     this.getUserList()
+    this.assetTemplateList()
   },
   methods: {
+    /* 获取asset列表数据 */
+    assetTemplateList () {
+      this.$get('asset/asset', { pageSize: -1, varType: 1, panelId: 0, groupId: 0 }).then(res => {
+        this.assetList = res.data.list
+      })
+    },
     textChange (val) {
       const html = `<div  class="editor-core ql-container ql-snow"><div class="ql-editor">${val}</div></div>`
       this.editIssue.content = html
@@ -356,18 +364,8 @@ export default {
       immediate: true,
       handler (n, o) {
         this.isEdit = true
-        const editObj = lodash.cloneDeep(n)
-        if (editObj.assets && editObj.assets[0] != null) {
-          const assetIdData = editObj.assets.map(item => {
-            return item.id
-          })
         this.editIssue = {
-            ...editObj,
+          ...n
-            assetIds: assetIdData.join('')
-          }
-        }
-        this.editIssue = {
-          ...editObj
         }
       }
     }

nezha-fronted/src/components/page/config/issue.vue

@@ -172,6 +172,19 @@ export default {
   mounted () {
   },
   methods: {
+    edit (u) {
+      this.$nextTick(() => {
+        this.$get(`${this.url}/${u.id}`).then(response => {
+          if (response.code === 200) {
+            this.object = {
+              ...response.data,
+              assetIds: response.data.assetIds.join(',')
+            }
+            this.rightBox.show = true
+          }
+        })
+      })
+    }
   },
   created () {
   }