@panpanzhao/component-ui 0.0.21 → 0.0.23

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.
@@ -289,19 +289,19 @@ render._withStripped = true
289
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
- var form_ = __webpack_require__(12);
292
+ var form_ = __webpack_require__(13);
293
293
  var form_default = /*#__PURE__*/__webpack_require__.n(form_);
294
294
 
295
295
  // EXTERNAL MODULE: external "element-ui/lib/row"
296
- var row_ = __webpack_require__(13);
296
+ var row_ = __webpack_require__(14);
297
297
  var row_default = /*#__PURE__*/__webpack_require__.n(row_);
298
298
 
299
299
  // EXTERNAL MODULE: external "element-ui/lib/col"
300
- var col_ = __webpack_require__(14);
300
+ var col_ = __webpack_require__(15);
301
301
  var col_default = /*#__PURE__*/__webpack_require__.n(col_);
302
302
 
303
303
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
304
- var form_item_ = __webpack_require__(15);
304
+ var form_item_ = __webpack_require__(16);
305
305
  var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
306
306
 
307
307
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -552,61 +552,16 @@ module.exports = require("element-ui/lib/collapse-item");
552
552
  // ESM COMPAT FLAG
553
553
  __webpack_require__.r(__webpack_exports__);
554
554
 
555
- // 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&
556
- var render = function render() {
557
- var _vm = this,
558
- _c = _vm._self._c
559
- return _c(
560
- "div",
561
- { staticClass: "form-view" },
562
- [
563
- _vm._t("default", function () {
564
- return [
565
- _c(
566
- "el-descriptions",
567
- _vm._g(
568
- _vm._b({ ref: "form" }, "el-descriptions", _vm.formProps, false),
569
- _vm.formListeners
570
- ),
571
- _vm._l(_vm.filterFormItems, function (item) {
572
- return _c(
573
- "el-descriptions-item",
574
- _vm._g(
575
- _vm._b(
576
- { key: item.prop },
577
- "el-descriptions-item",
578
- item,
579
- false
580
- ),
581
- item.on
582
- ),
583
- [
584
- _vm._v(
585
- "\n " + _vm._s(_vm.formModel[item.prop]) + "\n "
586
- ),
587
- ]
588
- )
589
- }),
590
- 1
591
- ),
592
- ]
593
- }),
594
- ],
595
- 2
596
- )
597
- }
598
- var staticRenderFns = []
599
- render._withStripped = true
600
-
601
-
602
- // CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=32454b68&
555
+ // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
556
+ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
557
+ var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
603
558
 
604
559
  // EXTERNAL MODULE: external "element-ui/lib/descriptions"
605
- var descriptions_ = __webpack_require__(18);
560
+ var descriptions_ = __webpack_require__(20);
606
561
  var descriptions_default = /*#__PURE__*/__webpack_require__.n(descriptions_);
607
562
 
608
563
  // EXTERNAL MODULE: external "element-ui/lib/descriptions-item"
609
- var descriptions_item_ = __webpack_require__(19);
564
+ var descriptions_item_ = __webpack_require__(21);
610
565
  var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_item_);
611
566
 
612
567
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -615,12 +570,19 @@ var formula_ = __webpack_require__(3);
615
570
  // EXTERNAL MODULE: external "lodash"
616
571
  var external_lodash_ = __webpack_require__(2);
617
572
 
618
- // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view/src/index.vue?vue&type=script&lang=js&
573
+ // EXTERNAL MODULE: external "dayjs"
574
+ var external_dayjs_ = __webpack_require__(11);
575
+ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_);
619
576
 
577
+ // CONCATENATED MODULE: ./src/components/form-view/src/index.js
620
578
 
621
579
 
622
580
 
