From 5d43a9ce886087f562a2f9ccdc1e7c850ed0fa90 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 26 Oct 2023 19:25:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orion-ops-ui/src/api/system/dict-value.ts     | 22 +++++++----------
 .../src/components/view/editor/core.ts        |  2 +-
 .../asset/host/components/host-table.vue      | 14 ++++-------
 .../dict-key/components/dict-key-table.vue    |  5 ++--
 .../components/dict-key-view-modal.vue        |  6 ++---
 .../src/views/system/dict-key/types/const.ts  |  2 +-
 .../system/dict-key/types/table.columns.ts    | 12 +++++-----
 .../components/dict-value-form-modal.vue      | 10 --------
 .../components/dict-value-table.vue           | 24 ++++---------------
 .../system/dict-value/types/form.rules.ts     |  9 -------
 .../system/dict-value/types/table.columns.ts  | 18 +++++---------
 11 files changed, 36 insertions(+), 88 deletions(-)

diff --git a/orion-ops-ui/src/api/system/dict-value.ts b/orion-ops-ui/src/api/system/dict-value.ts
index 6f8a71f6..c4de113a 100644
--- a/orion-ops-ui/src/api/system/dict-value.ts
+++ b/orion-ops-ui/src/api/system/dict-value.ts
@@ -38,7 +38,6 @@ export interface DictValueQueryRequest extends Pagination {
   id?: number;
   keyId?: number;
   keyName?: string;
-  name?: string;
   value?: string;
   label?: string;
   extra?: string;
@@ -53,7 +52,6 @@ export interface DictValueQueryResponse extends TableData {
   keyId?: number;
   keyName?: string;
   keyDescription?: string;
-  name?: string;
   value?: string;
   label?: string;
   extra?: string;
@@ -65,9 +63,9 @@ export interface DictValueQueryResponse extends TableData {
 }
 
 /**
- * 字典配置值枚举查询响应
+ * 字典配置值选项查询响应
  */
-export interface DictValueEnumQueryResponse extends Options {
+export interface DictValueOptionsQueryResponse extends Options {
 
   [key: string]: unknown;
 }
@@ -96,15 +94,13 @@ export function rollbackDictValue(request: DictValueRollbackRequest) {
 /**
  * 查询字典配置值
  */
-export function getDictValue(keyName: string) {
-  return axios.get<Array<DictValueQueryResponse>>('/infra/dict-value/list', { params: { keyName } });
-}
-
-/**
- * 查询字典配置值枚举
- */
-export function getDictValueEnum(keyName: string) {
-  return axios.get<Record<string, DictValueEnumQueryResponse>>('/infra/dict-value/enum', { params: { keyName } });
+export function getDictValueList(keys: string[]) {
+  return axios.get<Record<string, Array<DictValueOptionsQueryResponse>>>('/infra/dict-value/list', {
+    params: { keys },
+    paramsSerializer: params => {
+      return qs.stringify(params, { arrayFormat: 'comma' });
+    }
+  });
 }
 
 /**
diff --git a/orion-ops-ui/src/components/view/editor/core.ts b/orion-ops-ui/src/components/view/editor/core.ts
index 65c8f20a..b3adc7e5 100644
--- a/orion-ops-ui/src/components/view/editor/core.ts
+++ b/orion-ops-ui/src/components/view/editor/core.ts
@@ -84,7 +84,7 @@ export const createDefaultOptions = (): Options => {
     minimap: {
       enabled: false,
     },
-    fontSize: 16,
+    fontSize: 14,
     scrollBeyondLastLine: false,
     overviewRulerBorder: false,
     colorDecorators: true,
diff --git a/orion-ops-ui/src/views/asset/host/components/host-table.vue b/orion-ops-ui/src/views/asset/host/components/host-table.vue
index 30d2eddb..b8042c57 100644
--- a/orion-ops-ui/src/views/asset/host/components/host-table.vue
+++ b/orion-ops-ui/src/views/asset/host/components/host-table.vue
@@ -92,11 +92,10 @@
       </template>
       <!-- 地址 -->
       <template #address="{ record }">
-        <a-tooltip content="点击复制">
-          <span class="host-address" @click="copy(record.address)">
-            <icon-copy /> {{ record.address }}
-          </span>
-        </a-tooltip>
+        <span title="复制">
+          <icon-copy class="copy-left" @click="copy(record.address)" />
+        </span>
+        <span class="span-blue">{{ record.address }}</span>
       </template>
       <!-- 标签 -->
       <template #tags="{ record }">
@@ -252,11 +251,6 @@
 
 <style lang="less" scoped>
 
-  .host-address {
-    cursor: pointer;
-    color: rgb(var(--arcoblue-6))
-  }
-
   .row-handle-wrapper {
     display: flex;
     align-items: center;
diff --git a/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue b/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue
index 93cd64c9..139baa9a 100644
--- a/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue
+++ b/orion-ops-ui/src/views/system/dict-key/components/dict-key-table.vue
@@ -55,9 +55,8 @@
              :bordered="false">
       <!-- 配置项 -->
       <template #keyName="{ record }">
-        <span class="pointer" @click="copy(record.keyName)">
-          <icon-copy /> {{ record.keyName }}
-        </span>
+        <icon-copy class="copy-left" title="复制" @click="copy(record.keyName)" />
+        <span>{{ record.keyName }}</span>
       </template>
       <!-- 配置值类型 -->
       <template #valueType="{ record }">
diff --git a/orion-ops-ui/src/views/system/dict-key/components/dict-key-view-modal.vue b/orion-ops-ui/src/views/system/dict-key/components/dict-key-view-modal.vue
index 526ccf99..ef9948d9 100644
--- a/orion-ops-ui/src/views/system/dict-key/components/dict-key-view-modal.vue
+++ b/orion-ops-ui/src/views/system/dict-key/components/dict-key-view-modal.vue
@@ -27,7 +27,7 @@
   import { ref } from 'vue';
   import useLoading from '@/hooks/loading';
   import useVisible from '@/hooks/visible';
-  import { getDictValueEnum } from '@/api/system/dict-value';
+  import { getDictValueList } from '@/api/system/dict-value';
 
   const { visible, setVisible } = useVisible();
   const { loading, setLoading } = useLoading();
@@ -48,8 +48,8 @@
     try {
       setLoading(true);
       // 查看
-      const { data } = await getDictValueEnum(keyName);
-      value.value = JSON.stringify(data, undefined, 4);
+      const { data } = await getDictValueList([keyName]);
+      value.value = JSON.stringify(data[keyName], undefined, 4);
     } finally {
       setLoading(false);
     }
diff --git a/orion-ops-ui/src/views/system/dict-key/types/const.ts b/orion-ops-ui/src/views/system/dict-key/types/const.ts
index a74f86a1..28821e06 100644
--- a/orion-ops-ui/src/views/system/dict-key/types/const.ts
+++ b/orion-ops-ui/src/views/system/dict-key/types/const.ts
@@ -17,7 +17,7 @@ export const definedExtraKeys = [{
 /**
  * 内置字段
  */
-export const innerKeys = ['name', 'value', 'label'];
+export const innerKeys = ['value', 'label'];
 
 /**
  * 额外参数类型
diff --git a/orion-ops-ui/src/views/system/dict-key/types/table.columns.ts b/orion-ops-ui/src/views/system/dict-key/types/table.columns.ts
index b785284f..ec135427 100644
--- a/orion-ops-ui/src/views/system/dict-key/types/table.columns.ts
+++ b/orion-ops-ui/src/views/system/dict-key/types/table.columns.ts
@@ -15,12 +15,6 @@ const columns = [
     align: 'left',
     ellipsis: true,
     tooltip: true,
-  }, {
-    title: '类型',
-    dataIndex: 'valueType',
-    slotName: 'valueType',
-    align: 'left',
-    width: 150
   }, {
     title: '配置描述',
     dataIndex: 'description',
@@ -28,6 +22,12 @@ const columns = [
     align: 'left',
     ellipsis: true,
     tooltip: true,
+  }, {
+    title: '类型',
+    dataIndex: 'valueType',
+    slotName: 'valueType',
+    align: 'left',
+    width: 150
   }, {
     title: '额外配置',
     dataIndex: 'extraSchema',
diff --git a/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue b/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
index c89f184c..bda53eb6 100644
--- a/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
+++ b/orion-ops-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
@@ -24,15 +24,6 @@
         <a-form-item field="keyId" label="配置项">
           <dict-key-selector v-model="formModel.keyId" @change="changeKey" />
         </a-form-item>
-        <!-- 配置名称 -->
-        <a-form-item field="name" label="配置名称">
-          <a-input v-model="formModel.name" placeholder="请输入配置名称" allow-clear />
-          <span class="item-extra-block pointer"
-                title="同步到值"
-                @click="() => formModel.value = formModel.name">
-            <icon-caret-down style="font-size: 16px" />
-          </span>
-        </a-form-item>
         <!-- 配置值 -->
         <a-form-item field="value" label="配置值">
           <a-input v-model="formModel.value" placeholder="请输入配置值" allow-clear />
@@ -117,7 +108,6 @@
     return {
       id: undefined,
       keyId: undefined,
-      name: undefined,
       value: undefined,
       label: undefined,
       extra: undefined,
diff --git a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
index 8cf32ed3..8b4dd342 100644
--- a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -12,10 +12,6 @@
                            @change="changeKey"
                            allow-create />
       </a-form-item>
-      <!-- 配置名称 -->
-      <a-form-item field="name" label="配置名称" label-col-flex="50px">
-        <a-input v-model="formModel.name" placeholder="请输入配置名称" allow-clear />
-      </a-form-item>
       <!-- 配置值 -->
       <a-form-item field="value" label="配置值" label-col-flex="50px">
         <a-input v-model="formModel.value" placeholder="请输入配置值" allow-clear />
@@ -80,23 +76,12 @@
              @page-change="(page) => fetchTableData(page, pagination.pageSize)"
              @page-size-change="(size) => fetchTableData(1, size)"
              :bordered="false">
-      <!-- 名称 -->
-      <template #name="{ record }">
-        <span class="pointer" @click="copy(record.name)">
-          <icon-copy class="copy-left" />
-          <a-tooltip :content="record.name">
-            <span>{{ record.name }}</span>
-          </a-tooltip>
-        </span>
-      </template>
       <!-- 值 -->
       <template #value="{ record }">
-        <span class="pointer" @click="copy(record.value)">
-          <icon-copy class="copy-left" />
-          <a-tooltip :content="record.value">
-            <span>{{ record.value }}</span>
-          </a-tooltip>
-        </span>
+        <icon-copy class="copy-left" title="复制" @click="copy(record.value)" />
+        <a-tooltip :content="record.value">
+          <span>{{ record.value }}</span>
+        </a-tooltip>
       </template>
       <!-- 操作 -->
       <template #handle="{ record }">
@@ -163,7 +148,6 @@
     id: undefined,
     keyId: undefined,
     keyName: undefined,
-    name: undefined,
     value: undefined,
     label: undefined,
     extra: undefined,
diff --git a/orion-ops-ui/src/views/system/dict-value/types/form.rules.ts b/orion-ops-ui/src/views/system/dict-value/types/form.rules.ts
index 74086a10..bddb52fc 100644
--- a/orion-ops-ui/src/views/system/dict-value/types/form.rules.ts
+++ b/orion-ops-ui/src/views/system/dict-value/types/form.rules.ts
@@ -13,14 +13,6 @@ export const keyName = [{
   message: '配置项长度不能大于32位'
 }] as FieldRule[];
 
-export const name = [{
-  required: true,
-  message: '请输入配置名称'
-}, {
-  maxLength: 32,
-  message: '配置名称长度不能大于32位'
-}] as FieldRule[];
-
 export const value = [{
   required: true,
   message: '请输入配置值'
@@ -50,7 +42,6 @@ export const sort = [{
 export default {
   keyId,
   keyName,
-  name,
   value,
   label,
   extra,
diff --git a/orion-ops-ui/src/views/system/dict-value/types/table.columns.ts b/orion-ops-ui/src/views/system/dict-value/types/table.columns.ts
index 70fd166f..314a5691 100644
--- a/orion-ops-ui/src/views/system/dict-value/types/table.columns.ts
+++ b/orion-ops-ui/src/views/system/dict-value/types/table.columns.ts
@@ -19,18 +19,6 @@ const columns = [
     render: ({ record }) => {
       return `${record.keyName} - ${record.keyDescription}`;
     },
-  }, {
-    title: '配置名称',
-    dataIndex: 'name',
-    slotName: 'name',
-    align: 'left',
-    ellipsis: true,
-  }, {
-    title: '配置值',
-    dataIndex: 'value',
-    slotName: 'value',
-    align: 'left',
-    ellipsis: true,
   }, {
     title: '配置描述',
     dataIndex: 'label',
@@ -38,6 +26,12 @@ const columns = [
     align: 'left',
     ellipsis: true,
     tooltip: true,
+  }, {
+    title: '配置值',
+    dataIndex: 'value',
+    slotName: 'value',
+    align: 'left',
+    ellipsis: true,
   }, {
     title: '额外参数',
     dataIndex: 'extra',