Merge branch 'ww' into 'main'

fix: BUG in teambition

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

@@ -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.114:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
+# VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
 
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -224,7 +224,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
                 if (data)
                   return data.map((item) => ({
                     ...item,
-                    label: item.name,
+                    label: item.alias || item.name,
                     value: item.id,
                     deviceType: item.deviceType,
                   }));
@@ -232,7 +232,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
             }
             return [];
           },
-
           onChange(_value, record: MasterDeviceList) {
             setFieldsValue({
               [DataSourceField.DEVICE_NAME]: record?.label,