@panpanzhao/component-ui 0.0.18 → 0.0.20

package/lib/component-ui.common.js

@@ -179,79 +179,79 @@ module.exports = require("@panpanzhao/component-ui/lib/components/table-search")
 /* 15 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/radio");
+module.exports = require("element-ui/lib/form");
 
 /***/ }),
 /* 16 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/table");
+module.exports = require("element-ui/lib/row");
 
 /***/ }),
 /* 17 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/message-box");
+module.exports = require("element-ui/lib/col");
 
 /***/ }),
 /* 18 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/src/utils/popup");
+module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
 
 /***/ }),
 /* 19 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/src/mixins/emitter");
+module.exports = require("element-ui/lib/radio");
 
 /***/ }),
 /* 20 */
 /***/ (function(module, exports) {
 
-module.exports = require("codemirror");
+module.exports = require("element-ui/lib/table");
 
 /***/ }),
 /* 21 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/drawer");
+module.exports = require("element-ui/lib/message-box");
 
 /***/ }),
 /* 22 */
 /***/ (function(module, exports) {
 
-module.exports = require("dayjs");
+module.exports = require("element-ui/src/utils/popup");
 
 /***/ }),
 /* 23 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/link");
+module.exports = require("element-ui/src/mixins/emitter");
 
 /***/ }),
 /* 24 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/form");
+module.exports = require("codemirror");
 
 /***/ }),
 /* 25 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/row");
+module.exports = require("@panpanzhao/component-ui/lib/components/drawer");
 
 /***/ }),
 /* 26 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/col");
+module.exports = require("dayjs");
 
 /***/ }),
 /* 27 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
+module.exports = require("element-ui/lib/link");
 
 /***/ }),
 /* 28 */
@@ -395,7 +395,7 @@ module.exports = require("element-ui/lib/dropdown-menu");
 /* 51 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/form");
+module.exports = require("@panpanzhao/component-ui/lib/components/form-query");
 
 /***/ }),
 /* 52 */
@@ -555,19 +555,19 @@ formvue_type_template_id_1aadb63c_render._withStripped = true
 // CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
-var form_ = __webpack_require__(24);
+var form_ = __webpack_require__(15);
 var form_default = /*#__PURE__*/__webpack_require__.n(form_);
 
 // EXTERNAL MODULE: external "element-ui/lib/row"
-var row_ = __webpack_require__(25);
+var row_ = __webpack_require__(16);
 var row_default = /*#__PURE__*/__webpack_require__.n(row_);
 
 // EXTERNAL MODULE: external "element-ui/lib/col"
-var col_ = __webpack_require__(26);
+var col_ = __webpack_require__(17);
 var col_default = /*#__PURE__*/__webpack_require__.n(col_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
-var form_item_ = __webpack_require__(27);
+var form_item_ = __webpack_require__(18);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -878,8 +878,8 @@ src_form.install = function (Vue) {
 var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
 var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Input.vue?vue&type=template&id=24c10975&
-var Inputvue_type_template_id_24c10975_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Input.vue?vue&type=template&id=74fa485e&
+var Inputvue_type_template_id_74fa485e_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -930,11 +930,11 @@ var Inputvue_type_template_id_24c10975_render = function render() {
     )
   )
 }
-var Inputvue_type_template_id_24c10975_staticRenderFns = []
-Inputvue_type_template_id_24c10975_render._withStripped = true
+var Inputvue_type_template_id_74fa485e_staticRenderFns = []
+Inputvue_type_template_id_74fa485e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/item/Input.vue?vue&type=template&id=24c10975&
+// CONCATENATED MODULE: ./src/components/form/src/item/Input.vue?vue&type=template&id=74fa485e&
 
 // EXTERNAL MODULE: external "element-ui/lib/input"
 var input_ = __webpack_require__(6);
@@ -950,7 +950,11 @@ var input_default = /*#__PURE__*/__webpack_require__.n(input_);
   props: {},
   computed: {
     attrs: function attrs() {
-      return Object.assign({}, this.$attrs);
+      return Object.assign({
+        clearable: true,
+        placeholder: "请输入",
+        maxlength: 30
+      }, this.$attrs);
     }
   }
 });
@@ -966,8 +970,8 @@ var input_default = /*#__PURE__*/__webpack_require__.n(input_);
 
 var Input_component = normalizeComponent(
   item_Inputvue_type_script_lang_js_,
-  Inputvue_type_template_id_24c10975_render,
-  Inputvue_type_template_id_24c10975_staticRenderFns,
+  Inputvue_type_template_id_74fa485e_render,
+  Inputvue_type_template_id_74fa485e_staticRenderFns,
   false,
   null,
   null,
@@ -976,8 +980,8 @@ var Input_component = normalizeComponent(
 )
 
 /* harmony default export */ var Input = (Input_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/InputNumber.vue?vue&type=template&id=7a2f5f6e&
-var InputNumbervue_type_template_id_7a2f5f6e_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/InputNumber.vue?vue&type=template&id=6c463d52&
+var InputNumbervue_type_template_id_6c463d52_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -1028,11 +1032,11 @@ var InputNumbervue_type_template_id_7a2f5f6e_render = function render() {
     )
   )
 }
-var InputNumbervue_type_template_id_7a2f5f6e_staticRenderFns = []
-InputNumbervue_type_template_id_7a2f5f6e_render._withStripped = true
+var InputNumbervue_type_template_id_6c463d52_staticRenderFns = []
+InputNumbervue_type_template_id_6c463d52_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/item/InputNumber.vue?vue&type=template&id=7a2f5f6e&
+// CONCATENATED MODULE: ./src/components/form/src/item/InputNumber.vue?vue&type=template&id=6c463d52&
 
 // EXTERNAL MODULE: external "element-ui/lib/input-number"
 var input_number_ = __webpack_require__(28);
@@ -1048,7 +1052,10 @@ var input_number_default = /*#__PURE__*/__webpack_require__.n(input_number_);
   props: {},
   computed: {
     attrs: function attrs() {
-      return Object.assign({}, this.$attrs);
+      return Object.assign({
+        clearable: true,
+        placeholder: "请输入"
+      }, this.$attrs);
     }
   }
 });
@@ -1064,8 +1071,8 @@ var input_number_default = /*#__PURE__*/__webpack_require__.n(input_number_);
 
 var InputNumber_component = normalizeComponent(
   item_InputNumbervue_type_script_lang_js_,
-  InputNumbervue_type_template_id_7a2f5f6e_render,
-  InputNumbervue_type_template_id_7a2f5f6e_staticRenderFns,
+  InputNumbervue_type_template_id_6c463d52_render,
+  InputNumbervue_type_template_id_6c463d52_staticRenderFns,
   false,
   null,
   null,
@@ -1478,7 +1485,10 @@ var SelectTree_component = normalizeComponent(
   },
   computed: {
     attrs: function attrs() {
-      return Object.assign({}, this.$attrs);
+      return Object.assign({
+        clearable: true,
+        placeholder: "请选择"
+      }, this.$attrs);
     },
     dictOption: function dictOption() {
       if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
@@ -1665,7 +1675,7 @@ var radio_group_ = __webpack_require__(32);
 var radio_group_default = /*#__PURE__*/__webpack_require__.n(radio_group_);
 
 // EXTERNAL MODULE: external "element-ui/lib/radio"
-var radio_ = __webpack_require__(15);
+var radio_ = __webpack_require__(19);
 var radio_default = /*#__PURE__*/__webpack_require__.n(radio_);
 
 // EXTERNAL MODULE: external "element-ui/lib/radio-button"
@@ -2327,6 +2337,7 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
     inlineMessage: Boolean,
     size: String,
     rules: [Object, Array],
+    required: Boolean,
     actions: Array,
     on: Object,
     config: Object,
@@ -2436,7 +2447,7 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       } else if (typeof itemEvent.target === "string") {
         targetConfig[itemEvent.target] = this.form.formItemLayout[itemEvent.target];
       }
-      (_itemEvent$exec = itemEvent.exec).call.apply(_itemEvent$exec, [this, {
+      itemEvent.exec && (_itemEvent$exec = itemEvent.exec).call.apply(_itemEvent$exec, [this, {
         trigger: this.form,
         triggerForm: this.form.formModel,
         triggerConfig: this.form.formItemLayout[this.prop],
@@ -2491,6 +2502,7 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       "attrs": {
         "label": this.label,
         "prop": this.prop,
+        "required": this.required,
         "rules": this._rules,
         "labelWidth": this.labelWidth,
         "size": this.size
@@ -2505,6 +2517,359 @@ form_item.install = function (Vue) {
   Vue.component(form_item.name, form_item);
 };
 /* harmony default export */ var components_form_item = (form_item);
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-query/src/form.vue?vue&type=script&lang=js&
+
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+
+
+
+
+/* harmony default export */ var form_query_src_formvue_type_script_lang_js_ = ({
+  name: "FormQuery",
+  componentName: "FormQuery",
+  components: {
+    elForm: form_default.a,
+    FormItem: form_item_default.a,
+    elRow: row_default.a,
+    elCol: col_default.a
+  },
+  provide: function provide() {
+    return {
+      form: this
+    };
+  },
+  props: {
+    defaultCollapsed: {
+      type: Boolean,
+      default: true
+    },
+    defaultColsNumber: Number,
+    //默认展示数
+    span: {
+      //每列占用行
+      Number: Number,
+      default: 8
+    },
+    submitterSpan: Number,
+    gutter: {
+      type: Number,
+      default: 24
+    },
+    showHiddenNum: Boolean,
+    //是否显示隐藏数量
+    isFull: {
+      type: Boolean,
+      default: true
+    },
+    actions: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
+    formItems: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
+    formModel: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    }
+  },
+  computed: {
+    formProps: function formProps() {
+      return Object.assign({}, this.$attrs, {
+        model: this.formModel
+      });
+    },
+    actionItem: function actionItem() {
+      var relItem = {};
+      this.actions.forEach(function (item) {
+        if (!relItem[item.trigger]) {
+          relItem[item.trigger] = [];
+        }
+        relItem[item.trigger].push(item);
+      });
+      return relItem;
+    }
+  },
+  data: function data() {
+    return {
+      pageData: {
+        searchLoading: false
+      },
+      collapsed: true,
+      defaultModel: {},
+      //默认值存储
+      formItemLayout: {}
+    };
+  },
+  created: function created() {
+    var _this = this;
+    this.collapsed = this.defaultCollapsed;
+    this.formItems.forEach(function (item) {
+      _this.formItemLayout[item.prop] = item;
+      if (typeof item.value === "function") {
+        item.value = item.value.call(_this);
+      }
+      _this.defaultModel[item.prop] = item.value;
+      //初始化值处理
+      var formVal = Object(external_lodash_["get"])(_this.formModel, item.prop);
+      if (typeof formVal === 'undefined') {
+        //初始化数据值
+        if (item.prop && item.prop.indexOf(".") != -1) {
+          //循环设置值
+          var keyArr = item.prop.split('.');
+          var tempObj = _this.formModel;
+          keyArr.forEach(function (key, index) {
+            if (index < keyArr.length - 1) {
+              if (typeof tempObj[key] === 'undefined') {
+                _this.$set(tempObj, key, {});
+              }
+              tempObj = tempObj[key];
+            } else {
+              _this.$set(tempObj, key, item.value || null);
+            }
+          });
+        } else {
+          _this.$set(_this.formModel, item.prop, item.value || null);
+        }
+      } else {
+        item.value = formVal;
+      }
+    });
+  },
+  methods: {
+    validate: function validate(callback) {
+      return this.$refs.form.validate(callback);
+    },
+    validateField: function validateField(props, callback) {
+      return this.$refs.form.validateField(props, callback);
+    },
+    reset: function reset() {
+      this.resetFields();
+    },
+    resetFields: function resetFields() {
+      for (var key in this.defaultModel) {
+        if (this.formItemLayout[key]) {
+          this.formItemLayout[key].value = this.defaultModel[key];
+          this.formModel[key] = this.defaultModel[key];
+        }
+      }
+      this.$refs.form.resetFields();
+    },
+    clearValidate: function clearValidate(props) {
+      return this.$refs.form.clearValidate(props);
+    },
+    searchSubmit: function searchSubmit() {
+      this.$emit("query", this.formModel, {
+        loading: this.pageData.searchLoading
+      });
+    },
+    resetForm: function resetForm() {
+      this.reset();
+    },
+    setCollapsed: function setCollapsed() {
+      this.collapsed = !this.collapsed;
+    },
+    needCollapseRender: function needCollapseRender(totalSize, showLength, totalSpan) {
+      if (totalSpan < 24 || totalSize <= showLength) {
+        return false;
+      }
+      return true;
+    },
+    offset: function offset(currentSpan) {
+      var offsetSpan = currentSpan % 24 + (this.submitterSpan || this.span);
+      if (offsetSpan > 24) {
+        return 24 - (this.submitterSpan || this.span);
+      }
+      return 24 - offsetSpan;
+    },
+    renderSubmitter: function renderSubmitter(hiddenNum, needCollapseRender) {
+      if (typeof this.$scopedSlots.submitter === "function") {
+        return this.$scopedSlots.submitter.call(this, {
+          formModel: this.formModel,
+          collapsed: this.collapsed,
+          setCollapsed: this.setCollapsed,
+          hiddenNum: hiddenNum,
+          needCollapseRender: needCollapseRender
+        });
+      }
+      return this.$slots.submitter;
+    },
+    renderQueryContent: function renderQueryContent(h, data) {
+      var _this2 = this;
+      var showLength = data.showLength;
+      // totalSpan 统计控件占的位置，计算 offset 保证查询按钮在最后一列
+      var totalSpan = 0;
+      // totalSize 统计控件占的份数
+      var totalSize = 0;
+      //首个表单项是否占满第一行
+      var firstRowFull = false;
+      var itemLength = 0;
+
+      // 处理过，包含是否需要隐藏的 数组
+      var processedList = this.formItems.map(function (item, index) {
+        // 如果 formItem 自己配置了 hidden，默认使用它自己的
+        var colSize = item.colSize ? item.colSize : 1;
+        var colSpan = item.span || Math.min(_this2.span * (colSize || 1), 24);
+        // 计算总的 totalSpan 长度
+        totalSpan += colSpan;
+        // 计算总的 colSize 长度
+        totalSize += colSize;
+        if (index === 0) {
+          firstRowFull == colSpan === 24 && !item.hidden;
+        }
+        var hidden = item.hidden ||
+        // 如果收起了
+        _this2.collapsed && (firstRowFull ||
+        // 如果 超过显示长度 且 总长度超过了 24
+        totalSize > showLength) && !!index && totalSpan >= 24;
+        itemLength += 1;
+        return {
+          itemDom: item,
+          hidden: hidden,
+          colSpan: colSpan
+        };
+      });
+      // for split compute
+      var currentSpan = 0;
+      var doms = processedList.map(function (itemProps, index) {
+        var itemDom = itemProps.itemDom,
+          colSpan = itemProps.colSpan,
+          hidden = itemProps.hidden;
+        var isHidden = itemDom.hidden || hidden;
+        if (isHidden) return null;
+
+        // 每一列的key, 一般是存在的
+        var itemKey = itemDom.key || itemDom.prop || index;
+        if (24 - currentSpan % 24 < colSpan) {
+          // 如果当前行空余位置放不下，那么折行
+          totalSpan += 24 - currentSpan % 24;
+          currentSpan += 24 - currentSpan % 24;
+        }
+        currentSpan += colSpan;
+        var itemProp = {
+          attrs: Object.assign(_extends({}, itemDom), {
+            config: itemDom,
+            value: _this2.formModel[itemDom.prop],
+            actions: _this2.actionItem[itemDom.prop]
+          }),
+          on: Object.assign(_extends({}, itemDom.on))
+        };
+        return h("el-col", {
+          "key": itemKey,
+          "attrs": {
+            "span": colSpan
+          }
+        }, [h("form-item", babel_helper_vue_jsx_merge_props_default()([{}, itemProp]))]);
+      });
+      var hiddenNum = this.showHiddenNum && processedList.filter(function (item) {
+        return item.hidden;
+      }).length;
+      /** 是否需要展示 collapseRender */
+      var needCollapseRender = this.needCollapseRender(totalSize, showLength, totalSpan);
+      var offset = this.offset(currentSpan);
+      return h("el-row", {
+        "attrs": {
+          "gutter": this.gutter
+        }
+      }, [doms, h("el-col", {
+        "key": "submitter",
+        "attrs": {
+          "span": this.submitterSpan || this.span,
+          "offset": offset
+        },
+        "style": {
+          textAlign: 'end'
+        }
+      }, [this.renderSubmitter(hiddenNum, needCollapseRender) || h("div", {
+        "class": "query-button"
+      }, [h("el-button", {
+        "attrs": {
+          "icon": "el-icon-refresh-left"
+        },
+        "on": {
+          "click": this.resetForm
+        }
+      }, ["\u91CD\u7F6E"]), h("el-button", {
+        "attrs": {
+          "loading": this.pageData.searchLoading,
+          "type": "primary",
+          "icon": "el-icon-search"
+        },
+        "on": {
+          "click": this.searchSubmit
+        }
+      }, ["\u67E5\u8BE2"]), needCollapseRender ? h("el-link", {
+        "attrs": {
+          "type": "primary"
+        },
+        "on": {
+          "click": this.setCollapsed
+        }
+      }, [h("span", {
+        "class": "collapse"
+      }, [this.collapsed ? "\u5C55\u5F00" + (hiddenNum ? "(" + hiddenNum + ")" : '') : "收起"]), h("i", {
+        "class": this.collapsed ? "el-icon-arrow-down" : "el-icon-arrow-up"
+      })]) : null])])]);
+    }
+  },
+  render: function render(h) {
+    // 查询重置按钮也会占一个格子，需要减掉计算
+    var showLength = this.defaultColsNumber ? this.defaultColsNumber : null; //展示数量
+    if (!showLength) {
+      showLength = Math.max(1, 24 / this.span - 1);
+    }
+    var formProp = {
+      attrs: Object.assign({}, this.formProps),
+      on: Object.assign({}, this.$listeners)
+    };
+    return h("div", {
+      "class": ['form form-query', {
+        'is-full': this.isFull
+      }]
+    }, [h("el-form", babel_helper_vue_jsx_merge_props_default()([{
+      "ref": "form"
+    }, formProp]), [this.renderQueryContent(h, {
+      showLength: showLength
+    })])]);
+  }
+});
+// CONCATENATED MODULE: ./src/components/form-query/src/form.vue?vue&type=script&lang=js&
+ /* harmony default export */ var components_form_query_src_formvue_type_script_lang_js_ = (form_query_src_formvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/form-query/src/form.vue
+var form_render, form_staticRenderFns
+
+
+
+
+/* normalize component */
+
+var form_component = normalizeComponent(
+  components_form_query_src_formvue_type_script_lang_js_,
+  form_render,
+  form_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var form_query_src_form = (form_component.exports);
+// CONCATENATED MODULE: ./src/components/form-query/index.js
+
+form_query_src_form.install = function (Vue) {
+  Vue.component(form_query_src_form.name, form_query_src_form);
+};
+/* harmony default export */ var form_query = (form_query_src_form);
 // CONCATENATED MODULE: ./src/components/form-group/src/content.js
 
 
@@ -3166,7 +3531,7 @@ form_dialog_src.install = function (Vue) {
 };
 /* harmony default export */ var form_dialog = (form_dialog_src);
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/drawer"
-var drawer_ = __webpack_require__(21);
+var drawer_ = __webpack_require__(25);
 var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-drawer/src/index.vue?vue&type=script&lang=js&
@@ -4066,8 +4431,8 @@ form_view_dialog_src.install = function (Vue) {
   Vue.component(form_view_dialog_src.name, form_view_dialog_src);
 };
 /* harmony default export */ var form_view_dialog = (form_view_dialog_src);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/table.vue?vue&type=template&id=0a336d65&
-var tablevue_type_template_id_0a336d65_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/table.vue?vue&type=template&id=36fba632&
+var tablevue_type_template_id_36fba632_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table" }, [
@@ -4145,14 +4510,14 @@ var tablevue_type_template_id_0a336d65_render = function render() {
       : _vm._e(),
   ])
 }
-var tablevue_type_template_id_0a336d65_staticRenderFns = []
-tablevue_type_template_id_0a336d65_render._withStripped = true
+var tablevue_type_template_id_36fba632_staticRenderFns = []
+tablevue_type_template_id_36fba632_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=0a336d65&
+// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=36fba632&
 
 // EXTERNAL MODULE: external "element-ui/lib/table"
-var table_ = __webpack_require__(16);
+var table_ = __webpack_require__(20);
 var table_default = /*#__PURE__*/__webpack_require__.n(table_);
 
 // EXTERNAL MODULE: external "element-ui/lib/table-column"
@@ -4411,6 +4776,11 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
       });
     }
   },
+  created: function created() {
+    if (this.pagination && this.pagination.pageSize) {
+      this.pageSize = this.pagination.pageSize;
+    }
+  },
   mounted: function mounted() {
     if (this.hasInit) {
       this.reset();
@@ -4482,8 +4852,8 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
 
 var table_component = normalizeComponent(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_0a336d65_render,
-  tablevue_type_template_id_0a336d65_staticRenderFns,
+  tablevue_type_template_id_36fba632_render,
+  tablevue_type_template_id_36fba632_staticRenderFns,
   false,
   null,
   null,
@@ -4747,7 +5117,7 @@ datevue_type_template_id_44c029a9_render._withStripped = true
 // CONCATENATED MODULE: ./src/components/table/src/column/date.vue?vue&type=template&id=44c029a9&
 
 // EXTERNAL MODULE: external "dayjs"
-var external_dayjs_ = __webpack_require__(22);
+var external_dayjs_ = __webpack_require__(26);
 var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/date.vue?vue&type=script&lang=js&
@@ -4953,7 +5323,7 @@ var dropdown_menu_ = __webpack_require__(50);
 var dropdown_menu_default = /*#__PURE__*/__webpack_require__.n(dropdown_menu_);
 
 // EXTERNAL MODULE: external "element-ui/lib/link"
-var link_ = __webpack_require__(23);
+var link_ = __webpack_require__(27);
 var link_default = /*#__PURE__*/__webpack_require__.n(link_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/index"
@@ -5227,7 +5597,7 @@ var operate_component = normalizeComponent(
 
 /* harmony default export */ var operate = (operate_component.exports);
 // CONCATENATED MODULE: ./src/components/table/src/table-column.js
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function table_column_extends() { table_column_extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return table_column_extends.apply(this, arguments); }
 
 
 
@@ -5286,7 +5656,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
         _loop(key);
       }
     }
-    return h(this.control, _extends({}, param));
+    return h(this.control, table_column_extends({}, param));
   }
 });
 // CONCATENATED MODULE: ./src/components/table-column/index.js
@@ -5296,51 +5666,109 @@ table_column.install = function (Vue) {
   Vue.component(table_column.name, table_column);
 };
 /* harmony default export */ var components_table_column = (table_column);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-search/src/index.vue?vue&type=template&id=36222536&
-var srcvue_type_template_id_36222536_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-search/src/index.vue?vue&type=template&id=122add3a&
+var srcvue_type_template_id_122add3a_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table-search" }, [
-    _vm.search
+    _vm.search && _vm.search.form
       ? _c(
           "div",
           [
-            _c("Form", _vm._b({ ref: "form" }, "Form", _vm.formProps, false)),
-            _vm._t("tools", function () {
-              return [
-                _vm.search.form
-                  ? _c(
-                      "div",
-                      { staticClass: "table-search_tools" },
-                      [
-                        _c(
-                          "el-button",
-                          {
-                            attrs: {
-                              loading: _vm.pageData.searchLoading,
-                              type: "primary",
-                              icon: "el-icon-search",
-                            },
-                            on: { click: _vm.searchSubmit },
-                          },
-                          [_vm._v("\n          查询\n        ")]
-                        ),
-                        _c(
-                          "el-button",
-                          {
-                            attrs: { icon: "el-icon-refresh-left" },
-                            on: { click: _vm.resetForm },
-                          },
-                          [_vm._v("重置")]
-                        ),
-                      ],
-                      1
-                    )
-                  : _vm._e(),
-              ]
-            }),
+            _c(
+              "FormQuery",
+              _vm._b(
+                {
+                  ref: "form",
+                  scopedSlots: _vm._u(
+                    [
+                      {
+                        key: "submitter",
+                        fn: function ({
+                          needCollapseRender,
+                          hiddenNum,
+                          collapsed,
+                          setCollapsed,
+                        }) {
+                          return [
+                            _c(
+                              "div",
+                              { staticClass: "query-button" },
+                              [
+                                _c(
+                                  "el-button",
+                                  {
+                                    attrs: { icon: "el-icon-refresh-left" },
+                                    on: { click: _vm.resetForm },
+                                  },
+                                  [_vm._v("重置")]
+                                ),
+                                _c(
+                                  "el-button",
+                                  {
+                                    attrs: {
+                                      loading: _vm.pageData.searchLoading,
+                                      type: "primary",
+                                      icon: "el-icon-search",
+                                    },
+                                    on: { click: _vm.searchSubmit },
+                                  },
+                                  [_vm._v("\n            查询\n          ")]
+                                ),
+                                needCollapseRender
+                                  ? _c(
+                                      "el-link",
+                                      {
+                                        attrs: { type: "primary" },
+                                        on: { click: setCollapsed },
+                                      },
+                                      [
+                                        _c(
+                                          "span",
+                                          { staticClass: "collapse" },
+                                          [
+                                            _vm._v(
+                                              _vm._s(
+                                                collapsed
+                                                  ? `展开${
+                                                      hiddenNum
+                                                        ? `(${hiddenNum})`
+                                                        : ""
+                                                    }`
+                                                  : "收起"
+                                              )
+                                            ),
+                                          ]
+                                        ),
+                                        _c("i", {
+                                          class: [
+                                            collapsed
+                                              ? "el-icon-arrow-down"
+                                              : "el-icon-arrow-up",
+                                          ],
+                                        }),
+                                      ]
+                                    )
+                                  : _vm._e(),
+                              ],
+                              1
+                            ),
+                          ]
+                        },
+                      },
+                    ],
+                    null,
+                    false,
+                    1131437147
+                  ),
+                },
+                "FormQuery",
+                _vm.formProps,
+                false
+              )
+            ),
           ],
-          2
+          1
         )
       : _vm._e(),
     _c(
@@ -5350,7 +5778,11 @@ var srcvue_type_template_id_36222536_render = function render() {
         _c(
           "Table",
           _vm._b(
-            { ref: "table", attrs: { request: _vm.request } },
+            {
+              ref: "table",
+              attrs: { request: _vm.request },
+              on: { success: _vm.searchFinish, error: _vm.searchFinish },
+            },
             "Table",
             _vm.tableProps,
             false
@@ -5361,15 +5793,15 @@ var srcvue_type_template_id_36222536_render = function render() {
     ),
   ])
 }
-var srcvue_type_template_id_36222536_staticRenderFns = []
-srcvue_type_template_id_36222536_render._withStripped = true
+var srcvue_type_template_id_122add3a_staticRenderFns = []
+srcvue_type_template_id_122add3a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=36222536&
+// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=122add3a&
 
-// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form"
-var components_form_ = __webpack_require__(51);
-var components_form_default = /*#__PURE__*/__webpack_require__.n(components_form_);
+// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-query"
+var form_query_ = __webpack_require__(51);
+var form_query_default = /*#__PURE__*/__webpack_require__.n(form_query_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table"
 var components_table_ = __webpack_require__(52);
@@ -5385,7 +5817,7 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
   componentName: "TableSearch",
   components: {
     elButton: button_default.a,
-    Form: components_form_default.a,
+    FormQuery: form_query_default.a,
     Table: components_table_default.a
   },
   props: {
@@ -5396,7 +5828,8 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
   computed: {
     formProps: function formProps() {
       return Object.assign({
-        formModel: this.searchData
+        formModel: this.searchData,
+        showHiddenNum: true
       }, this.search.form);
     },
     tableProps: function tableProps() {
@@ -5433,12 +5866,16 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
     reloadTable: function reloadTable() {
       this.$refs.table.reload();
     },
+    searchFinish: function searchFinish() {
+      this.pageData.searchLoading = false;
+    },
     searchSubmit: function searchSubmit() {
       var _this2 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
+        _this2.pageData.searchLoading = true;
         _this2.resetTable();
       });
     }
@@ -5456,8 +5893,8 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
 
 var table_search_src_component = normalizeComponent(
   components_table_search_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_36222536_render,
-  srcvue_type_template_id_36222536_staticRenderFns,
+  srcvue_type_template_id_122add3a_render,
+  srcvue_type_template_id_122add3a_staticRenderFns,
   false,
   null,
   null,
@@ -5775,7 +6212,8 @@ var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(extern
         render: this.render
       }, this.inputConfig, {
         value: this.value,
-        rowData: this.rowData
+        rowData: this.rowData,
+        row: this.row
       }),
       on: Object.assign({}, this.eventOn, this.actionEventOn, {
         focus: function focus() {
@@ -6200,7 +6638,7 @@ var table_search_ = __webpack_require__(14);
 var table_search_default = /*#__PURE__*/__webpack_require__.n(table_search_);
 
 // EXTERNAL MODULE: external "element-ui/lib/message-box"
-var message_box_ = __webpack_require__(17);
+var message_box_ = __webpack_require__(21);
 var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-operate/src/index.vue?vue&type=script&lang=js&
@@ -6494,8 +6932,8 @@ table_operate_src.install = function (Vue) {
   Vue.component(table_operate_src.name, table_operate_src);
 };
 /* harmony default export */ var table_operate = (table_operate_src);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=template&id=34fe6a3b&
-var srcvue_type_template_id_34fe6a3b_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=template&id=9139e8a2&
+var srcvue_type_template_id_9139e8a2_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", [
@@ -6561,11 +6999,11 @@ var srcvue_type_template_id_34fe6a3b_render = function render() {
     ),
   ])
 }
-var srcvue_type_template_id_34fe6a3b_staticRenderFns = []
-srcvue_type_template_id_34fe6a3b_render._withStripped = true
+var srcvue_type_template_id_9139e8a2_staticRenderFns = []
+srcvue_type_template_id_9139e8a2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=34fe6a3b&
+// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=9139e8a2&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=script&lang=js&
 
@@ -6875,8 +7313,8 @@ srcvue_type_template_id_34fe6a3b_render._withStripped = true
 
 var crud_src_component = normalizeComponent(
   components_crud_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_34fe6a3b_render,
-  srcvue_type_template_id_34fe6a3b_staticRenderFns,
+  srcvue_type_template_id_9139e8a2_render,
+  srcvue_type_template_id_9139e8a2_staticRenderFns,
   false,
   null,
   null,
@@ -6892,7 +7330,7 @@ crud_src.install = function (Vue) {
 };
 /* harmony default export */ var crud = (crud_src);
 // EXTERNAL MODULE: external "codemirror"
-var external_codemirror_ = __webpack_require__(20);
+var external_codemirror_ = __webpack_require__(24);
 var external_codemirror_default = /*#__PURE__*/__webpack_require__.n(external_codemirror_);
 
 // EXTERNAL MODULE: external "codemirror/mode/javascript/javascript"
@@ -9495,7 +9933,7 @@ srcvue_type_template_id_6ea89ba6_render._withStripped = true
 // CONCATENATED MODULE: ./src/components/dialog/src/index.vue?vue&type=template&id=6ea89ba6&
 
 // EXTERNAL MODULE: external "element-ui/src/utils/popup"
-var popup_ = __webpack_require__(18);
+var popup_ = __webpack_require__(22);
 var popup_default = /*#__PURE__*/__webpack_require__.n(popup_);
 
 // EXTERNAL MODULE: external "element-ui/src/mixins/migrating"
@@ -9503,7 +9941,7 @@ var migrating_ = __webpack_require__(58);
 var migrating_default = /*#__PURE__*/__webpack_require__.n(migrating_);
 
 // EXTERNAL MODULE: external "element-ui/src/mixins/emitter"
-var emitter_ = __webpack_require__(19);
+var emitter_ = __webpack_require__(23);
 var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dialog/src/index.vue?vue&type=script&lang=js&
@@ -10036,8 +10474,9 @@ drawer_src.install = function (Vue) {
 
 
 
+
 var API = index_;
-var components = [components_form, components_form_input, components_form_item, form_group, form_dialog, form_drawer, form_view, form_view_group, form_view_dialog, components_table, components_table_column, table_search, table_editable, table_operate, crud, formula, dialog, drawer];
+var components = [components_form, components_form_input, components_form_item, form_query, form_group, form_dialog, form_drawer, form_view, form_view_group, form_view_dialog, components_table, components_table_column, table_search, table_editable, table_operate, crud, formula, dialog, drawer];
 var install = function install(Vue, opts) {
   if (opts === void 0) {
     opts = {};
@@ -10064,6 +10503,7 @@ if (typeof window !== 'undefined' && window.Vue) {
   Form: components_form,
   FormInput: components_form_input,
   FormItem: components_form_item,
+  FormQuery: form_query,
   FormGroup: form_group,
   FormDialog: form_dialog,
   FormDrawer: form_drawer,