@panpanzhao/component-ui 0.0.21 → 0.0.22

package/lib/components/form-drawer.js

@@ -199,35 +199,35 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 12:
+/***/ 13:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/form");
 
 /***/ }),
 
-/***/ 13:
+/***/ 14:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/row");
 
 /***/ }),
 
-/***/ 14:
+/***/ 15:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/col");
 
 /***/ }),
 
-/***/ 15:
+/***/ 16:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
 
 /***/ }),
 
-/***/ 16:
+/***/ 18:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -602,7 +602,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
 
-/***/ 34:
+/***/ 35:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/drawer");
@@ -690,19 +690,19 @@ render._withStripped = true
 // 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);
+var form_ = __webpack_require__(13);
 var form_default = /*#__PURE__*/__webpack_require__.n(form_);
 
 // EXTERNAL MODULE: external "element-ui/lib/row"
-var row_ = __webpack_require__(13);
+var row_ = __webpack_require__(14);
 var row_default = /*#__PURE__*/__webpack_require__.n(row_);
 
 // EXTERNAL MODULE: external "element-ui/lib/col"
-var col_ = __webpack_require__(14);
+var col_ = __webpack_require__(15);
 var col_default = /*#__PURE__*/__webpack_require__.n(col_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
-var form_item_ = __webpack_require__(15);
+var form_item_ = __webpack_require__(16);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -957,7 +957,7 @@ 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_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/drawer"
-var drawer_ = __webpack_require__(34);
+var drawer_ = __webpack_require__(35);
 var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
 
 // EXTERNAL MODULE: external "element-ui/lib/button"
@@ -968,7 +968,7 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 var components_form = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./src/components/form-group/index.js + 2 modules
-var form_group = __webpack_require__(16);
+var form_group = __webpack_require__(18);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
 var formula_ = __webpack_require__(3);
@@ -1131,7 +1131,7 @@ var external_lodash_ = __webpack_require__(2);
       this.$emit("close");
     },
     setFormModel: function setFormModel(model) {
-      Object(external_lodash_["merge"])(this.formModel, model);
+      Object.assign(this.formModel, model);
     },
     reset: function reset() {
       this.$refs.form && this.$refs.form.reset();

package/lib/components/form-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 16);
+/******/ 	return __webpack_require__(__webpack_require__.s = 18);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -289,19 +289,19 @@ render._withStripped = true
 // 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);
+var form_ = __webpack_require__(13);
 var form_default = /*#__PURE__*/__webpack_require__.n(form_);
 
 // EXTERNAL MODULE: external "element-ui/lib/row"
-var row_ = __webpack_require__(13);
+var row_ = __webpack_require__(14);
 var row_default = /*#__PURE__*/__webpack_require__.n(row_);
 
 // EXTERNAL MODULE: external "element-ui/lib/col"
-var col_ = __webpack_require__(14);
+var col_ = __webpack_require__(15);
 var col_default = /*#__PURE__*/__webpack_require__.n(col_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
-var form_item_ = __webpack_require__(15);
+var form_item_ = __webpack_require__(16);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -542,31 +542,33 @@ module.exports = require("element-ui/lib/collapse-item");
 /***/ }),
 /* 10 */,
 /* 11 */,
-/* 12 */
+/* 12 */,
+/* 13 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/form");
 
 /***/ }),
-/* 13 */
+/* 14 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/row");
 
 /***/ }),
-/* 14 */
+/* 15 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/col");
 
 /***/ }),
-/* 15 */
+/* 16 */
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
 
 /***/ }),
-/* 16 */
+/* 17 */,
+/* 18 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/components/form-input.js

@@ -226,24 +226,24 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 /* 19 */,
 /* 20 */,
 /* 21 */,
-/* 22 */
+/* 22 */,
+/* 23 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/input");
 
 /***/ }),
-/* 23 */,
 /* 24 */,
 /* 25 */,
 /* 26 */,
 /* 27 */,
-/* 28 */
+/* 28 */,
+/* 29 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/radio");
 
 /***/ }),
-/* 29 */,
 /* 30 */,
 /* 31 */,
 /* 32 */,
@@ -434,7 +434,7 @@ Inputvue_type_template_id_74fa485e_render._withStripped = true
 // 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__(22);
+var input_ = __webpack_require__(23);
 var input_default = /*#__PURE__*/__webpack_require__.n(input_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Input.vue?vue&type=script&lang=js&
@@ -1181,7 +1181,7 @@ var radio_group_ = __webpack_require__(41);
 var radio_group_default = /*#__PURE__*/__webpack_require__.n(radio_group_);
 
 // EXTERNAL MODULE: external "element-ui/lib/radio"
-var radio_ = __webpack_require__(28);
+var radio_ = __webpack_require__(29);
 var radio_default = /*#__PURE__*/__webpack_require__.n(radio_);
 
 // EXTERNAL MODULE: external "element-ui/lib/radio-button"

package/lib/components/form-item.js

@@ -101,7 +101,7 @@ module.exports = require("lodash");
 
 /***/ }),
 
-/***/ 25:
+/***/ 26:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-input");
@@ -131,7 +131,7 @@ var form_item_ = __webpack_require__(53);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-input"
-var form_input_ = __webpack_require__(25);
+var form_input_ = __webpack_require__(26);
 var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
 
 // EXTERNAL MODULE: external "lodash"

package/lib/components/form-query.js

@@ -199,28 +199,28 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 12:
+/***/ 13:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/form");
 
 /***/ }),
 
-/***/ 13:
+/***/ 14:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/row");
 
 /***/ }),
 
-/***/ 14:
+/***/ 15:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/col");
 
 /***/ }),
 
-/***/ 15:
+/***/ 16:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
@@ -246,19 +246,19 @@ 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_);
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
-var form_ = __webpack_require__(12);
+var form_ = __webpack_require__(13);
 var form_default = /*#__PURE__*/__webpack_require__.n(form_);
 
 // EXTERNAL MODULE: external "element-ui/lib/row"
-var row_ = __webpack_require__(13);
+var row_ = __webpack_require__(14);
 var row_default = /*#__PURE__*/__webpack_require__.n(row_);
 
 // EXTERNAL MODULE: external "element-ui/lib/col"
-var col_ = __webpack_require__(14);
+var col_ = __webpack_require__(15);
 var col_default = /*#__PURE__*/__webpack_require__.n(col_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
-var form_item_ = __webpack_require__(15);
+var form_item_ = __webpack_require__(16);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "lodash"
@@ -302,7 +302,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
     submitterSpan: Number,
     gutter: {
       type: Number,
-      default: 24
+      default: 0
     },
     showHiddenNum: Boolean,
     //是否显示隐藏数量

package/lib/components/form-view-dialog.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 24);
+/******/ 	return __webpack_require__(__webpack_require__.s = 25);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -246,61 +246,16 @@ module.exports = require("element-ui/lib/collapse-item");
 // 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-view/src/index.vue?vue&type=template&id=32454b68&
-var render = function render() {
-  var _vm = this,
-    _c = _vm._self._c
-  return _c(
-    "div",
-    { staticClass: "form-view" },
-    [
-      _vm._t("default", function () {
-        return [
-          _c(
-            "el-descriptions",
-            _vm._g(
-              _vm._b({ ref: "form" }, "el-descriptions", _vm.formProps, false),
-              _vm.formListeners
-            ),
-            _vm._l(_vm.filterFormItems, function (item) {
-              return _c(
-                "el-descriptions-item",
-                _vm._g(
-                  _vm._b(
-                    { key: item.prop },
-                    "el-descriptions-item",
-                    item,
-                    false
-                  ),
-                  item.on
-                ),
-                [
-                  _vm._v(
-                    "\n      " + _vm._s(_vm.formModel[item.prop]) + "\n      "
-                  ),
-                ]
-              )
-            }),
-            1
-          ),
-        ]
-      }),
-    ],
-    2
-  )
-}
-var staticRenderFns = []
-render._withStripped = true
-
-
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=32454b68&
+// EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
+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_);
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
-var descriptions_ = __webpack_require__(18);
+var descriptions_ = __webpack_require__(20);
 var descriptions_default = /*#__PURE__*/__webpack_require__.n(descriptions_);
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions-item"
-var descriptions_item_ = __webpack_require__(19);
+var descriptions_item_ = __webpack_require__(21);
 var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
@@ -309,12 +264,19 @@ var formula_ = __webpack_require__(3);
 // EXTERNAL MODULE: external "lodash"
 var external_lodash_ = __webpack_require__(2);
 
-// 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&
+// EXTERNAL MODULE: external "dayjs"
+var external_dayjs_ = __webpack_require__(11);
+var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_);
 
+// CONCATENATED MODULE: ./src/components/form-view/src/index.js
 
 
 
