Merge branch 'main_dev' into ft

@@ -126,6 +126,7 @@ export interface MasterDeviceList {
   name: string;
   label?: string;
   value?: string;
+  alias?: string;
 }
 
 export interface ComponentInfoDetail {

@@ -162,9 +162,10 @@ export const step1Schemas: FormSchema[] = [
     changeEvent: 'update:value',
     valueField: 'value',
     componentProps: {
-      type: AddressTypeEnum.HEX,
-      maxValue: Number(247).toString(16),
+      type: AddressTypeEnum.DEC,
+      maxValue: 247,
       minValue: 0,
+      disabledSwitch: true,
     },
     ifShow: ({ values }) => {
       return (

@@ -389,7 +389,7 @@
         setFieldsValue({
           ...data,
           code: data?.code,
-          addressCode: data?.code,
+          addressCode: parseInt(data?.code || '', 16),
         });
       }
       // 父组件调用获取字段值的方法
@@ -398,7 +398,12 @@
         return {
           ...value,
           ...(value?.code || value?.addressCode
-            ? { code: value?.codeType === TaskTypeEnum.CUSTOM ? value?.code : value?.addressCode }
+            ? {
+                code:
+                  value?.codeType === TaskTypeEnum.CUSTOM
+                    ? value?.code
+                    : (value?.addressCode || '').toString(16).padStart(2, '0').toUpperCase(),
+              }
             : {}),
         };
       }

@@ -18,6 +18,7 @@
       minValue?: number | string;
       type?: string;
       toUpperCase?: boolean;
+      disabledSwitch?: boolean;
     }>(),
     {
       inputProps: () => ({}),
@@ -113,7 +114,7 @@
 
   const validate = (value: string | number) => {
     if (unref(inputType) === AddressTypeEnum.DEC) {
-      return /^[1-9]\d*$/.test(value.toString());
+      return /^[0-9]\d*$/.test(value.toString());
     } else {
       return /(0x)?[0-9a-fA-F]+/.test(value.toString());
     }
@@ -142,12 +143,12 @@
 <template>
   <InputGroup compact class="!flex">
     <Select
+      v-if="!disabledSwitch"
       v-model:value="inputType"
       :options="addressTypeOptions"
       :disabled="disabled"
       class="bg-gray-200 max-w-20"
     />
-
     <Input
       :value="getInputValue"
       @change="handleSyncValue"

@@ -27,7 +27,7 @@ export enum TaskTargetNameEnum {
 
 export enum TaskTypeEnum {
   CUSTOM = 'CUSTOM',
-  MODBUS = 'MODBUS',
+  MODBUS = 'MODBUS_RTU',
 }
 
 export enum TaskTypeNameEnum {

@@ -135,11 +135,11 @@
         time: 0,
       };
     }) as any;
-    const { data } = message;
-    const alarmList = data?.data;
+    const { data, update } = message;
+    const alarmList = data?.data || update;
     const uniData = getReduce(alarmList); //去重得到最新的事件对象
 
-    if (!data?.data.length) return;
+    // if (!data?.data.length) return;
     uniData.forEach((item) => {
       alarmStatusList.value?.forEach((item1) => {
         if (item.entityId.id == item1.id) {

@@ -147,8 +147,9 @@
 
   const updateFn = (message: ReceiveAlarmDataCmdsMessageType) => {
     const { data } = message || {};
+    if (!data?.data) return;
     const tableList = ref<any>(
-      data?.data.map((item) => {
+      data?.data?.map((item) => {
         return {
           time: item.createdTime,
           device: item.originatorName,

@@ -104,7 +104,7 @@
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
       controlList.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.checked = Boolean(getNumberValue(value));
         }
       });

@@ -79,6 +79,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     currentValue.value = Number(value);

@@ -70,6 +70,7 @@
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [timespan, value] = latest;
+    if (!latest.length) return;
     time.value = timespan;
     currentValue.value = Number(value);
   };

@@ -50,6 +50,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
 

@@ -65,6 +65,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     currentValue.value = isNaN(value as unknown as number) ? 0 : Number(value);

@@ -166,6 +166,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -177,6 +177,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -261,7 +261,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
       series.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           // time.value = timespan;
         }

@@ -148,6 +148,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -181,6 +181,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -157,6 +157,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     updateChartFn(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -32,7 +32,7 @@
       );
       const options = deviceList
         .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
-        .map((item) => ({ ...item, label: item.name, value: item.tbDeviceId }));
+        .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
 
       const attKey = dataSource.map((item) => ({
         ...item,

@@ -47,6 +47,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     isOpenClose.value = Boolean(getNumberValue(value));

@@ -49,6 +49,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     time.value = timespan;
     isOpenClose.value = Boolean(getNumberValue(value));

@@ -156,7 +156,6 @@
   onMounted(() => {
     initial();
     // !props.config.option.uuid && randomFn();
-    !props.config.option.uuid;
   });
 
   const resize = async () => {

@@ -15,31 +15,37 @@
   import { MultipleDataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
 
   interface IList {
-    [key: string]: string | number;
+    [key: string]: string | number | object;
   }
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
   }>();
 
-  const [registerTable, { setTableData, setColumns, getDataSource, redoHeight, setProps }] =
-    useTable({ showIndexColumn: false, showTableSetting: false, canResize: true, size: 'small' });
-
-  const getDesign = computed(() => {
-    const { persetOption, option } = props.config;
-    const { dataSource = [] } = option || {};
-    const { unit: presetUnit, showDeviceName: presetShowDeviceName } = persetOption || {};
-    const columns: BasicColumn[] = dataSource.map((item) => ({
-      title: item.attributeRename || item.attributeName || item.attribute,
-      dataIndex: item.attribute,
+  const columns: BasicColumn[] = [
+    {
+      title: '设备属性',
+      dataIndex: 'attribute',
+      width: 80,
+      ellipsis: true,
+      format(text) {
+        if (props.config.option.mode == 'SELECT_PREVIEW') return text;
+        const { uniqueArr } = unref(getDesign);
+        const values = uniqueArr.filter((item) => item[text])[0][text];
+        return values;
+      },
+    },
+    {
+      title: '值',
+      dataIndex: 'value',
       width: 80,
       ellipsis: true,
       format(text, record) {
         const value = text ? text + (record.unit || '') : '';
         return value;
       },
-    }));
-    columns.push({
+    },
+    {
       title: '时间',
       dataIndex: 'time',
       width: 110,
@@ -47,9 +53,37 @@
       format(text) {
         return formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss');
       },
+    },
+  ];
+
+  const [registerTable, { setTableData, getDataSource, redoHeight, setProps }] = useTable({
+    showIndexColumn: false,
+    showTableSetting: false,
+    canResize: true,
+    size: 'small',
+    columns,
+  });
+
+  const getDesign = computed(() => {
+    const { persetOption, option } = props.config;
+    const { dataSource = [] } = option || {};
+    const { unit: presetUnit, showDeviceName: presetShowDeviceName } = persetOption || {};
+    const convert = dataSource.map((item) => {
+      return {
+        [item.attribute + '-' + item.deviceId]: item.deviceName + '-' + item.attributeName,
+        id: item.deviceId,
+      };
+    });
+
+    const uniqueSet = new Set();
+    const uniqueArr = convert.filter((obj) => {
+      const jsonString = JSON.stringify(obj);
+      const isUnique = !uniqueSet.has(jsonString);
+      uniqueSet.add(jsonString);
+      return isUnique;
     });
     return {
-      columns,
+      uniqueArr,
       dataSource: dataSource?.map((item) => {
         const { unit, showDeviceName } = item.componentInfo || {};
         const { attribute, attributeName, attributeRename, deviceName, deviceRename, deviceId } =
@@ -57,11 +91,9 @@
         return {
           unit: unit ?? presetUnit,
           attribute,
-          attributeRename,
-          attributeName,
+          attributeName: attributeRename || attributeName,
           showDeviceName: showDeviceName ?? presetShowDeviceName,
-          deviceName,
-          deviceRename,
+          deviceName: deviceRename || deviceName,
           id: deviceId,
         };
       }),
@@ -73,29 +105,30 @@
 
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
     const list: IList = {};
+    const list1: IList = {};
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
-      list[attribute] = getNumberValue(value);
+      list[deviceId + attribute] = getNumberValue(value);
       list.time = timespan || list.time;
+
+      if (timespan && value) {
+        list1[attribute + '-' + deviceId] = {
+          attribute: attribute + '-' + deviceId,
+          value: value ? getNumberValue(value) : value,
+          time: timespan,
+        };
+      }
     });
     await nextTick();
-    setTableData([list, ...toRaw(unref(getDataSource()))]);
+    setTableData([...Object.values(list1), ...toRaw(unref(getDataSource()))]);
   };
 
   useMultipleDataFetch(props, updateFn);
   onMounted(async () => {
-    setColumns(
-      props.config.option.dataSource
-        ? unref(getDesign).columns
-        : [
-            { title: '属性', dataIndex: 'attribute', width: 80, ellipsis: true },
-            { title: '时间', dataIndex: 'time', width: 80, ellipsis: true },
-          ]
-    );
     !props.config.option.dataSource &&
       setTableData([
-        { attribute: '温度', time: '2023-06-29' },
-        { attribute: '湿度', time: '2023-06-29' },
-        { attribute: '湿度', time: '2023-06-29' },
+        { attribute: '温度', value: 1, time: '2023-06-29' },
+        { attribute: '湿度', value: 1, time: '2023-06-29' },
+        { attribute: '湿度', value: 1, time: '2023-06-29' },
       ]);
 
     await nextTick();

@@ -13,12 +13,12 @@
         component: 'Input',
         defaultValue: option.unit,
       },
-      {
-        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
-        label: '显示设备名称',
-        component: 'Checkbox',
-        defaultValue: option.showDeviceName,
-      },
+      // {
+      //   field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
+      //   label: '显示设备名称',
+      //   component: 'Checkbox',
+      //   defaultValue: option.showDeviceName,
+      // },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -86,7 +86,11 @@
   const getDesign = computed(() => {
     const { persetOption, option } = props.config;
     const { dataSource = [] } = option || {};
-    const { unit: presetUnit, fontColor: presetFontColor } = persetOption || {};
+    const {
+      unit: presetUnit,
+      fontColor: presetFontColor,
+      // lineColor: persetLineColor,
+    } = persetOption || {};
 
     return {
       dataSource: dataSource?.map((item) => {
@@ -97,12 +101,11 @@
           unit: unit ?? presetUnit,
           fontColor: fontColor ?? presetFontColor,
           attribute,
-          attributeName,
-          attributeRename,
+          attributeName: attributeRename || attributeName,
           showDeviceName,
-          deviceName,
-          deviceRename,
+          deviceName: deviceRename || deviceName,
           id: deviceId,
+          // lineColor: lineColor || persetLineColor,
         };
       }),
     };
@@ -117,12 +120,16 @@
     unref(getDesign).dataSource.map((item) => {
       return {
         type: 'line',
-        name: `${item.showDeviceName || item.deviceRename || item.deviceName} - ${
-          item.attributeRename || item.attributeName
-        }`,
+        name: `${item.deviceName} - ${item.attributeName}`,
         data: [] as { name: string; value: number }[],
         id: item.id,
         attribute: item.attribute,
+        // itemStyle: {
+        //   color: item.lineColor,
+        // },
+        // lineStyle: {
+        //   color: item.lineColor,
+        // },
       };
     })
   );
@@ -131,15 +138,13 @@
 
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
     legendData.value = unref(getDesign).dataSource.map((item) => {
-      return `${item.deviceRename || item.deviceName} - ${
-        item.attributeRename || item.attributeName
-      }`;
+      return `${item.deviceName} - ${item.attributeName}`;
     });
     const list: IList | any = {};
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       list.time = timespan || list.time;
       series.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.data.push({
             name: formatToDateTime(list.time, 'HH:mm:ss'),
             value: value,
@@ -169,6 +174,8 @@
             type,
             name,
             data,
+            // itemStyle,
+            // lineStyle,
           };
         })
       ),

@@ -31,6 +31,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [_, value] = latest;
     currentValue.value = value;
   };

@@ -34,6 +34,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [info] = data[attribute] || [];
+    if (!info.length) return;
     const [timespan, value] = info;
     currentValue.value = value;
     time.value = timespan;

@@ -43,6 +43,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     currentValue.value = value;
     time.value = timespan;

@@ -40,6 +40,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const [info] = data[attribute] || [];
+    if (!info.length) return;
     const [_, value] = info;
     currentValue.value = value;
   };

@@ -89,7 +89,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       percentList.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           time.value = timespan;
         }

@@ -75,7 +75,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       updateSvgList.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           time.value = timespan;
         }