Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
memberTag-web
Overview
Overview
Details
Activity
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
memberTag
memberTag-web
Commits
d3504848
Commit
d3504848
authored
May 06, 2019
by
caoyanzhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改会员标签关系的实现方式
parent
e073d5c2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
selected-tags-list.vue
src/components/selected-tags-list.vue
+1
-1
memberGroupEdit.vue
src/view/memberGroup/memberGroupEdit.vue
+6
-4
tags-group.vue
src/view/memberGroup/tags-group.vue
+1
-1
member-tag.vue
src/view/platformTag/member-tag.vue
+1
-1
No files found.
src/components/selected-tags-list.vue
View file @
d3504848
...
...
@@ -15,7 +15,7 @@
<div
v-if=
"(index === 0 && tagsListFilter.length > 1) || (index === 1 && tagsListFilter.length > 2)"
class=
"tag-relation"
>
<span
class=
"tag-relation__wrap"
>
<i
class=
"tag-relation__cont"
>
{{
tags
[
0
].
levelType
===
'or'
?
'或者'
:
tags
[
0
].
levelType
===
'andNot'
?
'剔除'
:
''
}}
{{
tags
ListFilter
[
index
+
1
][
0
].
levelType
===
'or'
?
'或者'
:
tagsListFilter
[
index
+
1
]
[
0
].
levelType
===
'andNot'
?
'剔除'
:
''
}}
</i>
</span>
</div>
...
...
src/view/memberGroup/memberGroupEdit.vue
View file @
d3504848
...
...
@@ -385,7 +385,7 @@ export default {
let
ruleForm
=
this
.
ruleForm
;
ruleForm
.
selectedTags
.
forEach
((
tagsGroup
,
tagsGroupIndex
)
=>
{
let
relation
=
ruleForm
.
tagsGroupRelation
[
tagsGroupIndex
];
let
relation
=
ruleForm
.
tagsGroupRelation
[
tagsGroupIndex
-
1
];
tagsGroup
.
forEach
(
item
=>
{
item
.
levelType
=
relation
?
relation
:
'or'
;
})
...
...
@@ -523,9 +523,11 @@ export default {
});
});
this
.
ruleForm
.
selectedTags
=
this
.
ruleForm
.
selectedTags
.
filter
(
item
=>
item
.
length
>
0
);
this
.
ruleForm
.
selectedTags
.
map
(
tagsGroup
=>
{
this
.
ruleForm
.
tagsGroupRelation
.
push
(
tagsGroup
[
0
].
levelType
?
tagsGroup
[
0
].
levelType
:
'or'
);
});
this
.
ruleForm
.
selectedTags
.
map
((
tagsGroup
,
index
)
=>
{
if
(
this
.
ruleForm
.
selectedTags
[
index
+
1
])
{
this
.
ruleForm
.
tagsGroupRelation
.
push
(
this
.
ruleForm
.
selectedTags
[
index
+
1
][
0
].
levelType
?
this
.
ruleForm
.
selectedTags
[
index
+
1
][
0
].
levelType
:
'or'
);
}
})
}
})
.
catch
(
error
=>
{
...
...
src/view/memberGroup/tags-group.vue
View file @
d3504848
...
...
@@ -69,7 +69,7 @@ export default {
tagsData
:
Array
,
// 是否显示剔除按钮
showTagsRelation
:
Boolean
,
// 与
下
一组标签之间的关系 or 、andNot
// 与
上
一组标签之间的关系 or 、andNot
tagsRelation
:
String
,
// 当前标签组的索引
tagsGroupIndex
:
Number
,
...
...
src/view/platformTag/member-tag.vue
View file @
d3504848
...
...
@@ -284,7 +284,7 @@ export default {
createNewGroup
()
{
this
.
selectedTags
.
forEach
((
tagsGroup
,
tagsGroupIndex
)
=>
{
let
relation
=
this
.
tagsGroupRelation
[
tagsGroupIndex
];
let
relation
=
this
.
tagsGroupRelation
[
tagsGroupIndex
-
1
];
tagsGroup
.
forEach
(
item
=>
{
item
.
levelType
=
relation
?
relation
:
'or'
;
})
...
...
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