@panpanzhao/component-ui 0.0.18 → 0.0.19

package/lib/components/crud.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=1aadb63c&
+// 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&
 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=1aadb63c&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -417,6 +417,8 @@ 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") {
@@ -1567,6 +1569,9 @@ 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;
@@ -2059,7 +2064,7 @@ module.exports = require("element-ui/lib/message-box");
 // 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/crud/src/index.vue?vue&type=template&id=34fe6a3b&
+// 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&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -2130,7 +2135,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=34fe6a3b&
+// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=8fb8bc56&
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-search"
 var table_search_ = __webpack_require__(27);
@@ -2176,21 +2181,21 @@ var external_lodash_ = __webpack_require__(2);
       };
     },
     createProps: function createProps() {
-      return Object.assign({
+      return Object(external_lodash_["merge"])({
         dialog: {
           title: "添加"
         }
       }, this.create);
     },
     updateProps: function updateProps() {
-      return Object.assign({
+      return Object(external_lodash_["merge"])({
         dialog: {
           title: "修改"
         }
       }, this.update);
     },
     viewProps: function viewProps() {
-      return Object.assign({
+      return Object(external_lodash_["merge"])({
         dialog: {
           title: "查看"
         }
@@ -2266,7 +2271,7 @@ var external_lodash_ = __webpack_require__(2);
       // 添加按钮处理
       if (this.create) {
         var tools = this.table && this.table.tools || [];
-        tools.unshift(Object.assign({
+        tools.unshift(Object(external_lodash_["merge"])({
           label: "添加",
           loading: false,
           sort: 10,
@@ -2286,7 +2291,7 @@ var external_lodash_ = __webpack_require__(2);
       var optColumn = filterColumns && filterColumns[0];
       var items = optColumn && optColumn.items || [];
       if (this.update) {
-        items.push(Object.assign({
+        items.push(Object(external_lodash_["merge"])({
           label: "修改",
           loading: false,
           sort: 10,
@@ -2296,7 +2301,7 @@ var external_lodash_ = __webpack_require__(2);
         }, this.update.tool));
       }
       if (this.view) {
-        items.push(Object.assign({
+        items.push(Object(external_lodash_["merge"])({
           label: "查看",
           loading: false,
           sort: 20,
@@ -2306,7 +2311,7 @@ var external_lodash_ = __webpack_require__(2);
         }, this.view.tool));
       }
       if (this.delete) {
-        items.push(Object.assign({
+        items.push(Object(external_lodash_["merge"])({
           label: "删除",
           loading: false,
           sort: 30,

package/lib/components/form-dialog.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=1aadb63c&
+// 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&
 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=1aadb63c&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -417,6 +417,8 @@ 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") {
@@ -1119,6 +1121,9 @@ 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/form-drawer.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 79);
+/******/ 	return __webpack_require__(__webpack_require__.s = 80);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -616,7 +616,7 @@ module.exports = require("@panpanzhao/component-ui/lib/components/drawer");
 // 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=1aadb63c&
+// 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&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -687,7 +687,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=1aadb63c&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -818,6 +818,8 @@ 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") {
@@ -938,7 +940,14 @@ module.exports = require("element-ui/lib/tab-pane");
 
 /***/ }),
 
-/***/ 79:
+/***/ 8:
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/collapse");
+
+/***/ }),
+
+/***/ 80:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1261,13 +1270,6 @@ src.install = function (Vue) {
 
 /***/ }),
 
-/***/ 8:
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/collapse");
-
-/***/ }),
-
 /***/ 9:
 /***/ (function(module, exports) {
 

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=1aadb63c&
+// 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&
 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=1aadb63c&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=5d1533a2&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -417,6 +417,8 @@ 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-input.js

@@ -375,8 +375,8 @@ __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_);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Input.vue?vue&type=template&id=24c10975&
-var Inputvue_type_template_id_24c10975_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Input.vue?vue&type=template&id=74fa485e&
+var Inputvue_type_template_id_74fa485e_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -428,10 +428,10 @@ var Inputvue_type_template_id_24c10975_render = function render() {
   )
 }
 var staticRenderFns = []
-Inputvue_type_template_id_24c10975_render._withStripped = true
+Inputvue_type_template_id_74fa485e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/item/Input.vue?vue&type=template&id=24c10975&
+// 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);
@@ -447,7 +447,11 @@ var input_default = /*#__PURE__*/__webpack_require__.n(input_);
   props: {},
   computed: {
     attrs: function attrs() {
-      return Object.assign({}, this.$attrs);
+      return Object.assign({
+        clearable: true,
+        placeholder: "请输入",
+        maxlength: 30
+      }, this.$attrs);
     }
   }
 });
@@ -466,7 +470,7 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   item_Inputvue_type_script_lang_js_,
-  Inputvue_type_template_id_24c10975_render,
+  Inputvue_type_template_id_74fa485e_render,
   staticRenderFns,
   false,
   null,
@@ -476,8 +480,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Input = (component.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/item/InputNumber.vue?vue&type=template&id=7a2f5f6e&
-var InputNumbervue_type_template_id_7a2f5f6e_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/InputNumber.vue?vue&type=template&id=6c463d52&
+var InputNumbervue_type_template_id_6c463d52_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -528,11 +532,11 @@ var InputNumbervue_type_template_id_7a2f5f6e_render = function render() {
     )
   )
 }
-var InputNumbervue_type_template_id_7a2f5f6e_staticRenderFns = []
-InputNumbervue_type_template_id_7a2f5f6e_render._withStripped = true
+var InputNumbervue_type_template_id_6c463d52_staticRenderFns = []
+InputNumbervue_type_template_id_6c463d52_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/item/InputNumber.vue?vue&type=template&id=7a2f5f6e&
+// CONCATENATED MODULE: ./src/components/form/src/item/InputNumber.vue?vue&type=template&id=6c463d52&
 
 // EXTERNAL MODULE: external "element-ui/lib/input-number"
 var input_number_ = __webpack_require__(37);
@@ -548,7 +552,10 @@ var input_number_default = /*#__PURE__*/__webpack_require__.n(input_number_);
   props: {},
   computed: {
     attrs: function attrs() {
-      return Object.assign({}, this.$attrs);
+      return Object.assign({
+        clearable: true,
+        placeholder: "请输入"
+      }, this.$attrs);
     }
   }
 });
@@ -564,8 +571,8 @@ var input_number_default = /*#__PURE__*/__webpack_require__.n(input_number_);
 
 var InputNumber_component = Object(componentNormalizer["a" /* default */])(
   item_InputNumbervue_type_script_lang_js_,
-  InputNumbervue_type_template_id_7a2f5f6e_render,
-  InputNumbervue_type_template_id_7a2f5f6e_staticRenderFns,
+  InputNumbervue_type_template_id_6c463d52_render,
+  InputNumbervue_type_template_id_6c463d52_staticRenderFns,
   false,
   null,
   null,
@@ -984,7 +991,10 @@ var formula_ = __webpack_require__(3);
   },
   computed: {
     attrs: function attrs() {
-      return Object.assign({}, this.$attrs);
+      return Object.assign({
+        clearable: true,
+        placeholder: "请选择"
+      }, this.$attrs);
     },
     dictOption: function dictOption() {
       if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {

package/lib/components/form-item.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 81);
+/******/ 	return __webpack_require__(__webpack_require__.s = 82);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -115,7 +115,7 @@ module.exports = require("element-ui/lib/form-item");
 
 /***/ }),
 
-/***/ 81:
+/***/ 82:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -159,6 +159,7 @@ var external_lodash_ = __webpack_require__(2);
     inlineMessage: Boolean,
     size: String,
     rules: [Object, Array],
+    required: Boolean,
     actions: Array,
     on: Object,
     config: Object,
@@ -268,7 +269,7 @@ var external_lodash_ = __webpack_require__(2);
       } else if (typeof itemEvent.target === "string") {
         targetConfig[itemEvent.target] = this.form.formItemLayout[itemEvent.target];
       }
-      (_itemEvent$exec = itemEvent.exec).call.apply(_itemEvent$exec, [this, {
+      itemEvent.exec && (_itemEvent$exec = itemEvent.exec).call.apply(_itemEvent$exec, [this, {
         trigger: this.form,
         triggerForm: this.form.formModel,
         triggerConfig: this.form.formItemLayout[this.prop],
@@ -323,6 +324,7 @@ var external_lodash_ = __webpack_require__(2);
       "attrs": {
         "label": this.label,
         "prop": this.prop,
+        "required": this.required,
         "rules": this._rules,
         "labelWidth": this.labelWidth,
         "size": this.size