element-ui-root 2.9.8 → 2.9.9

package/dist/index.common.js

@@ -4282,17 +4282,6 @@ if (!isCallable(store.inspectSource)) {
 module.exports = store.inspectSource;
 
 
-/***/ }),
-
-/***/ "0634":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ed84b344_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("b33c");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ed84b344_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ed84b344_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "066e":
@@ -5212,6 +5201,9 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("5a1c");
+/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_index_css__WEBPACK_IMPORTED_MODULE_0__);
+
 /* harmony default export */ __webpack_exports__["default"] = ({
   name: 'AdragBox',
   props: {
@@ -5219,6 +5211,10 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => `id-a-drag-box-${Math.random()}`
     },
+    prompt: {
+      type: String,
+      default: () => '按住进行拖放'
+    },
     dragType: {
       type: String,
       default: () => 'text/plain'
@@ -5226,19 +5222,41 @@ __webpack_require__.r(__webpack_exports__);
     draggable: {
       type: Boolean,
       default: () => true
+    },
+    insert: {
+      type: Boolean,
+      default: () => false
+    },
+    color: {
+      type: String,
+      default: () => ''
+    },
+    padding: {
+      type: String,
+      default: () => '0'
+    },
+    height: {
+      type: String,
+      default: () => '100%'
+    },
+    background: {
+      type: String,
+      default: () => ''
+    },
+    styles: {
+      type: Object,
+      default: () => ({})
+    },
+    loading: {
+      type: Boolean,
+      default: () => false
     }
   },
-  created() {
-    this.create();
-  },
   methods: {
-    create() {
-      // TODO
-    },
     dragstart(a) {
       if (this.draggable) {
         a.dataTransfer.setData(this.dragType, this.id);
-        this.$store.commit('changeDragId', this.id);
+        this.$store.commit('setDragId', this.id);
         this.$emit('dragstart', a);
       }
     },
@@ -5264,41 +5282,62 @@ __webpack_require__.r(__webpack_exports__);
     },
     drop(a) {
       a.preventDefault();
-      const {
-        dragId,
-        dropId
-      } = this.$store.state;
-      this.$emit('drop', {
-        dragId,
-        dropId
-      });
-      a.dataTransfer.clearData();
-    },
-    mousedown(a, b) {
-      // TODO
-      return;
+      if (this.draggable) {
+        const id = a.dataTransfer.getData(this.dragType);
+        const draging = document.getElementById(id);
+        const droping = document.getElementById(this.id);
+        if (draging !== droping) {
+          let dragPostion = draging.getBoundingClientRect();
+          let dropPostion = droping.getBoundingClientRect();
+          if (this.insert) {
+            if (this.getIndex(draging) > this.getIndex(droping)) {
+              this.$el.parentNode.insertBefore(draging, droping);
+            } else {
+              this.$el.parentNode.insertBefore(draging, droping.nextSibling);
+            }
+          }
+          this.animate(draging, dragPostion);
+          this.animate(droping, dropPostion);
+        }
+        this.$store.commit('setDropId', this.id);
+        this.$emit('drop', a);
+      }
     },
-    mouseup(a, b) {
-      // TODO
-      return;
+    getIndex(element = null) {
+      let index = 0;
+      if (!element) return -1;
+      while (element = element.previousSibling) index++;
+      return index;
     },
-    mouseover(a, b) {
-      // TODO
-      return;
+    animate(element, postion, delay = 300) {
+      let current = element.getBoundingClientRect();
+      let action = (() => {
+        element.style.transition = 'none';
+        element.style.transform = `translate3d(${postion.left - current.left}px, ${postion.top - current.top}px, 0)`;
+        element.offsetWidth;
+        element.style.transition = `all ${delay}ms`;
+        element.style.transform = 'translate3d(0, 0, 0)';
+      })();
+      setTimeout(() => action = null, delay);
     }
   },
   render() {
     const h = arguments[0];
+    const {
+      ...props
+    } = this.$attrs;
     return h("div", {
       "attrs": {
         "id": this.id,
+        "title": this.prompt,
         "draggable": this.draggable
       },
       "class": "a-drag-box",
+      "directives": [{
+        name: "loading",
+        value: this.loading
+      }],
       "on": {
-        "mousedown": a => this.mousedown(a, this.id),
-        "mouseover": a => this.mouseover(a, this.id),
-        "mouseup": a => this.mouseup(a, this.id),
         "dragstart": this.dragstart,
         "dragenter": this.dragenter,
         "dragleave": this.dragleave,
@@ -5306,8 +5345,24 @@ __webpack_require__.r(__webpack_exports__);
         "dragend": this.dragend,
         "drag": this.drag,
         "drop": this.drop
+      },
+      "style": {
+        color: this.color,
+        minHeight: this.height,
+        background: this.background,
+        ...this.styles
+      },
+      "props": {
+        ...props
       }
-    }, [this.$slots.default]);
+    }, [h("div", {
+      "class": "a-drag-box-body",
+      "style": {
+        padding: this.padding
+      }
+    }, [h("div", {
+      "class": "custom-body"
+    }, [this.$slots.default])])]);
   }
 });
 
@@ -12752,7 +12807,7 @@ __webpack_require__.r(__webpack_exports__);
     },
     inline: {
       type: Boolean,
-      default: () => false
+      default: () => true
     },
     cols: {
       type: String,
@@ -12801,28 +12856,21 @@ __webpack_require__.r(__webpack_exports__);
   },
   data() {
     return {
-      form: {},
-      height: 0,
-      opened: false
+      form: {}
     };
   },
   created() {
     this.create();
   },
-  mounted() {
-    this.update();
-  },
+  mounted() {},
   destroyed() {
     this.create = null;
-    this.update = null;
     this.submit = null;
     this.cancel = null;
     this.filter = null;
     this.result = null;
-    this.switch = null;
     this.prompt = null;
     this.format = null;
-    this.output = null;
   },
   watch: {
     values() {
@@ -12839,10 +12887,6 @@ __webpack_require__.r(__webpack_exports__);
         this.form = data;
       }
     },
