Merge branch 'local_dev_ft_fix_teambition_issue' into 'main_dev'

fix: 修改设备列表分页和设备分布分页，初始化传deviceProfileIds:null问题

See merge request yunteng/thingskit-front!963

@@ -308,6 +308,7 @@
         columns,
         beforeFetch: (params) => {
           const { deviceProfileId } = params;
+          if (!deviceProfileId) return;
           const obj = {
             ...params,
             ...{

@@ -260,6 +260,7 @@
         },
         beforeFetch: (params) => {
           const { deviceProfileId } = params;
+          if (!deviceProfileId) return;
           const deviceProfileIds = [deviceProfileId];
           const obj = {
             ...params,

@@ -86,12 +86,12 @@ export enum OriginatorTelemetryFieldsEnum {
 }
 
 export enum OriginatorTelemetryFieldsNameEnum {
-  LATEST_TS_KEY_NAMES = 'Latest timeseries',
+  LATEST_TS_KEY_NAMES = 'Timeseries key',
   AGGREGATION = '数据聚合功能',
   FETCH_MODE = 'Fetch Mode',
   ORDER_BY = 'Order by',
   LIMIT = 'Limit',
-  USE_METADATA_INTERVAL_PATTERNS = 'useMetadataIntervalPatterns',
+  USE_METADATA_INTERVAL_PATTERNS = 'Use interval patterns',
   START_INTERVAL = 'Start Interval',
   START_INTERVAL_TIME_UNIT = 'Start Interval Time Unit',
   END_INTERVAL = 'End Interval',

@@ -73,6 +73,10 @@ export const formSchemas: FormSchema[] = [
       getPopupContainer: () => document.body,
       placeholder: `请选择${RestApiCallFieldsEnum.PROXY_SCHEME}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_HOST,
@@ -83,6 +87,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_PORT,
@@ -93,6 +101,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_USER,
@@ -101,6 +113,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_USER}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.PROXY_PASSWORD,
@@ -109,6 +125,10 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_PASSWORD}`,
     },
+    ifShow: ({ model }) => {
+      const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
+      return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
+    },
   },
   {
     field: RestApiCallFieldsEnum.READ_TIMEOUT_MS,