@panpanzhao/component-ui 0.0.18 → 0.0.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/lib/component-ui.common.js +552 -112
  2. package/lib/components/crud.js +2 -2
  3. package/lib/components/form-drawer.js +9 -9
  4. package/lib/components/form-input.js +25 -15
  5. package/lib/components/form-item.js +5 -3
  6. package/lib/components/form-query.js +626 -0
  7. package/lib/components/table-editable.js +2 -1
  8. package/lib/components/table-operate.js +3 -2
  9. package/lib/components/table-search.js +112 -45
  10. package/lib/components/table.js +10 -5
  11. package/lib/index.js +1 -1
  12. package/lib/styles/component-ui.css +1 -1
  13. package/lib/styles/form-query.css +1 -0
  14. package/lib/styles/index.css +1 -1
  15. package/lib/styles/table-search.css +0 -1
  16. package/package.json +1 -1
package/lib/components/table-search.js CHANGED
@@ -209,7 +209,7 @@ module.exports = require("element-ui/lib/button");
209
209
  /***/ 58:
210
210
  /***/ (function(module, exports) {
211
211
 
212
- module.exports = require("@panpanzhao/component-ui/lib/components/form");
212
+ module.exports = require("@panpanzhao/component-ui/lib/components/form-query");
213
213
 
214
214
  /***/ }),
215
215
 
@@ -227,51 +227,109 @@ module.exports = require("@panpanzhao/component-ui/lib/components/table");
227
227
  // ESM COMPAT FLAG
228
228
  __webpack_require__.r(__webpack_exports__);
229
229
 
