@panpanzhao/component-ui 0.0.17 → 0.0.19

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 */
@@ -481,8 +481,8 @@ __webpack_require__.r(__webpack_exports__);
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "API", function() { return /* binding */ API; });
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
-var formvue_type_template_id_dfeb985e_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/form.vue?vue&type=template&id=5d1533a2&
+var formvue_type_template_id_5d1533a2_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -549,25 +549,25 @@ var formvue_type_template_id_dfeb985e_render = function render() {
   )
 }
 var staticRenderFns = []
-formvue_type_template_id_dfeb985e_render._withStripped = true
+formvue_type_template_id_5d1533a2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
 
 // 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"
@@ -648,7 +648,7 @@ var external_lodash_ = __webpack_require__(1);
         if (item.show === false) {
           return false;
         }
-        if (typeof item.show === "function" && !item.show.call(_this, {
+        if (typeof item.show === "function" && !item.show.call(_this, _this.formModel, {
           form: _this,
           formModel: _this.formModel,
           config: item
@@ -683,6 +683,8 @@ var external_lodash_ = __webpack_require__(1);
   },
   created: function created() {
     var _this2 = this;
+    console.log(this.formItems);
+    debugger;
     this.formItems.forEach(function (item) {
       _this2.formItemLayout[item.prop] = item;
       if (typeof item.value === "function") {
@@ -858,7 +860,7 @@ function normalizeComponent(
 
 var component = normalizeComponent(
   src_formvue_type_script_lang_js_,
-  formvue_type_template_id_dfeb985e_render,
+  formvue_type_template_id_5d1533a2_render,
   staticRenderFns,
   false,
   null,
@@ -878,8 +880,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 +932,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 +952,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 +972,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 +982,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 +1034,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 +1054,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 +1073,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 +1487,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 +1677,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 +2339,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,
@@ -2386,11 +2399,30 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
         };
       });
       return relItemOn;
+    },
+    _rules: function _rules() {
+      var _this = this;
+      if (!this.rules) {
+        return [];
+      }
+      var rulesList = Array.isArray(this.rules) ? this.rules : [this.rules];
+      return rulesList.filter(function (item) {
+        return item.disabled !== true;
+      }).map(function (item) {
+        if (typeof item.validator === "function") {
+          item.validator = item.validator.bind({
+            form: _this.form,
+            formModel: _this.form.formModel,
+            formItemLayout: _this.form.formItemLayout
+          });
+        }
+        return item;
+      });
     }
   },
   methods: {
     execEvent: function execEvent(eventName) {
-      var _this = this,
+      var _this2 = this,
         _itemEvent$exec;
       for (var _len = arguments.length, arg = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         arg[_key - 1] = arguments[_key];
@@ -2412,12 +2444,12 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       var targetConfig = {};
       if (Array.isArray(itemEvent.target)) {
         itemEvent.target.forEach(function (tarItem) {
-          targetConfig[tarItem] = _this.form.formItemLayout[tarItem];
+          targetConfig[tarItem] = _this2.form.formItemLayout[tarItem];
         });
       } 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],
@@ -2436,7 +2468,7 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
     }
   },
   render: function render(h) {
-    var _this2 = this;
+    var _this3 = this;
     if (typeof this.render === "function") {
       return this.render(h, {
         form: this.form,
@@ -2459,12 +2491,12 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       }),
       on: Object.assign({}, this.eventOn, this.actionEventOn, {
         input: function input(val) {
-          _this2.setValue(val);
-          _this2.execEvent("input", val);
+          _this3.setValue(val);
+          _this3.execEvent("input", val);
         },
         change: function change(val, selectOption) {
-          _this2.setValue(val);
-          _this2.execEvent("change", val, selectOption);
+          _this3.setValue(val);
+          _this3.execEvent("change", val, selectOption);
         }
       })
     };
@@ -2472,7 +2504,8 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       "attrs": {
         "label": this.label,
         "prop": this.prop,
-        "rules": this.rules,
+        "required": this.required,
+        "rules": this._rules,
         "labelWidth": this.labelWidth,
         "size": this.size
       }
@@ -2486,6 +2519,339 @@ 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
+    },
+    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() {
+      console.log(this.formModel);
+    },
+    resetForm: function resetForm() {
+      this.reset();
+    },
+    needCollapseRender: function needCollapseRender(totalSize, showLength, totalSpan) {
+      if (totalSpan < 24 || totalSize <= showLength) {
+        return false;
+      }
+      return true;
+    },
+    offset: function offset(currentSpan) {
+      var offsetSpan = currentSpan % 24 + this.span;
+      if (offsetSpan > 24) {
+        return 24 - this.span;
+      }
+      return 24 - offsetSpan;
+    },
+    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.span,
+          "offset": offset
+        },
+        "style": {
+          textAlign: 'end'
+        }
+      }, [h("div", [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": function click() {
+            _this2.collapsed = !_this2.collapsed;
+          }
+        }
+      }, [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', {
+        '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
 
 
@@ -2984,6 +3350,9 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
       return this.api.request || this.request || (this.$COMPONENT || {}).request;
     }
   },
+  created: function created() {
+    console.log(this.form);
+  },
   methods: {
     open: function open(model, expandModel) {
       var _this2 = this;
@@ -3147,7 +3516,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&
@@ -3292,9 +3661,12 @@ var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
   },
   methods: {
     open: function open(model) {
+      var _this2 = this;
       this.show = true;
       if (model) {
-        this.setFormModel(model);
+        this.$nextTick(function () {
+          _this2.setFormModel(model);
+        });
       }
     },
     close: function close() {
@@ -3308,31 +3680,31 @@ var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
       this.$refs.form && this.$refs.form.reset();
     },
     submit: function submit(button) {
-      var _this2 = this;
+      var _this3 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
-        var reqData = Object(external_lodash_["merge"])(_this2.api.data || {}, _this2.formModel);
-        if (!(_this2.api.url && _this2.request)) {
-          _this2.$emit("success", null, reqData);
-          _this2.reset();
-          _this2.close();
+        var reqData = Object(external_lodash_["merge"])(_this3.api.data || {}, _this3.formModel);
+        if (!(_this3.api.url && _this3.request)) {
+          _this3.$emit("success", null, reqData);
+          _this3.reset();
+          _this3.close();
           return false;
         }
         button.loading = true;
-        _this2.request({
-          url: Object(formula_["evaluate"])(_this2.api.url, reqData),
-          method: _this2.api.method || "POST",
+        _this3.request({
+          url: Object(formula_["evaluate"])(_this3.api.url, reqData),
+          method: _this3.api.method || "POST",
           data: reqData
         }).then(function (res) {
           button.loading = false;
-          _this2.$emit("success", res, reqData);
-          _this2.reset();
-          _this2.close();
+          _this3.$emit("success", res, reqData);
+          _this3.reset();
+          _this3.close();
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", error, reqData);
+          _this3.$emit("error", error, reqData);
         });
       });
     },
@@ -3352,16 +3724,28 @@ var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
       }, param]));
     },
     renderTitle: function renderTitle(h) {
-      if (typeof this.slots.title === "function") {
-        return this.slots.title.call(this, this.formModel);
+      if (this.$scopedSlots.title) {
+        return this.$scopedSlots.title.call(this, {
+          formModel: this.formModel
+        });
+      } else if (typeof this.slots.title === "function") {
+        return this.slots.title.call(this, {
+          formModel: this.formModel
+        });
       }
-      return this.slots.title || this.drawer.title;
+      return this.$slots.title || this.slots.title || this.drawer.title;
     },
     renderTools: function renderTools(h) {
-      if (typeof this.slots.footer === "function") {
-        return this.slots.footer.call(this, this.formModel);
+      if (this.$scopedSlots.footer) {
+        return this.$scopedSlots.footer.call(this, {
+          formModel: this.formModel
+        });
+      } else if (typeof this.slots.footer === "function") {
+        return this.slots.footer.call(this, {
+          formModel: this.formModel
+        });
       }
-      return h("div", [(this.tools || this.defaultTools).map(function (item) {
+      return h("div", [this.$slots.footer || (this.tools || this.defaultTools).map(function (item) {
         var toolParam = {
           attrs: Object.assign({}, item),
           on: item.on
@@ -3371,7 +3755,7 @@ var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this4 = this;
     var param = {
       attrs: Object.assign({
         visible: this.show,
@@ -3380,7 +3764,7 @@ var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
       }, this.drawer),
       on: Object.assign(this.on, {
         close: function close() {
-          _this3.close();
+          _this4.close();
         }
       })
     };
@@ -3421,8 +3805,8 @@ form_drawer_src.install = function (Vue) {
   Vue.component(form_drawer_src.name, form_drawer_src);
 };
 /* harmony default export */ var form_drawer = (form_drawer_src);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
-var srcvue_type_template_id_720bd4fc_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-view/src/index.vue?vue&type=template&id=32454b68&
+var srcvue_type_template_id_32454b68_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -3464,11 +3848,11 @@ var srcvue_type_template_id_720bd4fc_render = function render() {
     2
   )
 }
-var srcvue_type_template_id_720bd4fc_staticRenderFns = []
-srcvue_type_template_id_720bd4fc_render._withStripped = true
+var srcvue_type_template_id_32454b68_staticRenderFns = []
+srcvue_type_template_id_32454b68_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=32454b68&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
 var descriptions_ = __webpack_require__(45);
@@ -3493,6 +3877,7 @@ var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_
   props: {
     prop: String,
     labelWidth: String,
+    labelPosition: String,
     formItems: {
       type: Array,
       default: function _default() {
@@ -3510,8 +3895,10 @@ var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_
     formProps: function formProps() {
       return Object.assign({
         border: true,
+        direction: this.labelPosition === "top" ? "vertical" : "horizontal",
         labelStyle: {
-          width: this.labelWidth
+          width: this.labelWidth,
+          textAlign: this.labelPosition
         }
       }, this.$attrs);
     },
@@ -3573,8 +3960,8 @@ var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_
 
 var form_view_src_component = normalizeComponent(
   components_form_view_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_720bd4fc_render,
-  srcvue_type_template_id_720bd4fc_staticRenderFns,
+  srcvue_type_template_id_32454b68_render,
+  srcvue_type_template_id_32454b68_staticRenderFns,
   false,
   null,
   null,
@@ -4029,8 +4416,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=a8e62da6&
-var tablevue_type_template_id_a8e62da6_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" }, [
@@ -4108,14 +4495,14 @@ var tablevue_type_template_id_a8e62da6_render = function render() {
       : _vm._e(),
   ])
 }
-var tablevue_type_template_id_a8e62da6_staticRenderFns = []
-tablevue_type_template_id_a8e62da6_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=a8e62da6&
+// 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"
@@ -4155,7 +4542,7 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
       props: {
         label: String,
         show: {
-          type: [Boolean, Function],
+          type: [Boolean, String, Function],
           default: true
         },
         on: Object,
@@ -4179,6 +4566,11 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
         if (this.show === false) {
           return null;
         }
+        if (typeof this.show === "string" && !Object(formula_["evaluate"])(this.show, this.$parent.selection[0], {
+          evalMode: true
+        })) {
+          return null;
+        }
         if (typeof this.show === "function" && !this.show.call(this, this.$parent.selection, this)) {
           return null;
         }
@@ -4369,6 +4761,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();
@@ -4440,8 +4837,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_a8e62da6_render,
-  tablevue_type_template_id_a8e62da6_staticRenderFns,
+  tablevue_type_template_id_36fba632_render,
+  tablevue_type_template_id_36fba632_staticRenderFns,
   false,
   null,
   null,
@@ -4659,8 +5056,8 @@ var selection_component = normalizeComponent(
 )
 
 /* harmony default export */ var selection = (selection_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/date.vue?vue&type=template&id=3d682315&
-var datevue_type_template_id_3d682315_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/column/date.vue?vue&type=template&id=44c029a9&
+var datevue_type_template_id_44c029a9_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -4698,14 +5095,14 @@ var datevue_type_template_id_3d682315_render = function render() {
     )
   )
 }
-var datevue_type_template_id_3d682315_staticRenderFns = []
-datevue_type_template_id_3d682315_render._withStripped = true
+var datevue_type_template_id_44c029a9_staticRenderFns = []
+datevue_type_template_id_44c029a9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/column/date.vue?vue&type=template&id=3d682315&
+// 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&
@@ -4718,7 +5115,7 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
   },
   props: {
     format: {
-      type: [String, Function],
+      type: String,
       default: "YYYY-MM-DD"
     }
   },
@@ -4734,10 +5131,10 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
   },
   methods: {
     formatDate: function formatDate(slotProps) {
-      if (typeof this.format === "function") {
-        return this.format.call(this, slotProps);
-      }
       var colVal = slotProps.row && slotProps.row[this.attrs.prop];
+      if (typeof slotProps.column.formatter === "function") {
+        return slotProps.column.formatter.call(this, slotProps.row, slotProps.column, colVal, slotProps.$index);
+      }
       if (colVal && this.format && external_dayjs_default()(colVal).isValid()) {
         return external_dayjs_default()(colVal).format(this.format);
       }
@@ -4757,8 +5154,8 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
 
 var date_component = normalizeComponent(
   column_datevue_type_script_lang_js_,
-  datevue_type_template_id_3d682315_render,
-  datevue_type_template_id_3d682315_staticRenderFns,
+  datevue_type_template_id_44c029a9_render,
+  datevue_type_template_id_44c029a9_staticRenderFns,
   false,
   null,
   null,
@@ -4767,8 +5164,8 @@ var date_component = normalizeComponent(
 )
 
 /* harmony default export */ var date = (date_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=template&id=1a393e81&
-var dictvue_type_template_id_1a393e81_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/column/dict.vue?vue&type=template&id=2b543e49&
+var dictvue_type_template_id_2b543e49_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -4806,11 +5203,11 @@ var dictvue_type_template_id_1a393e81_render = function render() {
     )
   )
 }
-var dictvue_type_template_id_1a393e81_staticRenderFns = []
-dictvue_type_template_id_1a393e81_render._withStripped = true
+var dictvue_type_template_id_2b543e49_staticRenderFns = []
+dictvue_type_template_id_2b543e49_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=1a393e81&
+// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=2b543e49&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=script&lang=js&
 
@@ -4825,7 +5222,7 @@ dictvue_type_template_id_1a393e81_render._withStripped = true
       type: Array
     },
     optionProp: {
-      type: [Object, Function],
+      type: Object,
       default: function _default() {
         return {
           value: "value",
@@ -4865,10 +5262,10 @@ dictvue_type_template_id_1a393e81_render._withStripped = true
   },
   methods: {
     renderOption: function renderOption(slotProps) {
-      if (typeof this.optionProp === "function") {
-        return this.optionProp.call(this, slotProps, this.options);
-      }
       var colVal = slotProps.row && slotProps.row[this.attrs.prop];
+      if (typeof slotProps.column.formatter === "function") {
+        return slotProps.column.formatter.call(this, slotProps.row, slotProps.column, colVal, slotProps.$index);
+      }
       if (colVal && this.optionMap[colVal]) {
         return this.optionMap[colVal] && this.optionMap[colVal][this.optionProp.label || "label"];
       }
@@ -4888,8 +5285,8 @@ dictvue_type_template_id_1a393e81_render._withStripped = true
 
 var dict_component = normalizeComponent(
   column_dictvue_type_script_lang_js_,
-  dictvue_type_template_id_1a393e81_render,
-  dictvue_type_template_id_1a393e81_staticRenderFns,
+  dictvue_type_template_id_2b543e49_render,
+  dictvue_type_template_id_2b543e49_staticRenderFns,
   false,
   null,
   null,
@@ -4911,7 +5308,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"
@@ -4933,6 +5330,7 @@ var index_ = __webpack_require__(5);
 
 
 
+
 /* harmony default export */ var operatevue_type_script_lang_js_ = ({
   name: "Operate",
   props: {
@@ -4979,7 +5377,12 @@ var index_ = __webpack_require__(5);
       var _this = this;
       var filterItems = Object(external_lodash_["sortBy"])(this.items, ['sort']).filter(function (row) {
         if (typeof row.show === "function") {
-          return row.show.call(_this, scoped, row);
+          return row.show.call(_this, scoped.row, scoped);
+        }
+        if (typeof row.show === "string") {
+          return Object(formula_["evaluate"])(row.show, scoped.row, {
+            evalMode: true
+          });
         }
         return row.show !== false;
       });
@@ -5075,7 +5478,7 @@ var index_ = __webpack_require__(5);
       props: {
         label: String,
         parentData: Object,
-        show: [Boolean, Function],
+        show: [Boolean, String, Function],
         on: Object
       },
       data: function data() {
@@ -5116,7 +5519,7 @@ var index_ = __webpack_require__(5);
       props: {
         label: String,
         parentData: Object,
-        show: [Boolean, Function],
+        show: [Boolean, String, Function],
         on: Object
       },
       computed: {
@@ -5179,7 +5582,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); }
 
 
 
@@ -5238,7 +5641,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
@@ -5727,7 +6130,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() {
@@ -6152,7 +6556,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&
@@ -6446,8 +6850,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=8fb8bc56&
+var srcvue_type_template_id_8fb8bc56_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", [
@@ -6513,11 +6917,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_8fb8bc56_staticRenderFns = []
+srcvue_type_template_id_8fb8bc56_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=8fb8bc56&
 
 // 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&
 
@@ -6543,21 +6947,21 @@ srcvue_type_template_id_34fe6a3b_render._withStripped = true
       };
     },
     createProps: function createProps() {
-      return Object.assign({
+      return Object(external_lodash_["merge"])({
         dialog: {
           title: "添加"
         }
       }, this.create);
     },
     updateProps: function updateProps() {
-      return Object.assign({
+      return Object(external_lodash_["merge"])({
         dialog: {
           title: "修改"
         }
       }, this.update);
     },
     viewProps: function viewProps() {
-      return Object.assign({
+      return Object(external_lodash_["merge"])({
         dialog: {
           title: "查看"
         }
@@ -6633,7 +7037,7 @@ srcvue_type_template_id_34fe6a3b_render._withStripped = true
       // 添加按钮处理
       if (this.create) {
         var tools = this.table && this.table.tools || [];
-        tools.unshift(Object.assign({
+        tools.unshift(Object(external_lodash_["merge"])({
           label: "添加",
           loading: false,
           sort: 10,
@@ -6653,7 +7057,7 @@ srcvue_type_template_id_34fe6a3b_render._withStripped = true
       var optColumn = filterColumns && filterColumns[0];
       var items = optColumn && optColumn.items || [];
       if (this.update) {
-        items.push(Object.assign({
+        items.push(Object(external_lodash_["merge"])({
           label: "修改",
           loading: false,
           sort: 10,
@@ -6663,7 +7067,7 @@ srcvue_type_template_id_34fe6a3b_render._withStripped = true
         }, this.update.tool));
       }
       if (this.view) {
-        items.push(Object.assign({
+        items.push(Object(external_lodash_["merge"])({
           label: "查看",
           loading: false,
           sort: 20,
@@ -6673,7 +7077,7 @@ srcvue_type_template_id_34fe6a3b_render._withStripped = true
         }, this.view.tool));
       }
       if (this.delete) {
-        items.push(Object.assign({
+        items.push(Object(external_lodash_["merge"])({
           label: "删除",
           loading: false,
           sort: 30,
@@ -6827,8 +7231,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_8fb8bc56_render,
+  srcvue_type_template_id_8fb8bc56_staticRenderFns,
   false,
   null,
   null,
@@ -6844,7 +7248,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"
@@ -9447,7 +9851,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"
@@ -9455,7 +9859,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&
@@ -9988,8 +10392,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 = {};
@@ -10016,6 +10421,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,