eoss-ui 0.5.45 → 0.5.47

package/lib/eoss-ui.common.js

@@ -3776,15 +3776,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           evt.preventDefault();
           var width = 0;
           var height = 0;
-          var win = void 0;
-          try {
-            utils_util["a" /* default */].win.top.document;
-            win = utils_util["a" /* default */].win.top;
-          } catch (error) {
-            win = utils_util["a" /* default */].getMyWinTop();
-          }
-          width = win.screen.availWidth - 10;
-          height = win.screen.availHeight - 60;
+          width = utils_util["a" /* default */].win.top.screen.availWidth - 10;
+          height = utils_util["a" /* default */].win.top.screen.availHeight - 60;
           var flag = true;
           if (this.esForm) {
             var params = utils_util["a" /* default */].getParams({ url: this.link });
@@ -4376,182 +4369,153 @@ src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var button_group = (src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox-group/src/main.vue?vue&type=template&id=6ffd0b06&
-var mainvue_type_template_id_6ffd0b06_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=template&id=9b8c6630&
+var mainvue_type_template_id_9b8c6630_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  return !_vm.hide
-    ? _c(
-        "div",
-        { staticClass: "es-checkbox-group" },
-        [
-          _vm.readonly
-            ? _c(
-                "div",
-                {
-                  staticClass: "es-input__inner",
-                  class: { "es-plain": this.plain || _vm.$attrs.text },
-                },
-                [_vm._v("\n    " + _vm._s(_vm.labelVal) + "\n  ")]
-              )
-            : _c(
-                "el-checkbox-group",
-                _vm._g(
-                  _vm._b(
-                    {
-                      directives: [
-                        {
-                          name: "show",
-                          rawName: "v-show",
-                          value: _vm.display,
-                          expression: "display",
-                        },
-                      ],
-                      model: {
-                        value: _vm.model,
-                        callback: function ($$v) {
-                          _vm.model = $$v
-                        },
-                        expression: "model",
-                      },
-                    },
-                    "el-checkbox-group",
-                    Object.assign(
-                      {},
-                      { valueKey: _vm.valKey, labelKey: _vm.label },
-                      _vm.$attrs
-                    ),
-                    false
-                  ),
-                  _vm.$listeners
+  return _c("div", { staticClass: "es-calendar" }, [
+    _c(
+      "div",
+      {
+        directives: [
+          {
+            name: "show",
+            rawName: "v-show",
+            value: _vm.showTitle,
+            expression: "showTitle",
+          },
+        ],
+        staticClass: "es-calendar-title",
+      },
+      [
+        _c("i", {
+          staticClass: "es-calendar-prev es-icon-pointer-left",
+          on: { click: _vm.prev },
+        }),
+        _c(
+          "div",
+          { staticClass: "es-title", on: { click: _vm.resetDate } },
+          [
+            _vm._t(
+              "title",
+              [
+                _vm._v(
+                  "\n        " +
+                    _vm._s(_vm.year) +
+                    "年" +
+                    _vm._s(_vm.month) +
+                    "月\n      "
                 ),
-                [
-                  _vm.genre === "button"
-                    ? _vm._l(_vm.results, function (item, index) {
-                        return _c(
-                          "el-checkbox-button",
-                          _vm._b(
-                            {
-                              key: index,
-                              attrs: {
-                                label:
-                                  _vm.isObject || typeof item == "string"
-                                    ? item
-                                    : item[_vm.valKey],
-                                disabled:
-                                  typeof item == "string"
-                                    ? false
-                                    : item.disabled,
-                              },
-                            },
-                            "el-checkbox-button",
-                            _vm.getprops(_vm.$attrs, item),
-                            false
-                          ),
-                          [
-                            _vm._v(
-                              "\n        " +
-                                _vm._s(
-                                  typeof item == "string"
-                                    ? item
-                                    : item[_vm.label]
-                                    ? item[_vm.label]
-                                    : item.label || item[_vm.valKey]
-                                ) +
-                                "\n      "
-                            ),
-                          ]
-                        )
-                      })
-                    : _vm._l(_vm.results, function (item, index) {
-                        return _c(
-                          "el-checkbox",
-                          _vm._b(
-                            {
-                              key: index,
-                              attrs: {
-                                label:
-                                  _vm.isObject || typeof item == "string"
-                                    ? item
-                                    : item[_vm.valKey],
-                                disabled:
-                                  typeof item == "string"
-                                    ? false
-                                    : item.disabled,
-                                border: _vm.genre === "border",
-                              },
-                            },
-                            "el-checkbox",
-                            _vm.getprops(_vm.$attrs, item),
-                            false
-                          ),
-                          [
-                            _vm._v(
-                              "\n        " +
-                                _vm._s(
-                                  typeof item == "string"
-                                    ? item
-                                    : item[_vm.label]
-                                    ? item[_vm.label]
-                                    : item.label || item[_vm.valKey]
-                                ) +
-                                "\n      "
-                            ),
-                          ]
-                        )
-                      }),
-                ],
-                2
-              ),
+              ],
+              { year: _vm.year, month: _vm.month }
+            ),
+          ],
+          2
+        ),
+        _c("i", {
+          staticClass: "es-calendar-next es-icon-pointer-right",
+          on: { click: _vm.next },
+        }),
+      ]
+    ),
+    _c(
+      "ul",
+      { staticClass: "es-calendar-weeks" },
+      _vm._l(_vm.weeks, function (item, index) {
+        return _c("li", { key: index, staticClass: "es-week" }, [
+          _vm._v("\n      " + _vm._s(item) + "\n    "),
+        ])
+      }),
+      0
+    ),
+    _c(
+      "ul",
+      { staticClass: "es-calendar-days" },
+      _vm._l(_vm.lists, function (item, index) {
+        return _c(
+          "li",
+          {
+            key: item.year + "-" + item.month + "-" + item.date,
+            staticClass: "es-day",
+            on: {
+              click: function ($event) {
+                _vm.handleClick(item)
+              },
+            },
+          },
+          [
+            _c(
+              "div",
+              {
+                staticClass: "es-day-item",
+                class: {
+                  "es-disabled-day": item.type == 0,
+                  "es-today": _vm.isSelect(item, _vm.today) && _vm.mark,
+                  "es-select": _vm.isSelect(item, _vm.select),
+                },
+              },
+              [
+                _vm._v("\n        " + _vm._s(item.date) + "\n        "),
+                _vm._t("mark", null, { data: item }),
+              ],
+              2
+            ),
+          ]
+        )
+      }),
+      0
+    ),
+    _c(
+      "div",
+      {
+        directives: [
+          {
+            name: "show",
+            rawName: "v-show",
+            value: _vm.fold,
+            expression: "fold",
+          },
         ],
-        1
-      )
-    : _vm._e()
+        staticClass: "es-calendar-switch",
+      },
+      [
+        _c("i", {
+          directives: [
+            {
+              name: "show",
+              rawName: "v-show",
+              value: _vm.all,
+              expression: "all",
+            },
+          ],
+          staticClass: "es-icon-pointer-up es-switch-icon",
+          attrs: { name: "" },
+          on: { click: _vm.handleHide },
+        }),
+        _c("i", {
+          directives: [
+            {
+              name: "show",
+              rawName: "v-show",
+              value: !_vm.all,
+              expression: "!all",
+            },
+          ],
+          staticClass: "es-icon-pointer-down es-switch-icon",
+          on: { click: _vm.handleShow },
+        }),
+      ]
+    ),
+  ])
 }
-var mainvue_type_template_id_6ffd0b06_staticRenderFns = []
-mainvue_type_template_id_6ffd0b06_render._withStripped = true
+var mainvue_type_template_id_9b8c6630_staticRenderFns = []
+mainvue_type_template_id_9b8c6630_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=6ffd0b06&
-
-// EXTERNAL MODULE: ./src/config/api.js
-var api = __webpack_require__(1);
+// CONCATENATED MODULE: ./packages/calendar/src/main.vue?vue&type=template&id=9b8c6630&
 
-// CONCATENATED MODULE: ./src/utils/store.js
-var store_store = {
-  state: {},
-  set: function set(name, value) {
-    this.state[name] = value;
-  },
-  get: function get(name) {
-    return this.state[name];
-  },
-  clear: function clear(name) {
-    this.state[name] = null;
-  },
-  remove: function remove(name) {
-    if (name) {
-      delete this.state[name];
-    } else {
-      this.state = {};
-    }
-  }
-};
-window.__store = store_store;
-/* harmony default export */ var utils_store = (store_store);
-// EXTERNAL MODULE: external "vue"
-var external_vue_ = __webpack_require__(12);
-var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
-
-// CONCATENATED MODULE: ./src/utils/bus.js
-
-
-/* harmony default export */ var bus = (new external_vue_default.a());
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox-group/src/main.vue?vue&type=script&lang=js&
-var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-//
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=script&lang=js&
 //
 //
 //
@@ -4604,255 +4568,341 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
-//
-//
-
-
 
-
-
-/* harmony default export */ var checkbox_group_src_mainvue_type_script_lang_js_ = ({
-  name: 'EsCheckboxGroup',
-  inheritAttrs: false,
-  inject: {
-    esForm: {
-      default: ''
-    }
-  },
+/* harmony default export */ var calendar_src_mainvue_type_script_lang_js_ = ({
+  name: 'esCalendar',
   props: {
-    method: {
-      type: String,
-      default: 'get'
-    },
-    // 	选择项本地数据
-    data: {
-      type: Array,
-      default: function _default() {
-        return [];
-      }
-    },
-    param: {
-      type: Object,
-      default: function _default() {
-        return {};
-      }
-    },
-    // 选择项远程地址
-    url: String,
-    hide: {
-      type: Boolean,
-      default: false
-    },
-    // 选择项获取代码表数据(优先级大于url)
-    sysCode: String,
-    // 	样式风格 button(按钮样式), border(带有边框)
-    genre: {
-      type: String,
-      default: ''
-    },
-    separator: {
-      type: String,
-      default: '、'
-    },
-    display: {
+    //显示title
+    showTitle: {
       type: Boolean,
       default: true
     },
-    valueType: {
-      type: String,
-      default: 'string',
-      validator: function validator(value) {
-        return ['string', 'object'].includes(value);
-      }
-    },
-    valueKey: {
-      type: String,
-      default: 'value'
-    },
-    // 指定选择项显示值的键名，data元素是对象类型时必填
-    labelKey: {
-      type: String,
-      default: 'name'
-    },
-    value: [Array, String],
-    readonly: Boolean,
-    plain: Boolean,
-    ajax: {
+    //指定日期
+    date: [String, Number],
+    //是否只显示本周
+    brief: Boolean,
+    //是否等指定日期传入后再渲染
+    wait: Boolean,
+    //是否显示收起展开按钮
+    fold: {
       type: Boolean,
       default: true
     },
-    isNoParamRequest: {
-      type: Boolean,
-      default: true
+    mark: Boolean
+  },
+  watch: {
+    date: {
+      immediate: true,
+      handler: function handler(val) {
+        if (this.wait) {
+          val && this.init();
+        } else {
+          this.init();
+        }
+      }
     },
-    dataKey: String
+    brief: {
+      immediate: true,
+      handler: function handler(val) {
+        this.all = !val;
+      }
+    }
+  },
+  computed: {
+    lists: function lists() {
+      var _this = this;
+
+      if (this.all) {
+        return this.daysList;
+      }
+      return this.daysList.filter(function (item) {
+        for (var i = 0; i < _this.weekDate.length; i++) {
+          var ele = _this.weekDate[i];
+          if (item.year == ele.year && item.month == ele.month && item.date == ele.date) {
+            return true;
+          }
+        }
+      });
+    }
   },
   data: function data() {
     return {
-      options: '',
-      canceled: false
+      year: '',
+      _month: '',
+      weeks: ['日', '一', '二', '三', '四', '五', '六'],
+      weekDate: [],
+      week7: '',
+      today: '',
+      select: '',
+      selectDate: '',
+      daysList: [],
+      all: true,
+      week: 0,
+      prevMonthDays: 0,
+      nextMonthDays: 0,
+      days: 0
     };
   },
+  mounted: function mounted() {},
 
-  computed: {
-    isObject: function isObject() {
-      if (this.value !== '' && Array.isArray(this.value) && this.value.length > 0 && utils_util["a" /* default */].isObject(this.value[0])) {
+  methods: {
+    resetDate: function resetDate() {
+      this.week = 0;
+      this.init();
+    },
+    init: function init(res) {
+      this.daysList = [];
+      var dates = this.getDays(res ? res : this.date);
+      var year = dates.year,
+          month = dates.month,
+          today = dates.today,
+          daysList = dates.daysList,
+          weekDate = dates.weekDate,
+          prevMonthDays = dates.prevMonthDays,
+          nextMonthDays = dates.nextMonthDays,
+          days = dates.days;
+
+      if (!res) {
+        this.today = year + '/' + month + '/' + today;
+        this.selectDate = today;
+        this.select = year + '/' + month + '/' + today;
+        this.$emit('select', { year: year, month: 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: function isShow(res) {
+      if (this.all) {
         return true;
-      } else {
-        if (this.valueType === 'object') {
-          return true;
-        } else {
-          return false;
-        }
       }
+      return this.weekDate.filter(function (item) {
+        return item.year == res.year && item.month == res.month && item.date == res.date;
+      }).length;
     },
+    isSelect: function isSelect(res, target) {
+      var year = res.year,
+          month = res.month,
+          date = res.date;
 
-    model: {
-      get: function get() {
-        return this.value === undefined ? [] : this.value;
-      },
-      set: function set(val) {
-        return val;
-      }
+      return target == year + '/' + month + '/' + date;
     },
-    label: function label() {
-      if (this.sysCode) {
-        return 'shortName';
-      }
-      return this.labelKey;
+    handleClick: function handleClick(res) {
+      var year = res.year,
+          month = res.month,
+          date = res.date;
+
+      this.selectDate = date;
+      this.select = year + '/' + month + '/' + date;
+      this.$emit('select', res);
     },
-    valKey: function valKey() {
-      if (this.sysCode) {
-        return 'cciValue';
+    prev: function prev() {
+      if (this.all) {
+        this.weekDate = [];
+        this.prevMonth();
+      } else {
+        this.weekDate = this.getWeekDay(-1);
+        this.$emit('prev', this.weekDate, 'week');
       }
-      return this.valueKey;
     },
-    results: function results() {
-      return this.options ? this.options : this.data;
+    next: function next() {
+      if (this.all) {
+        this.weekDate = [];
+        this.nextMonth();
+      } else {
+        this.weekDate = this.getWeekDay(1);
+        this.$emit('next', this.weekDate, 'week');
+      }
     },
-    labelVal: function labelVal() {
-      var _this = this;
-
-      var model = typeof this.model === 'string' ? this.model.split(',') : this.model || [];
-      var label = model.map(function (item) {
-        if (utils_util["a" /* default */].isObject(item)) {
-          return item[_this.label];
+    prevMonth: function prevMonth() {
+      var year = this.year;
+      var month = this.month;
+      var dates = this.select.split('/');
+      if (month == 1) {
+        year -= 1;
+        month = 12;
+      } else {
+        month -= 1;
+      }
+      var date = year == dates[0] && month == dates[1] ? dates[2] : this.prevMonthDays;
+      date = date.toString().padStart(2, '0');
+      month = month.toString().padStart(2, '0');
+      var res = this.init(year + '/' + month + '/' + date);
+      this.$emit('prev', res, 'month');
+    },
+    nextMonth: function nextMonth() {
+      var year = this.year;
+      var month = this.month;
+      var dates = this.select.split('/');
+      if (month == 12) {
+        year += 1;
+        month = 1;
+      } else {
+        month += 1;
+      }
+      var date = year == dates[0] && month == dates[1] ? dates[2] : 1;
+      date = date.toString().padStart(2, '0');
+      month = month.toString().padStart(2, '0');
+      var res = this.init(year + '/' + month + '/' + date);
+      this.$emit('next', res, 'month');
+    },
+
+    //获取当月或指定日期所在月天数
+    getDays: function getDays(res) {
+      var date = res ? new Date(res) : new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth();
+      var today = date.getDate();
+      var week = date.getDay();
+      //此月天数
+      var days = new Date(year, month + 1, 0).getDate();
+      //此月第一天周几
+      var stratDay = new Date(year, month, 1).getDay();
+      //此月最后一天周几
+      var endDay = new Date(year, month, days).getDay();
+      //上月天数
+      var prevMonthDays = month == 0 ? new Date(year - 1, 11, 0).getDate() : new Date(year, month, 0).getDate();
+      //下月天数
+      var nextMonthDays = month == 11 ? new Date(year + 1, 1, 0).getDate() : new Date(year, month + 2, 0).getDate();
+      //当前日期所在的周
+      var weekDate = [{ date: today, year: year, month: month + 1 }];
+      for (var _i = 0; _i < week; _i++) {
+        var 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
+          });
         }
-        if (utils_util["a" /* default */].isObject(_this.results[0])) {
-          var vals = [];
-          _this.results.forEach(function (ele) {
-            if (ele[_this.valKey] === item) {
-              vals.push(ele[_this.label]);
-            }
+      }
+      for (var _i2 = 0; _i2 < 6 - week; _i2++) {
+        var _d = _i2 + 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
           });
-          return vals.join(_this.separator);
         }
-        return item;
-      });
-      return label.join(this.separator);
-    }
-  },
-  watch: {
-    sysCode: {
-      immediate: true,
-      handler: function handler(val, old) {
-        if (val && val != old) {
-          var options = utils_store.get(val);
-          if (options) {
-            this.options = JSON.parse(JSON.stringify(options));
-          } else {
-            this.getData(api["v" /* findSysCode */], val);
-          }
+      }
+
+      var daysList = [];
+      //本月前加入数组
+      if (stratDay > 0) {
+        for (var _i3 = prevMonthDays; _i3 > prevMonthDays - stratDay; _i3--) {
+          daysList.unshift({
+            date: _i3,
+            type: 0,
+            year: month == 0 ? year - 1 : year,
+            month: month == 0 ? 12 : month
+          });
         }
       }
-    },
-    url: {
-      immediate: true,
-      handler: function handler(val) {
-        if (val && !this.sysCode) {
-          this.getData(val);
+      //本月加入数组
+      for (var _i4 = 1; _i4 <= days; _i4++) {
+        daysList.push({
+          date: _i4,
+          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
+      };
     },
-    param: {
-      deep: true,
-      handler: function handler() {
-        this.url && this.getData(this.url);
-      }
-    }
-  },
-  created: function created() {
-    this.bindEventBus();
-  },
-  mounted: function mounted() {},
-
-  methods: {
-    getData: function getData(url, sysCode) {
+    getWeekDay: function getWeekDay(val) {
       var _this2 = this;
 
-      var params = {};
-      if (this.results.length === 0) {
-        params = utils_util["a" /* default */].extend({}, this.param, sysCode ? { sysAppCode: sysCode } : {});
-      } else {
-        return false;
-      }
-      if (!this.ajax || !this.isNoParamRequest && Object.keys(this.param).length == 0) {
-        return false;
-      }
-      this.loading = true;
-      utils_util["a" /* default */].ajax({
-        url: url,
-        method: this.method,
-        params: params,
-        data: params
-      }).then(function (res) {
-        _this2.loading = false;
-        _this2.canceled = false;
-        if (res.rCode === 0) {
-          _this2.options = JSON.parse(JSON.stringify(res.results));
-          if (sysCode || _this2.dataKey) {
-            bus.$emit(sysCode || _this2.dataKey, JSON.parse(JSON.stringify(_this2.options)));
-            utils_store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
+      var flag = true;
+      var weekDate = JSON.parse(JSON.stringify(this.weekDate));
+      var days = weekDate.map(function (item) {
+        var date = item.date,
+            month = item.month,
+            year = item.year;
+
+        date += val * 7;
+        if (date < 1) {
+          date += _this2.prevMonthDays;
+          month -= 1;
+          if (month == 0) {
+            month = 12;
+            year -= 1;
           }
-        } else {
-          var msg = res.msg || '系统错误，请联系管理员！';
-          _this2.$message.error(msg);
-        }
-      }).catch(function (err) {
-        _this2.loading = false;
-        if (err.message) {
-          if (err.message !== 'canceled') {
-            _this2.$message.error(err.message);
-          }
-          if (err.message === 'canceled' && sysCode) {
-            _this2.canceled = true;
+        } else if (date > _this2.days) {
+          date -= _this2.days;
+          month += 1;
+          if (month > 12) {
+            month = 1;
+            year += 1;
           }
         }
+        if (_this2.month == month) {
+          flag = false;
+        }
+        return { date: date, month: month, year: year };
       });
-    },
-    getprops: function getprops(attrs, res) {
-      if (res.checked && this.model) {
-        this.$emit('input', this.valueType === 'object' ? res : res[this.valKey]);
+      if (flag) {
+        val == 1 ? this.nextMonth() : this.prevMonth();
       }
-      return utils_util["a" /* default */].isObject(res) ? mainvue_type_script_lang_js_extends({}, attrs, res) : attrs;
+      return days;
     },
-    setOptions: function setOptions(val) {
-      this.options = val;
-    },
-    bindEventBus: function bindEventBus() {
-      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+    handleShow: function handleShow() {
+      this.all = true;
+      this.$emit('show', true);
     },
-    unbindEventBus: function unbindEventBus() {
-      bus.$off(this.sysCode || this.dataKey, this.setOptions);
+    handleHide: function handleHide() {
+      this.all = false;
+      this.$emit('show', false);
     }
-  },
-  beforeDestroy: function beforeDestroy() {
-    this.unbindEventBus();
   }
 });
-// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=script&lang=js&
- /* harmony default export */ var packages_checkbox_group_src_mainvue_type_script_lang_js_ = (checkbox_group_src_mainvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue
+// CONCATENATED MODULE: ./packages/calendar/src/main.vue?vue&type=script&lang=js&
+ /* harmony default export */ var packages_calendar_src_mainvue_type_script_lang_js_ = (calendar_src_mainvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/calendar/src/main.vue
 
 
 
@@ -4860,10 +4910,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 
 /* normalize component */
 
-var checkbox_group_src_main_component = normalizeComponent(
-  packages_checkbox_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6ffd0b06_render,
-  mainvue_type_template_id_6ffd0b06_staticRenderFns,
+var calendar_src_main_component = normalizeComponent(
+  packages_calendar_src_mainvue_type_script_lang_js_,
+  mainvue_type_template_id_9b8c6630_render,
+  mainvue_type_template_id_9b8c6630_staticRenderFns,
   false,
   null,
   null,
@@ -4871,15 +4921,15 @@ var checkbox_group_src_main_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var checkbox_group_src_main = (checkbox_group_src_main_component.exports);
-// CONCATENATED MODULE: ./packages/checkbox-group/index.js
+/* harmony default export */ var calendar_src_main = (calendar_src_main_component.exports);
+// CONCATENATED MODULE: ./packages/calendar/index.js
 
 
-checkbox_group_src_main.install = function (Vue) {
-  return Vue.component(checkbox_group_src_main.name, checkbox_group_src_main);
+calendar_src_main.install = function (Vue) {
+  return Vue.component(calendar_src_main.name, calendar_src_main);
 };
 
-/* harmony default export */ var checkbox_group = (checkbox_group_src_main);
+/* harmony default export */ var calendar = (calendar_src_main);
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/card/src/main.vue?vue&type=template&id=46ef4fcd&
 var mainvue_type_template_id_46ef4fcd_render = function () {
   var _vm = this
@@ -5200,233 +5250,737 @@ mainvue_type_template_id_46ef4fcd_render._withStripped = true
 //
 //
 
-/* harmony default export */ var card_src_mainvue_type_script_lang_js_ = ({
-  name: 'EsCard',
-  inheritAttrs: false,
-  props: {
-    show: {
-      type: Boolean,
-      default: true
-    },
-    header: [String, Object],
-    tabs: Array,
-    defaultActive: String,
-    max: {
-      type: Number,
-      default: 99
-    },
-    isDot: Boolean
-  },
-  computed: {
-    isObject: function isObject() {
-      return typeof this.header !== 'string';
-    },
-
-    active: {
-      get: function get() {
-        if (this.defaultActive === undefined) {
-          if (typeof this.tabs[0] === 'string') {
-            return '0';
-          } else {
-            return this.tabs[0].id ? this.tabs[0].id : '0';
-          }
-        }
-        return this.defaultActive;
-      }
-    }
-  },
-  data: function data() {
-    return {};
-  },
-
-  methods: {
-    handleSelect: function handleSelect(res, path) {
-      this.$emit('select', res, path);
-    }
-  }
-});
-// CONCATENATED MODULE: ./packages/card/src/main.vue?vue&type=script&lang=js&
- /* harmony default export */ var packages_card_src_mainvue_type_script_lang_js_ = (card_src_mainvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./packages/card/src/main.vue
-
-
-
-
-
-/* normalize component */
-
-var card_src_main_component = normalizeComponent(
-  packages_card_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_46ef4fcd_render,
-  mainvue_type_template_id_46ef4fcd_staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
+/* harmony default export */ var card_src_mainvue_type_script_lang_js_ = ({
+  name: 'EsCard',
+  inheritAttrs: false,
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    },
+    header: [String, Object],
+    tabs: Array,
+    defaultActive: String,
+    max: {
+      type: Number,
+      default: 99
+    },
+    isDot: Boolean
+  },
+  computed: {
+    isObject: function isObject() {
+      return typeof this.header !== 'string';
+    },
+
+    active: {
+      get: function get() {
+        if (this.defaultActive === undefined) {
+          if (typeof this.tabs[0] === 'string') {
+            return '0';
+          } else {
+            return this.tabs[0].id ? this.tabs[0].id : '0';
+          }
+        }
+        return this.defaultActive;
+      }
+    }
+  },
+  data: function data() {
+    return {};
+  },
+
+  methods: {
+    handleSelect: function handleSelect(res, path) {
+      this.$emit('select', res, path);
+    }
+  }
+});
+// CONCATENATED MODULE: ./packages/card/src/main.vue?vue&type=script&lang=js&
+ /* harmony default export */ var packages_card_src_mainvue_type_script_lang_js_ = (card_src_mainvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/card/src/main.vue
+
+
+
+
+
+/* normalize component */
+
+var card_src_main_component = normalizeComponent(
+  packages_card_src_mainvue_type_script_lang_js_,
+  mainvue_type_template_id_46ef4fcd_render,
+  mainvue_type_template_id_46ef4fcd_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var card_src_main = (card_src_main_component.exports);
+// CONCATENATED MODULE: ./packages/card/index.js
+
+
+card_src_main.install = function (Vue) {
+  return Vue.component(card_src_main.name, card_src_main);
+};
+
+/* harmony default export */ var card = (card_src_main);
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/cascader/src/main.vue?vue&type=script&lang=js&
+var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+/* harmony default export */ var cascader_src_mainvue_type_script_lang_js_ = ({
+  name: 'EsCascader',
+  inheritAttrs: false,
+  props: {
+    value: [String, Array],
+    data: Array,
+    options: Array,
+    hide: {
+      type: Boolean,
+      default: false
+    },
+    readonly: Boolean,
+    plain: Boolean,
+    separator: {
+      type: String,
+      default: '/'
+    },
+    props: Object,
+    //Props
+    trigger: {
+      type: String,
+      default: 'click'
+    },
+    multiple: Boolean,
+    checkStrictly: Boolean,
+    emitPath: {
+      type: Boolean,
+      default: true
+    },
+    lazy: Boolean,
+    lazyLoad: Function,
+    type: {
+      type: String,
+      default: 'object'
+    },
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+    labelKey: {
+      type: String,
+      default: 'label'
+    },
+    children: {
+      type: String,
+      default: 'children'
+    },
+    disabled: {
+      type: String,
+      default: 'disabled'
+    },
+    leaf: {
+      type: String,
+      default: 'leaf'
+    }
+  },
+  computed: {
+    model: {
+      get: function get() {
+        return this.value;
+      },
+      set: function set(val) {
+        return val;
+      }
+    },
+    datas: function datas() {
+      return this.data || this.options;
+    },
+    newProps: function newProps() {
+      var props = {
+        expandTrigger: this.trigger,
+        multiple: this.multiple,
+        checkStrictly: this.checkStrictly,
+        emitPath: this.emitPath,
+        lazy: this.lazy,
+        lazyLoad: this.lazyLoad,
+        type: this.type,
+        value: this.valueKey,
+        label: this.labelKey,
+        children: this.children,
+        disabled: this.disabled,
+        leaf: this.leaf
+      };
+      if (this.props) {
+        return mainvue_type_script_lang_js_extends({}, props, this.props);
+      }
+      return props;
+    }
+  },
+  data: function data() {
+    return {};
+  },
+  created: function created() {},
+
+  methods: {},
+  render: function render(h) {
+    var _this = this;
+
+    if (!this.hide) {
+      if (this.readonly) {
+        var value = '';
+        if (this.model) {
+          value = Array.isArray(this.model) ? this.model.map(function (item) {
+            if (Array.isArray(item)) {
+              return item.map(function (ele) {
+                if (typeof ele === 'string') {
+                  return ele;
+                } else {
+                  return ele[_this.newProps.label];
+                }
+              }).join(_this.separator);
+            } else {
+              if (typeof item === 'string') {
+                return item;
+              } else {
+                return item[_this.newProps.label];
+              }
+            }
+          }).join(this.multiple ? '，' : this.separator) : this.model;
+        }
+        return h('div', {
+          class: ['el-cascader el-input__inner', { 'es-plain': this.plain }]
+        }, [value]);
+      }
+      return h('el-cascader', {
+        attrs: mainvue_type_script_lang_js_extends({}, this.$attrs, {
+          options: this.datas,
+          props: this.newProps,
+          value: this.model
+        }),
+        on: this.$listeners
+      }, [this.$slots.default]);
+    }
+  }
+});
+// CONCATENATED MODULE: ./packages/cascader/src/main.vue?vue&type=script&lang=js&
+ /* harmony default export */ var packages_cascader_src_mainvue_type_script_lang_js_ = (cascader_src_mainvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/cascader/src/main.vue
+var src_main_render, main_staticRenderFns
+
+
+
+
+/* normalize component */
+
+var cascader_src_main_component = normalizeComponent(
+  packages_cascader_src_mainvue_type_script_lang_js_,
+  src_main_render,
+  main_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var cascader_src_main = (cascader_src_main_component.exports);
+// CONCATENATED MODULE: ./packages/cascader/index.js
+
+
+cascader_src_main.install = function (Vue) {
+  return Vue.component(cascader_src_main.name, cascader_src_main);
+};
+
+/* harmony default export */ var cascader = (cascader_src_main);
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox-group/src/main.vue?vue&type=template&id=6ffd0b06&
+var mainvue_type_template_id_6ffd0b06_render = function () {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+  return !_vm.hide
+    ? _c(
+        "div",
+        { staticClass: "es-checkbox-group" },
+        [
+          _vm.readonly
+            ? _c(
+                "div",
+                {
+                  staticClass: "es-input__inner",
+                  class: { "es-plain": this.plain || _vm.$attrs.text },
+                },
+                [_vm._v("\n    " + _vm._s(_vm.labelVal) + "\n  ")]
+              )
+            : _c(
+                "el-checkbox-group",
+                _vm._g(
+                  _vm._b(
+                    {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.display,
+                          expression: "display",
+                        },
+                      ],
+                      model: {
+                        value: _vm.model,
+                        callback: function ($$v) {
+                          _vm.model = $$v
+                        },
+                        expression: "model",
+                      },
+                    },
+                    "el-checkbox-group",
+                    Object.assign(
+                      {},
+                      { valueKey: _vm.valKey, labelKey: _vm.label },
+                      _vm.$attrs
+                    ),
+                    false
+                  ),
+                  _vm.$listeners
+                ),
+                [
+                  _vm.genre === "button"
+                    ? _vm._l(_vm.results, function (item, index) {
+                        return _c(
+                          "el-checkbox-button",
+                          _vm._b(
+                            {
+                              key: index,
+                              attrs: {
+                                label:
+                                  _vm.isObject || typeof item == "string"
+                                    ? item
+                                    : item[_vm.valKey],
+                                disabled:
+                                  typeof item == "string"
+                                    ? false
+                                    : item.disabled,
+                              },
+                            },
+                            "el-checkbox-button",
+                            _vm.getprops(_vm.$attrs, item),
+                            false
+                          ),
+                          [
+                            _vm._v(
+                              "\n        " +
+                                _vm._s(
+                                  typeof item == "string"
+                                    ? item
+                                    : item[_vm.label]
+                                    ? item[_vm.label]
+                                    : item.label || item[_vm.valKey]
+                                ) +
+                                "\n      "
+                            ),
+                          ]
+                        )
+                      })
+                    : _vm._l(_vm.results, function (item, index) {
+                        return _c(
+                          "el-checkbox",
+                          _vm._b(
+                            {
+                              key: index,
+                              attrs: {
+                                label:
+                                  _vm.isObject || typeof item == "string"
+                                    ? item
+                                    : item[_vm.valKey],
+                                disabled:
+                                  typeof item == "string"
+                                    ? false
+                                    : item.disabled,
+                                border: _vm.genre === "border",
+                              },
+                            },
+                            "el-checkbox",
+                            _vm.getprops(_vm.$attrs, item),
+                            false
+                          ),
+                          [
+                            _vm._v(
+                              "\n        " +
+                                _vm._s(
+                                  typeof item == "string"
+                                    ? item
+                                    : item[_vm.label]
+                                    ? item[_vm.label]
+                                    : item.label || item[_vm.valKey]
+                                ) +
+                                "\n      "
+                            ),
+                          ]
+                        )
+                      }),
+                ],
+                2
+              ),
+        ],
+        1
+      )
+    : _vm._e()
+}
+var mainvue_type_template_id_6ffd0b06_staticRenderFns = []
+mainvue_type_template_id_6ffd0b06_render._withStripped = true
+
+
+// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=6ffd0b06&
+
+// EXTERNAL MODULE: ./src/config/api.js
+var api = __webpack_require__(1);
+
+// CONCATENATED MODULE: ./src/utils/store.js
+var store_store = {
+  state: {},
+  set: function set(name, value) {
+    this.state[name] = value;
+  },
+  get: function get(name) {
+    return this.state[name];
+  },
+  clear: function clear(name) {
+    this.state[name] = null;
+  },
+  remove: function remove(name) {
+    if (name) {
+      delete this.state[name];
+    } else {
+      this.state = {};
+    }
+  }
+};
+window.__store = store_store;
+/* harmony default export */ var utils_store = (store_store);
+// EXTERNAL MODULE: external "vue"
+var external_vue_ = __webpack_require__(12);
+var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
+
+// CONCATENATED MODULE: ./src/utils/bus.js
+
+
+/* harmony default export */ var bus = (new external_vue_default.a());
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox-group/src/main.vue?vue&type=script&lang=js&
+var src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
 
-/* harmony default export */ var card_src_main = (card_src_main_component.exports);
-// CONCATENATED MODULE: ./packages/card/index.js
 
 
-card_src_main.install = function (Vue) {
-  return Vue.component(card_src_main.name, card_src_main);
-};
 
-/* harmony default export */ var card = (card_src_main);
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/cascader/src/main.vue?vue&type=script&lang=js&
-var src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-/* harmony default export */ var cascader_src_mainvue_type_script_lang_js_ = ({
-  name: 'EsCascader',
+/* harmony default export */ var checkbox_group_src_mainvue_type_script_lang_js_ = ({
+  name: 'EsCheckboxGroup',
   inheritAttrs: false,
+  inject: {
+    esForm: {
+      default: ''
+    }
+  },
   props: {
-    value: [String, Array],
-    data: Array,
-    options: Array,
+    method: {
+      type: String,
+      default: 'get'
+    },
+    // 	选择项本地数据
+    data: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
+    param: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    // 选择项远程地址
+    url: String,
     hide: {
       type: Boolean,
       default: false
     },
-    readonly: Boolean,
-    plain: Boolean,
-    separator: {
+    // 选择项获取代码表数据(优先级大于url)
+    sysCode: String,
+    // 	样式风格 button(按钮样式), border(带有边框)
+    genre: {
       type: String,
-      default: '/'
+      default: ''
     },
-    props: Object,
-    //Props
-    trigger: {
+    separator: {
       type: String,
-      default: 'click'
+      default: '、'
     },
-    multiple: Boolean,
-    checkStrictly: Boolean,
-    emitPath: {
+    display: {
       type: Boolean,
       default: true
     },
-    lazy: Boolean,
-    lazyLoad: Function,
-    type: {
+    valueType: {
       type: String,
-      default: 'object'
+      default: 'string',
+      validator: function validator(value) {
+        return ['string', 'object'].includes(value);
+      }
     },
     valueKey: {
       type: String,
       default: 'value'
     },
+    // 指定选择项显示值的键名，data元素是对象类型时必填
     labelKey: {
       type: String,
-      default: 'label'
+      default: 'name'
     },
-    children: {
-      type: String,
-      default: 'children'
+    value: [Array, String],
+    readonly: Boolean,
+    plain: Boolean,
+    ajax: {
+      type: Boolean,
+      default: true
     },
-    disabled: {
-      type: String,
-      default: 'disabled'
+    isNoParamRequest: {
+      type: Boolean,
+      default: true
     },
-    leaf: {
-      type: String,
-      default: 'leaf'
-    }
+    dataKey: String
+  },
+  data: function data() {
+    return {
+      options: '',
+      canceled: false
+    };
   },
+
   computed: {
+    isObject: function isObject() {
+      if (this.value !== '' && Array.isArray(this.value) && this.value.length > 0 && utils_util["a" /* default */].isObject(this.value[0])) {
+        return true;
+      } else {
+        if (this.valueType === 'object') {
+          return true;
+        } else {
+          return false;
+        }
+      }
+    },
+
     model: {
       get: function get() {
-        return this.value;
+        return this.value === undefined ? [] : this.value;
       },
       set: function set(val) {
         return val;
       }
     },
-    datas: function datas() {
-      return this.data || this.options;
+    label: function label() {
+      if (this.sysCode) {
+        return 'shortName';
+      }
+      return this.labelKey;
     },
-    newProps: function newProps() {
-      var props = {
-        expandTrigger: this.trigger,
-        multiple: this.multiple,
-        checkStrictly: this.checkStrictly,
-        emitPath: this.emitPath,
-        lazy: this.lazy,
-        lazyLoad: this.lazyLoad,
-        type: this.type,
-        value: this.valueKey,
-        label: this.labelKey,
-        children: this.children,
-        disabled: this.disabled,
-        leaf: this.leaf
-      };
-      if (this.props) {
-        return src_mainvue_type_script_lang_js_extends({}, props, this.props);
+    valKey: function valKey() {
+      if (this.sysCode) {
+        return 'cciValue';
       }
-      return props;
+      return this.valueKey;
+    },
+    results: function results() {
+      return this.options ? this.options : this.data;
+    },
+    labelVal: function labelVal() {
+      var _this = this;
+
+      var model = typeof this.model === 'string' ? this.model.split(',') : this.model || [];
+      var label = model.map(function (item) {
+        if (utils_util["a" /* default */].isObject(item)) {
+          return item[_this.label];
+        }
+        if (utils_util["a" /* default */].isObject(_this.results[0])) {
+          var vals = [];
+          _this.results.forEach(function (ele) {
+            if (ele[_this.valKey] === item) {
+              vals.push(ele[_this.label]);
+            }
+          });
+          return vals.join(_this.separator);
+        }
+        return item;
+      });
+      return label.join(this.separator);
     }
   },
-  data: function data() {
-    return {};
+  watch: {
+    sysCode: {
+      immediate: true,
+      handler: function handler(val, old) {
+        if (val && val != old) {
+          var options = utils_store.get(val);
+          if (options) {
+            this.options = JSON.parse(JSON.stringify(options));
+          } else {
+            this.getData(api["v" /* findSysCode */], val);
+          }
+        }
+      }
+    },
+    url: {
+      immediate: true,
+      handler: function handler(val) {
+        if (val && !this.sysCode) {
+          this.getData(val);
+        }
+      }
+    },
+    param: {
+      deep: true,
+      handler: function handler() {
+        this.url && this.getData(this.url);
+      }
+    }
   },
-  created: function created() {},
+  created: function created() {
+    this.bindEventBus();
+  },
+  mounted: function mounted() {},
 
-  methods: {},
-  render: function render(h) {
-    var _this = this;
+  methods: {
+    getData: function getData(url, sysCode) {
+      var _this2 = this;
 
-    if (!this.hide) {
-      if (this.readonly) {
-        var value = '';
-        if (this.model) {
-          value = Array.isArray(this.model) ? this.model.map(function (item) {
-            if (Array.isArray(item)) {
-              return item.map(function (ele) {
-                if (typeof ele === 'string') {
-                  return ele;
-                } else {
-                  return ele[_this.newProps.label];
-                }
-              }).join(_this.separator);
-            } else {
-              if (typeof item === 'string') {
-                return item;
-              } else {
-                return item[_this.newProps.label];
-              }
-            }
-          }).join(this.multiple ? '，' : this.separator) : this.model;
+      var params = {};
+      if (this.results.length === 0) {
+        params = utils_util["a" /* default */].extend({}, this.param, sysCode ? { sysAppCode: sysCode } : {});
+      } else {
+        return false;
+      }
+      if (!this.ajax || !this.isNoParamRequest && Object.keys(this.param).length == 0) {
+        return false;
+      }
+      this.loading = true;
+      utils_util["a" /* default */].ajax({
+        url: url,
+        method: this.method,
+        params: params,
+        data: params
+      }).then(function (res) {
+        _this2.loading = false;
+        _this2.canceled = false;
+        if (res.rCode === 0) {
+          _this2.options = JSON.parse(JSON.stringify(res.results));
+          if (sysCode || _this2.dataKey) {
+            bus.$emit(sysCode || _this2.dataKey, JSON.parse(JSON.stringify(_this2.options)));
+            utils_store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
+          }
+        } else {
+          var msg = res.msg || '系统错误，请联系管理员！';
+          _this2.$message.error(msg);
         }
-        return h('div', {
-          class: ['el-cascader el-input__inner', { 'es-plain': this.plain }]
-        }, [value]);
+      }).catch(function (err) {
+        _this2.loading = false;
+        if (err.message) {
+          if (err.message !== 'canceled') {
+            _this2.$message.error(err.message);
+          }
+          if (err.message === 'canceled' && sysCode) {
+            _this2.canceled = true;
+          }
+        }
+      });
+    },
+    getprops: function getprops(attrs, res) {
+      if (res.checked && this.model) {
+        this.$emit('input', this.valueType === 'object' ? res : res[this.valKey]);
       }
-      return h('el-cascader', {
-        attrs: src_mainvue_type_script_lang_js_extends({}, this.$attrs, {
-          options: this.datas,
-          props: this.newProps,
-          value: this.model
-        }),
-        on: this.$listeners
-      }, [this.$slots.default]);
+      return utils_util["a" /* default */].isObject(res) ? src_mainvue_type_script_lang_js_extends({}, attrs, res) : attrs;
+    },
+    setOptions: function setOptions(val) {
+      this.options = val;
+    },
+    bindEventBus: function bindEventBus() {
+      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+    },
+    unbindEventBus: function unbindEventBus() {
+      bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
+  },
+  beforeDestroy: function beforeDestroy() {
+    this.unbindEventBus();
   }
 });
-// CONCATENATED MODULE: ./packages/cascader/src/main.vue?vue&type=script&lang=js&
- /* harmony default export */ var packages_cascader_src_mainvue_type_script_lang_js_ = (cascader_src_mainvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./packages/cascader/src/main.vue
-var src_main_render, main_staticRenderFns
+// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=script&lang=js&
+ /* harmony default export */ var packages_checkbox_group_src_mainvue_type_script_lang_js_ = (checkbox_group_src_mainvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue
+
 
 
 
 
 /* normalize component */
 
-var cascader_src_main_component = normalizeComponent(
-  packages_cascader_src_mainvue_type_script_lang_js_,
-  src_main_render,
-  main_staticRenderFns,
+var checkbox_group_src_main_component = normalizeComponent(
+  packages_checkbox_group_src_mainvue_type_script_lang_js_,
+  mainvue_type_template_id_6ffd0b06_render,
+  mainvue_type_template_id_6ffd0b06_staticRenderFns,
   false,
   null,
   null,
@@ -5434,15 +5988,15 @@ var cascader_src_main_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var cascader_src_main = (cascader_src_main_component.exports);
-// CONCATENATED MODULE: ./packages/cascader/index.js
+/* harmony default export */ var checkbox_group_src_main = (checkbox_group_src_main_component.exports);
+// CONCATENATED MODULE: ./packages/checkbox-group/index.js
 
 
-cascader_src_main.install = function (Vue) {
-  return Vue.component(cascader_src_main.name, cascader_src_main);
+checkbox_group_src_main.install = function (Vue) {
+  return Vue.component(checkbox_group_src_main.name, checkbox_group_src_main);
 };
 
-/* harmony default export */ var cascader = (cascader_src_main);
+/* harmony default export */ var checkbox_group = (checkbox_group_src_main);
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/clients/src/main.vue?vue&type=template&id=2f0c03c7&
 var mainvue_type_template_id_2f0c03c7_render = function () {
   var _vm = this
@@ -5701,8 +6255,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=76df6f7a&
-var mainvue_type_template_id_76df6f7a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=5745f486&
+var mainvue_type_template_id_5745f486_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5967,11 +6521,11 @@ var mainvue_type_template_id_76df6f7a_render = function () {
     1
   )
 }
-var mainvue_type_template_id_76df6f7a_staticRenderFns = []
-mainvue_type_template_id_76df6f7a_render._withStripped = true
+var mainvue_type_template_id_5745f486_staticRenderFns = []
+mainvue_type_template_id_5745f486_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=76df6f7a&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=5745f486&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
 var childrenvue_type_template_id_29bcbc72_render = function () {
@@ -8284,7 +8838,11 @@ var mainvue_type_script_lang_js_components, _watch;
     least: Boolean,
     //保留搜索参数
     retainSearh: Boolean,
-    infiniteScroll: Boolean
+    infiniteScroll: Boolean,
+    isJoin: {
+      type: Boolean,
+      default: true
+    }
   },
   data: function data() {
     return {
@@ -8317,6 +8875,9 @@ var mainvue_type_script_lang_js_components, _watch;
   },
 
   computed: {
+    params: function params() {
+      return data_table_src_mainvue_type_script_lang_js_extends({}, this.param || {}, this.searchValue || {}, this.advanceValue || {});
+    },
     tag: function tag() {
       return this.form && this.elForm == '' ? 'el-form' : 'div';
     },
@@ -8751,7 +9312,7 @@ var mainvue_type_script_lang_js_components, _watch;
         this.config.pageNum = 1;
       }
       this.tableLoadingText = '加载中...';
-      var reqData = utils_util["a" /* default */].extend({}, this.param, this.page ? {
+      var reqData = utils_util["a" /* default */].extend({}, this.params, this.page ? {
         pageNum: this.config.pageNum,
         pageSize: this.config.pageSize
       } : {});
@@ -8761,6 +9322,13 @@ var mainvue_type_script_lang_js_components, _watch;
       if (this.retainSearh) {
         reqData = utils_util["a" /* default */].extend({}, reqData, this.wheres);
       }
+      if (this.isJoin) {
+        for (var i in reqData) {
+          if (Array.isArray(reqData[i])) {
+            reqData[i] = reqData[i].join(',');
+          }
+        }
+      }
       this.tableLoading = true;
       utils_util["a" /* default */].ajax({
         url: this.url,
@@ -9110,53 +9678,41 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('next', res);
     },
     hanleSearch: function hanleSearch(data) {
-      this.wheres = data;
+      this.wheres = this.response !== undefined ? this.response({
+        type: 'search',
+        data: JSON.parse(JSON.stringify(data))
+      }) : data;
       if (this.url) {
-        if (this.response !== undefined) {
-          this.getTableData({
-            where: this.response({
-              type: 'search',
-              data: JSON.parse(JSON.stringify(data))
-            })
-          });
-        } else {
-          this.getTableData({ where: this.wheres });
-        }
+        this.getTableData();
       }
-      this.$emit('search', data);
+      this.$emit('search', this.wheres);
     },
     hanleReset: function hanleReset() {
       if (this.url) {
         this.wheres = {};
         this.getTableData();
       }
-      this.$emit('reset');
+      this.$emit('reset', this.params);
     },
     hanleSubmit: function hanleSubmit(_ref) {
       var data = _ref.data,
           show = _ref.show;
 
-      this.wheres = data;
+      this.wheres = this.response !== undefined ? this.response({
+        type: 'filter',
+        data: JSON.parse(JSON.stringify(data))
+      }) : data;
       if (this.url) {
-        if (this.response !== undefined) {
-          this.getTableData({
-            where: this.response({
-              type: 'filter',
-              data: JSON.parse(JSON.stringify(data))
-            })
-          });
-        } else {
-          this.getTableData({ where: this.wheres });
-        }
+        this.getTableData();
       }
-      this.$emit('submit', { data: data, show: show });
+      this.$emit('submit', { data: this.wheres, show: show });
     },
     hanleCancel: function hanleCancel() {
-      if (this.url && JSON.stringify(this.wheres) !== '{}') {
-        this.wheres = {};
-        this.getTableData();
-      }
-      this.$emit('cancel');
+      // if (this.url && JSON.stringify(this.wheres) !== '{}') {
+      //   this.wheres = {};
+      //   this.getTableData();
+      // }
+      this.$emit('cancel', this.params);
     },
     handleTabs: function handleTabs(_ref2) {
       var item = _ref2.item,
@@ -9282,8 +9838,8 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_76df6f7a_render,
-  mainvue_type_template_id_76df6f7a_staticRenderFns,
+  mainvue_type_template_id_5745f486_render,
+  mainvue_type_template_id_5745f486_staticRenderFns,
   false,
   null,
   null,
@@ -9300,14 +9856,17 @@ data_table_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var data_table = (data_table_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/table.vue?vue&type=template&id=736ff20c&
-var tablevue_type_template_id_736ff20c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/table.vue?vue&type=template&id=3953d5ce&
+var tablevue_type_template_id_3953d5ce_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   return _c(
     "div",
-    { staticClass: "es-data-form" },
+    {
+      staticClass: "es-data-form",
+      class: { "es-data-form-haspage": _vm.page },
+    },
     [
       _c(
         "el-scrollbar",
@@ -9413,7 +9972,10 @@ var tablevue_type_template_id_736ff20c_render = function () {
                           refInFor: true,
                           staticClass: "es-data-table-form-handle",
                           style: _vm.style,
-                          attrs: { data: _vm.options[item.field || item.prop] },
+                          attrs: {
+                            suffix: false,
+                            data: _vm.options[item.field || item.prop],
+                          },
                           on: {
                             "hide-menu": function ($event) {
                               _vm.selectShow = false
@@ -9487,11 +10049,11 @@ var tablevue_type_template_id_736ff20c_render = function () {
     2
   )
 }
-var tablevue_type_template_id_736ff20c_staticRenderFns = []
-tablevue_type_template_id_736ff20c_render._withStripped = true
+var tablevue_type_template_id_3953d5ce_staticRenderFns = []
+tablevue_type_template_id_3953d5ce_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table-form/src/table.vue?vue&type=template&id=736ff20c&
+// CONCATENATED MODULE: ./packages/data-table-form/src/table.vue?vue&type=template&id=3953d5ce&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/colgroup.vue?vue&type=template&id=9b289ebe&
 var colgroupvue_type_template_id_9b289ebe_render = function () {
@@ -10830,6 +11392,7 @@ var tablevue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 //import rules from 'eoss-ui/src/utils/rules.js';
@@ -10846,6 +11409,11 @@ var tablevue_type_script_lang_js_components;
     };
   },
 
+  inject: {
+    esDialog: {
+      default: ''
+    }
+  },
   props: {
     height: String,
     readonly: Boolean,
@@ -10925,8 +11493,15 @@ var tablevue_type_script_lang_js_components;
       }
     },
     setStyle: function setStyle(res, data, field) {
-      this.style.left = res ? res.left + 'px' : '';
-      this.style.top = res ? res.top + 'px' : '';
+      var left = 0;
+      var top = 0;
+      if (this.esDialog) {
+        var style = this.esDialog.getDialog().getBoundingClientRect();
+        left = style.left;
+        top = style.top;
+      }
+      this.style.left = res ? res.left - left + 'px' : '';
+      this.style.top = res ? res.top - top + 'px' : '';
       this.style.width = res ? res.width + 'px' : '';
       this.target = data;
       this.field = field;
@@ -10968,8 +11543,8 @@ var tablevue_type_script_lang_js_components;
 
 var table_component = normalizeComponent(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_736ff20c_render,
-  tablevue_type_template_id_736ff20c_staticRenderFns,
+  tablevue_type_template_id_3953d5ce_render,
+  tablevue_type_template_id_3953d5ce_staticRenderFns,
   false,
   null,
   null,
@@ -10979,6 +11554,8 @@ var table_component = normalizeComponent(
 
 /* harmony default export */ var src_table = (table_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/main.vue?vue&type=script&lang=js&
+var data_table_form_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 var src_mainvue_type_script_lang_js_components;
 
 
@@ -11115,15 +11692,17 @@ var src_mainvue_type_script_lang_js_components;
     }
   },
   render: function render(h) {
-    var _props;
+    var _extends2;
 
     var tag = this.elForm ? 'div' : 'form';
-    return h(tag, {}, [h('eo-table', {
-      props: (_props = {
+    return h(tag, {
+      class: { 'es-data-form-full': this.full, 'es-data-table-form': 1 }
+    }, [h('eo-table', {
+      props: data_table_form_src_mainvue_type_script_lang_js_extends((_extends2 = {
         cols: this.cols,
         thead: this.theads,
         numbers: this.numbers
-      }, _props['cols'] = this.cols, _props.data = this.models, _props.types = this.types, _props.options = this.options, _props.page = this.page, _props),
+      }, _extends2['cols'] = this.cols, _extends2.data = this.models, _extends2.types = this.types, _extends2.options = this.options, _extends2.page = this.page, _extends2), this.$attrs),
       on: this.$listeners
     })]);
   }
@@ -11388,8 +11967,8 @@ date_picker_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var date_picker = (date_picker_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=b1d8aec4&
-var mainvue_type_template_id_b1d8aec4_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=39199bdc&
+var mainvue_type_template_id_39199bdc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11898,11 +12477,11 @@ var mainvue_type_template_id_b1d8aec4_render = function () {
     2
   )
 }
-var mainvue_type_template_id_b1d8aec4_staticRenderFns = []
-mainvue_type_template_id_b1d8aec4_render._withStripped = true
+var mainvue_type_template_id_39199bdc_staticRenderFns = []
+mainvue_type_template_id_39199bdc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=b1d8aec4&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=39199bdc&
 
 // EXTERNAL MODULE: external "wujie-vue2"
 var external_wujie_vue2_ = __webpack_require__(13);
@@ -12302,15 +12881,8 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
 
     var availWidth = 0;
     var availHeight = 0;
-    var win = void 0;
-    try {
-      utils_util["a" /* default */].win.top.document;
-      win = utils_util["a" /* default */].win.top;
-    } catch (error) {
-      win = utils_util["a" /* default */].getMyWinTop();
-    }
-    availWidth = win.document.body.offsetWidth - 260;
-    availHeight = win.document.body.offsetHeight - 60;
+    availWidth = utils_util["a" /* default */].win.top.document.body.offsetWidth - 260;
+    availHeight = utils_util["a" /* default */].win.top.document.body.offsetHeight - 60;
     this.sizes.max = { width: availWidth + 'px', height: availHeight + 'px' };
     if (this.size === 'full' || this.width == '100%' && this.height == '100%') {
       this.full = true;
@@ -12450,6 +13022,9 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
       this.zoom = res;
       this.$set(this.scales, 'zoom', res);
       this.$emit('scale', res);
+    },
+    getDialog: function getDialog() {
+      return this.$refs[this.wujieName].$refs['dialog'];
     }
   }
 });
@@ -12465,8 +13040,8 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
 
 var dialog_src_main_component = normalizeComponent(
   packages_dialog_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_b1d8aec4_render,
-  mainvue_type_template_id_b1d8aec4_staticRenderFns,
+  mainvue_type_template_id_39199bdc_render,
+  mainvue_type_template_id_39199bdc_staticRenderFns,
   false,
   null,
   null,
@@ -39996,8 +40571,8 @@ flow_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_flow = (flow_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=template&id=16f6a02a&
-var mainvue_type_template_id_16f6a02a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=template&id=6cb3ec91&
+var mainvue_type_template_id_6cb3ec91_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -41225,11 +41800,11 @@ var mainvue_type_template_id_16f6a02a_render = function () {
     2
   )
 }
-var mainvue_type_template_id_16f6a02a_staticRenderFns = []
-mainvue_type_template_id_16f6a02a_render._withStripped = true
+var mainvue_type_template_id_6cb3ec91_staticRenderFns = []
+mainvue_type_template_id_6cb3ec91_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=16f6a02a&
+// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=6cb3ec91&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=script&lang=js&
 var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -41807,13 +42382,7 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
         var name = item.name;
         var width = 0;
         var height = 0;
-        var win = void 0;
-        try {
-          utils_util["a" /* default */].win.top.document;
-          win = utils_util["a" /* default */].win.top;
-        } catch (error) {
-          win = utils_util["a" /* default */].getMyWinTop();
-        }
+        var win = utils_util["a" /* default */].win.top;
         width = win.screen.availWidth - 10;
         height = win.screen.availHeight - 60;
         if (item.url) {
@@ -41875,16 +42444,10 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
     handleSuccess: function handleSuccess() {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      } else if (utils_util["a" /* default */].win.opener) {
-        var win = void 0;
-        try {
-          utils_util["a" /* default */].win.top.document;
-          win = utils_util["a" /* default */].win.top;
-        } catch (error) {
-          win = utils_util["a" /* default */].getMyWinTop();
-        }
-        win.close();
-        win.postMessage({ type: 0 }, '*');
+      } else if (utils_util["a" /* default */].win.top.COOS_SDK) {
+        utils_util["a" /* default */].win.top.COOS_SDK.closePopup && utils_util["a" /* default */].win.top.COOS_SDK.closePopup();
+      } else if (utils_util["a" /* default */].win.top.opener) {
+        utils_util["a" /* default */].win.top.close();
       }
       if (this.events && this.events.success) {
         this.events.success();
@@ -41919,8 +42482,8 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
 
 var flow_group_src_main_component = normalizeComponent(
   packages_flow_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_16f6a02a_render,
-  mainvue_type_template_id_16f6a02a_staticRenderFns,
+  mainvue_type_template_id_6cb3ec91_render,
+  mainvue_type_template_id_6cb3ec91_staticRenderFns,
   false,
   null,
   null,
@@ -43196,8 +43759,8 @@ flow_list_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var flow_list = (flow_list_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handle-user/src/main.vue?vue&type=template&id=4616b35e&
-var mainvue_type_template_id_4616b35e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handle-user/src/main.vue?vue&type=template&id=2f21f1e1&
+var mainvue_type_template_id_2f21f1e1_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -43280,11 +43843,11 @@ var mainvue_type_template_id_4616b35e_render = function () {
       : _vm._e(),
   ])
 }
-var mainvue_type_template_id_4616b35e_staticRenderFns = []
-mainvue_type_template_id_4616b35e_render._withStripped = true
+var mainvue_type_template_id_2f21f1e1_staticRenderFns = []
+mainvue_type_template_id_2f21f1e1_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/handle-user/src/main.vue?vue&type=template&id=4616b35e&
+// CONCATENATED MODULE: ./packages/handle-user/src/main.vue?vue&type=template&id=2f21f1e1&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/handle-user/src/main.vue?vue&type=script&lang=js&
 //
@@ -43386,13 +43949,7 @@ mainvue_type_template_id_4616b35e_render._withStripped = true
               duration: 500,
               onClose: function onClose() {
                 utils_util["a" /* default */].removeStorage(['mainConfig', 'jump']);
-                var win = void 0;
-                try {
-                  utils_util["a" /* default */].win.top.document;
-                  win = utils_util["a" /* default */].win.top;
-                } catch (error) {
-                  win = utils_util["a" /* default */].getMyWinTop();
-                }
+                var win = utils_util["a" /* default */].win.top;
                 win.location.reload();
               }
             });
@@ -43425,8 +43982,8 @@ mainvue_type_template_id_4616b35e_render._withStripped = true
 
 var handle_user_src_main_component = normalizeComponent(
   packages_handle_user_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_4616b35e_render,
-  mainvue_type_template_id_4616b35e_staticRenderFns,
+  mainvue_type_template_id_2f21f1e1_render,
+  mainvue_type_template_id_2f21f1e1_staticRenderFns,
   false,
   null,
   null,
@@ -52853,8 +53410,8 @@ menu_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var menu = (menu_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=74f295ae&
-var mainvue_type_template_id_74f295ae_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=5d7ddb00&
+var mainvue_type_template_id_5d7ddb00_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -52992,11 +53549,11 @@ var mainvue_type_template_id_74f295ae_render = function () {
     ]
   )
 }
-var mainvue_type_template_id_74f295ae_staticRenderFns = []
-mainvue_type_template_id_74f295ae_render._withStripped = true
+var mainvue_type_template_id_5d7ddb00_staticRenderFns = []
+mainvue_type_template_id_5d7ddb00_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=74f295ae&
+// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=5d7ddb00&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=script&lang=js&
 //
@@ -53102,7 +53659,7 @@ mainvue_type_template_id_74f295ae_render._withStripped = true
       return active;
     },
     menuActive: function menuActive() {
-      var active = typeof this.defaultActive === 'string' ? this.defaultActive : this.defaultActive.length ? this.defaultActive[this.defaultActive.length - 1] : undefined;
+      var active = typeof this.defaultActive === 'string' ? this.defaultActive : this.defaultActive && this.defaultActive.length ? this.defaultActive[this.defaultActive.length - 1] : undefined;
       return active;
     },
     boxWidth: function boxWidth() {
@@ -53263,8 +53820,8 @@ mainvue_type_template_id_74f295ae_render._withStripped = true
 
 var nav_src_main_component = normalizeComponent(
   packages_nav_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_74f295ae_render,
-  mainvue_type_template_id_74f295ae_staticRenderFns,
+  mainvue_type_template_id_5d7ddb00_render,
+  mainvue_type_template_id_5d7ddb00_staticRenderFns,
   false,
   null,
   null,
@@ -65661,41 +66218,25 @@ function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var ta
       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 = JSON.parse(JSON.stringify(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 = JSON.parse(JSON.stringify(val));
       }
     }
   },
   data: function data() {
     return {
-      show: false
+      show: false,
+      searchData: JSON.parse(JSON.stringify(this.searchValue)),
+      advancedData: JSON.parse(JSON.stringify(this.advanceValue))
     };
   },
   created: function created() {
@@ -65745,13 +66286,14 @@ function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var ta
     },
     hanleReset: function hanleReset() {
       this.$refs.filter && this.$refs.filter.resetFields();
-      this.searchData = {};
-      this.advancedData = {};
-      this.$emit('reset');
+      this.searchData = JSON.parse(JSON.stringify(this.searchValue));
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('reset', this.searchData);
     },
     hanleCancel: function hanleCancel() {
       this.show = false;
-      this.$emit('cancel');
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('cancel', this.advancedData);
     }
   },
   render: function render(h) {
@@ -65888,8 +66430,8 @@ function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var ta
             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: toolbar_src_mainvue_type_script_lang_js_extends({}, other, config || {}, {
             size: 'medium',
@@ -65901,7 +66443,7 @@ function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var ta
             submit: _this2.hanleSubmit,
             reset: _this2.hanleCancel
           }
-        }, [])])]);
+        }, []) : ''])]);
       }
     });
     var box = [h('div', {
@@ -71943,7 +72485,8 @@ wxlogin_src_main.install = function (Vue) {
 
 
 
-var components = [packages_button, button_group, checkbox_group, card, cascader, clients, data_table, data_table_form, date_picker, packages_dialog, enterprise, error_page, packages_form, packages_flow, flow_group, flow_list, handle_user, packages_handler, icons, packages_input, input_number, packages_label, layout, login, packages_main, menu, nav, packages_notify, pagination, packages_page, player, qr_code, radio_group, retrial_auth, packages_select, select_ganged, selector, selector_panel, packages_sizer, steps, packages_switch, packages_tabs, tabs_panel, tips, packages_tree, tree_group, packages_toolbar, table_form, upload, wujie, wxlogin];
+
+var components = [packages_button, button_group, calendar, card, cascader, checkbox_group, clients, data_table, data_table_form, date_picker, packages_dialog, enterprise, error_page, packages_form, packages_flow, flow_group, flow_list, handle_user, packages_handler, icons, packages_input, input_number, packages_label, layout, login, packages_main, menu, nav, packages_notify, pagination, packages_page, player, qr_code, radio_group, retrial_auth, packages_select, select_ganged, selector, selector_panel, packages_sizer, steps, packages_switch, packages_tabs, tabs_panel, tips, packages_tree, tree_group, packages_toolbar, table_form, upload, wujie, wxlogin];
 
 var install = function install(Vue) {
   var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -71958,13 +72501,14 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.45',
+  version: '0.5.47',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,
-  CheckboxGroup: checkbox_group,
+  Calendar: calendar,
   Card: card,
   Cascader: cascader,
+  CheckboxGroup: checkbox_group,
   Clients: clients,
   DataTable: data_table,
   DataTableForm: data_table_form,