Merge branch 'perf_device_access' into 'main_dev'

perf: 设备接入信息管理修改更新请求方式为put

See merge request yunteng/thingskit-front!1218

@@ -15,6 +15,16 @@ export const deviceProfileAccessInformation = (params) => {
 };
 
 /**
+ * 修改设备接入信息
+ */
+export const updateDeviceProfileAccessInformation = (params) => {
+  return defHttp.put<any>({
+    url: `${Api.DEVICE_PROFILE_ACCESS_INFORMATIION}`,
+    params,
+  });
+};
+
+/**
  * 获取设备接入信息列表
  */
 export const getDeviceAccessInformationList = (params) => {

@@ -18,11 +18,12 @@
   });
 
   const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
-    setDrawerProps({ confirmLoading: false });
+    setDrawerProps({ confirmLoading: true });
     const dataValue = {
       ...data,
-      ...data.sipExtend,
+      ...data?.sipExtend,
     };
-    setDescProps({ data: dataValue });
+    setDrawerProps({ confirmLoading: false });
+    await setDescProps({ data: dataValue });
   });
 </script>

@@ -4,7 +4,10 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { deleteFormField, schemas } from '../index';
   import { useForm, BasicForm } from '/@/components/Form';
-  import { deviceProfileAccessInformation } from '/@/api/device/deviceAccess';
+  import {
+    deviceProfileAccessInformation,
+    updateDeviceProfileAccessInformation,
+  } from '/@/api/device/deviceAccess';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { ipRegex } from '/@/utils/rules';
 
@@ -16,7 +19,7 @@
 
   const { createMessage } = useMessage();
 
-  const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
+  const [registerForm, { getFieldsValue, setFieldsValue, validate, resetFields }] = useForm({
     labelWidth: 150,
     schemas,
     actionColOptions: {
@@ -28,6 +31,7 @@
   const recordInfo = ref<Recordable>({});
 
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
+    await resetFields();
     setModalProps({ confirmLoading: false, loading: true });
     isUpdate.value = data?.isUpdate;
     recordInfo.value = data?.record;
@@ -52,9 +56,6 @@
   const handleOk = async () => {
     await validate();
     let values = getFieldsValue();
-    if (unref(isUpdate)) {
-      values = { ...values, id: unref(recordInfo).id };
-    }
     const { intranetIpAndPort, outerIpAndPort } = values;
     values.intranetIp = intranetIpAndPort.inputIp;
     values.intranetPort = intranetIpAndPort.inputPort;
@@ -81,7 +82,13 @@
     deleteFormField.forEach((deleteItem) => {
       Reflect.deleteProperty(values, deleteItem);
     });
-    await deviceProfileAccessInformation(values);
+    if (unref(isUpdate)) {
+      // 更新
+      values = { ...values, id: unref(recordInfo).id };
+      await updateDeviceProfileAccessInformation(values);
+    } else {
+      await deviceProfileAccessInformation(values);
+    }
     createMessage.success('操作成功');
     emit('handleReload');
     handleCancel();