-    update() {
-      let rows = Math.ceil(Object.keys(this.config).length / this.cols);
-      this.height = this.$el.clientHeight * (rows - 1);
-    },
     submit(e) {
       // 提交表单
       e && e.preventDefault();
@@ -12852,22 +12896,34 @@ __webpack_require__.r(__webpack_exports__);
       if (Object.keys(this.config).length > 0) {
         // 格式化属性为模糊查询属性
         for (let a in this.config) {
-          if (this.config[a] != '' && this.config[a].like && this.form[a].trim() != '' && this.form[a].trim() != null && this.form[a].trim() != undefined) {
-            if (this.config[a].like == 'left') data[a] = '%' + this.form[a].trim();
-            if (this.config[a].like == 'right') data[a] = this.form[a].trim() + '%';else data[a] = '%' + this.form[a].trim() + '%';
+          if (this.config[a] != '' && this.config[a].like && this.form[a] != '' && this.form[a] != null && this.form[a] != undefined) {
+            if (this.config[a].like == 'left') data[a] = '%' + this.form[a];
+            if (this.config[a].like == 'right') data[a] = this.form[a] + '%';else data[a] = '%' + this.form[a] + '%';
           } else {
             if (this.config[a] != '' && (this.config[a].than || this.config[a].range || this.config[a].scope)) {
-              data[`${a}LE`] = this.form[`${a}LE`].trim();
-              data[`${a}GE`] = this.form[`${a}GE`].trim();
-            } else if (this.form[a].trim().includes(' 00:00:00')) data[a] = '%' + this.form[a].trim().split(' 00:00:00')[0] + '%';else data[a] = this.form[a].trim();
+              data[`${a}LE`] = this.form[`${a}LE`];
+              data[`${a}GE`] = this.form[`${a}GE`];
+            } else if (this.form[a].includes(' 00:00:00')) data[a] = '%' + this.form[a].split(' 00:00:00')[0] + '%';else data[a] = this.form[a];
           }
         }
       }
       if (pass) {
         let result = this.filter(data);
+        const {
+          formParams,
+          pageParams
+        } = this.$store.state;
+        this.$store.commit('setFormParams', result); // 添加查询参数
+        this.$store.commit('setPageParams', {
+          ...pageParams,
+          page: 1
+        }); // 重置分页参数
         this.$nextTick(() => {
-          this.$emit('submit', {
+          let change = false;
+          Object.keys(result).forEach(a => result[a] != formParams[a] && (change = true));
+          if (change) this.$emit('submit', {
             ...result,
+            ...pageParams,
             page: 1
           }); // 派发事件并重置当前分页
           return result;
@@ -12880,6 +12936,15 @@ __webpack_require__.r(__webpack_exports__);
       let pass = !this.check; // 判断是否是空表单
       for (let a in this.form) if (this.form[a] != '') pass = true;
       if (pass) {
+        const {
+          pageParams
+        } = this.$store.state;
+        this.$store.commit('setPageParams', {
+          ...pageParams,
+          page: 1,
+          size: 10
+        }); // 重置分页参数
+        this.$store.commit('setFormParams', {}); // 重置查询参数
         this.$nextTick(() => {
           for (let a in this.form) this.form[a] = '';
           this.$nextTick(() => this.$emit('cancel', this.form));
@@ -12887,18 +12952,19 @@ __webpack_require__.r(__webpack_exports__);
       }
     },
     filter(form = {}) {
+      // 过滤空值属性
       const data = {};
       for (let a in form) {
-        if (form[a] != '' && form[a] != '%%' && form[a] != 'null' && form[a] != 'undefined' && form[a] != null && form[a] != undefined) data[a] = form[a];
+        if (a != undefined && a != 'undefined' && form[a] != '' && form[a] != '%%' && form[a] != 'null' && form[a] != 'undefined' && form[a] != null && form[a] != undefined) {
+          data[a] = form[a];
+        }
       }
       return data;
     },
     result() {
+      // 返回验证后的表单数据
       return this.filter(this.form);
     },
-    switch() {
-      this.opened = !this.opened;
-    },
     prompt(a = {}, index = 0, placeholder = '') {
       if (Object.keys(a).length > 0 && a.placeholder && a.placeholder.length && a.placeholder.length > 0) return a.placeholder[index];
       return placeholder;
@@ -12927,31 +12993,6 @@ __webpack_require__.r(__webpack_exports__);
           }
         });
       }
-    },
-    output(a, b) {
-      const h = this.$createElement;
-      let style = this.cols != '' ? {
-        width: `${100 / this.cols}%`
-      } : {};
-      return h("el-col", {
-        "key": b,
-        "style": style
-      }, [h("el-form-item", {
-        "attrs": {
-          "prop": `${a}`,
-          "label": this.label ? this.config[a]['text'] : ''
-        }
-      }, [this.config[a].than || this.config[a].range || this.config[a].scope ? h("el-col", {
-        "class": "range-cols"
-      }, [h("el-col", {
-        "attrs": {
-          "span": 12
-        }
-      }, [this.format(a, `${a}LE`, this.prompt(this.config[a], 0, '最高'))]), h("el-col", {
-        "attrs": {
-          "span": 12
-        }
-      }, [this.format(a, `${a}GE`, this.prompt(this.config[a], 1, '最低'))])]) : this.format(a)])]);
     }
   },
   render() {
@@ -12963,6 +13004,10 @@ __webpack_require__.r(__webpack_exports__);
       submit = null,
       cancel = null
     } = this.$listeners;
+    let style = this.cols != '' ? {
+      width: `${100 / this.cols}%`
+    } : {};
+    let label = a => this.label ? this.config[a].text || this.config[a].label || this.config[a].title : '';
     return h("div", {
       "class": "c-f-search",
       "style": {
@@ -12971,8 +13016,7 @@ __webpack_require__.r(__webpack_exports__);
     }, [h("el-form", _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
       "ref": "form",
       "attrs": {
-        "size": this.size,
-        "inline": this.inline
+        "size": this.size
       }
     }, {
       "props": {
@@ -12984,42 +13028,38 @@ __webpack_require__.r(__webpack_exports__);
         "labelWidth": this.labelWidth,
         "labelPosition": this.labelPosition
       }
-    }]), [h("div", {
-      "class": "column"
-    }, [h("el-row", {
+    }]), [h("el-row", {
       "attrs": {
         "gutter": Number(this.gutter)
-      },
-      "class": "main-row"
-    }, [Object.keys(this.config).map((a, b) => b < this.cols && this.output(a, b))]), h("el-row", {
+      }
+    }, [Object.keys(this.config).map((a, b) => h("el-col", {
+      "key": b,
+      "class": "column",
+      "style": style
+    }, [h("el-form-item", {
       "attrs": {
-        "gutter": Number(this.gutter)
-      },
-      "class": "fold-row",
-      "style": {
-        height: this.opened ? `${this.height}px` : '0'
+        "prop": `${a}`,
+        "label": label(a)
       }
-    }, [Object.keys(this.config).map((a, b) => b > this.cols - 1 && this.output(a, b))])]), (Object.keys(this.config).length > this.cols || submit || cancel) && h("div", {
-      "class": "action",
-      "style": {
-        paddingLeft: `${this.gutter}px`
+    }, [this.config[a].than || this.config[a].range || this.config[a].scope ? h("el-col", {
+      "class": "range-cols"
+    }, [h("el-col", {
+      "attrs": {
+        "span": 12
       }
-    }, [h("el-form-item", {
+    }, [this.format(a, `${a}LE`, this.prompt(this.config[a], 0, '最高'))]), h("el-col", {
       "attrs": {
-        "label": "action"
+        "span": 12
       }
-    }, [Object.keys(this.config).length > this.cols && h("el-button", {
+    }, [this.format(a, `${a}GE`, this.prompt(this.config[a], 1, '最低'))])]) : this.format(a)])])), this.$slots.default, (submit || cancel) && h("el-col", {
+      "key": "action",
+      "class": "action",
+      "style": style
+    }, [h("el-form-item", {
       "attrs": {
-        "disabled": this.loading,
-        "type": "text"
-      },
-      "class": "collapse-button",
-      "on": {
-        "click": this.switch
+        "label": this.label ? 'action' : ''
       }
-    }, [h("i", {
-      "class": `el-icon-arrow-${this.opened ? 'up' : 'down'}`
-    }), this.opened ? '收起' : '展开']), submit && h("el-button", {
+    }, [submit && h("el-button", {
       "attrs": {
         "disabled": this.loading,
         "type": "primary"
@@ -13035,7 +13075,7 @@ __webpack_require__.r(__webpack_exports__);
       "on": {
         "click": this.cancel
       }
-    }, [this.cancelText])])])])]);
+    }, [this.cancelText])])])])])]);
   }
 });
 
@@ -13176,6 +13216,7 @@ var map = {
 	"./AdragBox": "0a59",
 	"./AdragBox/": "0a59",
 	"./AdragBox/index": "0a59",
+	"./AdragBox/index.css": "5a1c",
 	"./AdragBox/index.js": "0a59",
 	"./AdropBox": "b7dd",
 	"./AdropBox/": "b7dd",
@@ -13835,14 +13876,14 @@ __webpack_require__.r(__webpack_exports__);
       if (Object.keys(this.config).length > 0) {
         // 格式化属性为模糊查询属性
         for (let a in this.config) {
-          if (this.config[a] != '' && this.config[a].like && this.form[a].trim() != '' && this.form[a].trim() != null && this.form[a].trim() != undefined) {
-            if (this.config[a].like == 'left') data[a] = '%' + this.form[a].trim();
-            if (this.config[a].like == 'right') data[a] = this.form[a].trim() + '%';else data[a] = '%' + this.form[a].trim() + '%';
+          if (this.config[a] != '' && this.config[a].like && this.form[a] != '' && this.form[a] != null && this.form[a] != undefined) {
+            if (this.config[a].like == 'left') data[a] = '%' + this.form[a];
+            if (this.config[a].like == 'right') data[a] = this.form[a] + '%';else data[a] = '%' + this.form[a] + '%';
           } else {
             if (this.config[a] != '' && (this.config[a].than || this.config[a].range || this.config[a].scope)) {
-              data[`${a}LE`] = this.form[`${a}LE`].trim();
-              data[`${a}GE`] = this.form[`${a}GE`].trim();
-            } else if (this.form[a].trim().includes(' 00:00:00')) data[a] = '%' + this.form[a].trim().split(' 00:00:00')[0] + '%';else data[a] = this.form[a].trim();
+              data[`${a}LE`] = this.form[`${a}LE`];
+              data[`${a}GE`] = this.form[`${a}GE`];
+            } else if (this.form[a].includes(' 00:00:00')) data[a] = '%' + this.form[a].split(' 00:00:00')[0] + '%';else data[a] = this.form[a];
           }
         }
       }
@@ -13852,8 +13893,8 @@ __webpack_require__.r(__webpack_exports__);
           formParams,
           pageParams
         } = this.$store.state;
-        this.$store.commit('changeFormParams', result); // 添加查询参数
-        this.$store.commit('changePageParams', {
+        this.$store.commit('setFormParams', result); // 添加查询参数
+        this.$store.commit('setPageParams', {
           ...pageParams,
           page: 1
         }); // 重置分页参数
@@ -13878,12 +13919,12 @@ __webpack_require__.r(__webpack_exports__);
         const {
           pageParams
         } = this.$store.state;
-        this.$store.commit('changePageParams', {
+        this.$store.commit('setPageParams', {
           ...pageParams,
           page: 1,
           size: 10
         }); // 重置分页参数
-        this.$store.commit('changeFormParams', {}); // 重置查询参数
+        this.$store.commit('setFormParams', {}); // 重置查询参数
         this.$nextTick(() => {
           for (let a in this.form) this.form[a] = '';
           this.$nextTick(() => this.$emit('cancel', this.form));
@@ -36495,6 +36536,17 @@ exports.scale = scale;
 exports.invert = invert;
 exports.clone = clone;
 
+/***/ }),
+
+/***/ "5934":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_446b4709_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("e95a");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_446b4709_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_446b4709_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "5974":
@@ -36580,6 +36632,13 @@ module.exports = _default;
 
 /***/ }),
 
+/***/ "5a1c":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "5aac":
 /***/ (function(module, exports) {
 
@@ -37101,6 +37160,13 @@ module.exports = _default;
 
 /***/ }),
 
+/***/ "5bf5":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "5c61":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -40512,8 +40578,8 @@ __webpack_require__.r(__webpack_exports__);
       return YYYY + '-' + MM + '-' + DD + ' ' + H + ':' + M + ':' + S;
     },
     select(items) {
-      this.$store.commit('changeSelectedRows', items);
-      this.$store.commit('changeSelectedKeys', items.map(a => a[this.rowKey]));
+      this.$store.commit('setSelectedRows', items);
+      this.$store.commit('setSelectedKeys', items.map(a => a[this.rowKey]));
       this.$emit('select', {
         rows: items,
         keys: items.map(a => a[this.rowKey])
@@ -40523,7 +40589,7 @@ __webpack_require__.r(__webpack_exports__);
       page: 1,
       size: 10
     }) {
-      this.$store.commit('changePageParams', pages);
+      this.$store.commit('setPageParams', pages);
       this.$emit('change', pages);
       this.search(pages);
     },
@@ -47708,13 +47774,6 @@ module.exports = _default;
 
 /***/ }),
 
-/***/ "731e":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "734e":
 /***/ (function(module, exports) {
 
@@ -50913,22 +50972,11 @@ module.exports = _default;
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6aaa");
 /* harmony import */ var _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _components_Aactions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("e94c");
-/* harmony import */ var _components_Aempty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("bd5e");
-/* harmony import */ var _components_Aenume__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("6cc8");
-/* harmony import */ var _components_Aform_AfSearch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("1b78");
-/* harmony import */ var _components_Aform_BfSearch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("fc0d");
-/* harmony import */ var _components_AformItem__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("2234");
-/* harmony import */ var _components_Apages__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("1d0c");
-/* harmony import */ var _components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("2ee7");
-/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("e6e6");
-/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_index_css__WEBPACK_IMPORTED_MODULE_9__);
-
-
-
-
-
-
+/* harmony import */ var _components_Aenume__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("6cc8");
+/* harmony import */ var _components_AformItem__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("2234");
+/* harmony import */ var _components_Apages__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("1d0c");
+/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("e6e6");
+/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_index_css__WEBPACK_IMPORTED_MODULE_4__);
 
 
 
@@ -50937,20 +50985,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony default export */ __webpack_exports__["default"] = ({
   name: 'Ctable',
   components: {
-    Aactions: _components_Aactions__WEBPACK_IMPORTED_MODULE_1__["default"],
-    Aempty: _components_Aempty__WEBPACK_IMPORTED_MODULE_2__["default"],
-    Aenume: _components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"],
-    AfSearch: _components_Aform_AfSearch__WEBPACK_IMPORTED_MODULE_4__["default"],
-    BfSearch: _components_Aform_BfSearch__WEBPACK_IMPORTED_MODULE_5__["default"],
-    AformItem: _components_AformItem__WEBPACK_IMPORTED_MODULE_6__["default"],
-    Apages: _components_Apages__WEBPACK_IMPORTED_MODULE_7__["default"],
-    Apopconfirm: _components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"]
+    Aenume: _components_Aenume__WEBPACK_IMPORTED_MODULE_1__["default"],
+    AformItem: _components_AformItem__WEBPACK_IMPORTED_MODULE_2__["default"],
+    Apages: _components_Apages__WEBPACK_IMPORTED_MODULE_3__["default"]
   },
   props: {
-    margin: {
-      type: String,
-      default: () => '0'
-    },
     rowKey: {
       type: String,
       default: () => 'id'
@@ -50959,22 +50998,10 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => 'medium'
     },
-    selectionWidth: {
-      type: String,
-      default: () => '50'
-    },
     sort: {
       type: Boolean,
       default: () => true
     },
-    sortTitle: {
-      type: String,
-      default: () => '#'
-    },
-    sortWidth: {
-      type: String,
-      default: () => '50'
-    },
     border: {
       type: Boolean,
       default: () => false
@@ -50983,10 +51010,6 @@ __webpack_require__.r(__webpack_exports__);
       type: Boolean,
       default: () => false
     },
-    loading: {
-      type: Boolean,
-      default: () => false
-    },
     column: {
       type: Array,
       default: () => []
@@ -50995,50 +51018,18 @@ __webpack_require__.r(__webpack_exports__);
       type: Object,
       default: () => ({})
     },
-    maxHeight: {
-      type: String,
-      default: () => '480'
-    },
-    elementLoadingText: {
-      type: String,
-      default: () => ''
-    },
-    elementLoadingSpinner: {
-      type: String,
-      default: () => 'el-icon-loading'
-    },
-    elementLoadingBackground: {
-      type: String,
-      default: () => 'rgba(0, 0, 0, 0.04)'
-    },
-    emptyText: {
-      type: String,
-      default: () => ''
-    },
-    showHeader: {
-      type: Boolean,
-      default: () => true
+    params: {
+      type: Object,
+      default: () => ({})
     },
     selection: {
       type: Boolean,
-      default: () => true
+      default: () => false
     },
     showOverflowTooltip: {
       type: Boolean,
       default: () => true
     },
-    tooltipEffect: {
-      type: String,
-      default: () => 'light'
-    },
-    showSummary: {
-      type: Boolean,
-      default: () => false
-    },
-    sumText: {
-      type: String,
-      default: () => '合计'
-    },
     sortable: {
       type: Boolean,
       default: () => false
@@ -51065,22 +51056,6 @@ __webpack_require__.r(__webpack_exports__);
         hasChildren: 'hasChildren'
       })
     },
-    highlightCurrentRow: {
-      type: Boolean,
-      default: () => false
-    },
-    action: {
-      type: Object,
-      default: () => ({
-        review: null,
-        modify: null,
-        update: null,
-        handle: null,
-        remove: null,
-        delete: null,
-        export: null
-      })
-    },
     actionWidth: {
       type: String,
       default: () => '180px'
@@ -51089,157 +51064,138 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => '操作'
     },
-    page: {
+    formatTime: {
+      type: Boolean,
+      default: () => true
+    },
+    preview: {
       type: Boolean,
       default: () => false
+    },
+    page: {
+      type: Boolean,
+      default: () => true
     }
   },
-  mounted() {
-    this.$refs['c-table'].bodyWrapper.addEventListener('wheel', this.scroll);
+  data() {
+    return {
+      loading: false
+    };
   },
-  beforeDestroy() {
-    this.$refs['c-table'].bodyWrapper.removeEventListener('wheel', this.scroll);
+  created() {
+    this.search();
+    this.create();
   },
-  destroyed() {
-    this.create = null;
-    this.search = null;
-    this.select = null;
-    this.choose = null;
-    this.change = null;
-    this.format = null;
-    this.scroll = null;
+  mounted() {
+    this.$refs['c-table'].bodyWrapper.addEventListener('scroll', this.scroll);
   },
   methods: {
-    create() {
+    create(column = []) {
       const h = this.$createElement;
-      let column = [...this.column, this.suffix()];
-      return column.map((a, b) => {
-        if (a && Object.keys(a).length > 0) {
-          let {
-            type = null,
-            render = null,
-            header = null,
-            ...r
-          } = a;
-          let field = a.field || a.index || a.name || a.prop;
-          let label = a.label || a.title || a.text;
-          let props = {
-            key: b,
-            prop: field,
-            scopedSlot: field,
-            sortable: field ? a.sortable ? a.sortable : this.sortable : false,
-            formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
-            showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
-            ...r
-          };
-          return h("el-table-column", {
-            "props": {
-              ...props
-            }
-          }, [h("template", {
-            "slot": "header"
-          }, [header ? () => header(r) : label && label != '' && label.length && label.length > 8 ? h("el-tooltip", {
-            "attrs": {
-              "content": label,
-              "placement": "top"
-            }
-          }, [h("span", {
-            "attrs": {
-              "title": label
-            }
-          }, [label])]) : h("span", {
-            "attrs": {
-              "title": label
-            }
-          }, [label])])]);
+      if (this.formatTime && this.column.length > 0) {
+        for (let a in this.column) {
+          if (this.column[a].field && this.column[a].field.toLowerCase().includes('time')) {
+            this.column[a].render = item => item[this.column[a].field] != '' && this.filter(item[this.column[a].field]);
+          }
         }
-      });
-    },
-    suffix() {
-      const h = this.$createElement;
-      if (this.action.review || this.action.modify || this.action.update || this.action.handle || this.action.remove || this.action.delete || this.action.export || this.$listeners.review || this.$listeners.modify || this.$listeners.update || this.$listeners.handle || this.$listeners.remove || this.$listeners.delete || this.$listeners.export) {
-        return {
-          fixed: 'right',
-          align: 'center',
-          width: this.actionWidth,
-          label: this.actionTitle,
-          formatter: item => h("div", {
-            "class": "action"
-          }, [this.action.review && h("i", {
-            "class": "el-icon-view",
-            "on": {
-              "click": () => this.action.review(item)
-            }
-          }), this.action.modify && h("i", {
-            "class": "el-icon-edit",
-            "on": {
-              "click": () => this.action.modify(item)
-            }
-          }), this.action.update && h("i", {
-            "class": "el-icon-edit",
-            "on": {
-              "click": () => this.action.update(item)
-            }
-          }), this.action.handle && h("i", {
-            "class": "el-icon-edit",
-            "on": {
-              "click": () => this.action.handle(item)
-            }
-          }), this.action.remove && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
-            "on": {
-              "submit": () => this.action.remove(item)
-            }
-          }), this.action.delete && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
-            "on": {
-              "submit": () => this.action.delete(item)
-            }
-          }), this.action.export && h("i", {
-            "class": "el-icon-download",
-            "on": {
-              "click": () => this.action.export(item)
-            }
-          }), this.$listeners.review && h("i", {
-            "class": "el-icon-view",
-            "on": {
-              "click": () => this.$listeners.review(item)
-            }
-          }), this.$listeners.modify && h("i", {
-            "class": "el-icon-edit",
-            "on": {
-              "click": () => this.$listeners.modify(item)
-            }
-          }), this.$listeners.update && h("i", {
-            "class": "el-icon-edit",
-            "on": {
-              "click": () => this.$listeners.update(item)
-            }
-          }), this.$listeners.handle && h("i", {
-            "class": "el-icon-edit",
-            "on": {
-              "click": () => this.$listeners.handle(item)
-            }
-          }), this.$listeners.remove && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
-            "on": {
-              "submit": () => this.$listeners.remove(item)
-            }
-          }), this.$listeners.delete && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
-            "on": {
-              "submit": () => this.$listeners.delete(item)
-            }
-          }), this.$listeners.export && h("i", {
-            "class": "el-icon-download",
-            "on": {
-              "click": () => this.$listeners.export(item)
-            }
-          })])
-        };
       }
+      const actionColumn = () => {
+        let data = [];
+        const {
+          review,
+          modify,
+          update,
+          handle,
+          remove
+        } = this.$listeners;
+        if (review || modify || update || handle || remove || this.$listeners.delete || this.$listeners.export) {
+          data = [{
+            label: this.actionTitle,
+            fixed: 'right',
+            align: 'center',
+            width: this.actionWidth,
+            render: item => h("div", {
+              "class": "action"
+            }, [review && h("i", {
+              "class": "el-icon-view",
+              "on": {
+                "click": () => review(item)
+              }
+            }), modify && h("i", {
+              "class": "el-icon-edit",
+              "on": {
+                "click": () => modify(item)
+              }
+            }), update && h("i", {
+              "class": "el-icon-edit",
+              "on": {
+                "click": () => update(item)
+              }
+            }), handle && h("i", {
+              "class": "el-icon-edit",
+              "on": {
+                "click": () => handle(item)
+              }
+            }), remove && h("Apopconfirm", {
+              "on": {
+                "submit": () => remove(item)
+              }
+            }), this.$listeners.delete && h("Apopconfirm", {
+              "on": {
+                "submit": () => this.$listeners.delete(item)
+              }
+            }), this.$listeners.export && h("i", {
+              "class": "el-icon-download",
+              "on": {
+                "click": () => this.$listeners.export(item)
+              }
+            })])
+          }];
+        }
+        return data;
+      };
+      const columnConfig = [...column, ...actionColumn()];
+      return columnConfig.map((a, b) => {
+        if (a) return h("el-table-column", {
+          "key": b,
+          "attrs": {
+            "prop": a.field,
+            "showOverflowTooltip": this.showOverflowTooltip,
+            "sortable": a.field ? a.sortable ? a.sortable : this.sortable : false,
+            "formatter": a.formatter ? (e, f, g, h) => a.formatter(e, h) : a.render ? (e, f, g, h) => a.render(e, h) : a.type ? (e, f, g, h) => this.format(a, b, e, h) : null
+          },
+          "props": {
+            ...a
+          }
+        });
+      });
     },
-    search(params = {}) {
+    search() {
+      const {
+        pageParams,
+        formParams
+      } = this.$store.state;
+      const params = Object.assign({}, pageParams, formParams, this.params);
       this.$emit('search', params);
     },
-    select(items = []) {
-      this.$emit('select', items);
+    filter(timeStamp) {
+      if (!typeof timeStamp == Number) return '';
+      let time = new Date(timeStamp);
+      const YYYY = time.getFullYear();
+      const MM = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
+      const DD = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
+      const H = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+      const M = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+      const S = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
+      return YYYY + '-' + MM + '-' + DD + ' ' + H + ':' + M + ':' + S;
+    },
+    select(items) {
+      this.$store.commit('setSelectedRows', items);
+      this.$store.commit('setSelectedKeys', items.map(a => a[this.rowKey]));
+      this.$emit('select', {
+        rows: items,
+        keys: items.map(a => a[this.rowKey])
+      });
     },
     choose(row, column, event) {
       this.$emit('choose', {
@@ -51252,27 +51208,47 @@ __webpack_require__.r(__webpack_exports__);
       page: 1,
       size: 10
     }) {
+      this.$store.commit('setPageParams', pages);
       this.$emit('change', pages);
       this.search(pages);
     },
+    switch(name = '', symbol = '_') {
+      return name.replace(/([A-Z])/g, `${symbol}$1`).toLowerCase();
+    },
     format({
-      type = '',
-      name = '',
-      data = [],
-      text = '',
-      label = '',
-      title = '',
-      field = '',
-      dicts = [],
+      label,
+      field,
+      type,
+      disabled,
+      action = '',
+      path = '',
+      flag = '',
       ...props
     }, colIndex, item, rowIndex) {
       const h = this.$createElement;
-      if (type == 'enume' || type == 'enumerate') {
-        if (field != '') return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
+      if (this.preview && (type != 'select' || type != 'enume' || type != 'enumerate')) return h("span", {
+        "key": colIndex + '-' + rowIndex
+      }, [item[field]]);
+      if (type == 'select' || type == 'enume' || type == 'enumerate') {
+        let dicts = [];
+        if (this.optionApi != '' || action != '' || path != '') {
+          let url = action != '' ? action : path != '' ? path : this.optionApi;
+          let params = flag != '' ? {
+            flag: this.switch(flag)
+          } : {
+            field: this.switch(field)
+          };
+          FN.get(url, params).then(({
+            data
+          }) => {
+            if (data && data.length > 0) dicts = data;
+          });
+        }
+        return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_1__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
           "key": colIndex + '-' + rowIndex,
           "attrs": {
-            "field": field,
-            "data": dicts.length > 0 ? dicts : data
+            "field": `${field}`,
+            "data": dicts
           }
         }, props, {
           "model": {
@@ -51282,103 +51258,47 @@ __webpack_require__.r(__webpack_exports__);
             }
           }
         }]));
-        return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
-          "key": colIndex + '-' + rowIndex,
-          "attrs": {
-            "field": name,
-            "data": dicts.length > 0 ? dicts : data
-          }
-        }, props, {
-          "model": {
-            value: item[name],
-            callback: $$v => {
-              this.$set(item, name, $$v);
-            }
-          }
-        }]));
       }
-      return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_6__["default"], {
+      return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_2__["default"], {
         "key": colIndex + '-' + rowIndex,
         "attrs": {
           "config": {
             type,
             form: item,
-            dicts: dicts.length > 0 ? dicts : data,
-            field: field != '' ? field : name != '' ? name : '',
-            label: text != '' ? text : label != '' ? label : title != '' ? title : '无栏目名称',
+            label,
+            field: `${field}`,
+            dicts,
+            table: true,
             ...props
           }
         }
       });
     },
-    scroll(a) {
-      let container = this.$refs['c-table'].bodyWrapper;
-      if (container) {
-        if (container.scrollHeight > container.clientHeight) {
-          a.preventDefault();
-          container.scrollTop += a.deltaY;
-        } else {
-          if (container.scrollWidth > container.clientWidth) {
-            a.preventDefault();
-            container.scrollLeft += a.deltaY;
-          }
-        }
-        this.$emit('scroll', a);
-      }
+    scroll({
+      target
+    }) {
+      this.$emit('scroll', target);
     }
   },
   render() {
     const h = arguments[0];
     const {
-      formCols = '6',
-      searchVerify = true,
-      searchConfig = {},
-      actionConfig = [],
-      ...props
-    } = this.$attrs;
-    const {
-      ...r
+      data = [],
+      size = 0
     } = this.record;
-    const data = r.data ? r.data : r.list ? r.list : r.rows ? r.rows : r.record ? r.record : r.records ? r.records : [];
-    const size = r.size ? r.size : r.total ? r.total : r.count ? r.count : 0;
     const {
-      loading = false,
-      search = null
-    } = this;
-    const condition = data.length > 0;
+      pageParams
+    } = this.$store.state;
+    const condition = data && data.length > 0;
+    const {
+      ...props
+    } = this.$attrs;
     return h("div", {
-      "style": {
-        padding: this.margin
-      }
-    }, [Object.keys(searchConfig).length > 0 && (Object.keys(searchConfig).length < 5 ? h(_components_Aform_AfSearch__WEBPACK_IMPORTED_MODULE_4__["default"], {
-      "attrs": {
-        "cols": formCols,
-        "verify": searchVerify,
-        "config": searchConfig,
-        "loading": loading
-      },
-      "on": {
-        "submit": search,
-        "cancel": search
-      }
-    }) : h(_components_Aform_BfSearch__WEBPACK_IMPORTED_MODULE_5__["default"], {
-      "attrs": {
-        "cols": formCols,
-        "verify": searchVerify,
-        "config": searchConfig,
-        "loading": loading
-      },
-      "on": {
-        "submit": search,
-        "cancel": search
-      }
-    })), actionConfig.length > 0 && h(_components_Aactions__WEBPACK_IMPORTED_MODULE_1__["default"], {
-      "attrs": {
-        "config": actionConfig,
-        "disabled": loading
-      }
-    }), h("div", {
-      "class": this.border ? 'c-table' : 'c-table border'
+      "class": "c-table",
+      "directives": [{
+        name: "loading",
+        value: this.loading
+      }]
     }, [h("el-table", {
       "ref": "c-table",
       "attrs": {
@@ -51386,23 +51306,12 @@ __webpack_require__.r(__webpack_exports__);
         "size": this.size,
         "border": this.border,
         "stripe": this.stripe,
+        "column": this.column,
         "row-key": this.rowKey,
-        "max-height": this.maxHeight,
-        "element-loading-text": this.elementLoadingText,
-        "element-loading-spinner": this.elementLoadingSpinner,
-        "element-loading-background": this.elementLoadingBackground,
-        "show-header": this.showHeader,
         "default-sort": this.defaultSort,
-        "show-summary": this.showSummary,
-        "tooltip-effect": this.tooltipEffect,
-        "default-expand-all": this.defaultExpandAll,
         "tree-props": this.tree ? this.treeProps : {},
-        "highlight-current-row": this.highlightCurrentRow
+        "default-expand-all": this.defaultExpandAll
       },
-      "directives": [{
-        name: "loading",
-        value: loading
-      }],
       "on": {
         "row-click": this.choose,
         "selection-change": this.select
@@ -51410,34 +51319,28 @@ __webpack_require__.r(__webpack_exports__);
       "props": {
         ...props
       }
-    }, [condition && (this.selection || this.$listeners.select) && h("el-table-column", {
+    }, [condition && this.selection && h("el-table-column", {
       "attrs": {
         "fixed": "left",
         "type": "selection",
-        "width": this.selectionWidth
+        "width": "50"
       }
     }), condition && this.sort && h("el-table-column", {
       "attrs": {
         "fixed": "left",
         "type": "index",
-        "width": this.sortWidth,
-        "label": this.sortTitle
-      }
-    }), condition && this.create(), condition && this.$slots.default, h("div", {
-      "slot": "empty",
-      "class": "empty"
-    }, [!loading && h(_components_Aempty__WEBPACK_IMPORTED_MODULE_2__["default"], {
-      "attrs": {
-        "description": this.emptyText
+        "width": "50",
+        "label": "#"
       }
-    })])]), !this.tree && this.page && condition && h(_components_Apages__WEBPACK_IMPORTED_MODULE_7__["default"], {
+    }), condition && this.create(this.column)]), !this.tree && this.page && condition && h(_components_Apages__WEBPACK_IMPORTED_MODULE_3__["default"], {
       "attrs": {
-        "total": Number(size)
+        "total": Number(size),
+        "pages": pageParams
       },
       "on": {
         "change": this.change
       }
-    })])]);
+    })]);
   }
 });
 
@@ -61684,11 +61587,22 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6aaa");
 /* harmony import */ var _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _components_Aenume__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("6cc8");
-/* harmony import */ var _components_AformItem__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("2234");
-/* harmony import */ var _components_Apages__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("1d0c");
-/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("f4d2");
-/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_index_css__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _components_Aactions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("e94c");
+/* harmony import */ var _components_Aempty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("bd5e");
+/* harmony import */ var _components_Aenume__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("6cc8");
+/* harmony import */ var _components_Aform_AfSearch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("1b78");
+/* harmony import */ var _components_Aform_BfSearch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("fc0d");
+/* harmony import */ var _components_AformItem__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("2234");
+/* harmony import */ var _components_Apages__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("1d0c");
+/* harmony import */ var _components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("2ee7");
+/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("f4d2");
+/* harmony import */ var _index_css__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_index_css__WEBPACK_IMPORTED_MODULE_9__);
+
+
+
+
+
+
 
 
 
@@ -61697,11 +61611,20 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony default export */ __webpack_exports__["default"] = ({
   name: 'Btable',
   components: {
-    Aenume: _components_Aenume__WEBPACK_IMPORTED_MODULE_1__["default"],
-    AformItem: _components_AformItem__WEBPACK_IMPORTED_MODULE_2__["default"],
-    Apages: _components_Apages__WEBPACK_IMPORTED_MODULE_3__["default"]
+    Aactions: _components_Aactions__WEBPACK_IMPORTED_MODULE_1__["default"],
+    Aempty: _components_Aempty__WEBPACK_IMPORTED_MODULE_2__["default"],
+    Aenume: _components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"],
+    AfSearch: _components_Aform_AfSearch__WEBPACK_IMPORTED_MODULE_4__["default"],
+    BfSearch: _components_Aform_BfSearch__WEBPACK_IMPORTED_MODULE_5__["default"],
+    AformItem: _components_AformItem__WEBPACK_IMPORTED_MODULE_6__["default"],
+    Apages: _components_Apages__WEBPACK_IMPORTED_MODULE_7__["default"],
+    Apopconfirm: _components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"]
   },
   props: {
+    margin: {
+      type: String,
+      default: () => '0'
+    },
     rowKey: {
       type: String,
       default: () => 'id'
@@ -61710,10 +61633,22 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => 'medium'
     },
+    selectionWidth: {
+      type: String,
+      default: () => '50'
+    },
     sort: {
       type: Boolean,
       default: () => true
     },
+    sortTitle: {
+      type: String,
+      default: () => '#'
+    },
+    sortWidth: {
+      type: String,
+      default: () => '50'
+    },
     border: {
       type: Boolean,
       default: () => false
@@ -61722,6 +61657,10 @@ __webpack_require__.r(__webpack_exports__);
       type: Boolean,
       default: () => false
     },
+    loading: {
+      type: Boolean,
+      default: () => false
+    },
     column: {
       type: Array,
       default: () => []
@@ -61730,18 +61669,50 @@ __webpack_require__.r(__webpack_exports__);
       type: Object,
       default: () => ({})
     },
-    params: {
-      type: Object,
-      default: () => ({})
+    maxHeight: {
+      type: String,
+      default: () => '480'
+    },
+    elementLoadingText: {
+      type: String,
+      default: () => ''
+    },
+    elementLoadingSpinner: {
+      type: String,
+      default: () => 'el-icon-loading'
+    },
+    elementLoadingBackground: {
+      type: String,
+      default: () => 'rgba(0, 0, 0, 0.04)'
+    },
+    emptyText: {
+      type: String,
+      default: () => ''
+    },
+    showHeader: {
+      type: Boolean,
+      default: () => true
     },
     selection: {
       type: Boolean,
-      default: () => false
+      default: () => true
     },
     showOverflowTooltip: {
       type: Boolean,
       default: () => true
     },
+    tooltipEffect: {
+      type: String,
+      default: () => 'light'
+    },
+    showSummary: {
+      type: Boolean,
+      default: () => false
+    },
+    sumText: {
+      type: String,
+      default: () => '合计'
+    },
     sortable: {
       type: Boolean,
       default: () => false
@@ -61768,6 +61739,22 @@ __webpack_require__.r(__webpack_exports__);
         hasChildren: 'hasChildren'
       })
     },
+    highlightCurrentRow: {
+      type: Boolean,
+      default: () => false
+    },
+    action: {
+      type: Object,
+      default: () => ({
+        review: null,
+        modify: null,
+        update: null,
+        handle: null,
+        remove: null,
+        delete: null,
+        export: null
+      })
+    },
     actionWidth: {
       type: String,
       default: () => '180px'
@@ -61776,138 +61763,157 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => '操作'
     },
-    formatTime: {
-      type: Boolean,
-      default: () => true
-    },
-    preview: {
-      type: Boolean,
-      default: () => false
-    },
     page: {
       type: Boolean,
-      default: () => true
+      default: () => false
     }
   },
-  data() {
-    return {
-      loading: false
-    };
+  mounted() {
+    this.$refs['b-table'].bodyWrapper.addEventListener('wheel', this.scroll);
   },
-  created() {
-    this.search();
-    this.create();
+  beforeDestroy() {
+    this.$refs['b-table'].bodyWrapper.removeEventListener('wheel', this.scroll);
   },
-  mounted() {
-    this.$refs['b-table'].bodyWrapper.addEventListener('scroll', this.scroll);
+  destroyed() {
+    this.create = null;
+    this.search = null;
+    this.select = null;
+    this.choose = null;
+    this.change = null;
+    this.format = null;
+    this.scroll = null;
   },
   methods: {
-    create(column = []) {
+    create() {
       const h = this.$createElement;
-      if (this.formatTime && this.column.length > 0) {
-        for (let a in this.column) {
-          if (this.column[a].field && this.column[a].field.toLowerCase().includes('time')) {
-            this.column[a].render = item => item[this.column[a].field] != '' && this.filter(item[this.column[a].field]);
-          }
-        }
-      }
-      const actionColumn = () => {
-        let data = [];
-        const {
-          review,
-          modify,
-          update,
-          handle,
-          remove
-        } = this.$listeners;
-        if (review || modify || update || handle || remove || this.$listeners.delete || this.$listeners.export) {
-          data = [{
-            label: this.actionTitle,
-            fixed: 'right',
-            align: 'center',
-            width: this.actionWidth,
-            render: item => h("div", {
-              "class": "action"
-            }, [review && h("i", {
-              "class": "el-icon-view",
-              "on": {
-                "click": () => review(item)
-              }
-            }), modify && h("i", {
-              "class": "el-icon-edit",
-              "on": {
-                "click": () => modify(item)
-              }
-            }), update && h("i", {
-              "class": "el-icon-edit",
-              "on": {
-                "click": () => update(item)
-              }
-            }), handle && h("i", {
-              "class": "el-icon-edit",
-              "on": {
-                "click": () => handle(item)
-              }
-            }), remove && h("Apopconfirm", {
-              "on": {
-                "submit": () => remove(item)
-              }
-            }), this.$listeners.delete && h("Apopconfirm", {
-              "on": {
-                "submit": () => this.$listeners.delete(item)
-              }
-            }), this.$listeners.export && h("i", {
-              "class": "el-icon-download",
-              "on": {
-                "click": () => this.$listeners.export(item)
-              }
-            })])
-          }];
+      let column = [...this.column, this.suffix()];
+      return column.map((a, b) => {
+        if (a && Object.keys(a).length > 0) {
+          let {
+            type = null,
+            render = null,
+            header = null,
+            ...r
+          } = a;
+          let field = a.field || a.index || a.name || a.prop;
+          let label = a.label || a.title || a.text;
+          let props = {
+            key: b,
+            prop: field,
+            scopedSlot: field,
+            sortable: field ? a.sortable ? a.sortable : this.sortable : false,
+            formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
+            showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
+            ...r
+          };
+          return h("el-table-column", {
+            "props": {
+              ...props
+            }
+          }, [h("template", {
+            "slot": "header"
+          }, [header ? () => header(r) : label && label != '' && label.length && label.length > 8 ? h("el-tooltip", {
+            "attrs": {
+              "content": label,
+              "placement": "top"
+            }
+          }, [h("span", {
+            "attrs": {
+              "title": label
+            }
+          }, [label])]) : h("span", {
+            "attrs": {
+              "title": label
+            }
+          }, [label])])]);
         }
-        return data;
-      };
-      const columnConfig = [...column, ...actionColumn()];
-      return columnConfig.map((a, b) => {
-        if (a) return h("el-table-column", {
-          "key": b,
-          "attrs": {
-            "prop": a.field,
-            "showOverflowTooltip": this.showOverflowTooltip,
-            "sortable": a.field ? a.sortable ? a.sortable : this.sortable : false,
-            "formatter": a.formatter ? (e, f, g, h) => a.formatter(e, h) : a.render ? (e, f, g, h) => a.render(e, h) : a.type ? (e, f, g, h) => this.format(a, b, e, h) : null
-          },
-          "props": {
-            ...a
-          }
-        });
       });
     },
-    search() {
-      const {
-        pageParams,
-        formParams
-      } = this.$store.state;
-      const params = Object.assign({}, pageParams, formParams, this.params);
-      this.$emit('search', params);
+    suffix() {
+      const h = this.$createElement;
+      if (this.action.review || this.action.modify || this.action.update || this.action.handle || this.action.remove || this.action.delete || this.action.export || this.$listeners.review || this.$listeners.modify || this.$listeners.update || this.$listeners.handle || this.$listeners.remove || this.$listeners.delete || this.$listeners.export) {
+        return {
+          fixed: 'right',
+          align: 'center',
+          width: this.actionWidth,
+          label: this.actionTitle,
+          formatter: item => h("div", {
+            "class": "action"
+          }, [this.action.review && h("i", {
+            "class": "el-icon-view",
+            "on": {
+              "click": () => this.action.review(item)
+            }
+          }), this.action.modify && h("i", {
+            "class": "el-icon-edit",
+            "on": {
+              "click": () => this.action.modify(item)
+            }
+          }), this.action.update && h("i", {
+            "class": "el-icon-edit",
+            "on": {
+              "click": () => this.action.update(item)
+            }
+          }), this.action.handle && h("i", {
+            "class": "el-icon-edit",
+            "on": {
+              "click": () => this.action.handle(item)
+            }
+          }), this.action.remove && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
+            "on": {
+              "submit": () => this.action.remove(item)
+            }
+          }), this.action.delete && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
+            "on": {
+              "submit": () => this.action.delete(item)
+            }
+          }), this.action.export && h("i", {
+            "class": "el-icon-download",
+            "on": {
+              "click": () => this.action.export(item)
+            }
+          }), this.$listeners.review && h("i", {
+            "class": "el-icon-view",
+            "on": {
+              "click": () => this.$listeners.review(item)
+            }
+          }), this.$listeners.modify && h("i", {
+            "class": "el-icon-edit",
+            "on": {
+              "click": () => this.$listeners.modify(item)
+            }
+          }), this.$listeners.update && h("i", {
+            "class": "el-icon-edit",
+            "on": {
+              "click": () => this.$listeners.update(item)
+            }
+          }), this.$listeners.handle && h("i", {
+            "class": "el-icon-edit",
+            "on": {
+              "click": () => this.$listeners.handle(item)
+            }
+          }), this.$listeners.remove && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
+            "on": {
+              "submit": () => this.$listeners.remove(item)
+            }
+          }), this.$listeners.delete && h(_components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"], {
+            "on": {
+              "submit": () => this.$listeners.delete(item)
+            }
+          }), this.$listeners.export && h("i", {
+            "class": "el-icon-download",
+            "on": {
+              "click": () => this.$listeners.export(item)
+            }
+          })])
+        };
+      }
     },
-    filter(timeStamp) {
-      if (!typeof timeStamp == Number) return '';
-      let time = new Date(timeStamp);
-      const YYYY = time.getFullYear();
-      const MM = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
-      const DD = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
-      const H = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
-      const M = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
-      const S = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
-      return YYYY + '-' + MM + '-' + DD + ' ' + H + ':' + M + ':' + S;
+    search(params = {}) {
+      this.$emit('search', params);
     },
-    select(items) {
-      this.$store.commit('changeSelectedRows', items);
-      this.$store.commit('changeSelectedKeys', items.map(a => a[this.rowKey]));
-      this.$emit('select', {
-        rows: items,
-        keys: items.map(a => a[this.rowKey])
-      });
+    select(items = []) {
+      this.$emit('select', items);
     },
     choose(row, column, event) {
       this.$emit('choose', {
@@ -61920,47 +61926,27 @@ __webpack_require__.r(__webpack_exports__);
       page: 1,
       size: 10
     }) {
-      this.$store.commit('changePageParams', pages);
       this.$emit('change', pages);
       this.search(pages);
     },
-    switch(name = '', symbol = '_') {
-      return name.replace(/([A-Z])/g, `${symbol}$1`).toLowerCase();
-    },
     format({
-      label,
-      field,
-      type,
-      disabled,
-      action = '',
-      path = '',
-      flag = '',
+      type = '',
+      name = '',
+      data = [],
+      text = '',
+      label = '',
+      title = '',
+      field = '',
+      dicts = [],
       ...props
     }, colIndex, item, rowIndex) {
       const h = this.$createElement;
-      if (this.preview && (type != 'select' || type != 'enume' || type != 'enumerate')) return h("span", {
-        "key": colIndex + '-' + rowIndex
-      }, [item[field]]);
-      if (type == 'select' || type == 'enume' || type == 'enumerate') {
-        let dicts = [];
-        if (this.optionApi != '' || action != '' || path != '') {
-          let url = action != '' ? action : path != '' ? path : this.optionApi;
-          let params = flag != '' ? {
-            flag: this.switch(flag)
-          } : {
-            field: this.switch(field)
-          };
-          FN.get(url, params).then(({
-            data
-          }) => {
-            if (data && data.length > 0) dicts = data;
-          });
-        }
-        return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_1__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
+      if (type == 'enume' || type == 'enumerate') {
+        if (field != '') return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
           "key": colIndex + '-' + rowIndex,
           "attrs": {
-            "field": `${field}`,
-            "data": dicts
+            "field": field,
+            "data": dicts.length > 0 ? dicts : data
           }
         }, props, {
           "model": {
@@ -61970,47 +61956,68 @@ __webpack_require__.r(__webpack_exports__);
             }
           }
         }]));
+        return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
+          "key": colIndex + '-' + rowIndex,
+          "attrs": {
+            "field": name,
+            "data": dicts.length > 0 ? dicts : data
+          }
+        }, props, {
+          "model": {
+            value: item[name],
+            callback: $$v => {
+              this.$set(item, name, $$v);
+            }
+          }
+        }]));
       }
-      return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_2__["default"], {
+      return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_6__["default"], {
         "key": colIndex + '-' + rowIndex,
         "attrs": {
           "config": {
             type,
             form: item,
-            label,
-            field: `${field}`,
-            dicts,
-            table: true,
+            dicts: dicts.length > 0 ? dicts : data,
+            field: field != '' ? field : name != '' ? name : '',
+            label: text != '' ? text : label != '' ? label : title != '' ? title : '无栏目名称',
             ...props
           }
         }
       });
     },
-    scroll({
-      target
-    }) {
-      this.$emit('scroll', target);
+    scroll(a) {
+      let container = this.$refs['b-table'].bodyWrapper;
+      if (container) {
+        if (container.scrollHeight > container.clientHeight) {
+          a.preventDefault();
+          container.scrollTop += a.deltaY;
+        } else {
+          if (container.scrollWidth > container.clientWidth) {
+            a.preventDefault();
+            container.scrollLeft += a.deltaY;
+          }
+        }
+        this.$emit('scroll', a);
+      }
     }
   },
   render() {
     const h = arguments[0];
-    const {
-      data = [],
-      size = 0
-    } = this.record;
-    const {
-      pageParams
-    } = this.$store.state;
-    const condition = data && data.length > 0;
     const {
       ...props
     } = this.$attrs;
+    const {
+      ...r
+    } = this.record;
+    const data = r.data ? r.data : r.list ? r.list : r.rows ? r.rows : r.record ? r.record : r.records ? r.records : [];
+    const size = r.size ? r.size : r.total ? r.total : r.count ? r.count : 0;
+    const condition = data.length > 0;
     return h("div", {
-      "class": "b-table",
-      "directives": [{
-        name: "loading",
-        value: this.loading
-      }]
+      "style": {
+        padding: this.margin
+      }
+    }, [h("div", {
+      "class": this.border ? 'b-table' : 'b-table border'
     }, [h("el-table", {
       "ref": "b-table",
       "attrs": {
@@ -62018,12 +62025,23 @@ __webpack_require__.r(__webpack_exports__);
         "size": this.size,
         "border": this.border,
         "stripe": this.stripe,
-        "column": this.column,
         "row-key": this.rowKey,
+        "max-height": this.maxHeight,
+        "element-loading-text": this.elementLoadingText,
+        "element-loading-spinner": this.elementLoadingSpinner,
+        "element-loading-background": this.elementLoadingBackground,
+        "show-header": this.showHeader,
         "default-sort": this.defaultSort,
+        "show-summary": this.showSummary,
+        "tooltip-effect": this.tooltipEffect,
+        "default-expand-all": this.defaultExpandAll,
         "tree-props": this.tree ? this.treeProps : {},
-        "default-expand-all": this.defaultExpandAll
+        "highlight-current-row": this.highlightCurrentRow
       },
+      "directives": [{
+        name: "loading",
+        value: this.loading
+      }],
       "on": {
         "row-click": this.choose,
         "selection-change": this.select
@@ -62031,28 +62049,34 @@ __webpack_require__.r(__webpack_exports__);
       "props": {
         ...props
       }
-    }, [condition && this.selection && h("el-table-column", {
+    }, [condition && (this.selection || this.$listeners.select) && h("el-table-column", {
       "attrs": {
         "fixed": "left",
         "type": "selection",
-        "width": "50"
+        "width": this.selectionWidth
       }
     }), condition && this.sort && h("el-table-column", {
       "attrs": {
         "fixed": "left",
         "type": "index",
-        "width": "50",
-        "label": "#"
+        "width": this.sortWidth,
+        "label": this.sortTitle
       }
-    }), condition && this.create(this.column)]), !this.tree && this.page && condition && h(_components_Apages__WEBPACK_IMPORTED_MODULE_3__["default"], {
+    }), condition && this.create(), condition && this.$slots.default, h("div", {
+      "slot": "empty",
+      "class": "empty"
+    }, [!this.loading && h(_components_Aempty__WEBPACK_IMPORTED_MODULE_2__["default"], {
       "attrs": {
-        "total": Number(size),
-        "pages": pageParams
+        "description": this.emptyText
+      }
+    })])]), !this.tree && this.page && condition && h(_components_Apages__WEBPACK_IMPORTED_MODULE_7__["default"], {
+      "attrs": {
+        "total": Number(size)
       },
       "on": {
         "change": this.change
       }
-    })]);
+    })])]);
   }
 });
 
@@ -63872,7 +63896,7 @@ exports.quadraticProjectPoint = quadraticProjectPoint;
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7125891e-vue-loader-template"}!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--13-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--1-0!./node_modules/_vue-loader@15.10.1@vue-loader/lib??vue-loader-options!./src/components/Btree/index.vue?vue&type=template&id=8c6268f6&scoped=true&
+// CONCATENATED MODULE: ./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7125891e-vue-loader-template"}!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--13-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--1-0!./node_modules/_vue-loader@15.10.1@vue-loader/lib??vue-loader-options!./src/components/Btree/index.vue?vue&type=template&id=0981a61e&scoped=true&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -63884,9 +63908,23 @@ var render = function render() {
       expression: "loading"
     }],
     staticClass: "b-tree"
