Skip to content

M
memberTag-web
Commit 9b07edc8 by caoyanzhi
Options

Merge branch 'master' into dev-dingdang 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.11f47f4e8b250e4d9d3553096bf0d854.css
#	dist/static/js/0.84b7ea4314b94dbc6cc6.js
#	dist/static/js/manifest.98ba2ada32cb83deafa3.js
parents d5e04f5f 02258dbd
Showing with 77 additions and 28 deletions
.eslintrc.js
......@@ -168,7 +168,7 @@ module.exports = {
// "semi": [2,"never"],
semi: 0,
// 代码块嵌套的深度禁止超过 5 层
"max-depth": [1, 5],
"max-depth": [1, 20],
// 回调函数嵌套禁止超过 4 层，多了请用 async await 替代
"max-nested-callbacks": [2, 4],
// 函数的参数禁止超过 7 个
......
dist/static/css/app.11f47f4e8b250e4d9d3553096bf0d854.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.84b7ea4314b94dbc6cc6.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.98ba2ada32cb83deafa3.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,f){for(var o,b,d,i=0,u=[];i<n.length;i++)b=n[i],r[b]&&u.push(r[b][0]),r[b]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(c&&c(n,a,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=t(t.s=f[i]);return d};var n={},r={33:0};function t(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,t){c=r[e]=[n,t]});c[2]=n;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"84b7ea4314b94dbc6cc6",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"a1d23b8276ed0dc5689a",4:"5346be35fdb53a222936",5:"5a523b4d63b337052d7b",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"d92460353eb3e0bb9bf6",16:"77043b18784ab0e7f74a",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"9552d108595ed6cf8df5",22:"61bb63c1296b6c9972a5",23:"c24a9f56d0040598512c",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"a847856eb9171d0ce268",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=b,a.appendChild(f),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -14,7 +14,7 @@
<script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
<!-- 公共组件引用 cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.18.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.20.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.12.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/datepicker.2.0.00.js"></script> -->
......
src/components/tag/tag-config-options.vue
......@@ -361,7 +361,7 @@
<!-- 固定时段 -->
<div class="m-t-18 w-438 p-20 border-box bg-f3f6f9" v-if="parent.radio == 1">
<vue-gic-datepicker
v-model="parent.monthDayRange"
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
......@@ -1299,7 +1299,6 @@ export default {
let tagValue = JSON.parse(this.templateDataList.tagValue);
let tagParams = JSON.parse(this.templateDataList.tagParams);
let value = null;
let radio = null;
let selectVal = null;
let checkedCount = null;
......@@ -1372,12 +1371,32 @@ export default {
break;
case 'tag015':
radio = tagParams.template[0].radio;
value = tagValue.val[0].data.value.split(',');
this.templateData[0].radio = radio;
this.templateData[0].monthDayRange = value;
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag015') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
if (this.templateData[i].radio == 1) {
if (templateDate.dateRangeValue && templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
} else {
// 相对时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = [];
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
}
}
}
break;
case 'tag012':
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag012') {
......@@ -1437,10 +1456,19 @@ export default {
if (this.templateData[i].templateCode === 'tag017') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
if (this.templateData[i].radio == 1) {
if (templateDate.dateRangeValue && templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
} else {
// 相对时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = [];
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
......@@ -1458,13 +1486,18 @@ export default {
if (this.templateData[i].templateCode === 'tag019') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
if (templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
if (this.templateData[i].radio == 1) {
if (templateDate.dateRangeValue && templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
// 相对时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = [];
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
......@@ -1479,13 +1512,18 @@ export default {
if (this.templateData[i].templateCode === 'tag020') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
if (templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
if (this.templateData[i].radio == 1) {
if (templateDate.dateRangeValue && templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
// 相对时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = [];
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
......@@ -1500,10 +1538,19 @@ export default {
if (this.templateData[i].templateCode === 'tag014') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
if (this.templateData[i].radio == 1) {
if (templateDate.dateRangeValue && templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
} else {
// 相对时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = [];
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment