@panpanzhao/component-ui 0.0.19 → 0.0.20

package/lib/components/form-group.js

@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_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/form.vue?vue&type=template&id=5d1533a2&
+// 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=1aadb63c&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -286,7 +286,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -417,8 +417,6 @@ var external_lodash_ = __webpack_require__(2);
   },
   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") {

package/lib/components/form-query.js

@@ -299,6 +299,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       Number: Number,
       default: 8
     },
+    submitterSpan: Number,
     gutter: {
       type: Number,
       default: 24
@@ -414,11 +415,16 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       return this.$refs.form.clearValidate(props);
     },
     searchSubmit: function searchSubmit() {
-      console.log(this.formModel);
+      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;
@@ -426,12 +432,24 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       return true;
     },
     offset: function offset(currentSpan) {
-      var offsetSpan = currentSpan % 24 + this.span;
+      var offsetSpan = currentSpan % 24 + (this.submitterSpan || this.span);
       if (offsetSpan > 24) {
-        return 24 - this.span;
+        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;
@@ -512,13 +530,15 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       }, [doms, h("el-col", {
         "key": "submitter",
         "attrs": {
-          "span": this.span,
+          "span": this.submitterSpan || this.span,
           "offset": offset
         },
         "style": {
           textAlign: 'end'
         }
-      }, [h("div", [h("el-button", {
+      }, [this.renderSubmitter(hiddenNum, needCollapseRender) || h("div", {
+        "class": "query-button"
+      }, [h("el-button", {
         "attrs": {
           "icon": "el-icon-refresh-left"
         },
@@ -539,11 +559,11 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
           "type": "primary"
         },
         "on": {
-          "click": function click() {
-            _this2.collapsed = !_this2.collapsed;
-          }
+          "click": this.setCollapsed
         }
-      }, [this.collapsed ? "\u5C55\u5F00" + (hiddenNum && "(" + hiddenNum + ")") : "收起", h("i", {
+      }, [h("span", {
+        "class": "collapse"
+      }, [this.collapsed ? "\u5C55\u5F00" + (hiddenNum ? "(" + hiddenNum + ")" : '') : "收起"]), h("i", {
         "class": this.collapsed ? "el-icon-arrow-down" : "el-icon-arrow-up"
       })]) : null])])]);
     }
@@ -559,7 +579,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       on: Object.assign({}, this.$listeners)
     };
     return h("div", {
-      "class": ['form', {
+      "class": ['form form-query', {
         'is-full': this.isFull
       }]
     }, [h("el-form", babel_helper_vue_jsx_merge_props_default()([{

package/lib/components/form.js

@@ -210,7 +210,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_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/form.vue?vue&type=template&id=5d1533a2&
+// 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=1aadb63c&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -281,7 +281,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -412,8 +412,6 @@ var external_lodash_ = __webpack_require__(2);
   },
   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") {

package/lib/components/table-operate.js

@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_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/form.vue?vue&type=template&id=5d1533a2&
+// 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=1aadb63c&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -286,7 +286,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -417,8 +417,6 @@ var external_lodash_ = __webpack_require__(2);
   },
   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") {
@@ -1569,9 +1567,6 @@ var external_lodash_ = __webpack_require__(2);
       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;

package/lib/components/table-search.js

@@ -209,7 +209,7 @@ module.exports = require("element-ui/lib/button");
 /***/ 58:
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/form");
+module.exports = require("@panpanzhao/component-ui/lib/components/form-query");
 
 /***/ }),
 
@@ -227,51 +227,109 @@ module.exports = require("@panpanzhao/component-ui/lib/components/table");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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&
+// 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 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(
@@ -281,7 +339,11 @@ var 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
@@ -296,15 +358,15 @@ var staticRenderFns = []
 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 "element-ui/lib/button"
 var button_ = __webpack_require__(5);
 var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 
-// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form"
-var form_ = __webpack_require__(58);
-var form_default = /*#__PURE__*/__webpack_require__.n(form_);
+// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-query"
+var form_query_ = __webpack_require__(58);
+var form_query_default = /*#__PURE__*/__webpack_require__.n(form_query_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table"
 var table_ = __webpack_require__(59);
@@ -323,7 +385,7 @@ var external_lodash_ = __webpack_require__(2);
   componentName: "TableSearch",
   components: {
     elButton: button_default.a,
-    Form: form_default.a,
+    FormQuery: form_query_default.a,
     Table: table_default.a
   },
   props: {
@@ -334,7 +396,8 @@ var external_lodash_ = __webpack_require__(2);
   computed: {
     formProps: function formProps() {
       return Object.assign({
-        formModel: this.searchData
+        formModel: this.searchData,
+        showHiddenNum: true
       }, this.search.form);
     },
     tableProps: function tableProps() {
@@ -371,12 +434,16 @@ var external_lodash_ = __webpack_require__(2);
     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();
       });
     }