Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
metagrid-go
metagrid-vue
Commits
4fd7466d
Commit
4fd7466d
authored
Oct 22, 2020
by
Tobinsk
Browse files
Merge branch '9-loading-animation' into 'master'
Resolve "loading animation" Closes
#9
See merge request
!11
parents
1290c3ea
e9115037
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/components/MatchForm.vue
View file @
4fd7466d
...
...
@@ -96,6 +96,7 @@
if
(
this
.
single
.
name
===
''
)
{
return
}
// todo: reset pagination
this
.
test
(
{
name
:
this
.
single
.
name
,
...
...
src/views/Search.vue
View file @
4fd7466d
...
...
@@ -3,10 +3,14 @@
<div
class=
"container-fluid"
>
<SearchForm
@
search=
"preSearch"
/>
</div>
<div
class=
"container-fluid"
>
<div
class=
"container-fluid"
v-if=
"!loading"
>
<ResultList/>
<Pagination
:get=
"list"
ref=
"pagination"
></Pagination>
</div>
<div
class=
"container-fluid d-flex justify-content-center mb-3"
v-if=
"loading"
>
<b-spinner
variant=
"primary"
type=
"grow"
label=
"Spinning"
></b-spinner>
</div>
<div
class=
"edit-box"
>
<div
class=
"container-fluid"
>
<EditForm
ref=
"editform"
/>
...
...
@@ -22,7 +26,8 @@ import SearchForm from '@/components/SearchForm.vue'
import
ResultList
from
'
@/components/ResultList.vue
'
import
EditForm
from
"
@/components/EditForm
"
;
import
Pagination
from
"
@/components/Pagination
"
;
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
Getters
}
from
"
@/store/concordance/type
"
;
export
default
{
name
:
'
Search
'
,
mounted
()
{
...
...
@@ -41,6 +46,9 @@ export default {
this
.
$refs
.
pagination
.
change
(
1
);
}
},
computed
:
{
...
mapGetters
(
'
concordance
'
,
{
loading
:
Getters
.
LOADING
})
},
components
:
{
EditForm
,
ResultList
,
...
...
Write
Preview
Supports
Markdown
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