Change plugin of iputs masks, Improve css of modal checkbox, Upgrade dependencies
This commit is contained in:
parent
271ec87ef0
commit
659ab5ade1
File diff suppressed because it is too large
Load Diff
20
package.json
20
package.json
|
@ -12,28 +12,28 @@
|
||||||
"bulma": "^0.7.1",
|
"bulma": "^0.7.1",
|
||||||
"mdi": "^2.2.43",
|
"mdi": "^2.2.43",
|
||||||
"moment": "^2.22.2",
|
"moment": "^2.22.2",
|
||||||
|
"node-sass": "^4.9.2",
|
||||||
"qs": "^6.5.2",
|
"qs": "^6.5.2",
|
||||||
"v-mask": "^1.3.2",
|
|
||||||
"v-tooltip": "^2.0.0-rc.33",
|
"v-tooltip": "^2.0.0-rc.33",
|
||||||
"vue": "^2.5.16",
|
"vue": "^2.5.16",
|
||||||
"node-sass": "^4.9.2",
|
|
||||||
"vue-router": "^3.0.1",
|
"vue-router": "^3.0.1",
|
||||||
|
"vue-the-mask": "^0.11.1",
|
||||||
"vuedraggable": "^2.16.0",
|
"vuedraggable": "^2.16.0",
|
||||||
"vuex": "^3.0.1"
|
"vuex": "^3.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"autoprefixer": "^9.0.0",
|
"autoprefixer": "^9.0.2",
|
||||||
"babel-core": "^6.26.3",
|
"babel-core": "^6.26.3",
|
||||||
"babel-loader": "^7.1.5",
|
"babel-loader": "^7.1.5",
|
||||||
"babel-preset-env": "^1.7.0",
|
"babel-preset-env": "^1.7.0",
|
||||||
"babel-preset-stage-3": "^6.24.1",
|
"babel-preset-stage-3": "^6.24.1",
|
||||||
"cross-env": "^5.2.0",
|
"cross-env": "^5.2.0",
|
||||||
"css-loader": "^1.0.0",
|
"css-loader": "^1.0.0",
|
||||||
"cypress": "^3.0.2",
|
"cypress": "^3.0.3",
|
||||||
"element-theme-chalk": "^2.4.4",
|
"element-theme-chalk": "^2.4.5",
|
||||||
"eslint": "^5.1.0",
|
"eslint": "^5.2.0",
|
||||||
"eslint-loader": "^2.0.0",
|
"eslint-loader": "^2.1.0",
|
||||||
"eslint-plugin-vue": "^4.7.0",
|
"eslint-plugin-vue": "^4.7.1",
|
||||||
"file-loader": "^1.1.11",
|
"file-loader": "^1.1.11",
|
||||||
"postcss-loader": "^2.1.6",
|
"postcss-loader": "^2.1.6",
|
||||||
"sass-loader": "^7.0.3",
|
"sass-loader": "^7.0.3",
|
||||||
|
@ -42,8 +42,8 @@
|
||||||
"vue-custom-element": "^3.2.2",
|
"vue-custom-element": "^3.2.2",
|
||||||
"vue-loader": "^15.2.6",
|
"vue-loader": "^15.2.6",
|
||||||
"vue-template-compiler": "^2.5.16",
|
"vue-template-compiler": "^2.5.16",
|
||||||
"webpack": "^4.16.1",
|
"webpack": "^4.16.3",
|
||||||
"webpack-cli": "^3.1.0",
|
"webpack-cli": "^3.1.0",
|
||||||
"webpack-dev-server": "^3.1.4"
|
"webpack-dev-server": "^3.1.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
class="tainacan-modal-content"
|
class="tainacan-modal-content"
|
||||||
style="width: auto">
|
style="width: auto; min-height: 600px;">
|
||||||
<header class="tainacan-modal-title">
|
<header class="tainacan-modal-title">
|
||||||
<h2>{{ this.$i18n.get('filter') }} <em>{{ filter.name }}</em></h2>
|
<h2>{{ this.$i18n.get('filter') }} <em>{{ filter.name }}</em></h2>
|
||||||
<hr>
|
<hr>
|
||||||
|
@ -152,7 +152,7 @@
|
||||||
|
|
||||||
this.isSearching = !!this.optionName.length;
|
this.isSearching = !!this.optionName.length;
|
||||||
|
|
||||||
let query = `?hideempty=0&order=asc&number=10&searchterm=${this.optionName}`;
|
let query = `?hideempty=0&order=asc&number=18&searchterm=${this.optionName}`;
|
||||||
|
|
||||||
axios.get(`/taxonomy/${this.taxonomy_id}/terms${query}`)
|
axios.get(`/taxonomy/${this.taxonomy_id}/terms${query}`)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
@ -356,6 +356,7 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
|
min-height: 253px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tainacan-finder-columns-container:focus {
|
.tainacan-finder-columns-container:focus {
|
||||||
|
@ -400,6 +401,7 @@
|
||||||
|
|
||||||
.tainacan-search-results-container {
|
.tainacan-search-results-container {
|
||||||
padding: 0 20px !important;
|
padding: 0 20px !important;
|
||||||
|
min-height: 253px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tainacan-modal-checkbox-search-results-body {
|
.tainacan-modal-checkbox-search-results-body {
|
||||||
|
|
|
@ -42,7 +42,7 @@ import store from '../../js/store/store'
|
||||||
import router from './router'
|
import router from './router'
|
||||||
import eventBusSearch from '../../js/event-bus-search';
|
import eventBusSearch from '../../js/event-bus-search';
|
||||||
import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin } from './utilities';
|
import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin } from './utilities';
|
||||||
import VueMask from 'v-mask';
|
import VueTheMask from 'vue-the-mask';
|
||||||
|
|
||||||
// Configure and Register Plugins
|
// Configure and Register Plugins
|
||||||
Vue.use(Buefy);
|
Vue.use(Buefy);
|
||||||
|
@ -52,7 +52,7 @@ Vue.use(UserPrefsPlugin);
|
||||||
Vue.use(RouterHelperPlugin);
|
Vue.use(RouterHelperPlugin);
|
||||||
Vue.use(UserCapabilitiesPlugin);
|
Vue.use(UserCapabilitiesPlugin);
|
||||||
Vue.use(ConsolePlugin, {visual: false});
|
Vue.use(ConsolePlugin, {visual: false});
|
||||||
Vue.use(VueMask);
|
Vue.use(VueTheMask);
|
||||||
|
|
||||||
/* Metadata */
|
/* Metadata */
|
||||||
Vue.component('tainacan-text', Text);
|
Vue.component('tainacan-text', Text);
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
{{ collapseAll ? $i18n.get('label_collapse_all') : $i18n.get('label_expand_all') }}
|
{{ collapseAll ? $i18n.get('label_collapse_all') : $i18n.get('label_expand_all') }}
|
||||||
<b-icon
|
<b-icon
|
||||||
type="is-secondary"
|
type="is-secondary"
|
||||||
size="is-small"
|
|
||||||
:icon=" collapseAll ? 'menu-down' : 'menu-right'" />
|
:icon=" collapseAll ? 'menu-down' : 'menu-right'" />
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
@ -1080,6 +1079,11 @@
|
||||||
|
|
||||||
@import '../../scss/_variables.scss';
|
@import '../../scss/_variables.scss';
|
||||||
|
|
||||||
|
.collapse-all {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
.advanced-search-criteria-title {
|
.advanced-search-criteria-title {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
|
||||||
|
@ -1091,7 +1095,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
hr {
|
hr {
|
||||||
margin: 3px 0px 4px 0px;
|
margin: 3px 0 4px 0;
|
||||||
height: 1px;
|
height: 1px;
|
||||||
background-color: $secondary;
|
background-color: $secondary;
|
||||||
}
|
}
|
||||||
|
@ -1108,7 +1112,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
hr {
|
hr {
|
||||||
margin: 3px 0px 4px 0px;
|
margin: 3px 0 4px 0;
|
||||||
height: 1px;
|
height: 1px;
|
||||||
background-color: $secondary;
|
background-color: $secondary;
|
||||||
}
|
}
|
||||||
|
@ -1125,7 +1129,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-container {
|
.page-container {
|
||||||
padding: 0px;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filters-menu {
|
.filters-menu {
|
||||||
|
@ -1136,7 +1140,6 @@
|
||||||
min-width: 180px;
|
min-width: 180px;
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background-color: white;
|
|
||||||
padding: $page-small-side-padding;
|
padding: $page-small-side-padding;
|
||||||
float: left;
|
float: left;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
v-if="!option.isChild"
|
v-if="!option.isChild"
|
||||||
>{{ option.name }}</b-checkbox>
|
>{{ option.name }}</b-checkbox>
|
||||||
<div
|
<div
|
||||||
:style="{ 'padding-left': '18px' }"
|
class="see-more-container"
|
||||||
v-if="option.seeMoreLink"
|
v-if="option.seeMoreLink"
|
||||||
@click="openCheckboxModal(option.parent)"
|
@click="openCheckboxModal(option.parent)"
|
||||||
v-html="option.seeMoreLink"/>
|
v-html="option.seeMoreLink"/>
|
||||||
|
@ -150,7 +150,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.filter.max_options && result.length >= this.filter.max_options){
|
if(this.filter.max_options && result.length >= this.filter.max_options){
|
||||||
let seeMoreLink = `<a class="add-link"> ${ this.$i18n.get('label_see_more') } </a>`;
|
let seeMoreLink = `<a style="font-size: 12px;"> ${ this.$i18n.get('label_see_more') } </a>`;
|
||||||
result[this.filter.max_options-1].seeMoreLink = seeMoreLink;
|
result[this.filter.max_options-1].seeMoreLink = seeMoreLink;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -225,3 +225,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.see-more-container {
|
||||||
|
display: flex;
|
||||||
|
padding-left: 18px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
:value="dateValue"
|
:value="dateValue"
|
||||||
@blur="onBlur"
|
@blur="onBlur"
|
||||||
@input="onInput"
|
@input="onInput"
|
||||||
:placeholder="dateFormat">
|
:placeholder="dateFormat.toLowerCase()">
|
||||||
<!--<b-collapse-->
|
<!--<b-collapse-->
|
||||||
<!--position="is-bottom-right">-->
|
<!--position="is-bottom-right">-->
|
||||||
<!--<b-icon-->
|
<!--<b-icon-->
|
||||||
|
|
Loading…
Reference in New Issue