diff --git a/frontend/src/components/business/ms-add-attachment/index.vue b/frontend/src/components/business/ms-add-attachment/index.vue index 491b31f516..95834bd90a 100644 --- a/frontend/src/components/business/ms-add-attachment/index.vue +++ b/frontend/src/components/business/ms-add-attachment/index.vue @@ -42,10 +42,15 @@ :class="props.inputClass" placeholder=" " :max-tag-count="1" + :size="props.inputSize" readonly > @@ -56,6 +61,7 @@ - + diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index 09af7b1494..8fe2d990c5 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -619,7 +619,6 @@ () => { if (innerVisible.value) { searchCase(); - resetSelector(); initModules(); } } diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue index 6e26b31aa1..25b1771385 100644 --- a/frontend/src/components/business/ms-tree/index.vue +++ b/frontend/src/components/business/ms-tree/index.vue @@ -96,7 +96,7 @@ blockNode?: boolean; // 是否块级节点 showLine?: boolean; // 是否展示连接线 defaultExpandAll?: boolean; // 是否默认展开所有节点 - selectable?: boolean; // 是否可选中 + selectable?: boolean | ((node: MsTreeNodeData, info: { level: number; isLeaf: boolean }) => boolean); // 是否可选中 fieldNames?: MsTreeFieldNames; // 自定义字段名 focusNodeKey?: string | number; // 聚焦的节点 key selectedKeys?: Array; // 选中的节点 key diff --git a/frontend/src/components/pure/ms-tags-input/index.vue b/frontend/src/components/pure/ms-tags-input/index.vue index 2ea5e265a2..4f62255f23 100644 --- a/frontend/src/components/pure/ms-tags-input/index.vue +++ b/frontend/src/components/pure/ms-tags-input/index.vue @@ -11,6 +11,7 @@ :max-tag-count="props.maxTagCount" :readonly="props.readonly" :class="props.class" + :size="props.size" @press-enter="tagInputEnter" @blur="tagInputBlur" @clear="emit('clear')" @@ -50,6 +51,7 @@ maxLength?: number; readonly?: boolean; class?: string; + size?: 'small' | 'large' | 'medium' | 'mini'; }>(), { retainInputValue: true, @@ -57,6 +59,7 @@ allowClear: true, maxLength: 64, class: '', + size: 'medium', } ); const emit = defineEmits(['update:modelValue', 'update:inputValue', 'change', 'clear']); diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts index 91a986ec15..878e961cef 100644 --- a/frontend/src/locale/en-US/common.ts +++ b/frontend/src/locale/en-US/common.ts @@ -117,4 +117,5 @@ export default { 'common.validateSuccess': 'Validate success', 'common.to': 'To', 'common.tip': 'Tips', + 'common.stay': 'Stay', }; diff --git a/frontend/src/locale/zh-CN/common.ts b/frontend/src/locale/zh-CN/common.ts index 5bc8142a44..16ac5c0fbb 100644 --- a/frontend/src/locale/zh-CN/common.ts +++ b/frontend/src/locale/zh-CN/common.ts @@ -120,4 +120,5 @@ export default { 'common.validateSuccess': '验证成功', 'common.to': '至', 'common.tip': '温馨提示', + 'common.stay': '留下', }; diff --git a/frontend/src/models/apiTest/debug.ts b/frontend/src/models/apiTest/debug.ts index 4917d452df..39beae2385 100644 --- a/frontend/src/models/apiTest/debug.ts +++ b/frontend/src/models/apiTest/debug.ts @@ -64,6 +64,8 @@ export type ExecuteRequestFormBodyFormValue = ExecuteRequestCommonParam & { fileId: string; fileName: string; local: boolean; // 是否是本地上传的文件 + fileAlias: string; // 文件别名 + delete: boolean; // 是否删除 [key: string]: any; // 用于前端渲染时填充的自定义信息,后台无此字段 }[]; contentType?: RequestContentTypeEnum & string; @@ -258,8 +260,14 @@ export interface ExecuteCommonChild { // 执行请求-认证配置 export interface ExecuteAuthConfig { authType: RequestAuthType; - password: string; - userName: string; + basicAuth: { + password: string; + userName: string; + }; + digestAuth: { + password: string; + userName: string; + }; } // 执行请求- body 配置-文本格式的 body export interface ExecuteValueBody { @@ -321,7 +329,7 @@ export interface SaveDebugParams { export interface UpdateDebugParams extends Partial { id: string; deleteFileIds?: string[]; - unLinkRefIds?: string[]; + unLinkFileIds?: string[]; } // 更新模块入参 export interface UpdateDebugModule { diff --git a/frontend/src/views/api-test/components/apiMethodName.vue b/frontend/src/views/api-test/components/apiMethodName.vue index d0ce7986d7..e3353a13da 100644 --- a/frontend/src/views/api-test/components/apiMethodName.vue +++ b/frontend/src/views/api-test/components/apiMethodName.vue @@ -1,7 +1,12 @@ diff --git a/frontend/src/views/api-test/components/requestComposition/body.vue b/frontend/src/views/api-test/components/requestComposition/body.vue index e17af9b1d1..dda1b5cb64 100644 --- a/frontend/src/views/api-test/components/requestComposition/body.vue +++ b/frontend/src/views/api-test/components/requestComposition/body.vue @@ -57,7 +57,10 @@ v-model:file-list="fileList" mode="input" :multiple="false" - :default-file-list="[innerParams.binaryBody.file]" + :fields="{ + id: 'fileId', + name: 'fileName', + }" @change="handleFileChange" /> @@ -111,6 +114,7 @@ import { requestBodyTypeMap } from '@/config/apiTest'; import { useI18n } from '@/hooks/useI18n'; + import useAppStore from '@/store/modules/app'; import { ExecuteBody, ExecuteRequestFormBodyFormValue } from '@/models/apiTest/debug'; import { RequestBodyFormat, RequestContentTypeEnum, RequestParamsType } from '@/enums/apiEnum'; @@ -127,6 +131,7 @@ (e: 'change'): void; }>(); + const appStore = useAppStore(); const { t } = useI18n(); const innerParams = useVModel(props, 'params', emit); @@ -155,6 +160,7 @@ if (!props.uploadTempFileApi) return; try { if (fileList.value[0]?.local) { + appStore.showLoading(); const res = await props.uploadTempFileApi(fileList.value[0].file); innerParams.value.binaryBody.file = { ...fileList.value[0], @@ -162,6 +168,7 @@ fileName: fileList.value[0]?.name || '', local: true, }; + appStore.hideLoading(); } else { innerParams.value.binaryBody.file = { ...fileList.value[0], diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue index 9ef43a78cb..83f2b46f39 100644 --- a/frontend/src/views/api-test/components/requestComposition/index.vue +++ b/frontend/src/views/api-test/components/requestComposition/index.vue @@ -1,8 +1,17 @@