Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zeroing-editor
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
劳工
zeroing-editor
Commits
2d77c605
Commit
2d77c605
authored
Apr 16, 2020
by
张超
🎱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zice
parent
710252f2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
94 additions
and
56 deletions
+94
-56
config.js
src/config.js
+2
-2
zh-CN.json
src/locales/zh-CN.json
+4
-1
project.js
src/store/modules/project.js
+6
-1
Editor.vue
src/views/Editor.vue
+20
-7
DetailsDialog.vue
src/views/Editor/dialogs/DetailsDialog.vue
+1
-1
AuthManagerEditor.vue
src/views/Editor/dialogs/editors/AuthManagerEditor.vue
+61
-44
No files found.
src/config.js
View file @
2d77c605
...
@@ -6,8 +6,8 @@ export let API_HOST;
...
@@ -6,8 +6,8 @@ export let API_HOST;
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
//API_HOST = '//10.10.95.74:7777';
//API_HOST = '//10.10.95.74:7777';
//API_HOST = '//192.168.1.16:7777';
//API_HOST = '//192.168.1.16:7777';
API_HOST
=
'//10.10.94.107
:3000'
;
API_HOST
=
'//10.10.95.89
:3000'
;
//API_HOST = '//192.168.0.105:7777';
//API_HOST = '//192.168.0.105:7777';
//API_HOST = '//localhost:3002';
//API_HOST = '//localhost:3002';
//API_HOST = window.__data.apiHost;
//API_HOST = window.__data.apiHost;
//API_HOST = 'http://beacon.duiba.com.cn';
//API_HOST = 'http://beacon.duiba.com.cn';
...
...
src/locales/zh-CN.json
View file @
2d77c605
...
@@ -226,7 +226,10 @@
...
@@ -226,7 +226,10 @@
"Store"
:
"数据"
,
"Store"
:
"数据"
,
"Operate"
:
"操作"
,
"Operate"
:
"操作"
,
"Computed"
:
"计算属性"
,
"Computed"
:
"计算属性"
,
"Are you sure to close?"
:
"确定关闭吗?"
,
"Are you sure to close?"
:
"确定关闭吗?"
,
"Failed to update operator"
:
"更新权限列表失败"
,
"Error delete self"
:
"连自己都删? 不可以!"
,
"No permission"
:
"没有权限喔!"
,
"eventGroup"
:
{
"eventGroup"
:
{
"in"
:
"接收"
,
"in"
:
"接收"
,
"out"
:
"派发"
"out"
:
"派发"
...
...
src/store/modules/project.js
View file @
2d77c605
...
@@ -126,10 +126,12 @@ export const projectStore = {
...
@@ -126,10 +126,12 @@ export const projectStore = {
},
},
updateProject
(
state
,
project
)
{
updateProject
(
state
,
project
)
{
const
{
id
,
name
,
creator
,
data
}
=
project
;
const
{
id
,
name
,
creator
,
data
,
operators
,
operator
}
=
project
;
state
.
id
=
id
;
state
.
id
=
id
;
state
.
name
=
name
;
state
.
name
=
name
;
state
.
creator
=
creator
;
state
.
creator
=
creator
;
state
.
operators
=
operators
;
state
.
operator
=
operator
;
const
localData
=
state
.
data
;
const
localData
=
state
.
data
;
if
(
data
)
{
if
(
data
)
{
...
@@ -183,6 +185,9 @@ export const projectStore = {
...
@@ -183,6 +185,9 @@ export const projectStore = {
},
},
modifyDependencies
(
state
,
value
)
{
modifyDependencies
(
state
,
value
)
{
state
.
data
.
dependencies
=
value
;
state
.
data
.
dependencies
=
value
;
},
modifyOperators
(
state
,
value
)
{
state
.
operators
=
value
;
},
},
/**
/**
* 激活组件
* 激活组件
...
...
src/views/Editor.vue
View file @
2d77c605
...
@@ -85,7 +85,9 @@
...
@@ -85,7 +85,9 @@
...
mapState
({
...
mapState
({
codeSyncServeConfig
(
state
)
{
codeSyncServeConfig
(
state
)
{
return
state
.
editor
.
codeSyncServeConfig
;
return
state
.
editor
.
codeSyncServeConfig
;
},
},
operators
:
(
state
)
=>
state
.
project
.
operators
,
currentOperator
:
(
state
)
=>
state
.
editor
.
operator
,
}),
}),
},
},
async
mounted
()
{
async
mounted
()
{
...
@@ -212,12 +214,23 @@
...
@@ -212,12 +214,23 @@
}
}
return
cancel
;
return
cancel
;
},
},
checkAuth
()
{
let
checkStatus
=
this
.
operators
.
includes
(
this
.
currentOperator
);
if
(
!
checkStatus
)
{
this
.
$message
({
message
:
this
.
$t
(
'No permission'
),
type
:
'error'
,
duration
:
1000
,
});
}
return
checkStatus
;
},
async
clickMenu
(
menuItem
)
{
async
clickMenu
(
menuItem
)
{
switch
(
menuItem
)
{
switch
(
menuItem
)
{
case
'save'
:
case
'save'
:
try
{
try
{
this
.
saveProject
();
this
.
checkAuth
()
&&
this
.
saveProject
();
}
catch
(
e
)
{
}
catch
(
e
)
{
}
}
break
;
break
;
...
@@ -232,13 +245,13 @@
...
@@ -232,13 +245,13 @@
this
.
preview
();
this
.
preview
();
break
;
break
;
case
'pack'
:
case
'pack'
:
await
this
.
pack
();
this
.
checkAuth
()
&&
await
this
.
pack
();
break
;
break
;
case
'pack-debug-mode'
:
case
'pack-debug-mode'
:
await
this
.
pack
(
true
);
this
.
checkAuth
()
&&
await
this
.
pack
(
true
);
break
;
break
;
case
'pack-manager'
:
case
'pack-manager'
:
this
.
$refs
.
packManagerDialog
.
show
();
this
.
checkAuth
()
&&
this
.
$refs
.
packManagerDialog
.
show
();
break
;
break
;
case
'search'
:
case
'search'
:
await
this
.
$refs
.
processSearchDialog
.
show
();
await
this
.
$refs
.
processSearchDialog
.
show
();
...
@@ -253,7 +266,7 @@
...
@@ -253,7 +266,7 @@
this
.
$store
.
commit
(
'undoRedo'
,
-
1
);
this
.
$store
.
commit
(
'undoRedo'
,
-
1
);
break
;
break
;
case
'px-skin-editor'
:
case
'px-skin-editor'
:
this
.
$refs
.
pxSkinEditorDialog
.
show
();
this
.
checkAuth
()
&&
this
.
$refs
.
pxSkinEditorDialog
.
show
();
break
;
break
;
case
'exit'
:
case
'exit'
:
const
{
projectID
}
=
this
.
$route
.
params
;
const
{
projectID
}
=
this
.
$route
.
params
;
...
...
src/views/Editor/dialogs/DetailsDialog.vue
View file @
2d77c605
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<projectx-config
ref=
"projectxConfig"
/>
<projectx-config
ref=
"projectxConfig"
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
:label=
"$t('Auth manager')"
name=
"authManagerEditor"
>
<el-tab-pane
:label=
"$t('Auth manager')"
name=
"authManagerEditor"
>
<auth-manager-editor
></auth-manager-editor
>
<auth-manager-editor
ref=
"authManagerEditor"
/
>
</el-tab-pane>
</el-tab-pane>
</el-tabs>
</el-tabs>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
src/views/Editor/dialogs/editors/AuthManagerEditor.vue
View file @
2d77c605
<
template
>
<
template
>
<div
class=
"project-auth-manager"
>
<div
class=
"project-auth-manager"
>
<el-card
shadow=
"hover"
>
<el-card
shadow=
"hover"
>
<h3
class=
"title"
>
当前权限用户列表
</h3>
<h3
class=
"title"
>
当前权限用户列表
{{
operatorsData
.
length
}}
</h3>
<div
class=
"user-list"
v-if=
"operators.length > 0"
>
<div
class=
"user-list"
v-if=
"operators
Data
.length > 0"
>
<el-tag
<el-tag
:key=
"tag"
:key=
"tag"
v-for=
"tag in operators"
v-for=
"tag in operators
Data
"
closable
closable
:disable-transitions=
"false"
:disable-transitions=
"false"
@
close=
"deleteAuth(tag)"
@
close=
"deleteAuth(tag)"
...
@@ -15,80 +15,97 @@
...
@@ -15,80 +15,97 @@
</div>
</div>
<p
v-else
>
空
</p>
<p
v-else
>
空
</p>
<el-divider></el-divider>
<el-divider></el-divider>
<el-button
type=
"primary"
size=
"small"
@
click=
"addDivShow = true"
>
增加权限
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"addDivShow = true"
>
增加权限
</el-button
>
</el-card>
</el-card>
<br
/>
<el-card
shadow=
"hover"
v-show=
"addDivShow"
>
<el-card
shadow=
"hover"
v-show=
"addDivShow"
>
<p>
请先勾选后,点击添加按钮
</p>
<p>
请先勾选后,点击添加按钮
</p>
<el-checkbox-group
v-model=
"checkList"
>
<el-checkbox-group
v-model=
"checkList"
>
<el-checkbox
<el-checkbox
v-for=
"item in devPersons"
v-for=
"item in devPersons"
:key=
"'dev-' + item"
:key=
"'dev-' + item
.id
"
:label=
"item"
:label=
"item
.name
"
:disabled=
"operators
.includes(item
)"
:disabled=
"operators
Data.includes(item.name
)"
></el-checkbox>
></el-checkbox>
</el-checkbox-group>
</el-checkbox-group>
<br
/>
<el-button
type=
"primary"
size=
"small"
@
click=
"onAdd"
>
添加
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"onAdd"
>
添加
</el-button>
</el-card>
</el-card>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
{
mapState
,
mapGetters
,
mapMutations
}
from
"vuex"
;
import
{
mapState
,
mapGetters
,
mapMutations
}
from
"vuex"
;
import
{
playWaiting
}
from
"../../../../utils"
;
import
{
playWaiting
}
from
"../../../../utils"
;
import
{
getDevPersons
}
from
"../../../../api/editor"
;
import
{
updateOperators
}
from
"../../../../api/project"
;
// updateOperators
export
default
{
export
default
{
name
:
"AuthManagerEditor"
,
name
:
"AuthManagerEditor"
,
data
()
{
data
()
{
return
{
return
{
authList
:
[
"张超"
,
"姜西西"
,
"王竹君"
],
checkList
:
[],
checkList
:
[
"张超"
],
devPersons
:
[],
devPersons
:
[],
addDivShow
:
false
addDivShow
:
false
,
};
};
},
},
computed
:
{
computed
:
{
...
mapState
({
...
mapState
({
operators
:
(
state
)
=>
operatorsData
:
(
state
)
=>
state
.
project
.
operators
&&
state
.
project
.
operators
.
split
(
","
),
state
.
project
.
operators
&&
state
.
project
.
operators
.
split
(
","
),
projectId
:
(
state
)
=>
state
.
project
.
id
,
currentOperator
:
(
state
)
=>
state
.
editor
.
operator
,
}),
}),
},
},
mounted
()
{
// getDevPersons
this
.
_getDevPersons
()
},
methods
:
{
methods
:
{
async
_getDevPersons
()
{
...
mapMutations
([
"modifyOperators"
]),
this
.
devPersons
=
await
this
.
getDevPersons
();
async
edit
()
{
},
this
.
devPersons
=
await
getDevPersons
();
// edit() {
// this.operators = clonePureObj(this.operators).split(",");
// },
save
()
{
// this.modifyEnv(this.editData);
},
},
onAdd
()
{
onAdd
()
{
this
.
checkList
=
[];
if
(
!
this
.
operatorsData
.
includes
(
this
.
currentOperator
))
{
this
.
addDivShow
=
false
;
this
.
$message
({
message
:
this
.
$t
(
'No permission'
),
type
:
"error"
});
// this.editData.push({
return
false
;
// name: "",
}
// value: "",
let
mergeData
=
[...
this
.
operatorsData
,
...
this
.
checkList
].
join
(
","
);
// });
this
.
onUpdate
(
mergeData
);
},
async
onUpdate
(
mergeData
)
{
updateOperators
(
this
.
projectId
,
mergeData
)
.
then
(()
=>
{
this
.
$message
({
message
:
this
.
$t
(
"Operate success"
),
type
:
"success"
,
});
this
.
modifyOperators
(
mergeData
);
this
.
checkList
=
[];
this
.
addDivShow
=
false
;
})
.
catch
((
e
)
=>
{
this
.
$message
({
message
:
e
.
message
,
type
:
"error"
});
});
},
},
deleteAuth
(
tag
)
{
deleteAuth
(
tag
)
{
this
.
$confirm
(
if
(
this
.
currentOperator
===
tag
)
{
this
.
$t
(
"Are you sure to delete this user auth"
)
+
tag
,
this
.
$message
({
message
:
this
.
$t
(
'Error delete self'
),
type
:
"error"
});
// this.$t("Alert"),
return
false
;
{
}
confirmButtonText
:
this
.
$t
(
"Confirm"
),
if
(
!
this
.
operatorsData
.
includes
(
this
.
currentOperator
))
{
cancelButtonText
:
this
.
$t
(
"Cancel"
),
this
.
$message
({
message
:
this
.
$t
(
'No permission'
),
type
:
"error"
});
type
:
"warning"
,
return
false
;
}
}
)
this
.
$confirm
(
this
.
$t
(
"Are you sure to delete this user auth"
)
+
tag
,
{
confirmButtonText
:
this
.
$t
(
"Confirm"
),
cancelButtonText
:
this
.
$t
(
"Cancel"
),
type
:
"warning"
,
})
.
then
(()
=>
{
.
then
(()
=>
{
this
.
authList
=
this
.
authList
.
filter
((
item
)
=>
item
!==
tag
);
let
mergeData
=
this
.
operatorsData
.
filter
((
item
)
=>
item
!==
tag
)
.
join
(
","
);
this
.
onUpdate
(
mergeData
);
})
})
.
catch
((
e
)
=>
{});
.
catch
((
e
)
=>
{});
console
.
log
(
tag
);
},
},
},
},
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment