Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
dff0c8a0
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,发现更多精彩内容 >>
提交
dff0c8a0
编写于
5月 11, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改util.js
上级
86722567
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
22 addition
and
29 deletion
+22
-29
frontend/src/business/components/common/head/HeaderUser.vue
frontend/src/business/components/common/head/HeaderUser.vue
+3
-5
frontend/src/business/components/project/MsProject.vue
frontend/src/business/components/project/MsProject.vue
+2
-3
frontend/src/business/components/settings/CurrentUser.vue
frontend/src/business/components/settings/CurrentUser.vue
+2
-3
frontend/src/business/components/settings/organization/OrganizationMember.vue
...s/components/settings/organization/OrganizationMember.vue
+2
-3
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
...omponents/settings/organization/OrganizationWorkspace.vue
+3
-4
frontend/src/business/components/settings/personal/PersonSetting.vue
...c/business/components/settings/personal/PersonSetting.vue
+2
-2
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
...usiness/components/settings/workspace/WorkspaceMember.vue
+2
-3
frontend/src/common/js/utils.js
frontend/src/common/js/utils.js
+6
-6
未找到文件。
frontend/src/business/components/common/head/HeaderUser.vue
浏览文件 @
dff0c8a0
...
...
@@ -51,7 +51,7 @@
TokenKey
,
WORKSPACE_ID
}
from
'
../../../../common/js/constants
'
;
import
{
hasRoles
,
saveLocalStorage
}
from
"
../../../../common/js/utils
"
;
import
{
getCurrentUser
,
hasRoles
,
saveLocalStorage
}
from
"
../../../../common/js/utils
"
;
export
default
{
name
:
"
MsUser
"
,
...
...
@@ -68,7 +68,7 @@
{
index
:
'
2-1
'
,
name
:
'
无工作空间
'
},
],
currentUserInfo
:
{},
currentUserId
:
JSON
.
parse
(
localStorage
.
getItem
(
TokenKey
)
).
id
,
currentUserId
:
getCurrentUser
(
).
id
,
workspaceIds
:
[],
currentOrganizationName
:
'
选择组织
'
,
currentWorkspaceName
:
'
选择工作空间
'
...
...
@@ -76,9 +76,7 @@
},
computed
:
{
currentUser
:
()
=>
{
let
user
=
localStorage
.
getItem
(
TokenKey
);
// window.console.log(user);
return
JSON
.
parse
(
user
);
return
getCurrentUser
();
}
},
methods
:
{
...
...
frontend/src/business/components/project/MsProject.vue
浏览文件 @
dff0c8a0
...
...
@@ -44,11 +44,11 @@
<
script
>
import
MsCreateBox
from
"
../settings/CreateBox
"
;
import
{
Message
}
from
"
element-ui
"
;
import
{
TokenKey
}
from
"
../../../common/js/constants
"
;
import
MsTablePagination
from
"
../common/pagination/TablePagination
"
;
import
MsTableHeader
from
"
../common/components/MsTableHeader
"
;
import
MsTableOperator
from
"
../common/components/MsTableOperator
"
;
import
MsDialogFooter
from
"
../common/components/MsDialogFooter
"
;
import
{
getCurrentUser
}
from
"
../../../common/js/utils
"
;
export
default
{
name
:
"
MsProject
"
,
...
...
@@ -97,8 +97,7 @@
},
computed
:
{
currentUser
:
()
=>
{
let
user
=
localStorage
.
getItem
(
TokenKey
);
return
JSON
.
parse
(
user
);
return
getCurrentUser
();
}
},
destroyed
()
{
...
...
frontend/src/business/components/settings/CurrentUser.vue
浏览文件 @
dff0c8a0
...
...
@@ -6,7 +6,7 @@
</
template
>
<
script
>
import
{
TokenKey
}
from
"
../../../common/js/constant
s
"
;
import
{
getCurrentUser
}
from
"
../../../common/js/util
s
"
;
export
default
{
name
:
"
MsCurrentUser
"
,
...
...
@@ -30,8 +30,7 @@
},
computed
:
{
currentUser
:
()
=>
{
let
user
=
localStorage
.
getItem
(
TokenKey
);
return
JSON
.
parse
(
user
);
return
getCurrentUser
();
}
}
}
...
...
frontend/src/business/components/settings/organization/OrganizationMember.vue
浏览文件 @
dff0c8a0
...
...
@@ -95,12 +95,12 @@
<
script
>
import
MsCreateBox
from
"
../CreateBox
"
;
import
{
TokenKey
}
from
"
../../../../common/js/constants
"
;
import
MsTablePagination
from
"
../../common/pagination/TablePagination
"
;
import
MsTableHeader
from
"
../../common/components/MsTableHeader
"
;
import
MsRolesTag
from
"
../../common/components/MsRolesTag
"
;
import
MsTableOperator
from
"
../../common/components/MsTableOperator
"
;
import
MsDialogFooter
from
"
../../common/components/MsDialogFooter
"
;
import
{
getCurrentUser
}
from
"
../../../../common/js/utils
"
;
export
default
{
name
:
"
MsOrganizationMember
"
,
...
...
@@ -134,8 +134,7 @@
},
methods
:
{
currentUser
:
()
=>
{
let
user
=
localStorage
.
getItem
(
TokenKey
);
return
JSON
.
parse
(
user
);
return
getCurrentUser
();
},
initTableData
()
{
let
param
=
{
...
...
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
浏览文件 @
dff0c8a0
...
...
@@ -145,13 +145,13 @@
<
script
>
import
MsCreateBox
from
"
../CreateBox
"
;
import
{
Message
}
from
"
element-ui
"
;
import
{
DEFAULT
,
TokenKey
}
from
"
../../../../common/js/constants
"
;
import
{
DEFAULT
}
from
"
../../../../common/js/constants
"
;
import
MsTablePagination
from
"
../../common/pagination/TablePagination
"
;
import
MsTableHeader
from
"
../../common/components/MsTableHeader
"
;
import
MsRolesTag
from
"
../../common/components/MsRolesTag
"
;
import
MsTableOperator
from
"
../../common/components/MsTableOperator
"
;
import
MsDialogFooter
from
"
../../common/components/MsDialogFooter
"
;
import
{
getCurrentWorkspaceId
,
refreshSessionAndCookies
}
from
"
../../../../common/js/utils
"
;
import
{
getCurrent
User
,
getCurrent
WorkspaceId
,
refreshSessionAndCookies
}
from
"
../../../../common/js/utils
"
;
export
default
{
name
:
"
MsOrganizationWorkspace
"
,
...
...
@@ -161,8 +161,7 @@
},
computed
:
{
currentUser
:
()
=>
{
let
user
=
localStorage
.
getItem
(
TokenKey
);
return
JSON
.
parse
(
user
);
return
getCurrentUser
();
}
},
methods
:
{
...
...
frontend/src/business/components/settings/personal/PersonSetting.vue
浏览文件 @
dff0c8a0
...
...
@@ -82,6 +82,7 @@
<
script
>
import
{
TokenKey
}
from
"
../../../../common/js/constants
"
;
import
MsDialogFooter
from
"
../../common/components/MsDialogFooter
"
;
import
{
getCurrentUser
}
from
"
../../../../common/js/utils
"
;
export
default
{
data
()
{
...
...
@@ -152,8 +153,7 @@
},
methods
:
{
currentUser
:
()
=>
{
let
user
=
localStorage
.
getItem
(
TokenKey
);
return
JSON
.
parse
(
user
);
return
getCurrentUser
();
},
edit
(
row
)
{
this
.
updateVisible
=
true
;
...
...
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
浏览文件 @
dff0c8a0
...
...
@@ -97,12 +97,12 @@
<
script
>
import
MsCreateBox
from
"
../CreateBox
"
;
import
{
TokenKey
}
from
"
../../../../common/js/constants
"
;
import
MsTablePagination
from
"
../../common/pagination/TablePagination
"
;
import
MsTableHeader
from
"
../../common/components/MsTableHeader
"
;
import
MsRolesTag
from
"
../../common/components/MsRolesTag
"
;
import
MsTableOperator
from
"
../../common/components/MsTableOperator
"
;
import
MsDialogFooter
from
"
../../common/components/MsDialogFooter
"
;
import
{
getCurrentUser
}
from
"
../../../../common/js/utils
"
;
export
default
{
name
:
"
MsMember
"
,
...
...
@@ -136,8 +136,7 @@
},
methods
:
{
currentUser
:
()
=>
{
let
user
=
localStorage
.
getItem
(
TokenKey
);
return
JSON
.
parse
(
user
);
return
getCurrentUser
();
},
initTableData
()
{
if
(
this
.
currentUser
().
lastWorkspaceId
===
null
)
{
...
...
frontend/src/common/js/utils.js
浏览文件 @
dff0c8a0
...
...
@@ -9,13 +9,13 @@ import {
import
axios
from
"
axios
"
;
export
function
hasRole
(
role
)
{
let
user
=
JSON
.
parse
(
localStorage
.
getItem
(
TokenKey
)
);
let
user
=
getCurrentUser
(
);
let
roles
=
user
.
roles
.
map
(
r
=>
r
.
id
);
return
roles
.
indexOf
(
role
)
>
-
1
;
}
export
function
hasRoles
(...
roles
)
{
let
user
=
JSON
.
parse
(
localStorage
.
getItem
(
TokenKey
)
);
let
user
=
getCurrentUser
(
);
let
rs
=
user
.
roles
.
map
(
r
=>
r
.
id
);
for
(
let
item
of
roles
)
{
if
(
rs
.
indexOf
(
item
)
>
-
1
)
{
...
...
@@ -26,24 +26,24 @@ export function hasRoles(...roles) {
}
export
function
checkoutCurrentOrganization
()
{
let
user
=
JSON
.
parse
(
localStorage
.
getItem
(
TokenKey
)
);
let
user
=
getCurrentUser
(
);
// 查看当前用户是否是 lastOrganizationId 的组织管理员
return
user
.
userRoles
.
filter
(
ur
=>
hasRole
(
ROLE_ORG_ADMIN
)
&&
user
.
lastOrganizationId
===
ur
.
sourceId
).
length
>
0
;
}
export
function
checkoutCurrentWorkspace
()
{
let
user
=
JSON
.
parse
(
localStorage
.
getItem
(
TokenKey
)
);
let
user
=
getCurrentUser
(
);
// 查看当前用户是否是 lastWorkspaceId 的工作空间用户
return
user
.
userRoles
.
filter
(
ur
=>
hasRoles
(
ROLE_TEST_MANAGER
,
ROLE_TEST_USER
,
ROLE_TEST_VIEWER
)
&&
user
.
lastWorkspaceId
===
ur
.
sourceId
).
length
>
0
;
}
export
function
getCurrentOrganizationId
()
{
let
user
=
JSON
.
parse
(
localStorage
.
getItem
(
TokenKey
)
);
let
user
=
getCurrentUser
(
);
return
user
.
lastOrganizationId
;
}
export
function
getCurrentWorkspaceId
()
{
let
user
=
JSON
.
parse
(
localStorage
.
getItem
(
TokenKey
)
);
let
user
=
getCurrentUser
(
);
return
user
.
lastWorkspaceId
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录