eoss-ui 0.5.45 → 0.5.46

package/lib/theme-chalk/toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content{line-height:32px!important}.es-toolbar .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
+@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-form-search-small .el-form-item__content{line-height:32px!important}.es-toolbar .es-form-search-small .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}

package/lib/tips.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 63);
+/******/ 	return __webpack_require__(__webpack_require__.s = 64);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3565,7 +3565,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 63:
+/***/ 64:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/toolbar.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 79);
+/******/ 	return __webpack_require__(__webpack_require__.s = 80);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 79:
+/***/ 80:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -256,41 +256,25 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       default: 'auto'
     }
   },
-  computed: {
-    searchData: {
-      get: function get() {
-        var value = void 0;
-        for (var i = 0; i < this.contents.length; i++) {
-          if (this.contents[i].type === 'search') {
-            value = this.contents[i].value || this.contents[i].searchValue;
-            break;
-          }
-        }
-        return value ? value : this.searchValue;
-      },
-      set: function set(val) {
-        return val;
+  watch: {
+    searchValue: {
+      deep: true,
+      handler: function handler(val) {
+        this.searchData = val;
       }
     },
-    advancedData: {
-      get: function get() {
-        var value = void 0;
-        for (var i = 0; i < this.contents.length; i++) {
-          if (this.contents[i].type === 'filter') {
-            value = this.contents[i].value || this.contents[i].searchValue;
-            break;
-          }
-        }
-        return value ? value : this.advanceValue;
-      },
-      set: function set(val) {
-        return val;
+    advanceValue: {
+      deep: true,
+      handler: function handler(val) {
+        this.advancedData = val;
       }
     }
   },
   data: function data() {
     return {
-      show: false
+      show: false,
+      searchData: this.searchValue,
+      advancedData: this.advanceValue
     };
   },
   created: function created() {
@@ -483,8 +467,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             name: 'show',
             value: _this2.show
           }]
-        }, [h('es-form', {
-          class: 'es-form-search',
+        }, [_this2.show ? h('es-form', {
+          class: 'es-form-advanced-filter',
           ref: 'filter',
           props: _extends({}, other, config || {}, {
             size: 'medium',
@@ -496,7 +480,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             submit: _this2.hanleSubmit,
             reset: _this2.hanleCancel
           }
-        }, [])])]);
+        }, []) : ''])]);
       }
     });
     var box = [h('div', {

package/lib/tree-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 65);
+/******/ 	return __webpack_require__(__webpack_require__.s = 66);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3565,7 +3565,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 65:
+/***/ 66:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 64);
+/******/ 	return __webpack_require__(__webpack_require__.s = 65);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3565,7 +3565,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 64:
+/***/ 65:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 67);
+/******/ 	return __webpack_require__(__webpack_require__.s = 68);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3565,7 +3565,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 67:
+/***/ 68:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 68);
+/******/ 	return __webpack_require__(__webpack_require__.s = 69);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3565,7 +3565,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 68:
+/***/ 69:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.45",
+  "version": "0.5.46",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/calendar/index.js

@@ -0,0 +1,5 @@
+import EsCalendar from './src/main';
+
+EsCalendar.install = Vue => Vue.component(EsCalendar.name, EsCalendar);
+
+export default EsCalendar;