-/* harmony default export */ var srcvue_type_script_lang_js_ = ({
+
+
+
+
+/* harmony default export */ var src = ({
   name: "FormView",
   componentName: "FormView",
   components: {
@@ -339,22 +301,6 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   computed: {
-    formProps: function formProps() {
-      return Object.assign({
-        border: true,
-        direction: this.labelPosition === "top" ? "vertical" : "horizontal",
-        labelStyle: {
-          width: this.labelWidth,
-          textAlign: this.labelPosition
-        }
-      }, this.$attrs);
-    },
-    formListeners: function formListeners() {
-      return Object.assign({}, this.$listeners);
-    },
-    rowProps: function rowProps() {
-      return Object.assign({}, this.$attrs);
-    },
     filterFormItems: function filterFormItems() {
       var _this = this;
       return this.formItems.filter(function (item) {
@@ -392,34 +338,61 @@ var external_lodash_ = __webpack_require__(2);
   methods: {
     setFormModel: function setFormModel(model) {
       Object(external_lodash_["merge"])(this.formModel, model);
+    },
+    renderContent: function renderContent(h, item) {
+      if (typeof item.formatter === "function") {
+        return item.formatter.call(this, {
+          formModel: this.formModel,
+          config: item
+        });
+      }
+      var value = this.formModel[item.prop];
+      if (item.control === "Dict" && item.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        var options = this.$COMPONENT.dataSource.dict[item.dictCode];
+        var map = {};
+        if (Array.isArray(options)) {
+          options.forEach(function (dictItem) {
+            map[dictItem.value] = item;
+          });
+        }
+        return map[value] && map[value].label;
+      } else if (item.control === "Data" && this.format && external_dayjs_default()(value).isValid()) {
+        return external_dayjs_default()(value).format(this.format);
+      } else {
+        return value;
+      }
+    },
+    renderItem: function renderItem(h, item) {
+      var param = {
+        attrs: Object.assign({}, item)
+      };
+      return h("el-descriptions-item", babel_helper_vue_jsx_merge_props_default()([{
+        "key": item.prop
+      }, param]), [this.renderContent(h, item)]);
     }
+  },
+  render: function render(h) {
+    var _this3 = this;
+    var param = {
+      attrs: Object.assign({
+        border: true,
+        direction: this.labelPosition === "top" ? "vertical" : "horizontal",
+        labelStyle: {
+          width: this.labelWidth,
+          textAlign: this.labelPosition
+        }
+      }, this.$attrs),
+      on: Object.assign({}, this.$listeners)
+    };
+    return h("div", {
+      "class": "form-view"
+    }, [h("el-descriptions", babel_helper_vue_jsx_merge_props_default()([{
+      "ref": "form"
+    }, param]), [this.filterFormItems.map(function (item) {
+      return _this3.renderItem(h, item);
+    })])]);
   }
 });
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=script&lang=js&
- /* harmony default export */ var form_view_srcvue_type_script_lang_js_ = (srcvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(1);
-
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue
-
-
-
-
-
-/* normalize component */
-
-var component = Object(componentNormalizer["a" /* default */])(
-  form_view_srcvue_type_script_lang_js_,
-  render,
-  staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* harmony default export */ var src = (component.exports);
 // CONCATENATED MODULE: ./src/components/form-view/index.js
 
 src.install = function (Vue) {
@@ -431,29 +404,35 @@ src.install = function (Vue) {
 /* 11 */
 /***/ (function(module, exports) {
 
+module.exports = require("dayjs");
+
+/***/ }),
+/* 12 */
+/***/ (function(module, exports) {
+
 module.exports = require("@panpanzhao/component-ui/lib/components/dialog");
 
 /***/ }),
-/* 12 */,
 /* 13 */,
 /* 14 */,
 /* 15 */,
 /* 16 */,
 /* 17 */,
-/* 18 */
+/* 18 */,
+/* 19 */,
+/* 20 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions");
 
 /***/ }),
-/* 19 */
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions-item");
 
 /***/ }),
-/* 20 */,
-/* 21 */
+/* 22 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -464,7 +443,7 @@ __webpack_require__.r(__webpack_exports__);
 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_);
 
-// EXTERNAL MODULE: ./src/components/form-view/index.js + 5 modules
+// EXTERNAL MODULE: ./src/components/form-view/index.js + 1 modules
 var form_view = __webpack_require__(10);
 
 // CONCATENATED MODULE: ./src/components/form-view-group/src/content.js
@@ -704,9 +683,9 @@ src.install = function (Vue) {
 /* harmony default export */ var form_view_group = __webpack_exports__["default"] = (src);
 
 /***/ }),
-/* 22 */,
 /* 23 */,
-/* 24 */
+/* 24 */,
+/* 25 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -718,18 +697,18 @@ 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_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/dialog"
-var dialog_ = __webpack_require__(11);
+var dialog_ = __webpack_require__(12);
 var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
 
 // EXTERNAL MODULE: external "element-ui/lib/button"
 var button_ = __webpack_require__(5);
 var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 
-// EXTERNAL MODULE: ./src/components/form-view/index.js + 5 modules
+// EXTERNAL MODULE: ./src/components/form-view/index.js + 1 modules
 var form_view = __webpack_require__(10);
 
 // EXTERNAL MODULE: ./src/components/form-view-group/index.js + 2 modules
-var form_view_group = __webpack_require__(21);
+var form_view_group = __webpack_require__(22);
 
 // EXTERNAL MODULE: external "lodash"
 var external_lodash_ = __webpack_require__(2);