Commit 6e3285a045ccaa6298a67fb617d70626dcb503a6

Authored by fengwotao
1 parent a7e5e21e

pref: 优化公共接口管理部分代码

@@ -115,7 +115,8 @@ @@ -115,7 +115,8 @@
115 return aceEditor?.value?.getValue(); 115 return aceEditor?.value?.getValue();
116 }; 116 };
117 117
118 - const setValue = (data) => { 118 + const setValue = async (data) => {
  119 + await nextTick();
119 return aceEditor?.value?.setValue(data); 120 return aceEditor?.value?.setValue(data);
120 }; 121 };
121 122
@@ -94,6 +94,9 @@ @@ -94,6 +94,9 @@
94 interfaceType: { 94 interfaceType: {
95 type: String, 95 type: String,
96 }, 96 },
  97 + filterValue: {
  98 + type: String,
  99 + },
97 }); 100 });
98 101
99 const emits = defineEmits(['activeKey']); 102 const emits = defineEmits(['activeKey']);
@@ -142,7 +145,6 @@ @@ -142,7 +145,6 @@
142 145
143 const onCloseTest = () => excuteTestRef.value?.resetValue(true); 146 const onCloseTest = () => excuteTestRef.value?.resetValue(true);
144 147
145 - //if-else-if-else分支优化  
146 const dataForTypeMap = [ 148 const dataForTypeMap = [
147 [(type) => type === 'Params', (data) => paramsCellTableRef.value?.setValue(data)], 149 [(type) => type === 'Params', (data) => paramsCellTableRef.value?.setValue(data)],
148 [(type) => type === 'Body', (data) => bodyRef.value?.setValue(data)], 150 [(type) => type === 'Body', (data) => bodyRef.value?.setValue(data)],
@@ -191,9 +193,14 @@ @@ -191,9 +193,14 @@
191 }; 193 };
192 }; 194 };
193 195
194 - const handleTestParamsInterface = () => { 196 + const commonExcuteRef = () => {
195 excuteTestRef.value?.showTest(); 197 excuteTestRef.value?.showTest();
196 excuteTestRef.value?.resetValue(false); 198 excuteTestRef.value?.resetValue(false);
  199 + excuteTestRef.value?.editSetFilterValue(props.filterValue);
  200 + };
  201 +
  202 + const handleTestParamsInterface = () => {
  203 + commonExcuteRef();
197 let value = getValue(false) as any; 204 let value = getValue(false) as any;
198 dataMap.mapParamsObj = { 205 dataMap.mapParamsObj = {
199 list: value?.Params, 206 list: value?.Params,
@@ -204,8 +211,7 @@ @@ -204,8 +211,7 @@
204 const handleTestBodyInterface = () => { 211 const handleTestBodyInterface = () => {
205 let value = getValue(false) as any; 212 let value = getValue(false) as any;
206 const type = value?.Body?.requestParamsBodyType; 213 const type = value?.Body?.requestParamsBodyType;
207 - excuteTestRef.value?.showTest();  
208 - excuteTestRef.value?.resetValue(false); 214 + commonExcuteRef();
209 let values = []; 215 let values = [];
210 for (let i in value?.Body) if (i === type) values = value?.Body[i]; 216 for (let i in value?.Body) if (i === type) values = value?.Body[i];
211 dataMap.mapBodyObj = { 217 dataMap.mapBodyObj = {
@@ -216,8 +222,7 @@ @@ -216,8 +222,7 @@
216 }; 222 };
217 223
218 const handleTestHeaderInterface = () => { 224 const handleTestHeaderInterface = () => {
219 - excuteTestRef.value?.showTest();  
220 - excuteTestRef.value?.resetValue(false); 225 + commonExcuteRef();
221 let value = getValue(false) as any; 226 let value = getValue(false) as any;
222 dataMap.mapHeaderObj = { 227 dataMap.mapHeaderObj = {
223 list: value?.Header, 228 list: value?.Header,
@@ -308,10 +308,17 @@ @@ -308,10 +308,17 @@
308 return aceTypeIsJsEditorRef?.value?.getValue(); 308 return aceTypeIsJsEditorRef?.value?.getValue();
309 }; 309 };
310 310
  311 + //编辑回显过滤器函数的内容
  312 + const editSetFilterValue = async (filterValue) => {
  313 + await nextTick();
  314 + aceTypeIsJsEditorRef?.value?.setValue(filterValue);
  315 + };
  316 +
311 defineExpose({ 317 defineExpose({
312 resetValue, 318 resetValue,
313 showTest, 319 showTest,
314 getFilterValue, 320 getFilterValue,
  321 + editSetFilterValue,
315 }); 322 });
316 </script> 323 </script>
317 324
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 :requestOriginUrl="model['requestOriginUrl']" 25 :requestOriginUrl="model['requestOriginUrl']"
26 :originUrlType="model['originUrlType']" 26 :originUrlType="model['originUrlType']"
27 :interfaceType="model['interfaceType']" 27 :interfaceType="model['interfaceType']"
  28 + :filterValue="editSetFilter"
28 /> 29 />
29 </template> 30 </template>
30 <template #slotFillAddress="{ model }"> 31 <template #slotFillAddress="{ model }">
@@ -134,10 +135,11 @@ @@ -134,10 +135,11 @@
134 setDrawerProps({ title }); 135 setDrawerProps({ title });
135 updateSchema(resetUpdateSchema); 136 updateSchema(resetUpdateSchema);
136 isUpdate.value = data.isUpdate; 137 isUpdate.value = data.isUpdate;
137 - !isUpdate.value ? (putId.value = '') : (putId.value = data.record.id);  
138 - editSetFilter.value = data.record?.filter; 138 + !isUpdate.value ? (putId.value = '') : (putId.value = data.record?.id);
139 simpleRequestRef.value?.resetValue(); 139 simpleRequestRef.value?.resetValue();
  140 + editSetFilter.value = '';
140 if (isUpdate.value) { 141 if (isUpdate.value) {
  142 + editSetFilter.value = data.record?.filter;
141 await setFieldsValue({ 143 await setFieldsValue({
142 ...data.record, 144 ...data.record,
143 requestContentType: String(data.record?.requestContentType), 145 requestContentType: String(data.record?.requestContentType),