Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
759bb684
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
759bb684
编写于
8月 03, 2020
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 环境域名可以设置为DbeaseUrl
上级
f6fee2f9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
39 addition
and
46 deletion
+39
-46
frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
...s/components/api/test/components/ApiEnvironmentConfig.vue
+1
-1
frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
...nents/api/test/components/environment/EnvironmentEdit.vue
+16
-24
frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
...onents/api/test/components/request/ApiHttpRequestForm.vue
+6
-7
frontend/src/business/components/api/test/model/ScenarioModel.js
...d/src/business/components/api/test/model/ScenarioModel.js
+5
-11
frontend/src/business/components/common/components/MsAsideContainer.vue
...usiness/components/common/components/MsAsideContainer.vue
+6
-2
frontend/src/business/components/common/components/MsAsideItem.vue
...src/business/components/common/components/MsAsideItem.vue
+5
-1
未找到文件。
frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
浏览文件 @
759bb684
...
...
@@ -2,7 +2,7 @@
<el-dialog
:title=
"$t('api_test.environment.environment_config')"
:visible.sync=
"visible"
class=
"environment-dialog"
@
close=
"close"
append-to-body
ref=
"environmentConfig"
>
<el-container
v-loading=
"result.loading"
>
<ms-aside-item
:title=
"$t('api_test.environment.environment_list')"
:data=
"environments"
:item-operators=
"environmentOperators"
:add-fuc=
"addEnvironment"
<ms-aside-item
:
enable-aside-hidden=
"false"
:
title=
"$t('api_test.environment.environment_list')"
:data=
"environments"
:item-operators=
"environmentOperators"
:add-fuc=
"addEnvironment"
:delete-fuc=
"deleteEnvironment"
@
itemSelected=
"environmentSelected"
ref=
"environmentItems"
/>
<environment-edit
:environment=
"currentEnvironment"
ref=
"environmentEdit"
@
close=
"close"
/>
</el-container>
...
...
frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
浏览文件 @
759bb684
...
...
@@ -42,6 +42,7 @@
import
MsApiKeyValue
from
"
../ApiKeyValue
"
;
import
MsDialogFooter
from
"
../../../../common/components/MsDialogFooter
"
;
import
{
REQUEST_HEADERS
}
from
"
../../../../../../common/js/constants
"
;
import
{
KeyValue
}
from
"
../../model/ScenarioModel
"
;
export
default
{
name
:
"
EnvironmentEdit
"
,
...
...
@@ -110,39 +111,30 @@
},
validateSocket
(
socket
)
{
if
(
!
socket
)
return
;
let
socketInfo
=
socket
.
split
(
"
:
"
);
if
(
socketInfo
.
length
>
2
)
{
return
false
;
let
urlStr
=
this
.
environment
.
protocol
+
'
://
'
+
socket
;
let
url
=
{};
try
{
url
=
new
URL
(
urlStr
);
}
catch
(
e
)
{
return
false
}
let
host
=
socketInfo
[
0
];
let
port
=
socketInfo
[
1
];
if
(
!
this
.
validateHost
(
host
)
||
!
(
port
==
undefined
||
this
.
validatePort
(
port
)))
{
return
false
;
this
.
environment
.
port
=
url
.
port
;
this
.
environment
.
domain
=
decodeURIComponent
(
url
.
hostname
);
if
(
url
.
port
)
{
this
.
environment
.
socket
=
this
.
environment
.
domain
+
'
:
'
+
url
.
port
+
url
.
pathname
;
}
else
{
this
.
environment
.
socket
=
this
.
environment
.
domain
+
url
.
pathname
;
}
this
.
environment
.
domain
=
host
;
this
.
environment
.
port
=
port
;
return
true
;
},
validateHost
(
host
)
{
let
hostReg
=
/^
(?=
^.
{3,255}
$
)[
a-zA-Z0-9
][
-a-zA-Z0-9
]{0,62}(\.[
a-zA-Z0-9
][
-a-zA-Z0-9
]{0,62})
+$/
;
if
(
hostReg
.
test
(
host
)
||
host
===
'
localhost
'
)
{
return
true
;
}
return
false
;
},
validatePort
(
port
)
{
let
portReg
=
/^
[
1-9
]\d
*$/
;
if
(
portReg
.
test
(
port
)
&&
1
<=
1
*
port
&&
1
*
port
<=
65535
){
return
true
}
return
false
;
},
cancel
()
{
this
.
$emit
(
'
close
'
);
},
clearValidate
()
{
this
.
$refs
[
"
from
"
].
clearValidate
();
}
}
,
},
}
</
script
>
...
...
frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
浏览文件 @
759bb684
...
...
@@ -100,7 +100,7 @@
{
validator
:
validateURL
,
trigger
:
'
blur
'
}
],
path
:
[
{
max
:
500
,
required
:
true
,
message
:
this
.
$t
(
'
commons.input_limit
'
,
[
1
,
500
]),
trigger
:
'
blur
'
},
{
max
:
500
,
message
:
this
.
$t
(
'
commons.input_limit
'
,
[
0
,
500
]),
trigger
:
'
blur
'
},
]
},
headerSuggestions
:
REQUEST_HEADERS
...
...
@@ -117,13 +117,12 @@
},
pathChange
()
{
if
(
!
this
.
request
.
path
)
return
;
if
(
!
this
.
request
.
path
.
startsWith
(
'
/
'
))
{
this
.
request
.
path
=
'
/
'
+
this
.
request
.
path
;
}
let
url
=
this
.
getURL
(
this
.
displayUrl
);
this
.
request
.
path
=
decodeURIComponent
(
url
.
pathname
);
this
.
request
.
urlWirhEnv
=
decodeURIComponent
(
url
.
origin
+
url
.
pathname
);
let
urlStr
=
url
.
origin
+
url
.
pathname
;
let
envUrl
=
this
.
request
.
environment
.
protocol
+
'
://
'
+
this
.
request
.
environment
.
socket
;
let
test
=
urlStr
.
substring
(
envUrl
.
length
,
urlStr
.
length
);
this
.
request
.
path
=
decodeURIComponent
(
test
);
},
getURL
(
urlStr
)
{
try
{
...
...
frontend/src/business/components/api/test/model/ScenarioModel.js
浏览文件 @
759bb684
...
...
@@ -285,11 +285,6 @@ export class HttpRequest extends Request {
isValid
:
false
,
info
:
'
api_test.request.please_configure_environment_in_scenario
'
}
}
else
if
(
!
this
.
path
)
{
return
{
isValid
:
false
,
info
:
'
api_test.request.input_path
'
}
}
}
else
{
if
(
!
this
.
url
)
{
...
...
@@ -668,12 +663,11 @@ class JMXHttpRequest {
this
.
protocol
=
url
.
protocol
.
split
(
"
:
"
)[
0
];
this
.
pathname
=
this
.
getPostQueryParameters
(
request
,
decodeURIComponent
(
url
.
pathname
));
}
else
{
if
(
environment
)
{
this
.
port
=
environment
.
port
;
this
.
protocol
=
environment
.
protocol
;
this
.
domain
=
environment
.
domain
;
}
this
.
path
=
this
.
getPostQueryParameters
(
request
,
decodeURIComponent
(
request
.
path
));
this
.
port
=
environment
.
port
;
this
.
protocol
=
environment
.
protocol
;
this
.
domain
=
environment
.
domain
;
let
url
=
new
URL
(
environment
.
protocol
+
"
://
"
+
environment
.
socket
);
this
.
path
=
this
.
getPostQueryParameters
(
request
,
decodeURIComponent
(
url
.
pathname
));
}
}
}
...
...
frontend/src/business/components/common/components/MsAsideContainer.vue
浏览文件 @
759bb684
<
template
>
<el-aside
:width=
"width"
class=
"ms-aside-container"
:style=
"
{'margin-left': asideHidden ? '0' : '-' + width}">
<div
class=
"hiddenBottom"
@
click=
"asideHidden = !asideHidden"
:style=
"
{'left': width}">
<div
v-if=
"enableAsideHidden"
class=
"hiddenBottom"
@
click=
"asideHidden = !asideHidden"
:style=
"
{'left': width}">
<i
v-if=
"asideHidden"
class=
"el-icon-arrow-left"
/>
<i
v-if=
"!asideHidden"
class=
"el-icon-arrow-right"
/>
</div>
...
...
@@ -16,7 +16,11 @@
width
:
{
type
:
String
,
default
:
'
300px
'
}
},
enableAsideHidden
:
{
type
:
Boolean
,
default
:
true
},
},
data
()
{
return
{
...
...
frontend/src/business/components/common/components/MsAsideItem.vue
浏览文件 @
759bb684
<
template
>
<ms-aside-container
:width=
"width + 'px'"
>
<ms-aside-container
:
enable-aside-hidden=
"false"
:
width=
"width + 'px'"
>
<div
class=
"title-bar"
:style=
"
{'height': titleBarHeight + 'px'}">
<slot
name=
"title"
>
<span
:style=
"
{'line-height': titleBarHeight - 10 + 'px'}" class="title-left">
...
...
@@ -58,6 +58,10 @@
];
}
},
enableAsideHidden
:
{
type
:
Boolean
,
default
:
true
},
},
methods
:
{
itemSelected
(
index
,
item
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录