@panpanzhao/component-ui 0.0.24 → 0.0.26

package/lib/components/form-input.js

@@ -314,31 +314,31 @@ module.exports = require("element-ui/lib/cascader");
 /* 47 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/switch");
+module.exports = require("element-ui/lib/date-picker");
 
 /***/ }),
 /* 48 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/slider");
+module.exports = require("element-ui/lib/switch");
 
 /***/ }),
 /* 49 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/transfer");
+module.exports = require("element-ui/lib/slider");
 
 /***/ }),
 /* 50 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/time-picker");
+module.exports = require("element-ui/lib/transfer");
 
 /***/ }),
 /* 51 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/date-picker");
+module.exports = require("element-ui/lib/time-picker");
 
 /***/ }),
 /* 52 */
@@ -971,6 +971,9 @@ var formula_ = __webpack_require__(3);
         return {};
       }
     },
+    valueIsString: Boolean,
+    optionBack: Boolean,
+    //事件改变是否返回选中的值
     apiOpen: {
       type: Boolean,
       default: function _default() {
@@ -991,10 +994,17 @@ var formula_ = __webpack_require__(3);
   },
   computed: {
     attrs: function attrs() {
+      //值处理
+      var _value = this.$attrs.value ? this.$attrs.value : this.$attrs.multiple ? [] : null;
+      if (this.$attrs.multiple && this.valueIsString && this.$attrs.value) {
+        _value = typeof this.$attrs.value === "string" ? this.$attrs.value.split(",") : this.$attrs.value;
+      }
       return Object.assign({
         clearable: true,
         placeholder: "请选择"
-      }, this.$attrs);
+      }, this.$attrs, {
+        value: _value
+      });
     },
     dictOption: function dictOption() {
       if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
@@ -1052,7 +1062,7 @@ var formula_ = __webpack_require__(3);
     },
     initApi: function initApi() {
       var _this = this;
-      if (!(this.api.url && this.request)) {
+      if (!(this.api && this.api.url && this.request)) {
         return false;
       }
       var reqData = Object(external_lodash_["merge"])({}, this.api.data);
@@ -1138,9 +1148,6 @@ var formula_ = __webpack_require__(3);
     if (this.selectMode === "tree") {
       return this.renderTree(h);
     }
-    if (this.attrs.multiple && !Array.isArray(this.attrs.value)) {
-      this.attrs.value = [];
-    }
     var param = {
       props: this.attrs,
       slots: this.$slots,
@@ -1149,7 +1156,27 @@ var formula_ = __webpack_require__(3);
           return _this4.renderOptions(h, scoped);
         }
       },
-      on: this.$listeners
+      on: Object.assign({}, this.$listeners, {
+        change: function change(value) {
+          var _value = value;
+          if (_this4.$attrs.multiple && _this4.valueIsString) {
+            _value = value.toString();
+          }
+          var selectOption = [];
+          if (_this4.optionBack) {
+            if (_this4.$attrs.multiple) {
+              selectOption = value && value.length > 0 ? _this4.optionData.filter(function (item) {
+                return value.indexOf(item[_this4._optionProps.value]) > -1;
+              }) : [];
+            } else {
+              selectOption = value ? _this4.optionData.filter(function (item) {
+                return item[_this4._optionProps.value] === value;
+              }) : [];
+            }
+          }
+          _this4.$emit("change", _value, selectOption);
+        }
+      })
     };
     return h("el-select", babel_helper_vue_jsx_merge_props_default()([{}, param]));
   }
