Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4

nezha-fronted/src/assets/css/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nz-icon"; /* Project id 2030432 */
-  src: url('iconfont.woff2?t=1658889956430') format('woff2'),
-       url('iconfont.woff?t=1658889956430') format('woff'),
-       url('iconfont.ttf?t=1658889956430') format('truetype');
+   src: url('iconfont.woff2?t=1658889956430') format('woff2'),
+        url('iconfont.woff?t=1658889956430') format('woff'),
+        url('iconfont.ttf?t=1658889956430') format('truetype');
 }
 
 .nz-icon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nz-icon-bubble:before {
+  content: "\e761";
+}
+
 .nz-icon-zhengfangxing:before {
   content: "\e796";
 }

nezha-fronted/src/assets/css/font/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "nz-icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "25495310",
+      "name": "气泡图",
+      "font_class": "bubble",
+      "unicode": "e761",
+      "unicode_decimal": 59233
+    },
     {
       "icon_id": "30875641",
       "name": "正方形",

nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue

@@ -122,8 +122,9 @@ export default {
           disabled: false
         }, {
           name: this.$t('overall.state'),
-          type: 'input',
-          label: 'state',
+          type: 'select',
+          label: 'ipamState',
+          readonly: true,
           disabled: false
         }]
       }

nezha-fronted/src/components/common/mixin/dataList.js

@@ -898,6 +898,21 @@ export default {
           },
           jsonKey: 'val'
         },
+        state: {
+          target: this.searchLabel,
+          isSearchInput: true,
+          propertyName: 'state',
+          type: 'string',
+          defaultJson: {
+            disabled: false,
+            label: 'ipamState',
+            name: 'State',
+            readonly: true,
+            type: 'select',
+            val: ''
+          },
+          jsonKey: 'val'
+        },
         name: {
           target: this.searchLabel,
           isSearchInput: true,

nezha-fronted/src/components/common/searchInput.vue

@@ -900,6 +900,8 @@ export default {
               objectInfo.types = val.valnum
             } else if (val.label === 'promState') {
               objectInfo.statuses = val.valnum
+            } else if (val.label === 'ipamState') {
+              objectInfo.state = val.valnum
             } else if (typeof (val.valnum) === 'undefined' || val.valnum == '') {
               this.selectInfoList[val.label].forEach(item => {
                 if (item.label === val.val) {

nezha-fronted/src/components/common/searchSelectInfo.vue

@@ -72,6 +72,19 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
       label: i18n.t('asset.down')
     }
   ],
+  ipamState: [
+    {
+      value: 1,
+      label: i18n.t('overall.ipam.available')
+    }, {
+      value: 2,
+      label: i18n.t('overall.ipam.transient')
+    }, {
+      value: 3,
+      label: i18n.t('overall.ipam.used')
+    }
+
+  ],
   pingStatus: [
     {
       value: '0',

nezha-fronted/src/components/common/table/settings/chartTmplTable.vue

@@ -166,6 +166,9 @@ export default {
         case 'logs':
           str += 'nz-icon-logs'
           break
+        case 'bubble':
+          str += 'nz-icon-bubble'
+          break
         default :
           str += 'nz-icon-table1'
           break