-  }, [_c('el-tree', {
+  }, [_vm.filter ? _c('el-input', {
+    staticClass: "filter",
+    attrs: {
+      "size": "small",
+      "placeholder": "输入关键字进行过滤"
+    },
+    model: {
+      value: _vm.context,
+      callback: function ($$v) {
+        _vm.context = $$v;
+      },
+      expression: "context"
+    }
+  }) : _vm._e(), _c('el-tree', {
     ref: "bTree",
     attrs: {
+      "accordion": _vm.accordion,
       "show-checkbox": _vm.showCheckbox,
       "check-strictly": _vm.checkStrictly,
       "node-key": _vm.nodeKey,
@@ -63922,7 +63960,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/Btree/index.vue?vue&type=template&id=8c6268f6&scoped=true&
+// CONCATENATED MODULE: ./src/components/Btree/index.vue?vue&type=template&id=0981a61e&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--13-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--1-0!./node_modules/_vue-loader@15.10.1@vue-loader/lib??vue-loader-options!./src/components/Btree/index.vue?vue&type=script&lang=js&
 /* harmony default export */ var Btreevue_type_script_lang_js_ = ({
@@ -63932,6 +63970,14 @@ var staticRenderFns = [];
       type: Boolean,
       default: () => false
     },
+    accordion: {
+      type: Boolean,
+      default: () => false
+    },
+    filter: {
+      type: Boolean,
+      default: () => true
+    },
     showCheckbox: {
       type: Boolean,
       default: () => true
@@ -63993,7 +64039,8 @@ var staticRenderFns = [];
       },
       halfCheckedKeys: [],
       checkedKeys: [],
-      selectedRow: {}
+      selectedRow: {},
+      context: ''
     };
   },
   watch: {
@@ -64002,6 +64049,9 @@ var staticRenderFns = [];
     },
     defaultCheckedKeys() {
       this.create();
+    },
+    context(value) {
+      this.$refs['bTree'].filter(value);
     }
   },
   mounted() {
@@ -64011,6 +64061,10 @@ var staticRenderFns = [];
     this.update();
   },
   methods: {
+    search(value, data) {
+      if (!value) return true;
+      return data[this.labelKey].indexOf(value) != -1;
+    },
     create() {
       this.checkedKeys = this.defaultCheckedKeys.filter(a => a != 0);
       this.$nextTick(() => {
@@ -64056,8 +64110,8 @@ var staticRenderFns = [];
 });
 // CONCATENATED MODULE: ./src/components/Btree/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_Btreevue_type_script_lang_js_ = (Btreevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/components/Btree/index.vue?vue&type=style&index=0&id=8c6268f6&prod&scoped=true&lang=css&
-var Btreevue_type_style_index_0_id_8c6268f6_prod_scoped_true_lang_css_ = __webpack_require__("f8b1");
+// EXTERNAL MODULE: ./src/components/Btree/index.vue?vue&type=style&index=0&id=0981a61e&prod&scoped=true&lang=css&
+var Btreevue_type_style_index_0_id_0981a61e_prod_scoped_true_lang_css_ = __webpack_require__("a749");
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__("e607");
@@ -64077,7 +64131,7 @@ var component = Object(componentNormalizer["a" /* default */])(
   staticRenderFns,
   false,
   null,
-  "8c6268f6",
+  "0981a61e",
   null
   
 )
@@ -127348,6 +127402,17 @@ function layout(gridModel, axisModel, opt) {
 
 exports.layout = layout;
 
+/***/ }),
+
+/***/ "a749":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_0981a61e_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("5bf5");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_0981a61e_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_0981a61e_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "a777":
@@ -132858,13 +132923,6 @@ exports.estimateLabelUnionRect = estimateLabelUnionRect;
 
 /***/ }),
 
-/***/ "b33c":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "b349":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -134236,7 +134294,7 @@ __webpack_require__.r(__webpack_exports__);
     dragstart(a) {
       if (this.draggable) {
         a.dataTransfer.setData(this.dragType, this.id);
-        this.$store.commit('changeDragId', this.id);
+        this.$store.commit('setDragId', this.id);
         this.$emit('dragstart', a);
       }
     },
@@ -136261,8 +136319,8 @@ __webpack_require__.r(__webpack_exports__);
       this.$emit('search', formatParams);
     },
     select(items = []) {
-      this.$store.commit('changeSelectedRows', items);
-      this.$store.commit('changeSelectedKeys', items.map(a => a[this.rowKey]));
+      this.$store.commit('setSelectedRows', items);
+      this.$store.commit('setSelectedKeys', items.map(a => a[this.rowKey]));
       this.$emit('select', {
         rows: items,
         keys: items.map(a => a[this.rowKey])
@@ -136279,7 +136337,7 @@ __webpack_require__.r(__webpack_exports__);
       page: 1,
       size: 10
     }) {
-      this.$store.commit('changePageParams', pages);
+      this.$store.commit('setPageParams', pages);
       this.$emit('change', pages);
       this.search(pages);
     },
@@ -147981,7 +148039,7 @@ module.exports = _default;
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7125891e-vue-loader-template"}!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--13-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--1-0!./node_modules/_vue-loader@15.10.1@vue-loader/lib??vue-loader-options!./src/components/Atree/index.vue?vue&type=template&id=ed84b344&scoped=true&
+// CONCATENATED MODULE: ./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7125891e-vue-loader-template"}!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--13-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--1-0!./node_modules/_vue-loader@15.10.1@vue-loader/lib??vue-loader-options!./src/components/Atree/index.vue?vue&type=template&id=446b4709&scoped=true&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -147993,9 +148051,23 @@ var render = function render() {
       expression: "loading"
     }],
     staticClass: "a-tree"
-  }, [_vm.horizontal ? _c('el-tree', {
+  }, [_vm.filter ? _c('el-input', {
+    staticClass: "filter",
+    attrs: {
+      "size": "small",
+      "placeholder": "输入关键字进行过滤"
+    },
+    model: {
+      value: _vm.context,
+      callback: function ($$v) {
+        _vm.context = $$v;
+      },
+      expression: "context"
+    }
+  }) : _vm._e(), _vm.horizontal ? _c('el-tree', {
     ref: "aTree",
     attrs: {
+      "accordion": _vm.accordion,
       "show-checkbox": _vm.showCheckbox,
       "check-strictly": _vm.checkStrictly,
       "iconClass": _vm.iconClass != '' ? _vm.iconClass : '',
@@ -148008,7 +148080,8 @@ var render = function render() {
       "check-on-click-node": _vm.checkOnClickNode,
       "auto-expand-parent": _vm.autoExpandParent,
       "default-expanded-keys": _vm.checkedKeys,
-      "draggable": _vm.draggable
+      "draggable": _vm.draggable,
+      "filter-node-method": _vm.search
     },
     on: {
       "node-click": _vm.nodeClick,
@@ -148019,6 +148092,7 @@ var render = function render() {
   }) : _c('el-tree', {
     ref: "aTree",
     attrs: {
+      "accordion": _vm.accordion,
       "show-checkbox": _vm.showCheckbox,
       "check-strictly": _vm.checkStrictly,
       "iconClass": _vm.iconClass != '' ? _vm.iconClass : '',
@@ -148030,7 +148104,8 @@ var render = function render() {
       "check-on-click-node": _vm.checkOnClickNode,
       "auto-expand-parent": _vm.autoExpandParent,
       "default-expanded-keys": _vm.checkedKeys,
-      "draggable": _vm.draggable
+      "draggable": _vm.draggable,
+      "filter-node-method": _vm.search
     },
     on: {
       "node-click": _vm.nodeClick,
@@ -148042,7 +148117,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/Atree/index.vue?vue&type=template&id=ed84b344&scoped=true&
+// CONCATENATED MODULE: ./src/components/Atree/index.vue?vue&type=template&id=446b4709&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--13-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib!./node_modules/_cache-loader@4.1.0@cache-loader/dist/cjs.js??ref--1-0!./node_modules/_vue-loader@15.10.1@vue-loader/lib??vue-loader-options!./src/components/Atree/index.vue?vue&type=script&lang=js&
 /* harmony default export */ var Atreevue_type_script_lang_js_ = ({
@@ -148052,6 +148127,14 @@ var staticRenderFns = [];
       type: Boolean,
       default: () => false
     },
+    accordion: {
+      type: Boolean,
+      default: () => false
+    },
+    filter: {
+      type: Boolean,
+      default: () => true
+    },
     showCheckbox: {
       type: Boolean,
       default: () => true
@@ -148121,7 +148204,8 @@ var staticRenderFns = [];
       },
       halfCheckedKeys: [],
       checkedKeys: [],
-      selectedRow: {}
+      selectedRow: {},
+      context: ''
     };
   },
   watch: {
@@ -148130,6 +148214,9 @@ var staticRenderFns = [];
     },
     defaultCheckedKeys() {
       this.create();
+    },
+    context(value) {
+      this.$refs['aTree'].filter(value);
     }
   },
   mounted() {
@@ -148139,6 +148226,10 @@ var staticRenderFns = [];
     this.update();
   },
   methods: {
+    search(value, data) {
+      if (!value) return true;
+      return data[this.labelKey].indexOf(value) != -1;
+    },
     format(h, {
       node,
       data,
@@ -148199,8 +148290,8 @@ var staticRenderFns = [];
 });
 // CONCATENATED MODULE: ./src/components/Atree/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_Atreevue_type_script_lang_js_ = (Atreevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/components/Atree/index.vue?vue&type=style&index=0&id=ed84b344&prod&scoped=true&lang=css&
-var Atreevue_type_style_index_0_id_ed84b344_prod_scoped_true_lang_css_ = __webpack_require__("0634");
+// EXTERNAL MODULE: ./src/components/Atree/index.vue?vue&type=style&index=0&id=446b4709&prod&scoped=true&lang=css&
+var Atreevue_type_style_index_0_id_446b4709_prod_scoped_true_lang_css_ = __webpack_require__("5934");
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__("e607");
@@ -148220,7 +148311,7 @@ var component = Object(componentNormalizer["a" /* default */])(
   staticRenderFns,
   false,
   null,
-  "ed84b344",
+  "446b4709",
   null
   
 )
@@ -159734,7 +159825,7 @@ __webpack_require__.r(__webpack_exports__);
             "attrs": {
               "type": type,
               "size": size,
-              "disabled": disabled || selectedKeys == 0
+              "disabled": disabled || selectedKeys.length == 0
             },
             "on": {
               "click": e => this.select(a, e)
@@ -159749,7 +159840,7 @@ __webpack_require__.r(__webpack_exports__);
             "attrs": {
               "type": "danger",
               "size": size,
-              "disabled": disabled || selectedKeys == 0
+              "disabled": disabled || selectedKeys.length == 0
             },
             "on": {
               "click": e => this.select(a, e)
@@ -159764,7 +159855,7 @@ __webpack_require__.r(__webpack_exports__);
             "attrs": {
               "type": "danger",
               "size": size,
-              "disabled": disabled || selectedKeys == 0
+              "disabled": disabled || selectedKeys.length == 0
             },
             "on": {
               "click": e => this.select(a, e)
@@ -159842,6 +159933,13 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
+/***/ "e95a":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "e9e0":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -162385,7 +162483,7 @@ __webpack_require__.r(__webpack_exports__);
     dragstart(a) {
       if (this.draggable) {
         a.dataTransfer.setData(this.dragType, this.id);
-        this.$store.commit('changeDragId', this.id);
+        this.$store.commit('setDragId', this.id);
         this.$emit('dragstart', a);
       }
     },
@@ -162428,7 +162526,7 @@ __webpack_require__.r(__webpack_exports__);
           this.animate(draging, dragPostion);
           this.animate(droping, dropPostion);
         }
-        this.$store.commit('changeDropId', this.id);
+        this.$store.commit('setDropId', this.id);
         this.$emit('drop', a);
       }
     },
@@ -165355,17 +165453,6 @@ Clip.prototype = {
 var _default = Clip;
 module.exports = _default;
 
-/***/ }),
-
-/***/ "f8b1":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_8c6268f6_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("731e");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_8c6268f6_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_0_9_0_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_3_6_0_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_15_10_1_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_3_0_0_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_4_1_0_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_15_10_1_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_8c6268f6_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "f8d0":
@@ -166994,7 +167081,7 @@ __webpack_require__.r(__webpack_exports__);
     },
     inline: {
       type: Boolean,
-      default: () => true
+      default: () => false
     },
     cols: {
       type: String,
@@ -167043,21 +167130,28 @@ __webpack_require__.r(__webpack_exports__);
   },
   data() {
     return {
-      form: {}
+      form: {},
+      height: 0,
+      opened: false
     };
   },
   created() {
     this.create();
   },
-  mounted() {},
+  mounted() {
+    this.update();
+  },
   destroyed() {
     this.create = null;
+    this.update = null;
     this.submit = null;
     this.cancel = null;
     this.filter = null;
     this.result = null;
+    this.switch = null;
     this.prompt = null;
     this.format = null;
+    this.output = null;
   },
   watch: {
     values() {
@@ -167074,43 +167168,35 @@ __webpack_require__.r(__webpack_exports__);
         this.form = data;
       }
     },
+    update() {
+      let rows = Math.ceil(Object.keys(this.config).length / this.cols);
+      this.height = this.$el.clientHeight * (rows - 1);
+    },
     submit(e) {
       // 提交表单
       e && e.preventDefault();
       let pass = !this.check; // 判断是否是空表单
-      for (let a in this.form) if (this.form[a].trim() != '') pass = true;
+      for (let a in this.form) if (this.form[a] != '') pass = true;
       let data = {};
       if (Object.keys(this.config).length > 0) {
         // 格式化属性为模糊查询属性
         for (let a in this.config) {
-          if (this.config[a] != '' && this.config[a].like && this.form[a].trim() != '' && this.form[a].trim() != null && this.form[a].trim() != undefined) {
-            if (this.config[a].like == 'left') data[a] = '%' + this.form[a].trim();
-            if (this.config[a].like == 'right') data[a] = this.form[a].trim() + '%';else data[a] = '%' + this.form[a].trim() + '%';
+          if (this.config[a] != '' && this.config[a].like && this.form[a] != '' && this.form[a] != null && this.form[a] != undefined) {
+            if (this.config[a].like == 'left') data[a] = '%' + this.form[a];
+            if (this.config[a].like == 'right') data[a] = this.form[a] + '%';else data[a] = '%' + this.form[a] + '%';
           } else {
             if (this.config[a] != '' && (this.config[a].than || this.config[a].range || this.config[a].scope)) {
-              data[`${a}LE`] = this.form[`${a}LE`].trim();
-              data[`${a}GE`] = this.form[`${a}GE`].trim();
-            } else if (this.form[a].trim().includes(' 00:00:00')) data[a] = '%' + this.form[a].trim().split(' 00:00:00')[0] + '%';else data[a] = this.form[a].trim();
+              data[`${a}LE`] = this.form[`${a}LE`];
+              data[`${a}GE`] = this.form[`${a}GE`];
+            } else if (this.form[a].includes(' 00:00:00')) data[a] = '%' + this.form[a].split(' 00:00:00')[0] + '%';else data[a] = this.form[a];
           }
         }
       }
       if (pass) {
         let result = this.filter(data);
-        const {
-          formParams,
-          pageParams
-        } = this.$store.state;
-        this.$store.commit('changeFormParams', result); // 添加查询参数
-        this.$store.commit('changePageParams', {
-          ...pageParams,
-          page: 1
-        }); // 重置分页参数
         this.$nextTick(() => {
-          let change = false;
-          Object.keys(result).forEach(a => result[a] != formParams[a] && (change = true));
-          if (change) this.$emit('submit', {
+          this.$emit('submit', {
             ...result,
-            ...pageParams,
             page: 1
           }); // 派发事件并重置当前分页
           return result;
@@ -167123,15 +167209,6 @@ __webpack_require__.r(__webpack_exports__);
       let pass = !this.check; // 判断是否是空表单
       for (let a in this.form) if (this.form[a] != '') pass = true;
       if (pass) {
-        const {
-          pageParams
-        } = this.$store.state;
-        this.$store.commit('changePageParams', {
-          ...pageParams,
-          page: 1,
-          size: 10
-        }); // 重置分页参数
-        this.$store.commit('changeFormParams', {}); // 重置查询参数
         this.$nextTick(() => {
           for (let a in this.form) this.form[a] = '';
           this.$nextTick(() => this.$emit('cancel', this.form));
@@ -167139,19 +167216,18 @@ __webpack_require__.r(__webpack_exports__);
       }
     },
     filter(form = {}) {
-      // 过滤空值属性
       const data = {};
       for (let a in form) {
-        if (a != undefined && a != 'undefined' && form[a] != '' && form[a] != '%%' && form[a] != 'null' && form[a] != 'undefined' && form[a] != null && form[a] != undefined) {
-          data[a] = form[a];
-        }
+        if (form[a] != '' && form[a] != '%%' && form[a] != 'null' && form[a] != 'undefined' && form[a] != null && form[a] != undefined) data[a] = form[a];
       }
       return data;
     },
     result() {
-      // 返回验证后的表单数据
       return this.filter(this.form);
     },
+    switch() {
+      this.opened = !this.opened;
+    },
     prompt(a = {}, index = 0, placeholder = '') {
       if (Object.keys(a).length > 0 && a.placeholder && a.placeholder.length && a.placeholder.length > 0) return a.placeholder[index];
       return placeholder;
@@ -167180,6 +167256,31 @@ __webpack_require__.r(__webpack_exports__);
           }
         });
       }
+    },
+    output(a, b) {
+      const h = this.$createElement;
+      let style = this.cols != '' ? {
+        width: `${100 / this.cols}%`
+      } : {};
+      return h("el-col", {
+        "key": b,
+        "style": style
+      }, [h("el-form-item", {
+        "attrs": {
+          "prop": `${a}`,
+          "label": this.label ? this.config[a]['text'] : ''
+        }
+      }, [this.config[a].than || this.config[a].range || this.config[a].scope ? h("el-col", {
+        "class": "range-cols"
+      }, [h("el-col", {
+        "attrs": {
+          "span": 12
+        }
+      }, [this.format(a, `${a}LE`, this.prompt(this.config[a], 0, '最高'))]), h("el-col", {
+        "attrs": {
+          "span": 12
+        }
+      }, [this.format(a, `${a}GE`, this.prompt(this.config[a], 1, '最低'))])]) : this.format(a)])]);
     }
   },
   render() {
@@ -167191,10 +167292,6 @@ __webpack_require__.r(__webpack_exports__);
       submit = null,
       cancel = null
     } = this.$listeners;
-    let style = this.cols != '' ? {
-      width: `${100 / this.cols}%`
-    } : {};
-    let label = a => this.label ? this.config[a].text || this.config[a].label || this.config[a].title : '';
     return h("div", {
       "class": "b-f-search",
       "style": {
@@ -167203,7 +167300,8 @@ __webpack_require__.r(__webpack_exports__);
     }, [h("el-form", _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
       "ref": "form",
       "attrs": {
-        "size": this.size
+        "size": this.size,
+        "inline": this.inline
       }
     }, {
       "props": {
@@ -167215,38 +167313,42 @@ __webpack_require__.r(__webpack_exports__);
         "labelWidth": this.labelWidth,
         "labelPosition": this.labelPosition
       }
-    }]), [h("el-row", {
+    }]), [h("div", {
+      "class": "column"
+    }, [h("el-row", {
       "attrs": {
         "gutter": Number(this.gutter)
-      }
-    }, [Object.keys(this.config).map((a, b) => h("el-col", {
-      "key": b,
-      "class": "column",
-      "style": style
-    }, [h("el-form-item", {
+      },
+      "class": "main-row"
+    }, [Object.keys(this.config).map((a, b) => b < this.cols && this.output(a, b))]), h("el-row", {
       "attrs": {
-        "prop": `${a}`,
-        "label": label(a)
+        "gutter": Number(this.gutter)
+      },
+      "class": "fold-row",
+      "style": {
+        height: this.opened ? `${this.height}px` : '0'
       }
-    }, [this.config[a].than || this.config[a].range || this.config[a].scope ? h("el-col", {
-      "class": "range-cols"
-    }, [h("el-col", {
-      "attrs": {
-        "span": 12
+    }, [Object.keys(this.config).map((a, b) => b > this.cols - 1 && this.output(a, b))])]), (Object.keys(this.config).length > this.cols || submit || cancel) && h("div", {
+      "class": "action",
+      "style": {
+        paddingLeft: `${this.gutter}px`
       }
-    }, [this.format(a, `${a}LE`, this.prompt(this.config[a], 0, '最高'))]), h("el-col", {
+    }, [h("el-form-item", {
       "attrs": {
-        "span": 12
+        "label": "action"
       }
-    }, [this.format(a, `${a}GE`, this.prompt(this.config[a], 1, '最低'))])]) : this.format(a)])])), this.$slots.default, (submit || cancel) && h("el-col", {
-      "key": "action",
-      "class": "action",
-      "style": style
-    }, [h("el-form-item", {
+    }, [Object.keys(this.config).length > this.cols && h("el-button", {
       "attrs": {
-        "label": this.label ? 'action' : ''
+        "disabled": this.loading,
+        "type": "text"
+      },
+      "class": "collapse-button",
+      "on": {
+        "click": this.switch
       }
-    }, [submit && h("el-button", {
+    }, [h("i", {
+      "class": `el-icon-arrow-${this.opened ? 'up' : 'down'}`
+    }), this.opened ? '收起' : '展开']), submit && h("el-button", {
       "attrs": {
         "disabled": this.loading,
         "type": "primary"
@@ -167262,7 +167364,7 @@ __webpack_require__.r(__webpack_exports__);
       "on": {
         "click": this.cancel
       }
-    }, [this.cancelText])])])])])]);
+    }, [this.cancelText])])])])]);
   }
 });