623
- /* harmony default export */ var srcvue_type_script_lang_js_ = ({
581
+
582
+
583
+
584
+
585
+ /* harmony default export */ var src = ({
624
586
  name: "FormView",
625
587
  componentName: "FormView",
626
588
  components: {
@@ -645,22 +607,6 @@ var external_lodash_ = __webpack_require__(2);
645
607
  }
646
608
  },
647
609
  computed: {
648
- formProps: function formProps() {
649
- return Object.assign({
650
- border: true,
651
- direction: this.labelPosition === "top" ? "vertical" : "horizontal",
652
- labelStyle: {
653
- width: this.labelWidth,
654
- textAlign: this.labelPosition
655
- }
656
- }, this.$attrs);
657
- },
658
- formListeners: function formListeners() {
659
- return Object.assign({}, this.$listeners);
660
- },
661
- rowProps: function rowProps() {
662
- return Object.assign({}, this.$attrs);
663
- },
664
610
  filterFormItems: function filterFormItems() {
665
611
  var _this = this;
666
612
  return this.formItems.filter(function (item) {
@@ -698,34 +644,64 @@ var external_lodash_ = __webpack_require__(2);
698
644
  methods: {
699
645
  setFormModel: function setFormModel(model) {
700
646
  Object(external_lodash_["merge"])(this.formModel, model);
647
+ },
648
+ renderContent: function renderContent(h, item) {
649
+ if (typeof item.formatter === "function") {
650
+ return item.formatter.call(this, {
651
+ formModel: this.formModel,
652
+ config: item
653
+ });
654
+ }
655
+ var value = this.formModel[item.prop];
656
+ if (value === null || value === undefined) {
657
+ return value;
658
+ }
659
+ if (item.control === "Dict" && item.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
660
+ var options = this.$COMPONENT.dataSource.dict[item.dictCode];
661
+ var map = {};
662
+ if (Array.isArray(options)) {
663
+ options.forEach(function (dictItem) {
664
+ map[dictItem.value] = dictItem;
665
+ });
666
+ }
667
+ return map[value] && map[value].label;
668
+ } else if (item.control === "Data" && this.format && external_dayjs_default()(value).isValid()) {
669
+ return external_dayjs_default()(value).format(this.format);
670
+ } else {
671
+ return value;
672
+ }
673
+ },
674
+ renderItem: function renderItem(h, item) {
675
+ var param = {
676
+ attrs: Object.assign({}, item)
677
+ };
678
+ return h("el-descriptions-item", babel_helper_vue_jsx_merge_props_default()([{
679
+ "key": item.prop
680
+ }, param]), [this.renderContent(h, item)]);
701
681
  }
682
+ },
683
+ render: function render(h) {
684
+ var _this3 = this;
685
+ var param = {
686
+ attrs: Object.assign({
687
+ border: true,
688
+ direction: this.labelPosition === "top" ? "vertical" : "horizontal",
689
+ labelStyle: {
690
+ width: this.labelWidth,
691
+ textAlign: this.labelPosition
692
+ }
693
+ }, this.$attrs),
694
+ on: Object.assign({}, this.$listeners)
695
+ };
696
+ return h("div", {
697
+ "class": "form-view"
698
+ }, [h("el-descriptions", babel_helper_vue_jsx_merge_props_default()([{
699
+ "ref": "form"
700
+ }, param]), [this.filterFormItems.map(function (item) {
701
+ return _this3.renderItem(h, item);
702
+ })])]);
702
703
  }
703
704
  });
704
- // CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=script&lang=js&
705
- /* harmony default export */ var form_view_srcvue_type_script_lang_js_ = (srcvue_type_script_lang_js_);
706
- // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
707
- var componentNormalizer = __webpack_require__(1);
708
-
709
- // CONCATENATED MODULE: ./src/components/form-view/src/index.vue
710
-
711
-
712
-
713
-
714
-
715
- /* normalize component */
716
-
717
- var component = Object(componentNormalizer["a" /* default */])(
718
- form_view_srcvue_type_script_lang_js_,
719
- render,
720
- staticRenderFns,
721
- false,
722
- null,
723
- null,
724
- null
725
-
726
- )
727
-
728
- /* harmony default export */ var src = (component.exports);
729
705
  // CONCATENATED MODULE: ./src/components/form-view/index.js
730
706
 
731
707
  src.install = function (Vue) {
@@ -737,34 +713,41 @@ src.install = function (Vue) {
737
713
  /* 11 */
738
714
  /***/ (function(module, exports) {
739
715
 
740
- module.exports = require("@panpanzhao/component-ui/lib/components/dialog");
716
+ module.exports = require("dayjs");
741
717
 
742
718
  /***/ }),
743
719
  /* 12 */
744
720
  /***/ (function(module, exports) {
745
721
 
746
- module.exports = require("element-ui/lib/form");
722
+ module.exports = require("@panpanzhao/component-ui/lib/components/dialog");
747
723
 
748
724
  /***/ }),
749
725
  /* 13 */
750
726
  /***/ (function(module, exports) {
751
727
 
752
- module.exports = require("element-ui/lib/row");
728
+ module.exports = require("element-ui/lib/form");
753
729
 
754
730
  /***/ }),
755
731
  /* 14 */
756
732
  /***/ (function(module, exports) {
757
733
 
758
- module.exports = require("element-ui/lib/col");
734
+ module.exports = require("element-ui/lib/row");
759
735
 
760
736
  /***/ }),
761
737
  /* 15 */
762
738
  /***/ (function(module, exports) {
763
739
 
764
- module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
740
+ module.exports = require("element-ui/lib/col");
765
741
 
766
742
  /***/ }),
767
743
  /* 16 */
744
+ /***/ (function(module, exports) {
745
+
746
+ module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
747
+
748
+ /***/ }),
749
+ /* 17 */,
750
+ /* 18 */
768
751
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
769
752
 
770
753
  "use strict";
@@ -1124,21 +1107,20 @@ src.install = function (Vue) {
1124
1107
  /* harmony default export */ var form_group = __webpack_exports__["default"] = (src);
1125
1108
 
1126
1109
  /***/ }),
1127
- /* 17 */,
1128
- /* 18 */
1110
+ /* 19 */,
1111
+ /* 20 */
1129
1112
  /***/ (function(module, exports) {
1130
1113
 
1131
1114
  module.exports = require("element-ui/lib/descriptions");
1132
1115
 
1133
1116
  /***/ }),
1134
- /* 19 */
1117
+ /* 21 */
1135
1118
  /***/ (function(module, exports) {
1136
1119
 
1137
1120
  module.exports = require("element-ui/lib/descriptions-item");
1138
1121
 
1139
1122
  /***/ }),
1140
- /* 20 */,
1141
- /* 21 */
1123
+ /* 22 */
1142
1124
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
1143
1125
 
1144
1126
  "use strict";
@@ -1149,7 +1131,7 @@ __webpack_require__.r(__webpack_exports__);
1149
1131
  var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
1150
1132
  var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
1151
1133
 
1152
- // EXTERNAL MODULE: ./src/components/form-view/index.js + 5 modules
1134
+ // EXTERNAL MODULE: ./src/components/form-view/index.js + 1 modules
1153
1135
  var form_view = __webpack_require__(10);
1154
1136
 
1155
1137
  // CONCATENATED MODULE: ./src/components/form-view-group/src/content.js
@@ -1389,8 +1371,8 @@ src.install = function (Vue) {
1389
1371
  /* harmony default export */ var form_view_group = __webpack_exports__["default"] = (src);
1390
1372
 
1391
1373
  /***/ }),
1392
- /* 22 */,
1393
- /* 23 */
1374
+ /* 23 */,
1375
+ /* 24 */
1394
1376
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
1395
1377
 
1396
1378
  "use strict";
@@ -1402,7 +1384,7 @@ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
1402
1384
  var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
1403
1385
 
1404
1386
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/dialog"
1405
- var dialog_ = __webpack_require__(11);
1387
+ var dialog_ = __webpack_require__(12);
1406
1388
  var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
1407
1389
 
1408
1390
  // EXTERNAL MODULE: external "element-ui/lib/button"
@@ -1413,7 +1395,7 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
1413
1395
  var components_form = __webpack_require__(4);
1414
1396
 
1415
1397
  // EXTERNAL MODULE: ./src/components/form-group/index.js + 2 modules
1416
- var form_group = __webpack_require__(16);
1398
+ var form_group = __webpack_require__(18);
1417
1399
 
1418
1400
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
1419
1401
  var formula_ = __webpack_require__(3);
@@ -1582,7 +1564,7 @@ var external_lodash_ = __webpack_require__(2);
1582
1564
  this.show = false;
1583
1565
  },
1584
1566
  setFormModel: function setFormModel(model) {
1585
- Object(external_lodash_["merge"])(this.formModel, model);
1567
+ Object.assign(this.formModel, model);
1586
1568
  },
1587
1569
  reset: function reset() {
1588
1570
  this.$refs.form && this.$refs.form.reset();
@@ -1734,7 +1716,7 @@ src.install = function (Vue) {
1734
1716
  /* harmony default export */ var form_dialog = __webpack_exports__["default"] = (src);
1735
1717
 
1736
1718
  /***/ }),
1737
- /* 24 */
1719
+ /* 25 */
1738
1720
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
1739
1721
 
1740
1722
  "use strict";
@@ -1746,18 +1728,18 @@ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
1746
1728
  var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
1747
1729
 
1748
1730
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/dialog"
1749
- var dialog_ = __webpack_require__(11);
1731
+ var dialog_ = __webpack_require__(12);
1750
1732
  var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
1751
1733
 
1752
1734
  // EXTERNAL MODULE: external "element-ui/lib/button"
1753
1735
  var button_ = __webpack_require__(5);
1754
1736
  var button_default = /*#__PURE__*/__webpack_require__.n(button_);
1755
1737
 
1756
- // EXTERNAL MODULE: ./src/components/form-view/index.js + 5 modules
1738
+ // EXTERNAL MODULE: ./src/components/form-view/index.js + 1 modules
1757
1739
  var form_view = __webpack_require__(10);
1758
1740
 
1759
1741
  // EXTERNAL MODULE: ./src/components/form-view-group/index.js + 2 modules
1760
- var form_view_group = __webpack_require__(21);
1742
+ var form_view_group = __webpack_require__(22);
1761
1743
 
1762
1744
  // EXTERNAL MODULE: external "lodash"
1763
1745
  var external_lodash_ = __webpack_require__(2);
@@ -1991,23 +1973,22 @@ src.install = function (Vue) {
1991
1973
  /* harmony default export */ var form_view_dialog = __webpack_exports__["default"] = (src);
1992
1974
 
1993
1975
  /***/ }),
1994
- /* 25 */,
1995
1976
  /* 26 */,
1996
- /* 27 */
1977
+ /* 27 */,
1978
+ /* 28 */
1997
1979
  /***/ (function(module, exports) {
1998
1980
 
1999
1981
  module.exports = require("@panpanzhao/component-ui/lib/components/table-search");
2000
1982
 
2001
1983
  /***/ }),
2002
- /* 28 */,
2003
1984
  /* 29 */,
2004
- /* 30 */
1985
+ /* 30 */,
1986
+ /* 31 */
2005
1987
  /***/ (function(module, exports) {
2006
1988
 
2007
1989
  module.exports = require("element-ui/lib/message-box");
2008
1990
 
2009
1991
  /***/ }),
2010
- /* 31 */,
2011
1992
  /* 32 */,
2012
1993
  /* 33 */,
2013
1994
  /* 34 */,
@@ -2133,17 +2114,17 @@ render._withStripped = true
2133
2114
  // CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=2155e5c4&
2134
2115
 
2135
2116
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-search"
2136
- var table_search_ = __webpack_require__(27);
2117
+ var table_search_ = __webpack_require__(28);
2137
2118
  var table_search_default = /*#__PURE__*/__webpack_require__.n(table_search_);
2138
2119
 
2139
2120
  // EXTERNAL MODULE: ./src/components/form-dialog/index.js + 3 modules
2140
- var form_dialog = __webpack_require__(23);
2121
+ var form_dialog = __webpack_require__(24);
2141
2122
 
2142
2123
  // EXTERNAL MODULE: ./src/components/form-view-dialog/index.js + 3 modules
2143
- var form_view_dialog = __webpack_require__(24);
2124
+ var form_view_dialog = __webpack_require__(25);
2144
2125
 
2145
2126
  // EXTERNAL MODULE: external "element-ui/lib/message-box"
2146
- var message_box_ = __webpack_require__(30);
2127
+ var message_box_ = __webpack_require__(31);
2147
2128
  var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
2148
2129
 
2149
2130
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -192,14 +192,14 @@ function normalizeComponent(
192
192
 
193
193
  /***/ }),
194
194
 
195
- /***/ 31:
195
+ /***/ 32:
196
196
  /***/ (function(module, exports) {
197
197
 
198
198
  module.exports = require("element-ui/src/utils/popup");
199
199
 
200
200
  /***/ }),
201
201
 
202
- /***/ 32:
202
+ /***/ 33:
203
203
  /***/ (function(module, exports) {
204
204
 
205
205
  module.exports = require("element-ui/src/mixins/emitter");
@@ -336,7 +336,7 @@ render._withStripped = true
336
336
  // CONCATENATED MODULE: ./src/components/dialog/src/index.vue?vue&type=template&id=6ea89ba6&
337
337
 
338
338
  // EXTERNAL MODULE: external "element-ui/src/utils/popup"
339
- var popup_ = __webpack_require__(31);
339
+ var popup_ = __webpack_require__(32);
340
340
  var popup_default = /*#__PURE__*/__webpack_require__.n(popup_);
341
341
 
342
342
  // EXTERNAL MODULE: external "element-ui/src/mixins/migrating"
@@ -344,7 +344,7 @@ var migrating_ = __webpack_require__(65);
344
344
  var migrating_default = /*#__PURE__*/__webpack_require__.n(migrating_);
345
345
 
346
346
  // EXTERNAL MODULE: external "element-ui/src/mixins/emitter"
347
- var emitter_ = __webpack_require__(32);
347
+ var emitter_ = __webpack_require__(33);
348
348
  var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
349
349
 
350
350
  // 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&
@@ -192,14 +192,14 @@ function normalizeComponent(
192
192
 
193
193
  /***/ }),
194
194
 
195
- /***/ 31:
195
+ /***/ 32:
196
196
  /***/ (function(module, exports) {
197
197
 
198
198
  module.exports = require("element-ui/src/utils/popup");
199
199
 
200
200
  /***/ }),
201
201
 
202
- /***/ 32:
202
+ /***/ 33:
203
203
  /***/ (function(module, exports) {
204
204
 
205
205
  module.exports = require("element-ui/src/mixins/emitter");
@@ -347,11 +347,11 @@ render._withStripped = true
347
347
  // CONCATENATED MODULE: ./src/components/drawer/src/index.vue?vue&type=template&id=6565c780&
348
348
 
349
349
  // EXTERNAL MODULE: external "element-ui/src/utils/popup"
350
- var popup_ = __webpack_require__(31);
350
+ var popup_ = __webpack_require__(32);
351
351
  var popup_default = /*#__PURE__*/__webpack_require__.n(popup_);
352
352
 
353
353
  // EXTERNAL MODULE: external "element-ui/src/mixins/emitter"
354
- var emitter_ = __webpack_require__(32);
354
+ var emitter_ = __webpack_require__(33);
355
355
  var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
356
356
 
357
357
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=script&lang=js&
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 23);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 24);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ([
@@ -289,19 +289,19 @@ render._withStripped = true
289
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
- var form_ = __webpack_require__(12);
292
+ var form_ = __webpack_require__(13);
293
293
  var form_default = /*#__PURE__*/__webpack_require__.n(form_);
294
294
 
295
295
  // EXTERNAL MODULE: external "element-ui/lib/row"
296
- var row_ = __webpack_require__(13);
296
+ var row_ = __webpack_require__(14);
297
297
  var row_default = /*#__PURE__*/__webpack_require__.n(row_);
298
298
 
299
299
  // EXTERNAL MODULE: external "element-ui/lib/col"
300
- var col_ = __webpack_require__(14);
300
+ var col_ = __webpack_require__(15);
301
301
  var col_default = /*#__PURE__*/__webpack_require__.n(col_);
302
302
 
303
303
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
304
- var form_item_ = __webpack_require__(15);
304
+ var form_item_ = __webpack_require__(16);
305
305
  var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
306
306
 
307
307
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -546,37 +546,39 @@ module.exports = require("element-ui/lib/collapse-item");
546
546
 
547
547
  /***/ }),
548
548
  /* 10 */,
549
- /* 11 */
549
+ /* 11 */,
550
+ /* 12 */
550
551
  /***/ (function(module, exports) {
551
552
 
552
553
  module.exports = require("@panpanzhao/component-ui/lib/components/dialog");
553
554
 
554
555
  /***/ }),
555
- /* 12 */
556
+ /* 13 */
556
557
  /***/ (function(module, exports) {
557
558
 
558
559
  module.exports = require("element-ui/lib/form");
559
560
 
560
561
  /***/ }),
561
- /* 13 */
562
+ /* 14 */
562
563
  /***/ (function(module, exports) {
563
564
 
564
565
  module.exports = require("element-ui/lib/row");
565
566
 
566
567
  /***/ }),
567
- /* 14 */
568
+ /* 15 */
568
569
  /***/ (function(module, exports) {
569
570
 
570
571
  module.exports = require("element-ui/lib/col");
571
572
 
572
573
  /***/ }),
573
- /* 15 */
574
+ /* 16 */
574
575
  /***/ (function(module, exports) {
575
576
 
576
577
  module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
577
578
 
578
579
  /***/ }),
579
- /* 16 */
580
+ /* 17 */,
581
+ /* 18 */
580
582
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
581
583
 
582
584
  "use strict";
@@ -936,13 +938,12 @@ src.install = function (Vue) {
936
938
  /* harmony default export */ var form_group = __webpack_exports__["default"] = (src);
937
939
 
938
940
  /***/ }),
939
- /* 17 */,
940
- /* 18 */,
941
941
  /* 19 */,
942
942
  /* 20 */,
943
943
  /* 21 */,
944
944
  /* 22 */,
945
- /* 23 */
945
+ /* 23 */,
946
+ /* 24 */
946
947
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
947
948
 
948
949
  "use strict";
@@ -954,7 +955,7 @@ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
954
955
  var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
955
956
 
956
957
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/dialog"
957
- var dialog_ = __webpack_require__(11);
958
+ var dialog_ = __webpack_require__(12);
958
959
  var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
959
960
 
960
961
  // EXTERNAL MODULE: external "element-ui/lib/button"
@@ -965,7 +966,7 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
965
966
  var components_form = __webpack_require__(4);
966
967
 
967
968
  // EXTERNAL MODULE: ./src/components/form-group/index.js + 2 modules
968
- var form_group = __webpack_require__(16);
969
+ var form_group = __webpack_require__(18);
969
970
 
970
971
  // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
971
972
  var formula_ = __webpack_require__(3);
@@ -1134,7 +1135,7 @@ var external_lodash_ = __webpack_require__(2);
1134
1135
  this.show = false;
1135
1136
  },
1136
1137
  setFormModel: function setFormModel(model) {
1137
- Object(external_lodash_["merge"])(this.formModel, model);
1138
+ Object.assign(this.formModel, model);
1138
1139
  },
1139
1140
  reset: function reset() {
1140
1141
  this.$refs.form && this.$refs.form.reset();