package/packages/calendar/src/main.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="es-calendar">
+    <div class="es-calendar-title" v-show="showTitle">
+      <i class="es-calendar-prev es-icon-pointer-left" @click="prev"></i>
+      <div class="es-title" @click="resetDate">
+        <slot name="title" :year="year" :month="month">
+          {{ year }}年{{ month }}月
+        </slot>
+      </div>
+      <i class="es-calendar-next es-icon-pointer-right" @click="next"></i>
+    </div>
+    <ul class="es-calendar-weeks">
+      <li v-for="(item, index) in weeks" :key="index" class="es-week">
+        {{ item }}
+      </li>
+    </ul>
+    <ul class="es-calendar-days">
+      <li
+        class="es-day"
+        @click="handleClick(item)"
+        v-for="(item, index) in lists"
+        :key="`${item.year}-${item.month}-${item.date}`"
+      >
+        <div
+          class="es-day-item"
+          :class="{
+            'es-disabled-day': item.type == 0,
+            'es-today': isSelect(item, today) && mark,
+            'es-select': isSelect(item, select)
+          }"
+        >
+          {{ item.date }}
+          <slot name="mark" :data="item"></slot>
+        </div>
+      </li>
+    </ul>
+    <div class="es-calendar-switch" v-show="fold">
+      <i
+        class="es-icon-pointer-up es-switch-icon"
+        name=""
+        @click="handleHide"
+        v-show="all"
+      ></i>
+      <i
+        class="es-icon-pointer-down es-switch-icon"
+        @click="handleShow"
+        v-show="!all"
+      ></i>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'esCalendar',
+  props: {
+    //显示title
+    showTitle: {
+      type: Boolean,
+      default: true
+    },
+    //指定日期
+    date: [String, Number],
+    //是否只显示本周
+    brief: Boolean,
+    //是否等指定日期传入后再渲染
+    wait: Boolean,
+    //是否显示收起展开按钮
+    fold: {
+      type: Boolean,
+      default: true
+    },
+    mark: Boolean
+  },
+  watch: {
+    date: {
+      immediate: true,
+      handler(val) {
+        if (this.wait) {
+          val && this.init();
+        } else {
+          this.init();
+        }
+      }
+    },
+    brief: {
+      immediate: true,
+      handler(val) {
+        this.all = !val;
+      }
+    }
+  },
+  computed: {
+    lists() {
+      if (this.all) {
+        return this.daysList;
+      }
+      return this.daysList.filter((item) => {
+        for (let i = 0; i < this.weekDate.length; i++) {
+          let ele = this.weekDate[i];
+          if (
+            item.year == ele.year &&
+            item.month == ele.month &&
+            item.date == ele.date
+          ) {
+            return true;
+          }
+        }
+      });
+    }
+  },
+  data() {
+    return {
+      year: '',
+      _month: '',
+      weeks: ['日', '一', '二', '三', '四', '五', '六'],
+      weekDate: [],
+      week7: '',
+      today: '',
+      select: '',
+      selectDate: '',
+      daysList: [],
+      all: true,
+      week: 0,
+      prevMonthDays: 0,
+      nextMonthDays: 0,
+      days: 0
+    };
+  },
+  mounted() {},
+  methods: {
+    resetDate() {
+      this.week = 0;
+      this.init();
+    },
+    init(res) {
+      this.daysList = [];
+      let dates = this.getDays(res ? res : this.date);
+      let {
+        year,
+        month,
+        today,
+        daysList,
+        weekDate,
+        prevMonthDays,
+        nextMonthDays,
+        days
+      } = dates;
+      if (!res) {
+        this.today = `${year}/${month}/${today}`;
+        this.selectDate = today;
+        this.select = `${year}/${month}/${today}`;
+        this.$emit('select', { year, month, date: today, type: 1 });
+      }
+      this.prevMonthDays = prevMonthDays;
+      this.nextMonthDays = nextMonthDays;
+      this.days = days;
+      this.daysList = daysList;
+      this.year = year;
+      this.month = month;
+      if (!this.weekDate.length) {
+        this.weekDate = weekDate;
+      }
+      this.$emit('init', dates);
+      return dates;
+    },
+    isShow(res) {
+      if (this.all) {
+        return true;
+      }
+      return this.weekDate.filter((item) => {
+        return (
+          item.year == res.year &&
+          item.month == res.month &&
+          item.date == res.date
+        );
+      }).length;
+    },
+    isSelect(res, target) {
+      let { year, month, date } = res;
+      return target == `${year}/${month}/${date}`;
+    },
+    handleClick(res) {
+      let { year, month, date } = res;
+      this.selectDate = date;
+      this.select = `${year}/${month}/${date}`;
+      this.$emit('select', res);
+    },
+    prev() {
+      if (this.all) {
+        this.weekDate = [];
+        this.prevMonth();
+      } else {
+        this.weekDate = this.getWeekDay(-1);
+        this.$emit('prev', this.weekDate, 'week');
+      }
+    },
+    next() {
+      if (this.all) {
+        this.weekDate = [];
+        this.nextMonth();
+      } else {
+        this.weekDate = this.getWeekDay(1);
+        this.$emit('next', this.weekDate, 'week');
+      }
+    },
+    prevMonth() {
+      let year = this.year;
+      let month = this.month;
+      let dates = this.select.split('/');
+      if (month == 1) {
+        year -= 1;
+        month = 12;
+      } else {
+        month -= 1;
+      }
+      let date =
+        year == dates[0] && month == dates[1] ? dates[2] : this.prevMonthDays;
+      date = date.toString().padStart(2, '0');
+      month = month.toString().padStart(2, '0');
+      let res = this.init(`${year}/${month}/${date}`);
+      this.$emit('prev', res, 'month');
+    },
+    nextMonth() {
+      let year = this.year;
+      let month = this.month;
+      let dates = this.select.split('/');
+      if (month == 12) {
+        year += 1;
+        month = 1;
+      } else {
+        month += 1;
+      }
+      let date = year == dates[0] && month == dates[1] ? dates[2] : 1;
+      date = date.toString().padStart(2, '0');
+      month = month.toString().padStart(2, '0');
+      let res = this.init(`${year}/${month}/${date}`);
+      this.$emit('next', res, 'month');
+    },
+    //获取当月或指定日期所在月天数
+    getDays(res) {
+      const date = res ? new Date(res) : new Date();
+      const year = date.getFullYear();
+      const month = date.getMonth();
+      const today = date.getDate();
+      const week = date.getDay();
+      //此月天数
+      const days = new Date(year, month + 1, 0).getDate();
+      //此月第一天周几
+      const stratDay = new Date(year, month, 1).getDay();
+      //此月最后一天周几
+      const endDay = new Date(year, month, days).getDay();
+      //上月天数
+      const prevMonthDays =
+        month == 0
+          ? new Date(year - 1, 11, 0).getDate()
+          : new Date(year, month, 0).getDate();
+      //下月天数
+      const nextMonthDays =
+        month == 11
+          ? new Date(year + 1, 1, 0).getDate()
+          : new Date(year, month + 2, 0).getDate();
+      //当前日期所在的周
+      const weekDate = [{ date: today, year: year, month: month + 1 }];
+      for (let i = 0; i < week; i++) {
+        let d = i + 1;
+        if (today - d > 1) {
+          weekDate.unshift({
+            date: today - d,
+            year: year,
+            month: month + 1
+          });
+        } else {
+          weekDate.unshift({
+            date: prevMonthDays - i,
+            year: month == 0 ? year - 1 : year,
+            month: month == 0 ? 12 : month
+          });
+        }
+      }
+      for (let i = 0; i < 6 - week; i++) {
+        let d = i + 1;
+        if (today + d <= days) {
+          weekDate.unshift({
+            date: today + d,
+            year: year,
+            month: month + 1
+          });
+        } else {
+          weekDate.push({
+            date: today + d - days,
+            year: month == 11 ? year + 1 : year,
+            month: month == 11 ? 1 : month + 2
+          });
+        }
+      }
+
+      let daysList = [];
+      //本月前加入数组
+      if (stratDay > 0) {
+        for (let i = prevMonthDays; i > prevMonthDays - stratDay; i--) {
+          daysList.unshift({
+            date: i,
+            type: 0,
+            year: month == 0 ? year - 1 : year,
+            month: month == 0 ? 12 : month
+          });
+        }
+      }
+      //本月加入数组
+      for (let i = 1; i <= days; i++) {
+        daysList.push({
+          date: i,
+          type: 1,
+          year: year,
+          month: month + 1,
+          row: week < 6 && today + week > days
+        });
+      }
+      //本月后加入数组
+      if (endDay < 6) {
+        for (var i = 1; i < 6 - endDay + 1; i++) {
+          daysList.push({
+            date: i,
+            type: 0,
+            year: month == 11 ? year + 1 : year,
+            month: month == 11 ? 1 : month + 2
+          });
+        }
+      }
+      return {
+        days: days,
+        prevMonthDays: prevMonthDays,
+        nextMonthDays: nextMonthDays,
+        stratDay: stratDay,
+        endDay: endDay,
+        weekDate: weekDate,
+        year: year,
+        month: month + 1,
+        today: today,
+        week: week,
+        daysList: daysList
+      };
+    },
+    getWeekDay(val) {
+      let flag = true;
+      let weekDate = JSON.parse(JSON.stringify(this.weekDate));
+      let days = weekDate.map((item) => {
+        let { date, month, year } = item;
+        date += val * 7;
+        if (date < 1) {
+          date += this.prevMonthDays;
+          month -= 1;
+          if (month == 0) {
+            month = 12;
+            year -= 1;
+          }
+        } else if (date > this.days) {
+          date -= this.days;
+          month += 1;
+          if (month > 12) {
+            month = 1;
+            year += 1;
+          }
+        }
+        if (this.month == month) {
+          flag = false;
+        }
+        return { date, month, year };
+      });
+      if (flag) {
+        val == 1 ? this.nextMonth() : this.prevMonth();
+      }
+      return days;
+    },
+    handleShow() {
+      this.all = true;
+      this.$emit('show', true);
+    },
+    handleHide() {
+      this.all = false;
+      this.$emit('show', false);
+    }
+  }
+};
+</script>

package/packages/data-table/src/main.vue

@@ -373,7 +373,11 @@ export default {
     least: Boolean,
     //保留搜索参数
     retainSearh: Boolean,
-    infiniteScroll: Boolean
+    infiniteScroll: Boolean,
+    isJoin: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -892,6 +896,13 @@ export default {
       if (this.retainSearh) {
         reqData = util.extend({}, reqData, this.wheres);
       }
+      if (this.isJoin) {
+        for (let i in reqData) {
+          if (Array.isArray(reqData[i])) {
+            reqData[i] = reqData[i].join(',');
+          }
+        }
+      }
       this.tableLoading = true;
       util
         .ajax({