Merge branch 'ww' into 'main'

fix:  in teambition bug && pref device list page new add device select device configuration automatically link device type

See merge request huang/yun-teng-iot-front!374

@@ -34,10 +34,30 @@ export const step1Schemas: FormSchema[] = [
     slot: 'snCode',
     slot: 'snCode',
   },
   },
   {
   {
+    field: 'profileId',
+    label: '设备配置',
+    required: true,
+    component: 'ApiSelect',
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        api: deviceProfile,
+        labelField: 'name',
+        valueField: 'id',
+        onChange(_value: string, option: { deviceType: string }) {
+          const { deviceType } = option;
+          setFieldsValue({ deviceType: deviceType });
+        },
+      };
+    },
+  },
+  {
     field: 'deviceType',
     field: 'deviceType',
     label: '设备类型',
     label: '设备类型',
     required: true,
     required: true,
     component: 'ApiSelect',
     component: 'ApiSelect',
+    dynamicDisabled: true,
+    helpMessage: ['选择设备配置,自动关联设备类型'],
     componentProps: {
     componentProps: {
       placeholder: '设备类型',
       placeholder: '设备类型',
       api: findDictItemByCode,
       api: findDictItemByCode,
@@ -67,17 +87,7 @@ export const step1Schemas: FormSchema[] = [
     },
     },
     ifShow: ({ values }) => isGateWay(values.deviceType),
     ifShow: ({ values }) => isGateWay(values.deviceType),
   },
   },
-  {
-    field: 'profileId',
-    label: '设备配置',
-    required: true,
-    component: 'ApiSelect',
-    componentProps: {
-      api: deviceProfile,
-      labelField: 'name',
-      valueField: 'id',
-    },
-  },
+
   {
   {
     field: 'organizationId',
     field: 'organizationId',
     label: '所属组织',
     label: '所属组织',

@@ -34,18 +34,30 @@
           @change="handleChange"
           @change="handleChange"
         >
         >
           <TabPane forceRender key="1" tab="设备配置">
           <TabPane forceRender key="1" tab="设备配置">
-            <DeviceConfigurationStep
-              :ifShowBtn="isViewDetail ? false : true"
-              v-show="activeKey === '1'"
-              ref="DevConStRef"
-            />
+            <div class="relative">
+              <DeviceConfigurationStep
+                :ifShowBtn="isViewDetail ? false : true"
+                v-show="activeKey === '1'"
+                ref="DevConStRef"
+              />
+              <div
+                v-show="isViewDetail"
+                class="absolute w-full h-full top-0 cursor-not-allowed"
+              ></div>
+            </div>
           </TabPane>
           </TabPane>
           <TabPane forceRender key="2" tab="传输配置">
           <TabPane forceRender key="2" tab="传输配置">
-            <TransportConfigurationStep
-              :ifShowBtn="isViewDetail ? false : true"
-              v-show="activeKey === '2'"
-              ref="TransConStRef"
-            />
+            <div class="relative">
+              <TransportConfigurationStep
+                :ifShowBtn="isViewDetail ? false : true"
+                v-show="activeKey === '2'"
+                ref="TransConStRef"
+              />
+              <div
+                v-show="isViewDetail"
+                class="absolute w-full h-full top-0 cursor-not-allowed"
+              ></div>
+            </div>
           </TabPane>
           </TabPane>
           <TabPane forceRender key="3" v-show="activeKey === '3'" tab="物模型管理">
           <TabPane forceRender key="3" v-show="activeKey === '3'" tab="物模型管理">
             <PhysicalModelManagementStep v-show="activeKey === '3'" ref="PhysicalModManRef" />
             <PhysicalModelManagementStep v-show="activeKey === '3'" ref="PhysicalModManRef" />

@@ -293,7 +293,7 @@
   }
   }
 
 
   const handleSetDefault = async (record: Recordable) => {
   const handleSetDefault = async (record: Recordable) => {
-    let id = record.id;
+    let id = record.tbProfileId;
     const data = await setDeviceProfileIsDefaultApi(id, 'default', defaultObj);
     const data = await setDeviceProfileIsDefaultApi(id, 'default', defaultObj);
     if (!data) return createMessage.error('设置该设备配置为默认失败');
     if (!data) return createMessage.error('设置该设备配置为默认失败');
     createMessage.success('设置该设备配置为默认成功');
     createMessage.success('设置该设备配置为默认成功');