mirror of
https://github.com/foss42/apidash.git
synced 2025-08-06 13:51:20 +08:00
Fix tab indicator for formdata
This commit is contained in:
@ -99,7 +99,7 @@ func main() {
|
|||||||
|
|
||||||
var templateStart = jj.Template(kTemplateStart);
|
var templateStart = jj.Template(kTemplateStart);
|
||||||
result += templateStart.render({
|
result += templateStart.render({
|
||||||
"hasBody": requestModel.hasData,
|
"hasBody": requestModel.hasBody,
|
||||||
"hasFormData": requestModel.hasFormData,
|
"hasFormData": requestModel.hasFormData,
|
||||||
"hasFileInFormData": requestModel.hasFileInFormData,
|
"hasFileInFormData": requestModel.hasFileInFormData,
|
||||||
});
|
});
|
||||||
@ -144,7 +144,7 @@ func main() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
var headersList = requestModel.enabledRequestHeaders;
|
var headersList = requestModel.enabledRequestHeaders;
|
||||||
if (headersList != null || requestModel.hasData) {
|
if (headersList != null || requestModel.hasBody) {
|
||||||
var headers = requestModel.enabledHeadersMap;
|
var headers = requestModel.enabledHeadersMap;
|
||||||
if (requestModel.hasJsonData || requestModel.hasTextData) {
|
if (requestModel.hasJsonData || requestModel.hasTextData) {
|
||||||
headers.putIfAbsent(kHeaderContentType,
|
headers.putIfAbsent(kHeaderContentType,
|
||||||
|
@ -116,7 +116,7 @@ body = b'\r\n'.join(dataList)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (requestModel.hasData) {
|
if (requestModel.hasBody) {
|
||||||
hasBody = true;
|
hasBody = true;
|
||||||
if (requestModel.hasJsonData || requestModel.hasTextData) {
|
if (requestModel.hasJsonData || requestModel.hasTextData) {
|
||||||
var templateBody = jj.Template(kTemplateBody);
|
var templateBody = jj.Template(kTemplateBody);
|
||||||
|
@ -68,7 +68,7 @@ class RequestModel {
|
|||||||
bool get hasJsonContentType => requestBodyContentType == ContentType.json;
|
bool get hasJsonContentType => requestBodyContentType == ContentType.json;
|
||||||
bool get hasTextContentType => requestBodyContentType == ContentType.text;
|
bool get hasTextContentType => requestBodyContentType == ContentType.text;
|
||||||
int get contentLength => utf8.encode(requestBody ?? "").length;
|
int get contentLength => utf8.encode(requestBody ?? "").length;
|
||||||
bool get hasData => hasJsonData || hasTextData || hasFormData;
|
bool get hasBody => hasJsonData || hasTextData || hasFormData;
|
||||||
bool get hasJsonData =>
|
bool get hasJsonData =>
|
||||||
kMethodsWithBody.contains(method) &&
|
kMethodsWithBody.contains(method) &&
|
||||||
hasJsonContentType &&
|
hasJsonContentType &&
|
||||||
|
@ -37,7 +37,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final selectedId = ref.watch(selectedIdStateProvider);
|
final selectedId = ref.watch(selectedIdStateProvider);
|
||||||
final length = ref.watch(selectedRequestModelProvider
|
ref.watch(selectedRequestModelProvider
|
||||||
.select((value) => value?.requestHeaders?.length));
|
.select((value) => value?.requestHeaders?.length));
|
||||||
var rH = ref.read(selectedRequestModelProvider)?.requestHeaders;
|
var rH = ref.read(selectedRequestModelProvider)?.requestHeaders;
|
||||||
rows = (rH == null || rH.isEmpty)
|
rows = (rH == null || rH.isEmpty)
|
||||||
|
@ -17,11 +17,14 @@ class EditRequestPane extends ConsumerWidget {
|
|||||||
selectedRequestModelProvider.select((value) => value?.requestTabIndex));
|
selectedRequestModelProvider.select((value) => value?.requestTabIndex));
|
||||||
|
|
||||||
final headerLength = ref.watch(selectedRequestModelProvider
|
final headerLength = ref.watch(selectedRequestModelProvider
|
||||||
.select((value) => value?.headersMap.length));
|
.select((value) => value?.headersMap.length)) ??
|
||||||
|
0;
|
||||||
final paramLength = ref.watch(selectedRequestModelProvider
|
final paramLength = ref.watch(selectedRequestModelProvider
|
||||||
.select((value) => value?.paramsMap.length));
|
.select((value) => value?.paramsMap.length)) ??
|
||||||
final bodyLength = ref.watch(selectedRequestModelProvider
|
0;
|
||||||
.select((value) => value?.requestBody?.length));
|
final hasBody = ref.watch(
|
||||||
|
selectedRequestModelProvider.select((value) => value?.hasBody)) ??
|
||||||
|
false;
|
||||||
|
|
||||||
return RequestPane(
|
return RequestPane(
|
||||||
selectedId: selectedId,
|
selectedId: selectedId,
|
||||||
@ -37,9 +40,9 @@ class EditRequestPane extends ConsumerWidget {
|
|||||||
.update(selectedId!, requestTabIndex: index);
|
.update(selectedId!, requestTabIndex: index);
|
||||||
},
|
},
|
||||||
showIndicators: [
|
showIndicators: [
|
||||||
paramLength != null && paramLength > 0,
|
paramLength > 0,
|
||||||
headerLength != null && headerLength > 0,
|
headerLength > 0,
|
||||||
bodyLength != null && bodyLength > 0,
|
hasBody,
|
||||||
],
|
],
|
||||||
children: const [
|
children: const [
|
||||||
EditRequestURLParams(),
|
EditRequestURLParams(),
|
||||||
|
@ -38,7 +38,7 @@ class EditRequestURLParamsState extends ConsumerState<EditRequestURLParams> {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final selectedId = ref.watch(selectedIdStateProvider);
|
final selectedId = ref.watch(selectedIdStateProvider);
|
||||||
final length = ref.watch(selectedRequestModelProvider
|
ref.watch(selectedRequestModelProvider
|
||||||
.select((value) => value?.requestParams?.length));
|
.select((value) => value?.requestParams?.length));
|
||||||
var rP = ref.read(selectedRequestModelProvider)?.requestParams;
|
var rP = ref.read(selectedRequestModelProvider)?.requestParams;
|
||||||
rows = (rP == null || rP.isEmpty)
|
rows = (rP == null || rP.isEmpty)
|
||||||
|
Reference in New Issue
Block a user