pref:优化Mqtt和Coap获取表单数据

@@ -40,7 +40,7 @@ export const CoapSchemas: FormSchema[] = [
         { label: 'Efento NB-IoT', value: 'EFENTO' },
       ],
     },
-    colProps: { span: 22},
+    colProps: { span: 22 },
   },
   {
     field: 'transportPayloadType',
@@ -163,9 +163,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 17,
     },
     defaultValue: `
     syntax ="proto3";
@@ -193,9 +191,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 9,
     },
     defaultValue: `
     syntax ="proto3";
@@ -215,9 +211,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -238,9 +232,7 @@ export const CoapSchemas: FormSchema[] = [
     colProps: { span: 22 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 9,
     },
     defaultValue: `
     syntax ="proto3";

@@ -8,16 +8,12 @@
 <script lang="ts" setup>
   import { reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import {
-    CoapSchemas,
-    // deviceTelemetryProtoSchemaData,
-    // deviceAttributesProtoSchemaData,
-    // deviceRpcRequestProtoSchemaData,
-    // deviceRpcResponseProtoSchemaData,
-  } from './Coap';
+  import { CoapSchemas } from './Coap';
 
   const emits = defineEmits(['prev']);
-  let coapAllData = reactive({});
+  const coapAllData = reactive({
+    coapData: {},
+  });
   const transportCoapData: any = reactive({
     coapDeviceTypeConfiguration: {
       coapDeviceType: null,
@@ -61,25 +57,43 @@
   const getFormData = async () => {
     const val = await validate();
     if (!val) return;
-    transportCoapData.coapDeviceTypeConfiguration.coapDeviceType = val.coapDeviceType;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.transportPayloadType =
-      val.transportPayloadType;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceTelemetryProtoSchema =
-      val.deviceTelemetryProtoSchema;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceAttributesProtoSchema =
-      val.deviceAttributesProtoSchema;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceRpcRequestProtoSchema =
-      val.deviceRpcRequestProtoSchema;
-    transportCoapData.coapDeviceTypeConfiguration.transportPayloadTypeConfiguration.deviceRpcResponseProtoSchema =
-      val.deviceRpcResponseProtoSchema;
-    transportCoapData.clientSettings.powerMode = val.powerMode;
-    transportCoapData.clientSettings.edrxCycle = val.edrxCycle;
-    transportCoapData.clientSettings.pagingTransmissionWindow = val.pagingTransmissionWindow;
-    transportCoapData.clientSettings.psmActivityTimer = val.psmActivityTimer;
-    coapAllData = {
+    for (let o in val) {
+      for (let u in transportCoapData) {
+        switch (u) {
+          case 'coapDeviceTypeConfiguration':
+            for (let t in transportCoapData.coapDeviceTypeConfiguration) {
+              if (t === 'coapDeviceType') {
+                Reflect.set(transportCoapData.coapDeviceTypeConfiguration, t, val[t]);
+              }
+              if (t === 'transportPayloadTypeConfiguration') {
+                for (let t in transportCoapData.coapDeviceTypeConfiguration
+                  .transportPayloadTypeConfiguration) {
+                  if (t === o) {
+                    Reflect.set(
+                      transportCoapData.coapDeviceTypeConfiguration
+                        .transportPayloadTypeConfiguration,
+                      t,
+                      val[t]
+                    );
+                  }
+                }
+              }
+            }
+            break;
+          case 'clientSettings':
+            for (let t in transportCoapData.clientSettings) {
+              if (t === o) {
+                Reflect.set(transportCoapData.clientSettings, t, val[t]);
+              }
+            }
+            break;
+        }
+      }
+    }
+    coapAllData.coapData = {
       ...transportCoapData,
     };
-    return coapAllData;
+    return coapAllData.coapData;
   };
   defineExpose({
     getFormData,

@@ -100,9 +100,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 17,
     },
     defaultValue: `
     syntax ="proto3";
@@ -129,9 +127,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -150,9 +146,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -172,9 +166,7 @@ export const MqttSchemas: FormSchema[] = [
     colProps: { span: 23 },
     component: 'InputTextArea',
     componentProps: {
-      autoSize: {
-        maxRows: 10,
-      },
+      rows: 11,
     },
     defaultValue: `
     syntax ="proto3";
@@ -235,3 +227,19 @@ message RpcResponseMsg {
   optional string payload = 1;
 }
 `;
+
+export const fixedTextA = `支持单[+]和多级[#]通配符。 [+] is suitable for any topic filter
+level。例如：v1/devices/+/telemetry or +/devices/+/attributes。 [#]可以替换 topic
+filter 本身，并且必须是 topic 的最后一个符号。例如：# or v1/devices/me/#。`;
+
+export const fixedTextB = `启用时，默认情况下，平台将使用Protobuf有效载荷格式。如果解析失败，平台将尝试使用JSON负载格式。
+有助于固件更新期间的向后兼容性。例如，固件的初始版本使用Json，而新版本使用Protobuf。
+在设备组的固件更新过程中，需要同时支持Protobuf和JSON。兼容性模式会导致性能略有下降，
+因此建议在更新所有设备后禁用此模式。`;
+
+export const fixedTextC = `启用后，平台将使用Json负载格式通过以下主题推送属性
+和RPC:v1/devices/me/attributes/response/$request id、v1/devices/me/attributes、
+v1/devices/me/RPC/request/$request id、v1/devices/me/RPC/response/$request id。
+此设置不会影响使用新（v2）主题发送的属性和rpc订阅： v2/a/res/$request
+id、v2/a、v2/r/req/$request id、v2/r/res/$request id。 其中，$request
+id是整数请求标识符。`;

@@ -13,31 +13,21 @@
         <template #descSlot>
           <div style="width: 47rem; margin-left: 2rem">
             <p>
-              支持单[+]和多级[#]通配符。 [+] is suitable for any topic filter
-              level。例如：v1/devices/+/telemetry or +/devices/+/attributes。 [#]可以替换 topic
-              filter 本身，并且必须是 topic 的最后一个符号。例如：# or v1/devices/me/#。
+              {{ fixedTextA }}
             </p>
           </div>
         </template>
         <template #desc1>
           <div style="width: 47rem; margin-left: 2rem">
             <p>
-              启用时，默认情况下，平台将使用Protobuf有效载荷格式。如果解析失败，平台将尝试使用JSON负载格式。
-              有助于固件更新期间的向后兼容性。例如，固件的初始版本使用Json，而新版本使用Protobuf。
-              在设备组的固件更新过程中，需要同时支持Protobuf和JSON。兼容性模式会导致性能略有下降，
-              因此建议在更新所有设备后禁用此模式。
+              {{ fixedTextB }}
             </p>
           </div>
         </template>
         <template #desc2>
           <div style="width: 47rem; margin-left: 2rem">
             <p>
-              启用后，平台将使用Json负载格式通过以下主题推送属性
-              和RPC:v1/devices/me/attributes/response/$request\u id、v1/devices/me/attributes、
-              v1/devices/me/RPC/request/$request\u id、v1/devices/me/RPC/response/$request\u id。
-              此设置不会影响使用新（v2）主题发送的属性和rpc订阅： v2/a/res/$request\u
-              id、v2/a、v2/r/req/$request\u id、v2/r/res/$request\u id。 其中，$request\u
-              id是整数请求标识符。
+              {{ fixedTextC }}
             </p>
           </div>
         </template>
@@ -48,17 +38,13 @@
 <script lang="ts" setup>
   import { reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import {
-    MqttSchemas,
-    // deviceTelemetryProtoSchemaData,
-    // deviceAttributesProtoSchemaData,
-    // deviceRpcRequestProtoSchemaData,
-    // deviceRpcResponseProtoSchemaData,
-  } from './Mqtt';
+  import { MqttSchemas, fixedTextA, fixedTextB, fixedTextC } from './Mqtt';
 
   const emits = defineEmits(['prev']);
 
-  let allMqttData: any = reactive({});
+  const allMqttData: any = reactive({
+    mqttData: {},
+  });
   const transportMqttData: any = reactive({
     transportPayloadTypeConfiguration: {
       transportPayloadType: null,
@@ -94,33 +80,27 @@
   const getFormData = async () => {
     let val = await validate();
     if (!val) return;
-    delete val.desc;
-    transportMqttData.transportPayloadTypeConfiguration.transportPayloadType =
-      val.transportPayloadType;
-    transportMqttData.transportPayloadTypeConfiguration.enableCompatibilityWithJsonPayloadFormat =
-      val.enableCompatibilityWithJsonPayloadFormat;
-    transportMqttData.transportPayloadTypeConfiguration.useJsonPayloadFormatForDefaultDownlinkTopics =
-      val.useJsonPayloadFormatForDefaultDownlinkTopics;
-    transportMqttData.transportPayloadTypeConfiguration.deviceAttributesProtoSchema =
-      val.deviceAttributesProtoSchema;
-    transportMqttData.transportPayloadTypeConfiguration.deviceRpcRequestProtoSchema =
-      val.deviceRpcRequestProtoSchema;
-    transportMqttData.transportPayloadTypeConfiguration.deviceRpcResponseProtoSchema =
-      val.deviceRpcResponseProtoSchema;
-    transportMqttData.transportPayloadTypeConfiguration.deviceTelemetryProtoSchema =
-      val.deviceTelemetryProtoSchema;
-    allMqttData = {
+    for (let o in val) {
+      for (let u in transportMqttData) {
+        if (u === 'transportPayloadTypeConfiguration') {
+          for (let t in transportMqttData.transportPayloadTypeConfiguration) {
+            if (t === o) {
+              Reflect.set(transportMqttData.transportPayloadTypeConfiguration, t, val[t]);
+            }
+          }
+        }
+      }
+    }
+    for (let i in val) {
+      if (i !== 'deviceAttributesTopic' && i !== 'deviceTelemetryTopic') {
+        Reflect.deleteProperty(val, i);
+      }
+    }
+    allMqttData.mqttData = {
       ...val,
       ...transportMqttData,
     };
-    delete allMqttData.deviceTelemetryProtoSchema;
-    delete allMqttData.deviceAttributesProtoSchema;
-    delete allMqttData.deviceRpcRequestProtoSchema;
-    delete allMqttData.deviceRpcResponseProtoSchema;
-    delete allMqttData.useJsonPayloadFormatForDefaultDownlinkTopics;
-    delete allMqttData.enableCompatibilityWithJsonPayloadFormat;
-    delete allMqttData.transportPayloadType;
-    return allMqttData;
+    return allMqttData.mqttData;
   };
   defineExpose({
     getFormData,

@@ -60,7 +60,7 @@
   import { exportPage, deleteExportManage } from '/@/api/export/exportManager';
 
   const searchInfo = reactive<Recordable>({});
-  const [registerTable, { reload, setProps, setTableData }] = useTable({
+  const [registerTable, { reload, setProps }] = useTable({
     title: '转换脚本列表',
     api: exportPage,
     columns,
@@ -102,24 +102,6 @@
 
   // 新增或编辑
   const handleCreateOrEdit = (record: Recordable | null) => {
-    setTableData([
-      {
-        id: 1,
-        reportConfigName: '11',
-        organizationName: 0,
-        dataType: '11',
-        executeWay: '11',
-        executeTime: '2022-05-21',
-      },
-      {
-        id: 2,
-        reportConfigName: '11',
-        organizationName: 0,
-        dataType: '11',
-        executeWay: '11',
-        executeTime: '2022-05-21',
-      },
-    ]);
     if (record) {
       openModal(true, {
         isUpdate: false,