Merge remote-tracking branch 'origin/dev' into dev

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSpecExtraModel.java

@@ -51,6 +51,16 @@ public class HostSpecExtraModel implements GenericsDataModel {
      */
     private String sn;
 
+    /**
+     * 制造商
+     */
+    private String vendor;
+
+    /**
+     * 型号
+     */
+    private String model;
+
     /**
      * 系统名称
      */

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java

@@ -258,7 +258,7 @@ public class HostIdentityServiceImpl implements HostIdentityService {
                 .eq(HostIdentityDO::getName, domain.getName());
         // 检查是否存在
         boolean present = hostIdentityDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java

@@ -242,7 +242,7 @@ public class HostKeyServiceImpl implements HostKeyService {
                 .eq(HostKeyDO::getName, domain.getName());
         // 检查是否存在
         boolean present = hostKeyDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java

@@ -408,7 +408,7 @@ public class ExecJobServiceImpl implements ExecJobService {
                 .eq(ExecJobDO::getName, domain.getName());
         // 检查是否存在
         boolean present = execJobDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java

@@ -208,7 +208,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
                 .eq(ExecTemplateDO::getName, domain.getName());
         // 检查是否存在
         boolean present = execTemplateDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java

@@ -343,7 +343,7 @@ public class DataGroupServiceImpl implements DataGroupService {
                 .eq(DataGroupDO::getName, domain.getName());
         // 检查是否存在
         boolean present = dataGroupDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java

@@ -248,7 +248,7 @@ public class DictKeyServiceImpl implements DictKeyService {
                 .eq(DictKeyDO::getKeyName, domain.getKeyName());
         // 检查是否存在
         boolean present = dictKeyDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
     /**

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java

@@ -226,7 +226,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
                 .eq(NotifyTemplateDO::getBizType, domain.getBizType());
         // 检查是否存在
         boolean present = notifyTemplateDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java

@@ -243,7 +243,7 @@ public class TagServiceImpl implements TagService {
                 .eq(TagDO::getName, domain.getName());
         // 检查是否存在
         boolean present = tagDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java

@@ -297,7 +297,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService {
                 .eq(AlarmPolicyDO::getName, domain.getName());
         // 检查是否存在
         boolean present = alarmPolicyDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java

@@ -203,7 +203,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService {
                 .eq(MonitorMetricsDO::getValue, domain.getValue());
         // 检查是否存在
         boolean present = monitorMetricsDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java

@@ -217,7 +217,7 @@ public class CommandSnippetServiceImpl implements CommandSnippetService {
                 .eq(CommandSnippetDO::getName, domain.getName());
         // 检查是否存在
         boolean present = commandSnippetDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java

@@ -217,7 +217,7 @@ public class PathBookmarkServiceImpl implements PathBookmarkService {
                 .eq(PathBookmarkDO::getName, domain.getName());
         // 检查是否存在
         boolean present = pathBookmarkDAO.of(wrapper).present();
-        Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
+        Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
     }
 
 }

orion-visor-ui/src/api/asset/host-extra.ts

@@ -49,6 +49,8 @@ export interface HostLabelExtraSettingModel {
 // 标签规格模型
 export interface HostSpecExtraModel {
   sn: string;
+  vendor: string;
+  model: string;
   osName: string;
   cpuCount: number;
   cpuPhysicalCore: number;

orion-visor-ui/src/assets/style/layout.less

@@ -198,7 +198,7 @@
 }
 
 .card-filter-wrapper {
-  padding: 18px 24px;
+  padding: 24px 24px 16px 24px;
 
   .card-filter-form {
     width: 320px;

orion-visor-ui/src/components/view/card-list/components/card-header.vue

@@ -112,7 +112,7 @@
 
 <script lang="ts" setup>
   import type { CardProps } from '../types/props';
-  import { ref, computed } from 'vue';
+  import { ref, computed, nextTick } from 'vue';
   import { useAppStore } from '@/store';
   import { triggerMouseEvent } from '@/utils/event';
   import { HeaderEmitter } from '../types/emits';
@@ -157,7 +157,9 @@
   // 搜索
   const filterSearch = () => {
     bubblesEmitter(HeaderEmitter.SEARCH);
-    triggerMouseEvent(filterRef);
+    nextTick(() => {
+      triggerMouseEvent(filterRef);
+    });
   };
 
 </script>

orion-visor-ui/src/utils/event.ts

@@ -37,5 +37,5 @@ export const triggerMouseEvent = (ref: Ref, e = 'click') => {
     bubbles: true,
     cancelable: true,
   });
-  ref.value.dispatchEvent(event);
+  ref.value?.dispatchEvent?.(event);
 };

orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue

@@ -11,6 +11,24 @@
                  allow-clear />
         <span v-else class="text">{{ formModel.sn }}</span>
       </a-descriptions-item>
+      <!-- 制造商 -->
+      <a-descriptions-item label="制造商" :span="2">
+        <a-input v-if="editing"
+                 v-model="formModel.vendor"
+                 class="input"
+                 size="mini"
+                 allow-clear />
+        <span v-else class="text">{{ formModel.vendor }}</span>
+      </a-descriptions-item>
+      <!-- 设备型号 -->
+      <a-descriptions-item label="设备型号" :span="2">
+        <a-input v-if="editing"
+                 v-model="formModel.model"
+                 class="input"
+                 size="mini"
+                 allow-clear />
+        <span v-else class="text">{{ formModel.model }}</span>
+      </a-descriptions-item>
       <!-- 系统名称 -->
       <a-descriptions-item label="系统名称" :span="2">
         <a-input v-if="editing"
@@ -121,19 +139,29 @@
       </a-descriptions-item>
       <!-- 公网地址 -->
       <a-descriptions-item label="公网地址" :span="2">
-        <a-input-tag v-model="formModel.publicIpAddresses"
+        <a-input-tag v-if="editing"
-                     :readonly="!editing"
+                     v-model="formModel.publicIpAddresses"
                      class="input"
                      size="mini"
                      allow-clear />
+        <a-space v-else>
+          <a-tag v-for="addr in (formModel.publicIpAddresses || [])">
+            {{ addr }}
+          </a-tag>
+        </a-space>
       </a-descriptions-item>
       <!-- 私网地址 -->
       <a-descriptions-item label="私网地址" :span="2">
-        <a-input-tag v-model="formModel.privateIpAddresses"
+        <a-input-tag v-if="editing"
-                     :readonly="!editing"
+                     v-model="formModel.privateIpAddresses"
                      class="input"
                      size="mini"
                      allow-clear />
+        <a-space v-else>
+          <a-tag v-for="addr in (formModel.privateIpAddresses || [])">
+            {{ addr }}
+          </a-tag>
+        </a-space>
       </a-descriptions-item>
       <!-- 负责人 -->
       <a-descriptions-item label="负责人" :span="2">

orion-visor-ui/src/views/monitor/monitor-host/types/table.columns.ts

@@ -13,10 +13,17 @@ const columns = [
     title: '主机信息',
     dataIndex: 'hostInfo',
     slotName: 'hostInfo',
-    width: 248,
+    width: 268,
     align: 'left',
     fixed: 'left',
     default: true,
+  }, {
+    title: '主机规格',
+    dataIndex: 'hostSpec',
+    slotName: 'hostSpec',
+    width: 248,
+    align: 'left',
+    default: true,
   }, {
     title: '告警策略',
     dataIndex: 'alarmPolicy',