修改模态框对象类型.

orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue

@@ -88,14 +88,12 @@
 </script>
 
 <script lang="ts" setup>
-  import { reactive, ref } from 'vue';
+  import { ref } from 'vue';
   import useLoading from '@/hooks/loading';
   import useVisible from '@/hooks/visible';
   import formRules from '../types/form.rules';
   import { createHostKey, updateHostKey, getHostKey, HostKeyUpdateRequest } from '@/api/asset/host-key';
   import { FileItem, Message } from '@arco-design/web-vue';
-  import {} from '../types/enum.types';
-  import {} from '../types/const';
   import { readFileText } from '@/utils/file';
 
   const { visible, setVisible } = useVisible();
@@ -105,7 +103,7 @@
   const isAddHandle = ref<boolean>(true);
   const isViewHandler = ref<boolean>(false);
 
-  const defaultForm = (): HostKeyUpdateRequest & Record<string, any> => {
+  const defaultForm = (): HostKeyUpdateRequest => {
     return {
       id: undefined,
       name: undefined,
@@ -117,7 +115,7 @@
   };
 
   const formRef = ref();
-  const formModel = reactive<HostKeyUpdateRequest & Record<string, any>>(defaultForm());
+  const formModel = ref<HostKeyUpdateRequest>({});
 
   const emits = defineEmits(['added', 'updated']);
 
@@ -162,26 +160,20 @@
 
   // 渲染表单
   const renderForm = (record: any) => {
-    Object.keys(formModel).forEach(k => {
-      if (record.hasOwnProperty(k)) {
-        formModel[k] = record[k];
-      }
-    });
+    formModel.value = Object.assign({}, record);
   };
 
   defineExpose({ openAdd, openUpdate, openView });
 
   // 选择公钥文件
   const selectPublicFile = async (fileList: FileItem[]) => {
-    // FIXME
-    formModel.publicKey = await readFileText(fileList[0].file as File);
+    formModel.value.publicKey = await readFileText(fileList[0].file as File);
     formRef.value.clearValidate('publicKey');
   };
 
   // 选择私钥文件
   const selectPrivateFile = async (fileList: FileItem[]) => {
-    // FIXME
-    formModel.privateKey = await readFileText(fileList[0].file as File);
+    formModel.value.privateKey = await readFileText(fileList[0].file as File);
     formRef.value.clearValidate('privateKey');
   };
 
@@ -196,12 +188,12 @@
       }
       if (isAddHandle.value) {
         // 新增
-        await createHostKey(formModel);
+        await createHostKey(formModel.value);
         Message.success('创建成功');
         emits('added');
       } else {
         // 修改
-        await updateHostKey(formModel);
+        await updateHostKey(formModel.value);
         Message.success('修改成功');
         emits('updated');
       }

orion-ops-ui/src/views/asset/host-key/components/host-key-table.vue

@@ -7,7 +7,10 @@
                     @reset="fetchTableData">
       <!-- id -->
       <a-form-item field="id" label="id" label-col-flex="30px">
-        <a-input-number v-model="formModel.id" placeholder="请输入id" allow-clear />
+        <a-input-number v-model="formModel.id"
+                        placeholder="请输入id"
+                        allow-clear
+                        hide-button />
       </a-form-item>
       <!-- 名称 -->
       <a-form-item field="name" label="名称" label-col-flex="30px">
@@ -45,7 +48,7 @@
              :loading="loading"
              :columns="columns"
              :data="tableRenderData"
-             :pagination="pagination as PaginationProps"
+             :pagination="pagination"
              @page-change="(page) => fetchTableData(page, pagination.pageSize)"
              @page-size-change="(size) => fetchTableData(pagination.current, size)"
              :bordered="false">
@@ -102,7 +105,7 @@
   const { loading, setLoading } = useLoading();
   const emits = defineEmits(['openAdd', 'openUpdate', 'openView']);
 
-  const pagination = reactive(defaultPagination());
+  const pagination = reactive(defaultPagination()) as PaginationProps;
 
   const formModel = reactive<HostKeyQueryRequest>({
     id: undefined,
@@ -112,7 +115,9 @@
   });
 
   // 删除当前行
-  const deleteRow = async ({ id }: { id: number }) => {
+  const deleteRow = async ({ id }: {
+    id: number
+  }) => {
     try {
       setLoading(true);
       // 调用删除接口