@@ -1293,7 +1320,7 @@ var radio_button_default = /*#__PURE__*/__webpack_require__.n(radio_button_);
   methods: {
     initApi: function initApi() {
       var _this = this;
-      if (!(this.api && this.request)) {
+      if (!(this.api && this.api.url && this.request)) {
         return false;
       }
       this.request({
@@ -1414,6 +1441,7 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
       }
     },
     selectMode: String,
+    valueIsString: Boolean,
     options: {
       type: Array,
       default: function _default() {
@@ -1446,9 +1474,15 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
   },
   computed: {
     attrs: function attrs() {
+      //值处理
+      var _value = this.$attrs.value ? this.$attrs.value : [];
+      if (this.valueIsString && this.$attrs.value) {
+        _value = typeof this.$attrs.value === "string" ? this.$attrs.value.split(",") : this.$attrs.value;
+      }
       return Object.assign({}, this.$attrs, {
         size: this.size,
-        border: this.border
+        border: this.border,
+        value: _value
       });
     },
     dictOption: function dictOption() {
@@ -1498,7 +1532,7 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
   methods: {
     initApi: function initApi() {
       var _this = this;
-      if (!(this.api && this.request)) {
+      if (!(this.api && this.api.url && this.request)) {
         return false;
       }
       this.request({
@@ -1548,9 +1582,6 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
   },
   render: function render(h) {
     var _this4 = this;
-    if (!Array.isArray(this.attrs.value)) {
-      this.attrs.value = [];
-    }
     var param = {
       props: this.attrs,
       slots: this.$slots,
@@ -1559,7 +1590,16 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
           return _this4.renderOptions(h, scoped);
         }
       },
-      on: this.$listeners
+      on: Object.assign({}, this.$listeners, {
+        change: function change(value) {
+          debugger;
+          var _value = value;
+          if (_this4.valueIsString) {
+            _value = value.toString();
+          }
+          _this4.$emit("change", _value);
+        }
+      })
     };
     return h("el-checkbox-group", babel_helper_vue_jsx_merge_props_default()([{}, param]));
   }
@@ -1709,26 +1749,114 @@ var Cascader_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Cascader = (Cascader_component.exports);
+// EXTERNAL MODULE: external "element-ui/lib/date-picker"
+var date_picker_ = __webpack_require__(47);
+var date_picker_default = /*#__PURE__*/__webpack_require__.n(date_picker_);
+
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/DatePicker.vue?vue&type=script&lang=js&
+
+
+/* harmony default export */ var DatePickervue_type_script_lang_js_ = ({
+  name: "DatePicker",
+  components: {
+    elDatePicker: date_picker_default.a
+  },
+  props: {
+    startProp: String,
+    endProp: String
+  },
+  computed: {
+    attrs: function attrs() {
+      //值处理
+      var _value = this.$attrs.value;
+      if (["monthrange", "daterange", "datetimerange"].indexOf(this.$attrs.type) > -1 && this.startProp && this.endProp && this._form && !_value) {
+        var startPropValue = this._form.formModel[this.startProp];
+        var endPropValue = this._form.formModel[this.endProp];
+        if (startPropValue && endPropValue) {
+          _value = [startPropValue, endPropValue];
+        }
+      }
+      var res = Object.assign({
+        clearable: true,
+        placeholder: "请选择",
+        valueFormat: "timestamp"
+      }, this.$attrs, {
+        value: _value
+      });
+      return res;
+    },
+    _form: function _form() {
+      var parent = this.$parent;
+      while (parent) {
+        if (parent.$options.componentName !== 'Form' && parent.$options.componentName !== 'FormQuery') {
+          parent = parent.$parent;
+        } else {
+          return parent;
+        }
+      }
+      return false;
+    }
+  },
+  render: function render(h) {
+    var _this = this;
+    var param = {
+      props: this.attrs,
+      slots: this.$slots,
+      scopedSlots: this.$scopedSlots,
+      on: Object.assign({}, this.$listeners, {
+        change: function change(value) {
+          if (["monthrange", "daterange", "datetimerange"].indexOf(_this.$attrs.type) > -1 && _this.startProp && _this.endProp && _this._form) {
+            var formModel = _this._form.formModel;
+            if (formModel) {
+              _this.$set(formModel, _this.startProp, value && value[0]);
+              _this.$set(formModel, _this.endProp, value && value[1]);
+            }
+          }
+          _this.$emit("change", value);
+        }
+      })
+    };
+    return h("el-date-picker", babel_helper_vue_jsx_merge_props_default()([{}, param]));
+  }
+});
+// CONCATENATED MODULE: ./src/components/form/src/item/DatePicker.vue?vue&type=script&lang=js&
+ /* harmony default export */ var item_DatePickervue_type_script_lang_js_ = (DatePickervue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/form/src/item/DatePicker.vue
+var DatePicker_render, DatePicker_staticRenderFns
+
+
+
+
+/* normalize component */
+
+var DatePicker_component = Object(componentNormalizer["a" /* default */])(
+  item_DatePickervue_type_script_lang_js_,
+  DatePicker_render,
+  DatePicker_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var DatePicker = (DatePicker_component.exports);
 // EXTERNAL MODULE: external "element-ui/lib/switch"
-var switch_ = __webpack_require__(47);
+var switch_ = __webpack_require__(48);
 var switch_default = /*#__PURE__*/__webpack_require__.n(switch_);
 
 // EXTERNAL MODULE: external "element-ui/lib/slider"
-var slider_ = __webpack_require__(48);
+var slider_ = __webpack_require__(49);
 var slider_default = /*#__PURE__*/__webpack_require__.n(slider_);
 
 // EXTERNAL MODULE: external "element-ui/lib/transfer"
-var transfer_ = __webpack_require__(49);
+var transfer_ = __webpack_require__(50);
 var transfer_default = /*#__PURE__*/__webpack_require__.n(transfer_);
 
 // EXTERNAL MODULE: external "element-ui/lib/time-picker"
-var time_picker_ = __webpack_require__(50);
+var time_picker_ = __webpack_require__(51);
 var time_picker_default = /*#__PURE__*/__webpack_require__.n(time_picker_);
 
-// EXTERNAL MODULE: external "element-ui/lib/date-picker"
-var date_picker_ = __webpack_require__(51);
-var date_picker_default = /*#__PURE__*/__webpack_require__.n(date_picker_);
-
 // EXTERNAL MODULE: external "element-ui/lib/upload"
 var upload_ = __webpack_require__(52);
 var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
@@ -1744,7 +1872,6 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
 
 
 
-// import elCascader from "element-ui/packages/cascader";
 
 
 
@@ -1760,7 +1887,7 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
     Switchs: switch_default.a,
     Upload: upload_default.a,
     TimePicker: time_picker_default.a,
-    DatePicker: date_picker_default.a,
+    DatePicker: DatePicker,
     Input: Input,
     InputNumber: InputNumber,
     Select: Select,

package/lib/components/form-item.js

@@ -168,18 +168,7 @@ var external_lodash_ = __webpack_require__(2);
   watch: {
     value: function value(val) {
       //监听form的formModel变化,处理config的value变化
-      if (this.config.value === val) {
-        return false;
-      }
-      this.setValue(val);
-      this.execEvent("input", val);
-      if (this.form && this.form.formModel) {
-        this.$emit("formItemChange", {
-          itemConfig: this.config,
-          itemProp: this.prop,
-          itemVal: val
-        });
-      }
+      this.initValue(val);
     }
   },
   computed: {
@@ -240,7 +229,27 @@ var external_lodash_ = __webpack_require__(2);
       });
     }
   },
+  created: function created() {
+    var formModel = this.form.formModel;
+    if (formModel) {
+      this.initValue(formModel[this.prop]);
+    }
+  },
   methods: {
+    initValue: function initValue(val) {
+      if (this.config.value === val) {
+        return false;
+      }
+      this.setValue(val);
+      this.execEvent("input", val);
+      if (this.form && this.form.formModel) {
+        this.$emit("formItemChange", {
+          itemConfig: this.config,
+          itemProp: this.prop,
+          itemVal: val
+        });
+      }
+    },
     execEvent: function execEvent(eventName) {
       var _this2 = this,
         _itemEvent$exec;