简柏林 / thingskit-front · Commits

Commit dfb13261bd0014a6fbc7f4c26e2074f668a801a9

Authored by xp.Huang
2 parents 3588017f 22d0cb68

Merge branch 'local_dev_ft_fix_teambition_issue' into 'main_dev' 

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

See merge request yunteng/thingskit-front!963
Inline Side-by-side
Showing 4 changed files with 24 additions and 2 deletions
@@ -308,6 +308,7 @@ @@ -308,6 +308,7 @@
308 columns, 308 columns,
309 beforeFetch: (params) => { 309 beforeFetch: (params) => {
310 const { deviceProfileId } = params; 310 const { deviceProfileId } = params;
  311 + if (!deviceProfileId) return;
311 const obj = { 312 const obj = {
312 ...params, 313 ...params,
313 ...{ 314 ...{
@@ -260,6 +260,7 @@ @@ -260,6 +260,7 @@
260 }, 260 },
261 beforeFetch: (params) => { 261 beforeFetch: (params) => {
262 const { deviceProfileId } = params; 262 const { deviceProfileId } = params;
  263 + if (!deviceProfileId) return;
263 const deviceProfileIds = [deviceProfileId]; 264 const deviceProfileIds = [deviceProfileId];
264 const obj = { 265 const obj = {
265 ...params, 266 ...params,
@@ -86,12 +86,12 @@ export enum OriginatorTelemetryFieldsEnum { @@ -86,12 +86,12 @@ export enum OriginatorTelemetryFieldsEnum {
86 } 86 }
87 87
88 export enum OriginatorTelemetryFieldsNameEnum { 88 export enum OriginatorTelemetryFieldsNameEnum {
89 - LATEST_TS_KEY_NAMES = 'Latest timeseries', 89 + LATEST_TS_KEY_NAMES = 'Timeseries key',
90 AGGREGATION = '数据聚合功能', 90 AGGREGATION = '数据聚合功能',
91 FETCH_MODE = 'Fetch Mode', 91 FETCH_MODE = 'Fetch Mode',
92 ORDER_BY = 'Order by', 92 ORDER_BY = 'Order by',
93 LIMIT = 'Limit', 93 LIMIT = 'Limit',
94 - USE_METADATA_INTERVAL_PATTERNS = 'useMetadataIntervalPatterns', 94 + USE_METADATA_INTERVAL_PATTERNS = 'Use interval patterns',
95 START_INTERVAL = 'Start Interval', 95 START_INTERVAL = 'Start Interval',
96 START_INTERVAL_TIME_UNIT = 'Start Interval Time Unit', 96 START_INTERVAL_TIME_UNIT = 'Start Interval Time Unit',
97 END_INTERVAL = 'End Interval', 97 END_INTERVAL = 'End Interval',
@@ -73,6 +73,10 @@ export const formSchemas: FormSchema[] = [ @@ -73,6 +73,10 @@ export const formSchemas: FormSchema[] = [
73 getPopupContainer: () => document.body, 73 getPopupContainer: () => document.body,
74 placeholder: `请选择${RestApiCallFieldsEnum.PROXY_SCHEME}`, 74 placeholder: `请选择${RestApiCallFieldsEnum.PROXY_SCHEME}`,
75 }, 75 },
  76 + ifShow: ({ model }) => {
  77 + const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
  78 + return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
  79 + },
76 }, 80 },
77 { 81 {
78 field: RestApiCallFieldsEnum.PROXY_HOST, 82 field: RestApiCallFieldsEnum.PROXY_HOST,
@@ -83,6 +87,10 @@ export const formSchemas: FormSchema[] = [ @@ -83,6 +87,10 @@ export const formSchemas: FormSchema[] = [
83 componentProps: { 87 componentProps: {
84 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`, 88 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`,
85 }, 89 },
  90 + ifShow: ({ model }) => {
  91 + const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
  92 + return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
  93 + },
86 }, 94 },
87 { 95 {
88 field: RestApiCallFieldsEnum.PROXY_PORT, 96 field: RestApiCallFieldsEnum.PROXY_PORT,
@@ -93,6 +101,10 @@ export const formSchemas: FormSchema[] = [ @@ -93,6 +101,10 @@ export const formSchemas: FormSchema[] = [
93 componentProps: { 101 componentProps: {
94 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`, 102 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_HOST}`,
95 }, 103 },
  104 + ifShow: ({ model }) => {
  105 + const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
  106 + return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
  107 + },
96 }, 108 },
97 { 109 {
98 field: RestApiCallFieldsEnum.PROXY_USER, 110 field: RestApiCallFieldsEnum.PROXY_USER,
@@ -101,6 +113,10 @@ export const formSchemas: FormSchema[] = [ @@ -101,6 +113,10 @@ export const formSchemas: FormSchema[] = [
101 componentProps: { 113 componentProps: {
102 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_USER}`, 114 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_USER}`,
103 }, 115 },
  116 + ifShow: ({ model }) => {
  117 + const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
  118 + return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
  119 + },
104 }, 120 },
105 { 121 {
106 field: RestApiCallFieldsEnum.PROXY_PASSWORD, 122 field: RestApiCallFieldsEnum.PROXY_PASSWORD,
@@ -109,6 +125,10 @@ export const formSchemas: FormSchema[] = [ @@ -109,6 +125,10 @@ export const formSchemas: FormSchema[] = [
109 componentProps: { 125 componentProps: {
110 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_PASSWORD}`, 126 placeholder: `请输入${RestApiCallFieldsNameEnum.PROXY_PASSWORD}`,
111 }, 127 },
  128 + ifShow: ({ model }) => {
  129 + const ifShowField = model[RestApiCallFieldsEnum.ENABLE_PROXY];
  130 + return ifShowField && !model[RestApiCallFieldsEnum.USE_SYSTEM_PROXY_PROPERTIES];
  131 + },
112 }, 132 },
113 { 133 {
114 field: RestApiCallFieldsEnum.READ_TIMEOUT_MS, 134 field: RestApiCallFieldsEnum.READ_TIMEOUT_MS,