230
- // 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&
230
+ // 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&
231
231
  var render = function render() {
232
232
  var _vm = this,
233
233
  _c = _vm._self._c
234
234
  return _c("div", { staticClass: "table-search" }, [
235
- _vm.search
235
+ _vm.search && _vm.search.form
236
236
  ? _c(
237
237
  "div",
238
238
  [
239
- _c("Form", _vm._b({ ref: "form" }, "Form", _vm.formProps, false)),
240
- _vm._t("tools", function () {
241
- return [
242
- _vm.search.form
243
- ? _c(
244
- "div",
245
- { staticClass: "table-search_tools" },
246
- [
247
- _c(
248
- "el-button",
249
- {
250
- attrs: {
251
- loading: _vm.pageData.searchLoading,
252
- type: "primary",
253
- icon: "el-icon-search",
254
- },
255
- on: { click: _vm.searchSubmit },
256
- },
257
- [_vm._v("\n 查询\n ")]
258
- ),
259
- _c(
260
- "el-button",
261
- {
262
- attrs: { icon: "el-icon-refresh-left" },
263
- on: { click: _vm.resetForm },
264
- },
265
- [_vm._v("重置")]
266
- ),
267
- ],
268
- 1
269
- )
270
- : _vm._e(),
271
- ]
272
- }),
239
+ _c(
240
+ "FormQuery",
241
+ _vm._b(
242
+ {
243
+ ref: "form",
244
+ scopedSlots: _vm._u(
245
+ [
246
+ {
247
+ key: "submitter",
248
+ fn: function ({
249
+ needCollapseRender,
250
+ hiddenNum,
251
+ collapsed,
252
+ setCollapsed,
253
+ }) {
254
+ return [
255
+ _c(
256
+ "div",
257
+ { staticClass: "query-button" },
258
+ [
259
+ _c(
260
+ "el-button",
261
+ {
262
+ attrs: { icon: "el-icon-refresh-left" },
263
+ on: { click: _vm.resetForm },
264
+ },
265
+ [_vm._v("重置")]
266
+ ),
267
+ _c(
268
+ "el-button",
269
+ {
270
+ attrs: {
271
+ loading: _vm.pageData.searchLoading,
272
+ type: "primary",
273
+ icon: "el-icon-search",
274
+ },
275
+ on: { click: _vm.searchSubmit },
276
+ },
277
+ [_vm._v("\n 查询\n ")]
278
+ ),
279
+ needCollapseRender
280
+ ? _c(
281
+ "el-link",
282
+ {
283
+ attrs: { type: "primary" },
284
+ on: { click: setCollapsed },
285
+ },
286
+ [
287
+ _c(
288
+ "span",
289
+ { staticClass: "collapse" },
290
+ [
291
+ _vm._v(
292
+ _vm._s(
293
+ collapsed
294
+ ? `展开${
295
+ hiddenNum
296
+ ? `(${hiddenNum})`
297
+ : ""
298
+ }`
299
+ : "收起"
300
+ )
301
+ ),
302
+ ]
303
+ ),
304
+ _c("i", {
305
+ class: [
306
+ collapsed
307
+ ? "el-icon-arrow-down"
308
+ : "el-icon-arrow-up",
309
+ ],
310
+ }),
311
+ ]
312
+ )
313
+ : _vm._e(),
314
+ ],
315
+ 1
316
+ ),
317
+ ]
318
+ },
319
+ },
320
+ ],
321
+ null,
322
+ false,
323
+ 1131437147
324
+ ),
325
+ },
326
+ "FormQuery",
327
+ _vm.formProps,
328
+ false
329
+ )
330
+ ),
273
331
  ],
274
- 2
332
+ 1
275
333
  )
276
334
  : _vm._e(),
277
335
  _c(
@@ -281,7 +339,11 @@ var render = function render() {
281
339
  _c(
282
340
  "Table",
283
341
  _vm._b(
284
- { ref: "table", attrs: { request: _vm.request } },
342
+ {
343
+ ref: "table",
344
+ attrs: { request: _vm.request },
345
+ on: { success: _vm.searchFinish, error: _vm.searchFinish },
346
+ },
285
347
  "Table",
286
348
  _vm.tableProps,
287
349
  false
@@ -296,15 +358,15 @@ var staticRenderFns = []
296
358
  render._withStripped = true
297
359
 
298
360
 
299
- // CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=36222536&
361
+ // CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=122add3a&
300
362
 
301
363
  // EXTERNAL MODULE: external "element-ui/lib/button"
302
364
  var button_ = __webpack_require__(5);
303
365
  var button_default = /*#__PURE__*/__webpack_require__.n(button_);
304
366
 
305
- // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form"
306
- var form_ = __webpack_require__(58);
307
- var form_default = /*#__PURE__*/__webpack_require__.n(form_);
367
+ // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-query"
368
+ var form_query_ = __webpack_require__(58);
369
+ var form_query_default = /*#__PURE__*/__webpack_require__.n(form_query_);
308
370
 
309
371
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table"
310
372
  var table_ = __webpack_require__(59);
@@ -323,7 +385,7 @@ var external_lodash_ = __webpack_require__(2);
323
385
  componentName: "TableSearch",
324
386
  components: {
325
387
  elButton: button_default.a,
326
- Form: form_default.a,
388
+ FormQuery: form_query_default.a,
327
389
  Table: table_default.a
328
390
  },
329
391
  props: {
@@ -334,7 +396,8 @@ var external_lodash_ = __webpack_require__(2);
334
396
  computed: {
335
397
  formProps: function formProps() {
336
398
  return Object.assign({
337
- formModel: this.searchData
399
+ formModel: this.searchData,
400
+ showHiddenNum: true
338
401
  }, this.search.form);
339
402
  },
340
403
  tableProps: function tableProps() {
@@ -371,12 +434,16 @@ var external_lodash_ = __webpack_require__(2);
371
434
  reloadTable: function reloadTable() {
372
435
  this.$refs.table.reload();
373
436
  },
437
+ searchFinish: function searchFinish() {
438
+ this.pageData.searchLoading = false;
439
+ },
374
440
  searchSubmit: function searchSubmit() {
375
441
  var _this2 = this;
376
442
  this.$refs.form.validate(function (isValidate, errorMessage) {
377
443
  if (!isValidate) {
378
444
  return false;
379
445
  }
446
+ _this2.pageData.searchLoading = true;
380
447
  _this2.resetTable();
381
448
  });
382
449
  }
package/lib/components/table.js CHANGED
@@ -255,8 +255,8 @@ module.exports = require("element-ui/lib/pagination");
255
255
  // ESM COMPAT FLAG
256
256
  __webpack_require__.r(__webpack_exports__);
257
257
 
258
- // 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&
259
- var tablevue_type_template_id_0a336d65_render = function render() {
258
+ // 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&
259
+ var tablevue_type_template_id_36fba632_render = function render() {
260
260
  var _vm = this,
261
261
  _c = _vm._self._c
262
262
  return _c("div", { staticClass: "table" }, [
@@ -335,10 +335,10 @@ var tablevue_type_template_id_0a336d65_render = function render() {
335
335
  ])
336
336
  }
337
337
  var staticRenderFns = []
338
- tablevue_type_template_id_0a336d65_render._withStripped = true
338
+ tablevue_type_template_id_36fba632_render._withStripped = true
339
339
 
340
340
 
341
- // CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=0a336d65&
341
+ // CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=36fba632&
342
342
 
343
343
  // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
344
344
  var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
@@ -614,6 +614,11 @@ var external_lodash_ = __webpack_require__(2);
614
614
  });
615
615
  }
616
616
  },
617
+ created: function created() {
618
+ if (this.pagination && this.pagination.pageSize) {
619
+ this.pageSize = this.pagination.pageSize;
620
+ }
621
+ },
617
622
  mounted: function mounted() {
618
623
  if (this.hasInit) {
619
624
  this.reset();
@@ -688,7 +693,7 @@ var componentNormalizer = __webpack_require__(1);
688
693
 
689
694
  var component = Object(componentNormalizer["a" /* default */])(
690
695
  src_tablevue_type_script_lang_js_,
691
- tablevue_type_template_id_0a336d65_render,
696
+ tablevue_type_template_id_36fba632_render,
692
697
  staticRenderFns,
693
698
  false,
694
699
  null,