Merge branch 'main' into ft_local_dev

@@ -29,8 +29,8 @@ export interface StructJSON {
 
 export interface FunctionJson {
   dataType?: DataType | DataType[];
-  inputData?: DataType[];
-  outputData?: DataType[];
+  inputData?: StructJSON[];
+  outputData?: StructJSON[];
   serviceCommand?: string;
 }
 

 <template>
   <div class="wrapper">
-    <div ref="wrapRef" :style="{ height, width }"> </div>
+    <Spin :spinning="spinning">
+      <div ref="wrapRef" :style="{ height, width }"> </div>
+    </Spin>
     <div class="right-wrap !dark:bg-dark-900">
       <BasicTable
         style="cursor: pointer"
@@ -91,6 +93,7 @@
   import { defaultSchemas } from './cpns/TimePeriodForm/config';
   import { QueryWay, SchemaFiled, AggregateDataEnum } from './cpns/TimePeriodForm/config';
   import { dateUtil } from '/@/utils/dateUtil';
+  import { Spin } from 'ant-design-vue';
 
   interface DeviceInfo {
     alarmStatus: 0 | 1;
@@ -114,6 +117,7 @@
       DeviceDetailDrawer,
       Loading,
       TimePeriodForm,
+      Spin,
     },
     props: {
       width: {
@@ -155,54 +159,56 @@
           showSizeChanger: true,
         },
         afterFetch: async (data: DeviceInfo[]) => {
-          Promise.resolve().then(() => {
-            const BMap = (window as any).BMap;
-            unref(BMapInstance).clearOverlays();
-            const markerList: MarkerList[] = [];
-            data.forEach((item) => {
-              const {
-                name,
-                deviceState,
-                deviceInfo: { longitude, latitude },
-              } = item;
-              const point = new BMap.Point(longitude, latitude);
-              const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
-              const myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
-              const marker = new BMap.Marker(point, { icon: myIcon });
-              const label = new BMap.Label(name, {
-                position: point,
-                offset: new BMap.Size(-15, -45),
-              });
-              label.setStyle({
-                color: '#000',
-                borderRadius: '5px',
-                borderColor: '#ccc',
-                padding: '5px',
-              });
-              markerList.push({ ...item, marker, label });
-            });
-
-            markerList.forEach((record) => {
-              unref(BMapInstance).addOverlay(record.marker);
-              unref(BMapInstance).addOverlay(record.label);
-              const isAlarmStatus = !!record.alarmStatus;
-              if (isAlarmStatus) {
-                const alarmStatusClassName = 'device-status__alarm';
-                const className = record.marker.Ec.getAttribute('class');
-                record.marker.Ec.setAttribute('class', `${className} ${alarmStatusClassName}`);
-              }
-
-              //标注监听事件
-              record.marker.addEventListener('click', function () {
-                createDeviceInfoWindow(record);
-              });
-            });
-          });
-
+          createMarket(data);
           return data;
         },
       });
 
+      async function createMarket(data: DeviceInfo[]) {
+        const BMap = (window as any).BMap;
+        if (!BMap) return;
+        unref(BMapInstance).clearOverlays();
+        const markerList: MarkerList[] = [];
+        data.forEach((item) => {
+          const {
+            name,
+            deviceState,
+            deviceInfo: { longitude, latitude },
+          } = item;
+          const point = new BMap.Point(longitude, latitude);
+          const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
+          const myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
+          const marker = new BMap.Marker(point, { icon: myIcon });
+          const label = new BMap.Label(name, {
+            position: point,
+            offset: new BMap.Size(-15, -45),
+          });
+          label.setStyle({
+            color: '#000',
+            borderRadius: '5px',
+            borderColor: '#ccc',
+            padding: '5px',
+          });
+          markerList.push({ ...item, marker, label });
+        });
+
+        markerList.forEach((record) => {
+          unref(BMapInstance).addOverlay(record.marker);
+          unref(BMapInstance).addOverlay(record.label);
+          const isAlarmStatus = !!record.alarmStatus;
+          if (isAlarmStatus) {
+            const alarmStatusClassName = 'device-status__alarm';
+            const className = record.marker.Ec.getAttribute('class');
+            record.marker.Ec.setAttribute('class', `${className} ${alarmStatusClassName}`);
+          }
+
+          //标注监听事件
+          record.marker.addEventListener('click', function () {
+            createDeviceInfoWindow(record);
+          });
+        });
+      }
+
       async function initMap() {
         await toPromise();
         await nextTick();
@@ -221,6 +227,7 @@
         myCity.get(myFun);
       }
 
