@panpanzhao/component-ui 0.0.19 → 0.0.21

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.
@@ -395,7 +395,7 @@ module.exports = require("element-ui/lib/dropdown-menu");
395
395
  /* 51 */
396
396
  /***/ (function(module, exports) {
397
397
 
398
- module.exports = require("@panpanzhao/component-ui/lib/components/form");
398
+ module.exports = require("@panpanzhao/component-ui/lib/components/form-query");
399
399
 
400
400
  /***/ }),
401
401
  /* 52 */
@@ -481,8 +481,8 @@ __webpack_require__.r(__webpack_exports__);
481
481
  // EXPORTS
482
482
  __webpack_require__.d(__webpack_exports__, "API", function() { return /* binding */ API; });
483
483
 
484
- // 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&
485
- var formvue_type_template_id_5d1533a2_render = function render() {
484
+ // 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&
485
+ var formvue_type_template_id_1aadb63c_render = function render() {
486
486
  var _vm = this,
487
487
  _c = _vm._self._c
488
488
  return _c(
@@ -549,10 +549,10 @@ var formvue_type_template_id_5d1533a2_render = function render() {
549
549
  )
550
550
  }
551
551
  var staticRenderFns = []
552
- formvue_type_template_id_5d1533a2_render._withStripped = true
552
+ formvue_type_template_id_1aadb63c_render._withStripped = true
553
553
 
554
554
 
555
- // CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
555
+ // CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
556
556
 
557
557
  // EXTERNAL MODULE: external "element-ui/lib/form"
558
558
  var form_ = __webpack_require__(15);
@@ -683,8 +683,6 @@ var external_lodash_ = __webpack_require__(1);
683
683
  },
684
684
  created: function created() {
685
685
  var _this2 = this;
686
- console.log(this.formItems);
687
- debugger;
688
686
  this.formItems.forEach(function (item) {
689
687
  _this2.formItemLayout[item.prop] = item;
690
688
  if (typeof item.value === "function") {
@@ -860,7 +858,7 @@ function normalizeComponent(
860
858
 
861
859
  var component = normalizeComponent(
862
860
  src_formvue_type_script_lang_js_,
863
- formvue_type_template_id_5d1533a2_render,
861
+ formvue_type_template_id_1aadb63c_render,
864
862
  staticRenderFns,
865
863
  false,
866
864
  null,
@@ -2554,6 +2552,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2554
2552
  Number: Number,
2555
2553
  default: 8
2556
2554
  },
2555
+ submitterSpan: Number,
2557
2556
  gutter: {
2558
2557
  type: Number,
2559
2558
  default: 24
@@ -2669,11 +2668,16 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2669
2668
  return this.$refs.form.clearValidate(props);
2670
2669
  },
2671
2670
  searchSubmit: function searchSubmit() {
2672
- console.log(this.formModel);
2671
+ this.$emit("query", this.formModel, {
2672
+ loading: this.pageData.searchLoading
2673
+ });
2673
2674
  },
2674
2675
  resetForm: function resetForm() {
2675
2676
  this.reset();
2676
2677
  },
2678
+ setCollapsed: function setCollapsed() {
2679
+ this.collapsed = !this.collapsed;
2680
+ },
2677
2681
  needCollapseRender: function needCollapseRender(totalSize, showLength, totalSpan) {
2678
2682
  if (totalSpan < 24 || totalSize <= showLength) {
2679
2683
  return false;
@@ -2681,12 +2685,24 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2681
2685
  return true;
2682
2686
  },
2683
2687
  offset: function offset(currentSpan) {
2684
- var offsetSpan = currentSpan % 24 + this.span;
2688
+ var offsetSpan = currentSpan % 24 + (this.submitterSpan || this.span);
2685
2689
  if (offsetSpan > 24) {
2686
- return 24 - this.span;
2690
+ return 24 - (this.submitterSpan || this.span);
2687
2691
  }
2688
2692
  return 24 - offsetSpan;
2689
2693
  },
2694
+ renderSubmitter: function renderSubmitter(hiddenNum, needCollapseRender) {
2695
+ if (typeof this.$scopedSlots.submitter === "function") {
2696
+ return this.$scopedSlots.submitter.call(this, {
2697
+ formModel: this.formModel,
2698
+ collapsed: this.collapsed,
2699
+ setCollapsed: this.setCollapsed,
2700
+ hiddenNum: hiddenNum,
2701
+ needCollapseRender: needCollapseRender
2702
+ });
2703
+ }
2704
+ return this.$slots.submitter;
2705
+ },
2690
2706
  renderQueryContent: function renderQueryContent(h, data) {
2691
2707
  var _this2 = this;
2692
2708
  var showLength = data.showLength;
@@ -2767,13 +2783,15 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2767
2783
  }, [doms, h("el-col", {
2768
2784
  "key": "submitter",
2769
2785
  "attrs": {
2770
- "span": this.span,
2786
+ "span": this.submitterSpan || this.span,
2771
2787
  "offset": offset
2772
2788
  },
2773
2789
  "style": {
2774
2790
  textAlign: 'end'
2775
2791
  }
2776
- }, [h("div", [h("el-button", {
2792
+ }, [this.renderSubmitter(hiddenNum, needCollapseRender) || h("div", {
2793
+ "class": "query-button"
2794
+ }, [h("el-button", {
2777
2795
  "attrs": {
2778
2796
  "icon": "el-icon-refresh-left"
2779
2797
  },
@@ -2794,11 +2812,11 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2794
2812
  "type": "primary"
2795
2813
  },
2796
2814
  "on": {
2797
- "click": function click() {
2798
- _this2.collapsed = !_this2.collapsed;
2799
- }
2815
+ "click": this.setCollapsed
2800
2816
  }
2801
- }, [this.collapsed ? "\u5C55\u5F00" + (hiddenNum && "(" + hiddenNum + ")") : "收起", h("i", {
2817
+ }, [h("span", {
2818
+ "class": "collapse"
2819
+ }, [this.collapsed ? "\u5C55\u5F00" + (hiddenNum ? "(" + hiddenNum + ")" : '') : "收起"]), h("i", {
2802
2820
  "class": this.collapsed ? "el-icon-arrow-down" : "el-icon-arrow-up"
2803
2821
  })]) : null])])]);
2804
2822
  }
@@ -2814,7 +2832,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2814
2832
  on: Object.assign({}, this.$listeners)
2815
2833
  };
2816
2834
  return h("div", {
2817
- "class": ['form', {
2835
+ "class": ['form form-query', {
2818
2836
  'is-full': this.isFull
2819
2837
  }]
2820
2838
  }, [h("el-form", babel_helper_vue_jsx_merge_props_default()([{
@@ -3350,9 +3368,6 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
3350
3368
  return this.api.request || this.request || (this.$COMPONENT || {}).request;
3351
3369
  }
3352
3370
  },
3353
- created: function created() {
3354
- console.log(this.form);
3355
- },
3356
3371
  methods: {
3357
3372
  open: function open(model, expandModel) {
3358
3373
  var _this2 = this;
@@ -5651,51 +5666,109 @@ table_column.install = function (Vue) {
5651
5666
  Vue.component(table_column.name, table_column);
5652
5667
  };
5653
5668
  /* harmony default export */ var components_table_column = (table_column);
5654
- // 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&
5655
- var srcvue_type_template_id_36222536_render = function render() {
5669
+ // 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&
5670
+ var srcvue_type_template_id_122add3a_render = function render() {
5656
5671
  var _vm = this,
5657
5672
  _c = _vm._self._c
5658
5673
  return _c("div", { staticClass: "table-search" }, [
5659
- _vm.search
5674
+ _vm.search && _vm.search.form
5660
5675
  ? _c(
5661
5676
  "div",
5662
5677
  [
5663
- _c("Form", _vm._b({ ref: "form" }, "Form", _vm.formProps, false)),
5664
- _vm._t("tools", function () {
5665
- return [
5666
- _vm.search.form
5667
- ? _c(
5668
- "div",
5669
- { staticClass: "table-search_tools" },
5670
- [
5671
- _c(
5672
- "el-button",
5673
- {
5674
- attrs: {
5675
- loading: _vm.pageData.searchLoading,
5676
- type: "primary",
5677
- icon: "el-icon-search",
5678
- },
5679
- on: { click: _vm.searchSubmit },
5680
- },
5681
- [_vm._v("\n 查询\n ")]
5682
- ),
5683
- _c(
5684
- "el-button",
5685
- {
5686
- attrs: { icon: "el-icon-refresh-left" },
5687
- on: { click: _vm.resetForm },
5688
- },
5689
- [_vm._v("重置")]
5690
- ),
5691
- ],
5692
- 1
5693
- )
5694
- : _vm._e(),
5695
- ]
5696
- }),
5678
+ _c(
5679
+ "FormQuery",
5680
+ _vm._b(
5681
+ {
5682
+ ref: "form",
5683
+ scopedSlots: _vm._u(
5684
+ [
5685
+ {
5686
+ key: "submitter",
5687
+ fn: function ({
5688
+ needCollapseRender,
5689
+ hiddenNum,
5690
+ collapsed,
5691
+ setCollapsed,
5692
+ }) {
5693
+ return [
5694
+ _c(
5695
+ "div",
5696
+ { staticClass: "query-button" },
5697
+ [
5698
+ _c(
5699
+ "el-button",
5700
+ {
5701
+ attrs: { icon: "el-icon-refresh-left" },
5702
+ on: { click: _vm.resetForm },
5703
+ },
5704
+ [_vm._v("重置")]
5705
+ ),
5706
+ _c(
5707
+ "el-button",
5708
+ {
5709
+ attrs: {
5710
+ loading: _vm.pageData.searchLoading,
5711
+ type: "primary",
5712
+ icon: "el-icon-search",
5713
+ },
5714
+ on: { click: _vm.searchSubmit },
5715
+ },
5716
+ [_vm._v("\n 查询\n ")]
5717
+ ),
5718
+ needCollapseRender
5719
+ ? _c(
5720
+ "el-link",
5721
+ {
5722
+ attrs: { type: "primary" },
5723
+ on: { click: setCollapsed },
5724
+ },
5725
+ [
5726
+ _c(
5727
+ "span",
5728
+ { staticClass: "collapse" },
5729
+ [
5730
+ _vm._v(
5731
+ _vm._s(
5732
+ collapsed
5733
+ ? `展开${
5734
+ hiddenNum
5735
+ ? `(${hiddenNum})`
5736
+ : ""
5737
+ }`
5738
+ : "收起"
5739
+ )
5740
+ ),
5741
+ ]
5742
+ ),
5743
+ _c("i", {
5744
+ class: [
5745
+ collapsed
5746
+ ? "el-icon-arrow-down"
5747
+ : "el-icon-arrow-up",
5748
+ ],
5749
+ }),
5750
+ ]
5751
+ )
5752
+ : _vm._e(),
5753
+ ],
5754
+ 1
5755
+ ),
5756
+ ]
5757
+ },
5758
+ },
5759
+ ],
5760
+ null,
5761
+ false,
5762
+ 1131437147
5763
+ ),
5764
+ },
5765
+ "FormQuery",
5766
+ _vm.formProps,
5767
+ false
5768
+ )
5769
+ ),
5697
5770
  ],
5698
- 2
5771
+ 1
5699
5772
  )
5700
5773
  : _vm._e(),
5701
5774
  _c(
@@ -5705,7 +5778,11 @@ var srcvue_type_template_id_36222536_render = function render() {
5705
5778
  _c(
5706
5779
  "Table",
5707
5780
  _vm._b(
5708
- { ref: "table", attrs: { request: _vm.request } },
5781
+ {
5782
+ ref: "table",
5783
+ attrs: { request: _vm.request },
5784
+ on: { success: _vm.searchFinish, error: _vm.searchFinish },
5785
+ },
5709
5786
  "Table",
5710
5787
  _vm.tableProps,
5711
5788
  false
@@ -5716,15 +5793,15 @@ var srcvue_type_template_id_36222536_render = function render() {
5716
5793
  ),
5717
5794
  ])
5718
5795
  }
5719
- var srcvue_type_template_id_36222536_staticRenderFns = []
5720
- srcvue_type_template_id_36222536_render._withStripped = true
5796
+ var srcvue_type_template_id_122add3a_staticRenderFns = []
5797
+ srcvue_type_template_id_122add3a_render._withStripped = true
5721
5798
 
5722
5799
 
5723
- // CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=36222536&
5800
+ // CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=122add3a&
5724
5801
 
5725
- // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form"
5726
- var components_form_ = __webpack_require__(51);
5727
- var components_form_default = /*#__PURE__*/__webpack_require__.n(components_form_);
5802
+ // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-query"
5803
+ var form_query_ = __webpack_require__(51);
5804
+ var form_query_default = /*#__PURE__*/__webpack_require__.n(form_query_);
5728
5805
 
5729
5806
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table"
5730
5807
  var components_table_ = __webpack_require__(52);
@@ -5740,7 +5817,7 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
5740
5817
  componentName: "TableSearch",
5741
5818
  components: {
5742
5819
  elButton: button_default.a,
5743
- Form: components_form_default.a,
5820
+ FormQuery: form_query_default.a,
5744
5821
  Table: components_table_default.a
5745
5822
  },
5746
5823
  props: {
@@ -5751,7 +5828,8 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
5751
5828
  computed: {
5752
5829
  formProps: function formProps() {
5753
5830
  return Object.assign({
5754
- formModel: this.searchData
5831
+ formModel: this.searchData,
5832
+ showHiddenNum: true
5755
5833
  }, this.search.form);
5756
5834
  },
5757
5835
  tableProps: function tableProps() {
@@ -5788,12 +5866,16 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
5788
5866
  reloadTable: function reloadTable() {
5789
5867
  this.$refs.table.reload();
5790
5868
  },
5869
+ searchFinish: function searchFinish() {
5870
+ this.pageData.searchLoading = false;
5871
+ },
5791
5872
  searchSubmit: function searchSubmit() {
5792
5873
  var _this2 = this;
5793
5874
  this.$refs.form.validate(function (isValidate, errorMessage) {
5794
5875
  if (!isValidate) {
5795
5876
  return false;
5796
5877
  }
5878
+ _this2.pageData.searchLoading = true;
5797
5879
  _this2.resetTable();
5798
5880
  });
5799
5881
  }
@@ -5811,8 +5893,8 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
5811
5893
 
5812
5894
  var table_search_src_component = normalizeComponent(
5813
5895
  components_table_search_srcvue_type_script_lang_js_,
5814
- srcvue_type_template_id_36222536_render,
5815
- srcvue_type_template_id_36222536_staticRenderFns,
5896
+ srcvue_type_template_id_122add3a_render,
5897
+ srcvue_type_template_id_122add3a_staticRenderFns,
5816
5898
  false,
5817
5899
  null,
5818
5900
  null,
@@ -6850,8 +6932,8 @@ table_operate_src.install = function (Vue) {
6850
6932
  Vue.component(table_operate_src.name, table_operate_src);
6851
6933
  };
6852
6934
  /* harmony default export */ var table_operate = (table_operate_src);
6853
- // 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&
6854
- var srcvue_type_template_id_8fb8bc56_render = function render() {
6935
+ // 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=2155e5c4&
6936
+ var srcvue_type_template_id_2155e5c4_render = function render() {
6855
6937
  var _vm = this,
6856
6938
  _c = _vm._self._c
6857
6939
  return _c("div", [
@@ -6917,11 +6999,11 @@ var srcvue_type_template_id_8fb8bc56_render = function render() {
6917
6999
  ),
6918
7000
  ])
6919
7001
  }
6920
- var srcvue_type_template_id_8fb8bc56_staticRenderFns = []
6921
- srcvue_type_template_id_8fb8bc56_render._withStripped = true
7002
+ var srcvue_type_template_id_2155e5c4_staticRenderFns = []
7003
+ srcvue_type_template_id_2155e5c4_render._withStripped = true
6922
7004
 
6923
7005
 
6924
- // CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=8fb8bc56&
7006
+ // CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=2155e5c4&
6925
7007
 
6926
7008
  // 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&
6927
7009
 
@@ -6947,21 +7029,21 @@ srcvue_type_template_id_8fb8bc56_render._withStripped = true
6947
7029
  };
6948
7030
  },
6949
7031
  createProps: function createProps() {
6950
- return Object(external_lodash_["merge"])({
7032
+ return Object.assign({
6951
7033
  dialog: {
6952
7034
  title: "添加"
6953
7035
  }
6954
7036
  }, this.create);
6955
7037
  },
6956
7038
  updateProps: function updateProps() {
6957
- return Object(external_lodash_["merge"])({
7039
+ return Object.assign({
6958
7040
  dialog: {
6959
7041
  title: "修改"
6960
7042
  }
6961
7043
  }, this.update);
6962
7044
  },
6963
7045
  viewProps: function viewProps() {
6964
- return Object(external_lodash_["merge"])({
7046
+ return Object.assign({
6965
7047
  dialog: {
6966
7048
  title: "查看"
6967
7049
  }
@@ -7037,7 +7119,7 @@ srcvue_type_template_id_8fb8bc56_render._withStripped = true
7037
7119
  // 添加按钮处理
7038
7120
  if (this.create) {
7039
7121
  var tools = this.table && this.table.tools || [];
7040
- tools.unshift(Object(external_lodash_["merge"])({
7122
+ tools.unshift(Object.assign({
7041
7123
  label: "添加",
7042
7124
  loading: false,
7043
7125
  sort: 10,
@@ -7057,7 +7139,7 @@ srcvue_type_template_id_8fb8bc56_render._withStripped = true
7057
7139
  var optColumn = filterColumns && filterColumns[0];
7058
7140
  var items = optColumn && optColumn.items || [];
7059
7141
  if (this.update) {
7060
- items.push(Object(external_lodash_["merge"])({
7142
+ items.push(Object.assign({
7061
7143
  label: "修改",
7062
7144
  loading: false,
7063
7145
  sort: 10,
@@ -7067,7 +7149,7 @@ srcvue_type_template_id_8fb8bc56_render._withStripped = true
7067
7149
  }, this.update.tool));
7068
7150
  }
7069
7151
  if (this.view) {
7070
- items.push(Object(external_lodash_["merge"])({
7152
+ items.push(Object.assign({
7071
7153
  label: "查看",
7072
7154
  loading: false,
7073
7155
  sort: 20,
@@ -7077,7 +7159,7 @@ srcvue_type_template_id_8fb8bc56_render._withStripped = true
7077
7159
  }, this.view.tool));
7078
7160
  }
7079
7161
  if (this.delete) {
7080
- items.push(Object(external_lodash_["merge"])({
7162
+ items.push(Object.assign({
7081
7163
  label: "删除",
7082
7164
  loading: false,
7083
7165
  sort: 30,
@@ -7133,7 +7215,13 @@ srcvue_type_template_id_8fb8bc56_render._withStripped = true
7133
7215
  if (typeof detailApi.after === "function") {
7134
7216
  res = detailApi.after.call(_this2, res);
7135
7217
  }
7136
- _this2.$refs.updateFormDialog.setFormModel(res);
7218
+ if (Promise.resolve(res) === res) {
7219
+ res.then(function (resData) {
7220
+ _this2.$refs.updateFormDialog.setFormModel(resData);
7221
+ });
7222
+ } else {
7223
+ _this2.$refs.updateFormDialog.setFormModel(res);
7224
+ }
7137
7225
  }).catch(function (error) {
7138
7226
  that.loading = false;
7139
7227
  });
@@ -7231,8 +7319,8 @@ srcvue_type_template_id_8fb8bc56_render._withStripped = true
7231
7319
 
7232
7320
  var crud_src_component = normalizeComponent(
7233
7321
  components_crud_srcvue_type_script_lang_js_,
7234
- srcvue_type_template_id_8fb8bc56_render,
7235
- srcvue_type_template_id_8fb8bc56_staticRenderFns,
7322
+ srcvue_type_template_id_2155e5c4_render,
7323
+ srcvue_type_template_id_2155e5c4_staticRenderFns,
7236
7324
  false,
7237
7325
  null,
7238
7326
  null,
@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
215
215
  // ESM COMPAT FLAG
216
216
  __webpack_require__.r(__webpack_exports__);
217
217
 
218
- // 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&
218
+ // 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&
219
219
  var render = function render() {
220
220
  var _vm = this,
221
221
  _c = _vm._self._c
@@ -286,7 +286,7 @@ var staticRenderFns = []
286
286
  render._withStripped = true
287
287
 
288
288
 
289
- // CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
289
+ // CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
290
290
 
291
291
  // EXTERNAL MODULE: external "element-ui/lib/form"
292
292
  var form_ = __webpack_require__(12);
@@ -417,8 +417,6 @@ var external_lodash_ = __webpack_require__(2);
417
417
  },
418
418
  created: function created() {
419
419
  var _this2 = this;
420
- console.log(this.formItems);
421
- debugger;
422
420
  this.formItems.forEach(function (item) {
423
421
  _this2.formItemLayout[item.prop] = item;
424
422
  if (typeof item.value === "function") {
@@ -1569,9 +1567,6 @@ var external_lodash_ = __webpack_require__(2);
1569
1567
  return this.api.request || this.request || (this.$COMPONENT || {}).request;
1570
1568
  }
1571
1569
  },
1572
- created: function created() {
1573
- console.log(this.form);
1574
- },
1575
1570
  methods: {
1576
1571
  open: function open(model, expandModel) {
1577
1572
  var _this2 = this;
@@ -2064,7 +2059,7 @@ module.exports = require("element-ui/lib/message-box");
2064
2059
  // ESM COMPAT FLAG
2065
2060
  __webpack_require__.r(__webpack_exports__);
2066
2061
 
2067
- // 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&
2062
+ // 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=2155e5c4&
2068
2063
  var render = function render() {
2069
2064
  var _vm = this,
2070
2065
  _c = _vm._self._c
@@ -2135,7 +2130,7 @@ var staticRenderFns = []
2135
2130
  render._withStripped = true
2136
2131
 
2137
2132
 
2138
- // CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=8fb8bc56&
2133
+ // CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=2155e5c4&
2139
2134
 
2140
2135
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-search"
2141
2136
  var table_search_ = __webpack_require__(27);
@@ -2181,21 +2176,21 @@ var external_lodash_ = __webpack_require__(2);
2181
2176
  };
2182
2177
  },
2183
2178
  createProps: function createProps() {
2184
- return Object(external_lodash_["merge"])({
2179
+ return Object.assign({
2185
2180
  dialog: {
2186
2181
  title: "添加"
2187
2182
  }
2188
2183
  }, this.create);
2189
2184
  },
2190
2185
  updateProps: function updateProps() {
2191
- return Object(external_lodash_["merge"])({
2186
+ return Object.assign({
2192
2187
  dialog: {
2193
2188
  title: "修改"
2194
2189
  }
2195
2190
  }, this.update);
2196
2191
  },
2197
2192
  viewProps: function viewProps() {
2198
- return Object(external_lodash_["merge"])({
2193
+ return Object.assign({
2199
2194
  dialog: {
2200
2195
  title: "查看"
2201
2196
  }
@@ -2271,7 +2266,7 @@ var external_lodash_ = __webpack_require__(2);
2271
2266
  // 添加按钮处理
2272
2267
  if (this.create) {
2273
2268
  var tools = this.table && this.table.tools || [];
2274
- tools.unshift(Object(external_lodash_["merge"])({
2269
+ tools.unshift(Object.assign({
2275
2270
  label: "添加",
2276
2271
  loading: false,
2277
2272
  sort: 10,
@@ -2291,7 +2286,7 @@ var external_lodash_ = __webpack_require__(2);
2291
2286
  var optColumn = filterColumns && filterColumns[0];
2292
2287
  var items = optColumn && optColumn.items || [];
2293
2288
  if (this.update) {
2294
- items.push(Object(external_lodash_["merge"])({
2289
+ items.push(Object.assign({
2295
2290
  label: "修改",
2296
2291
  loading: false,
2297
2292
  sort: 10,
@@ -2301,7 +2296,7 @@ var external_lodash_ = __webpack_require__(2);
2301
2296
  }, this.update.tool));
2302
2297
  }
2303
2298
  if (this.view) {
2304
- items.push(Object(external_lodash_["merge"])({
2299
+ items.push(Object.assign({
2305
2300
  label: "查看",
2306
2301
  loading: false,
2307
2302
  sort: 20,
@@ -2311,7 +2306,7 @@ var external_lodash_ = __webpack_require__(2);
2311
2306
  }, this.view.tool));
2312
2307
  }
2313
2308
  if (this.delete) {
2314
- items.push(Object(external_lodash_["merge"])({
2309
+ items.push(Object.assign({
2315
2310
  label: "删除",
2316
2311
  loading: false,
2317
2312
  sort: 30,
@@ -2367,7 +2362,13 @@ var external_lodash_ = __webpack_require__(2);
2367
2362
  if (typeof detailApi.after === "function") {
2368
2363
  res = detailApi.after.call(_this2, res);
2369
2364
  }
2370
- _this2.$refs.updateFormDialog.setFormModel(res);
2365
+ if (Promise.resolve(res) === res) {
2366
+ res.then(function (resData) {
2367
+ _this2.$refs.updateFormDialog.setFormModel(resData);
2368
+ });
2369
+ } else {
2370
+ _this2.$refs.updateFormDialog.setFormModel(res);
2371
+ }
2371
2372
  }).catch(function (error) {
2372
2373
  that.loading = false;
2373
2374
  });
@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
215
215
  // ESM COMPAT FLAG
216
216
  __webpack_require__.r(__webpack_exports__);
217
217
 
218
- // 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&
218
+ // 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&
219
219
  var render = function render() {
220
220
  var _vm = this,
221
221
  _c = _vm._self._c
@@ -286,7 +286,7 @@ var staticRenderFns = []
286
286
  render._withStripped = true
287
287
 
288
288
 
289
- // CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
289
+ // CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
290
290
 
291
291
  // EXTERNAL MODULE: external "element-ui/lib/form"
292
292
  var form_ = __webpack_require__(12);
@@ -417,8 +417,6 @@ var external_lodash_ = __webpack_require__(2);
417
417
  },
418
418
  created: function created() {
419
419
  var _this2 = this;
420
- console.log(this.formItems);
421
- debugger;
422
420
  this.formItems.forEach(function (item) {
423
421
  _this2.formItemLayout[item.prop] = item;
424
422
  if (typeof item.value === "function") {
@@ -1121,9 +1119,6 @@ var external_lodash_ = __webpack_require__(2);
1121
1119
  return this.api.request || this.request || (this.$COMPONENT || {}).request;
1122
1120
  }
1123
1121
  },
1124
- created: function created() {
1125
- console.log(this.form);
1126
- },
1127
1122
  methods: {
1128
1123
  open: function open(model, expandModel) {
1129
1124
  var _this2 = this;