Merge remote-tracking branch 'origin/ww'

# Conflicts:
#	src/views/tenant/list/TenantDrawer.vue

@@ -14,9 +14,9 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-# VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
+VITE_PROXY = [["/api","http://192.168.10.114:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
 
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -3,9 +3,10 @@ import { HistoryData } from './model';
 import { defHttp } from '/@/utils/http/axios';
 
 // 获取设备配置
-export const getDeviceProfile = () => {
+export const getDeviceProfile = (deviceType?: string) => {
   return defHttp.get<DeviceProfileModel[]>({
     url: '/device_profile/me/list',
+    params: { deviceType },
   });
 };
 

@@ -7,6 +7,7 @@ import {
   DeviceAttributeParams,
   DeviceAttributeRecord,
   GetDataBoardParams,
+  GetMeetTheConditionsDeviceParams,
   MasterDeviceList,
   SendCommandParams,
   UpdateDataBoardLayoutParams,
@@ -39,9 +40,10 @@ enum SendCommand {
 }
 
 enum DeviceUrl {
-  GET_DEVICE = '/device/list/master',
+  GET_DEVICE_MASTER = '/device/list/master',
   GET_SLAVE_DEVICE = '/device/list/slave',
   GET_DEVICE_ATTRIBUTE = '/device/attributes',
+  GET_DEVICE = '/device/list',
 }
 
 /**
@@ -168,8 +170,20 @@ export const getShareBoardComponentInfo = (params: { boardId: string; tenantId:
  */
 export const getAllDeviceByOrg = (organizationId: string, deviceProfileId?: string) => {
   return defHttp.get<MasterDeviceList[]>({
-    url: `${DeviceUrl.GET_DEVICE}/${organizationId}`,
-    params: { deviceProfileId },
+    url: DeviceUrl.GET_DEVICE_MASTER,
+    params: { deviceProfileId, organizationId },
+  });
+};
+
+/**
+ * @description 获取满足条件的设备
+ * @param params
+ * @returns
+ */
+export const getMeetTheConditionsDevice = (params: GetMeetTheConditionsDeviceParams) => {
+  return defHttp.get({
+    url: DeviceUrl.GET_DEVICE,
+    params,
   });
 };
 

@@ -162,3 +162,10 @@ export interface SendCommandParams {
   deviceId: string;
   value: any;
 }
+
+export interface GetMeetTheConditionsDeviceParams {
+  deviceLabel?: string;
+  deviceType?: string;
+  organizationId?: string;
+  deviceProfileId?: string;
+}

@@ -5,6 +5,8 @@ import {
   DeviceProfileModel,
   DeviceProfileQueryParam,
   DeviceQueryParam,
+  DeviceRecord,
+  DeviceTypeEnum,
 } from '/@/api/device/model/deviceModel';
 import { ChildDeviceParams } from './model/deviceModel';
 import { PaginationResult } from '/#/axios';
@@ -27,6 +29,8 @@ enum DeviceManagerApi {
   COMMAND_ISSUANCE = '/rpc',
 
   DEVICE_ATTR = '/device/attributes',
+
+  GATEWAY_DEVICE = '/device/gateway/list',
 }
 
 export const devicePage = (params: DeviceQueryParam) => {
@@ -183,16 +187,34 @@ export const cancelDispatchCustomer = (data) => {
 };
 
 // 获取组织下的的所有网关设备
-export const getGATEWAYdevice = async (params: { organization: string }) => {
+export const getGATEWAYdevice = async (params: {
+  organizationId: string;
+  deviceType: DeviceTypeEnum.GATEWAY;
+}) => {
+  const { organizationId, deviceType } = params;
   const res = await defHttp.get({
-    url: `/device/list/GATEWAY`,
-    params,
+    url: `/device/list`,
+    params: {
+      organizationId,
+      deviceType,
+    },
   });
   return Promise.resolve<{ label: string; value: string }[]>(
     res.map((item) => ({ label: item.name, value: item.tbDeviceId }))
   );
 };
 
+export const getGatewayDevice = (params: Record<'organizationId' | 'transportType', string>) => {
+  const { organizationId, transportType } = params;
+  return defHttp.get<DeviceRecord[]>({
+    url: DeviceManagerApi.GATEWAY_DEVICE,
+    params: {
+      organizationId,
+      transportType,
+    },
+  });
+};
+
 // 获取网关设备
 export const getGATEWAY = (tbDeviceId: string) => {
   return defHttp.get({

@@ -82,9 +82,9 @@
           if (next) {
             const value = next[valueField];
             prev.push({
+              ...omit(next, [labelField, valueField]),
               label: next[labelField],
               value: numberToString ? `${value}` : value,
-              ...omit(next, [labelField, valueField]),
             });
           }
           return prev;

@@ -62,7 +62,6 @@ export function useECharts(
     }
     nextTick(() => {
       useTimeoutFn(() => {
-        console.log(chartInstance);
         if (!chartInstance) {
           initCharts(getDarkMode.value as 'default');
 
@@ -71,7 +70,6 @@ export function useECharts(
         clear && chartInstance?.clear();
 
         chartInstance?.setOption(unref(getOptions));
-        chartInstance = null;
       }, 30);
     });
   }
@@ -105,10 +103,17 @@ export function useECharts(
     return chartInstance;
   }
 
+  function destory() {
+    if (!chartInstance) return;
+    chartInstance.dispose();
+    chartInstance = null;
+  }
+
   return {
     setOptions,
     resize,
     echarts,
     getInstance,
+    destory,
   };
 }

@@ -117,15 +117,16 @@ const transform: AxiosTransform = {
     const errorLogStore = useErrorLogStoreWithOut();
     errorLogStore.addAjaxErrorInfo(error);
     const { response, code, message, config } = error || {};
+
     const errorMessageMode = config?.requestOptions?.errorMessageMode || 'none';
-    const errorMsgIsObj = typeof response.data === 'object';
+    const errorMsgIsObj = typeof response?.data === 'object';
     const msg: string = errorMsgIsObj
       ? response?.data?.message || response?.data?.msg
-      : response.data;
+      : response?.data;
     const err: string = error?.toString?.() ?? '';
     let errMessage = '';
     try {
-      if (response.data.status == '401' || response.data.message == '"Authentication failed"') {
+      if (response?.data?.status == '401' || response?.data?.message == '"Authentication failed"') {
         window.localStorage.clear();
         window.sessionStorage.clear();
         router.push(PageEnum.BASE_HOME);

 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { deviceProfile, getGATEWAYdevice } from '/@/api/device/deviceManager';
+import { deviceProfile, getGatewayDevice } from '/@/api/device/deviceManager';
 
 export enum TypeEnum {
   IS_GATEWAY = 'GATEWAY',
@@ -73,7 +73,12 @@ export const step1Schemas: FormSchema[] = [
           option: { deviceType: string; transportType: string; id: string }
         ) {
           const { deviceType, transportType, id } = option;
-          setFieldsValue({ deviceType: deviceType, transportType, deviceProfileId: id });
+          setFieldsValue({
+            deviceType: deviceType,
+            transportType,
+            deviceProfileId: id,
+            gatewayId: null,
+          });
         },
       };
     },
@@ -125,7 +130,6 @@ export const step1Schemas: FormSchema[] = [
     },
     ifShow: ({ values }) => isGateWay(values.deviceType),
   },
-
   {
     field: 'organizationId',
     label: '所属组织',
@@ -140,13 +144,20 @@ export const step1Schemas: FormSchema[] = [
     component: 'ApiSelect',
     ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
     componentProps: ({ formModel }) => {
-      const { organizationId } = formModel;
+      const { organizationId, transportType } = formModel;
       return {
-        api: getGATEWAYdevice,
+        // api: async (params: Record<'transportType' | 'organizationId', string>) => {
+        //   const options = await getGatewayDevice(params);
+        //   return options.filter((item) => item.deviceType === DeviceTypeEnum.GATEWAY);
+        // },
+        api: getGatewayDevice,
         showSearch: true,
         params: {
           organizationId,
+          transportType,
         },
+        valueField: 'id',
+        labelField: 'name',
       };
     },
   },

@@ -18,6 +18,7 @@
   import { computed } from '@vue/reactivity';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { isArray, isObject } from '/@/utils/is';
+  import { DateTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
 
   interface ReceiveMessage {
     data: {
@@ -89,6 +90,7 @@
         );
         await nextTick();
         socketInfo.dataSource = data;
+
         setTableData(data);
       } catch (error) {}
     },
@@ -127,14 +129,17 @@
   const getUnit = (record: StructJSON) => {
     const { dataType } = record;
     const { specs } = dataType! || {};
-
     return isObject(specs)
       ? (specs as Specs).unitName && (specs as Specs).unit
-        ? `${(specs as Specs).unitName}/${(specs as Specs).unit}`
+        ? `${(specs as Specs).unitName}`
         : ''
       : '';
   };
 
+  const isStructAndTextType = (type: DateTypeEnum) => {
+    return [DateTypeEnum.IS_STRUCT, DateTypeEnum.IS_STRING].includes(type);
+  };
+
   const { send, close, data } = useWebSocket(socketInfo.origin, {
     async onConnected() {
       const { deviceProfileId } = props.deviceDetail;
@@ -156,7 +161,18 @@
             const { identifier: key, name, detail } = item;
             const unit = getUnit(detail);
             const [time, value] = socketInfo.message[key].at(0) || [];
-            return { key, value, time, name, unit };
+            const dataInfo = socketInfo.attrKeys.find((item) => item.identifier === key);
+
+            return {
+              key,
+              value,
+              time,
+              name,
+              unit,
+              showHistoryDataButton: !isStructAndTextType(
+                dataInfo?.detail.dataType as unknown as DateTypeEnum
+              ),
+            };
           });
 
           await nextTick();
@@ -226,15 +242,21 @@
                 <span class="text-base font-normal">{{ item.name }}</span>
               </template>
               <template #extra>
-                <Button type="link" class="!p-0" @click="handleShowDetail(item)">历史数据</Button>
+                <Button
+                  v-if="item.showHistoryDataButton"
+                  type="link"
+                  class="!p-0"
+                  @click="handleShowDetail(item)"
+                  >历史数据</Button
+                >
               </template>
               <section class="min-h-16 flex flex-col justify-between">
                 <div class="flex font-bold text-lg mb-4 gap-2">
                   <div>{{ item.value || '--' }}</div>
-                  <div>{{ item.unit }}</div>
+                  <div class="text-xs flex items-center">{{ item.unit }}</div>
                 </div>
                 <div class="text-dark-800 text-xs">
-                  {{ item.value ? formatToDateTime(item.time) : '--' }}
+                  {{ item.value ? formatToDateTime(item.time, 'YYYY-MM-DD HH:mm:ss') : '--' }}
                 </div>
               </section>
             </Card>

@@ -40,7 +40,6 @@
   import { FileItem } from '/@/components/Upload/src/typing';
   import { upload } from '/@/api/oss/ossFileUploader';
   import { getTenantRoles, updateOrCreateTenant } from '/@/api/tenant/tenantApi';
-  import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     name: 'TenantDrawer',
     components: {
@@ -120,8 +119,8 @@
 
       //提交按钮
       async function handleSubmit() {
+        setDrawerProps({ confirmLoading: true });
         try {
-          setDrawerProps({ confirmLoading: true });
           const values = await validate();
           const req = {
             id: values.id,
@@ -140,22 +139,16 @@
               entityType: 'TENANT_PROFILE',
             },
           };
-          updateOrCreateTenant(req)
-            .then((res) => {
-              console.log(res);
-              closeDrawer(); //关闭侧框
-              emit('success');
-              setTimeout(() => {
-                setDrawerProps({ confirmLoading: false });
-              }, 300);
-            })
-            .catch((e) => {
-              const { createMessage } = useMessage();
-              createMessage.error(`${e.message}`);
-            })
-            .finally(() => {});
+          await updateOrCreateTenant(req);
+          emit('success');
+          closeDrawer(); //关闭侧框
         } catch (e) {
+          if ((e as { code: string }).code === 'ECONNABORTED') {
+            emit('success');
+            closeDrawer(); //关闭侧框
+          }
         } finally {
+          setDrawerProps({ confirmLoading: false });
         }
       }
       return {

@@ -7,7 +7,7 @@
   } from '@ant-design/icons-vue';
   import { Tooltip, Button, Alert } from 'ant-design-vue';
   import { FormActionType, useForm } from '/@/components/Form';
-  import { basicSchema, DataSourceField, isMapComponent } from '../config/basicConfiguration';
+  import { basicSchema, DataSourceField } from '../config/basicConfiguration';
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   import { ref, shallowReactive, unref, nextTick, watch, computed, onMounted } from 'vue';
   import VisualOptionsModal from './VisualOptionsModal.vue';
@@ -17,7 +17,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { DataBoardLayoutInfo } from '../../types/type';
   import { getDataSourceComponent } from './DataSourceForm/help';
-  import { FrontComponent } from '../../const/const';
+  import { FrontComponent, FrontComponentCategory } from '../../const/const';
   import { isNullAndUnDef } from '/@/utils/is';
   import { useSortable } from '/@/hooks/web/useSortable';
   import { cloneDeep } from 'lodash-es';
@@ -32,6 +32,7 @@
     record: DataBoardLayoutInfo;
     frontId?: FrontComponent;
     defaultConfig?: Partial<ComponentInfo>;
+    componentCategory?: FrontComponentCategory;
   }>();
 
   const { createMessage } = useMessage();
@@ -94,10 +95,8 @@
   const validateMapComponent = async (dataSource: Record<DataSourceField, string>[]) => {
     if (dataSource.length) {
       const firstRecord = dataSource.at(0)!;
-      const { deviceId, slaveDeviceId } = firstRecord;
-      const flag = dataSource.every(
-        (item) => item.deviceId === deviceId && item.slaveDeviceId === slaveDeviceId
-      );
+      const { deviceId } = firstRecord;
+      const flag = dataSource.every((item) => item.deviceId === deviceId);
       if (!flag) {
         createMessage.warning('地图组件绑定的数据源应该一致');
         return Promise.reject(false);
@@ -167,7 +166,15 @@
     dataSourceEl[data.id] = null;
   };
 
+  const isMapComponent = computed(() => {
+    return props.componentCategory === FrontComponentCategory.MAP;
+  });
+
   const handleAdd = () => {
+    if (unref(isMapComponent) && unref(dataSource).length === 2) {
+      createMessage.warning('地图组件只能绑定两条数据源');
+      return;
+    }
     unref(dataSource).push({
       id: buildUUID(),
       componentInfo: props.defaultConfig || {},
@@ -255,10 +262,6 @@
     return isControlComponent(props.frontId as FrontComponent);
   });
 
-  const isMapCmp = computed(() => {
-    return isMapComponent(props.frontId as FrontComponent);
-  });
-
   onMounted(() => handleSort());
 
   defineExpose({
@@ -283,7 +286,7 @@
         </div>
       </template>
     </Alert>
-    <Alert type="info" show-icon v-if="isMapCmp">
+    <Alert type="info" show-icon v-if="isMapComponent">
       <template #description>
         <div>
           地图组件，需绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为维度，否则地图组件不能正常显示。

@@ -13,6 +13,7 @@
   import { ComponentInfo } from '/@/api/dataBoard/model';
   import { useCalcGridLayout } from '../../hook/useCalcGridLayout';
   import { FrontComponent } from '../../const/const';
+  import { frontComponentMap } from '../../components/help';
 
   interface DataComponentRouteParams extends RouteParams {
     id: string;
@@ -40,6 +41,10 @@
 
   const componentDefaultConfig = ref<Partial<ComponentInfo>>({});
 
+  const getComponentCategory = computed(() => {
+    return frontComponentMap.get(unref(frontId))?.ComponentCategory;
+  });
+
   const [register, { closeModal, changeOkLoading }] = useModalInner(
     (data: { isEdit: boolean; record?: DataBoardLayoutInfo }) => {
       componentRecord.value = data.record || ({} as unknown as DataBoardLayoutInfo);
@@ -149,6 +154,7 @@
             :front-id="frontId"
             :record="componentRecord"
             :defaultConfig="componentDefaultConfig"
+            :componentCategory="getComponentCategory"
           />
         </Tabs.TabPane>
         <Tabs.TabPane key="visualConfig" tab="可视化配置">

@@ -28,7 +28,7 @@
   const { deviceAttrs, getDeviceKeys, getSearchParams, setChartOptions, getDeviceAttribute } =
     useHistoryData();
 
-  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
+  const { setOptions, destory } = useECharts(chartRef as Ref<HTMLDivElement>);
 
   function hasDeviceAttr() {
     if (!unref(deviceAttrs).length) {
@@ -133,7 +133,7 @@
     for (const item of dataSource) {
       const { deviceName, gatewayDevice, slaveDeviceId, organizationId } = item;
       let { deviceId } = item;
-      if (gatewayDevice) {
+      if (gatewayDevice && slaveDeviceId) {
         deviceId = slaveDeviceId;
       }
       if (record[deviceId]) continue;
@@ -177,10 +177,22 @@
 
     await handleModalOpen();
   });
+
+  const handleCancel = () => {
+    destory();
+  };
 </script>
 
 <template>
-  <BasicModal @register="registerModal" :destroy-on-close="true" width="70%" title="历史趋势">
+  <BasicModal
+    @register="registerModal"
+    @cancel="handleCancel"
+    :destroy-on-close="true"
+    :show-ok-btn="false"
+    cancel-text="关闭"
+    width="70%"
+    title="历史趋势"
+  >
     <section
       class="flex flex-col p-4 h-full w-full min-w-7/10"
       style="color: #f0f2f5; background-color: #f0f2f5"

-import { getAllDeviceByOrg, getDeviceAttributes, getGatewaySlaveDevice } from '/@/api/dataBoard';
+import { getDeviceAttributes, getMeetTheConditionsDevice } from '/@/api/dataBoard';
 import { getOrganizationList } from '/@/api/system/system';
 import { FormSchema } from '/@/components/Form';
 import { copyTransFun } from '/@/utils/fnUtils';
@@ -6,6 +6,8 @@ import { DeviceAttributeParams, MasterDeviceList } from '/@/api/dataBoard/model'
 import { FrontComponent } from '../../const/const';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { getModelServices } from '/@/api/device/modelOfMatter';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 
 export enum BasicConfigField {
   NAME = 'name',
@@ -31,10 +33,11 @@ const getDeviceService = async (deviceProfileId: string) => {
 
 export enum DataSourceField {
   IS_GATEWAY_DEVICE = 'gatewayDevice',
+  DEVICE_TYPE = 'deviceType',
   TRANSPORT_TYPE = 'transportType',
   ORIGINATION_ID = 'organizationId',
   DEVICE_ID = 'deviceId',
-  SLAVE_DEVICE_ID = 'slaveDeviceId',
+  // SLAVE_DEVICE_ID = 'slaveDeviceId',
   DEVICE_PROFILE_ID = 'deviceProfileId',
   ATTRIBUTE = 'attribute',
   ATTRIBUTE_RENAME = 'attributeRename',
@@ -107,6 +110,34 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       show: false,
     },
     {
+      field: DataSourceField.DEVICE_TYPE,
+      component: 'ApiSelect',
+      label: '设备类型',
+      colProps: { span: 8 },
+      defaultValue: DeviceTypeEnum.SENSOR,
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          api: findDictItemByCode,
+          params: {
+            dictCode: 'device_type',
+          },
+          valueField: 'itemValue',
+          labelField: 'itemText',
+          placeholder: '请选择设备类型',
+          onChange: (value: DeviceTypeEnum) => {
+            setFieldsValue({
+              [DataSourceField.IS_GATEWAY_DEVICE]: value === DeviceTypeEnum.GATEWAY,
+              [DataSourceField.DEVICE_PROFILE_ID]: null,
+              [DataSourceField.DEVICE_ID]: null,
+              [DataSourceField.ATTRIBUTE]: null,
+              [DataSourceField.TRANSPORT_TYPE]: null,
+            });
+          },
+        };
+      },
+    },
+    {
       field: DataSourceField.DEVICE_PROFILE_ID,
       component: 'ApiSelect',
       label: '产品',
@@ -115,9 +146,11 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       componentProps: ({ formActionType, formModel }) => {
         const { setFieldsValue } = formActionType;
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+        const deviceType = formModel[DataSourceField.DEVICE_TYPE];
         return {
           api: async () => {
-            const list = await getDeviceProfile();
+            if (!deviceType) return [];
+            const list = await getDeviceProfile(deviceType);
             if (deviceProfileId) {
               const record = list.find((item) => item.id === deviceProfileId);
               setFieldsValue({ [DataSourceField.TRANSPORT_TYPE]: record?.transportType });
@@ -126,14 +159,12 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
           },
           labelField: 'name',
           valueField: 'id',
-          onChange: (_, option: Record<'transportType', string>) => {
-            console.log(option);
+          placeholder: '请选择产品',
+          onChange: (_, option = {} as Record<'transportType', string>) => {
             setFieldsValue({
               [DataSourceField.DEVICE_ID]: null,
               [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.SLAVE_DEVICE_ID]: null,
-              [DataSourceField.IS_GATEWAY_DEVICE]: false,
-              [DataSourceField.TRANSPORT_TYPE]: option.transportType,
+              [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
             });
           },
         };
@@ -157,9 +188,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
           onChange() {
             setFieldsValue({
               [DataSourceField.DEVICE_ID]: null,
-              [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.SLAVE_DEVICE_ID]: null,
-              [DataSourceField.IS_GATEWAY_DEVICE]: false,
             });
           },
           getPopupContainer: () => document.body,
@@ -182,12 +210,17 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
         const { setFieldsValue } = formActionType;
         const organizationId = formModel[DataSourceField.ORIGINATION_ID];
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+        const deviceType = formModel[DataSourceField.DEVICE_TYPE];
 
         return {
           api: async () => {
             if (organizationId) {
               try {
-                const data = await getAllDeviceByOrg(organizationId, deviceProfileId);
+                const data = await getMeetTheConditionsDevice({
+                  organizationId,
+                  deviceProfileId,
+                  deviceType,
+                });
                 if (data)
                   return data.map((item) => ({
                     ...item,
@@ -202,9 +235,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
 
           onChange(_value, record: MasterDeviceList) {
             setFieldsValue({
-              [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.IS_GATEWAY_DEVICE]: record?.deviceType === 'GATEWAY',
-              [DataSourceField.SLAVE_DEVICE_ID]: null,
               [DataSourceField.DEVICE_NAME]: record?.label,
             });
           },
@@ -214,58 +244,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       },
     },
     {
-      field: DataSourceField.SLAVE_DEVICE_ID,
-      label: '网关子设备',
-      component: 'ApiSelect',
-      colProps: { span: 8 },
-      rules: [{ required: true, message: '网关子设备为必填项' }],
-      show: false,
-      ifShow({ model }) {
-        const transportType = model[DataSourceField.TRANSPORT_TYPE];
-        return (
-          !(isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)) &&
-          model[DataSourceField.IS_GATEWAY_DEVICE]
-        );
-      },
-      dynamicRules({ model }) {
-        return [
-          { required: model[DataSourceField.IS_GATEWAY_DEVICE], message: '请选择网关子设备' },
-        ];
-      },
-      componentProps({ formModel, formActionType }) {
-        const { setFieldsValue } = formActionType;
-        const organizationId = formModel[DataSourceField.ORIGINATION_ID];
-        const isGatewayDevice = formModel[DataSourceField.IS_GATEWAY_DEVICE];
-        const deviceId = formModel[DataSourceField.DEVICE_ID];
-
-        return {
-          api: async () => {
-            if (organizationId && isGatewayDevice) {
-              try {
-                const data = await getGatewaySlaveDevice({ organizationId, masterId: deviceId });
-                if (data)
-                  return data.map((item) => ({
-                    ...item,
-                    label: item.name,
-                    value: item.id,
-                    deviceType: item.deviceType,
-                  }));
-              } catch (error) {}
-            }
-            return [];
-          },
-          onChange(_value, record: MasterDeviceList) {
-            setFieldsValue({
-              [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.DEVICE_NAME]: record?.label,
-            });
-          },
-          placeholder: '请选择网关子设备',
-          getPopupContainer: () => document.body,
-        };
-      },
-    },
-    {
       field: DataSourceField.ATTRIBUTE,
       component: 'ApiSelect',
       label: '属性',
@@ -274,7 +252,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       componentProps({ formModel }) {
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
-
         return {
           api: async () => {
             try {
@@ -303,7 +280,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
     {
       field: DataSourceField.DEVICE_RENAME,
       component: 'Input',
-      label: '设备',
+      label: '设备名',
       colProps: { span: 8 },
       componentProps: {
         placeholder: '设备重命名',