+      const spinning = ref(false);
       const createDeviceInfoWindow = async (record: DeviceInfo) => {
         const BMap = (window as any).BMap;
         entityId = record.tbDeviceId;
@@ -287,7 +294,13 @@
       };
       // 点击表格某一行触发
       const deviceRowClick = async (record) => {
-        createDeviceInfoWindow(record);
+        try {
+          spinning.value = true;
+          await createDeviceInfoWindow(record);
+        } catch (err) {
+        } finally {
+          spinning.value = false;
+        }
       };
 
       // 设备信息
@@ -451,6 +464,7 @@
         isNull,
         registerDetailDrawer,
         loading,
+        spinning,
         timePeriodRegister,
         handleCancelModal,
       };

@@ -452,11 +452,6 @@ export const topicTableColumn: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '操作权限',
-    dataIndex: 'access',
-    width: 100,
-  },
-  {
     title: '描述',
     dataIndex: 'description',
     width: 100,

 <script lang="ts" setup>
   import { topicTableColumn } from '../device.profile.data';
   import { BasicTable, useTable } from '/@/components/Table';
+  import { buildUUID } from '/@/utils/uuid';
+
+  const list = [
+    { function: '遥测主题', class: 'v1/devices/me/telemetry' },
+    { function: '属性主题', class: 'v1/devices/me/attributes' },
+    { function: '设备上报事件主题', class: 'v1/devices/me/attributes' },
+    { function: '服务控制设备(RPC)主题', class: 'v1/devices/me/attributes' },
+  ];
+
+  const dataSource = Array.from({ length: 10 }, (_, index) => {
+    const record = list[index % 4];
+    return {
+      id: buildUUID(),
+      ...record,
+      description: record.function,
+    };
+  });
+
   const [register] = useTable({
     title: 'Topic',
+    showIndexColumn: false,
+    dataSource,
     columns: topicTableColumn,
     bordered: true,
     showTableSetting: true,

@@ -35,12 +35,16 @@
 
   async function getFormData() {
     const _values = (await validate()) as StructFormValue;
-    const { functionName, remark, identifier, outputData: _outputData, eventType } = _values;
+    const { functionName, remark, identifier, outputData: _outputData = [], eventType } = _values;
     if (!_values) return {} as unknown as ModelOfMatterParams;
 
-    const outputData = (_outputData as unknown as StructJSON[]).map((item) =>
-      excludeIdInStructJSON(item.dataType!)
-    );
+    const outputData = (_outputData as unknown as StructJSON[]).map((item) => {
+      const dataType = excludeIdInStructJSON(item.dataType!);
+      return {
+        ...item,
+        dataType,
+      };
+    });
 
     const value = {
       functionName,

@@ -58,12 +58,20 @@
     } = _values;
     if (!_values) return {};
 
-    const outputData = (_outputData as unknown as StructJSON[]).map((item) =>
-      excludeIdInStructJSON(item.dataType!)
-    );
-    const inputData = (_inputData as unknown as StructJSON[]).map((item) =>
-      excludeIdInStructJSON(item.dataType!)
-    );
+    const outputData = (_outputData as unknown as StructJSON[]).map((item) => {
+      const dataType = excludeIdInStructJSON(item.dataType!);
+      return {
+        ...item,
+        dataType,
+      };
+    });
+    const inputData = (_inputData as unknown as StructJSON[]).map((item) => {
+      const dataType = excludeIdInStructJSON(item.dataType!);
+      return {
+        ...item,
+        dataType,
+      };
+    });
 
     const value = {
       functionName,