@panpanzhao/component-ui 0.0.9 → 0.0.12

package/lib/components/form-item.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 77);
+/******/ 	return __webpack_require__(__webpack_require__.s = 81);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -94,21 +94,28 @@ module.exports = require("@vue/babel-helper-vue-jsx-merge-props");
 
 /***/ }),
 
-/***/ 23:
+/***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("lodash");
+
+/***/ }),
+
+/***/ 25:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-input");
 
 /***/ }),
 
-/***/ 48:
+/***/ 53:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/form-item");
 
 /***/ }),
 
-/***/ 77:
+/***/ 81:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -120,17 +127,21 @@ 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-item"
-var form_item_ = __webpack_require__(48);
+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__(23);
+var form_input_ = __webpack_require__(25);
 var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
 
+// EXTERNAL MODULE: external "lodash"
+var external_lodash_ = __webpack_require__(2);
+
 // CONCATENATED MODULE: ./src/components/form/src/form-item.js
 
 
 
+
 /* harmony default export */ var form_item = ({
   name: "FormItem",
   components: {
@@ -143,6 +154,10 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
     prop: String,
     value: [String, Number, Boolean, Object, Array, Date],
     label: String,
+    labelWidth: String,
+    showMessage: Boolean,
+    inlineMessage: Boolean,
+    size: String,
     rules: [Object, Array],
     actions: Array,
     on: Object,
@@ -152,7 +167,11 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
   watch: {
     value: function value(val) {
       //监听form的formModel变化,处理config的value变化
-      this.config.value = 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,
@@ -212,8 +231,9 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       if (this.on && this.on[eventName]) {
         this.$emit.apply(this, [eventName, {
           trigger: this.form,
+          triggerConfig: this.form.formItemLayout[this.prop],
           triggerForm: this.form.formModel,
-          triggerConfig: this.form.formItemLayout[this.prop]
+          triggerFormConfig: this.form.formItemLayout
         }].concat(arg));
       }
       //联动配置事件
@@ -235,6 +255,16 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
         triggerConfig: this.form.formItemLayout[this.prop],
         targetConfig: targetConfig
       }].concat(arg));
+    },
+    setValue: function setValue(val) {
+      if (this.form) {
+        if (this.prop && this.prop.indexOf(".") != -1) {
+          Object(external_lodash_["set"])(this.form.formModel, this.prop, val);
+        } else {
+          this.form.formModel[this.prop] = val;
+        }
+      }
+      this.config.value = val;
     }
   },
   render: function render(h) {
@@ -242,23 +272,31 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
     if (typeof this.render === "function") {
       return this.render(h, {
         form: this.form,
+        formModel: this.form.formModel,
+        config: this.config
+      });
+    }
+    // disabled用的多，特殊处理下支持函数
+    var disabled = this.config.disabled;
+    if (typeof this.config.disabled === "function") {
+      disabled = this.config.disabled.call(this, {
+        form: this.form,
+        formModel: this.form.formModel,
         config: this.config
       });
     }
     var itemProp = {
-      attrs: Object.assign({}, this.config),
+      attrs: Object.assign({}, this.config, {
+        disabled: disabled
+      }),
       on: Object.assign({}, this.eventOn, this.actionEventOn, {
         input: function input(val) {
+          _this2.setValue(val);
           _this2.execEvent("input", val);
-          if (_this2.form) {
-            _this2.form.formModel[_this2.prop] = val;
-          }
         },
         change: function change(val, selectOption) {
+          _this2.setValue(val);
           _this2.execEvent("change", val, selectOption);
-          if (_this2.form) {
-            _this2.form.formModel[_this2.prop] = val;
-          }
         }
       })
     };
@@ -266,7 +304,9 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       "attrs": {
         "label": this.label,
         "prop": this.prop,
-        "rules": this.rules
+        "rules": this.rules,
+        "labelWidth": this.labelWidth,
+        "size": this.size
       }
     }, [h("form-input", babel_helper_vue_jsx_merge_props_default()([{}, itemProp]))]);
   }

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 = 28);
+/******/ 	return __webpack_require__(__webpack_require__.s = 24);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -199,46 +199,46 @@ function normalizeComponent(
 /* 2 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+module.exports = require("lodash");
 
 /***/ }),
 /* 3 */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
-/* 4 */
+/* 4 */,
+/* 5 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/button");
 
 /***/ }),
-/* 5 */
+/* 6 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/tabs");
 
 /***/ }),
-/* 6 */
+/* 7 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/tab-pane");
 
 /***/ }),
-/* 7 */
+/* 8 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/collapse");
 
 /***/ }),
-/* 8 */
+/* 9 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/collapse-item");
 
 /***/ }),
-/* 9 */,
 /* 10 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -246,7 +246,7 @@ 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=1df6f53d&
+// 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=720bd4fc&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -293,21 +293,21 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=1df6f53d&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
-var descriptions_ = __webpack_require__(17);
+var descriptions_ = __webpack_require__(18);
 var descriptions_default = /*#__PURE__*/__webpack_require__.n(descriptions_);
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions-item"
-var descriptions_item_ = __webpack_require__(18);
+var descriptions_item_ = __webpack_require__(19);
 var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
-var formula_ = __webpack_require__(2);
+var formula_ = __webpack_require__(3);
 
 // EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(3);
+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&
 
@@ -364,7 +364,9 @@ var external_lodash_ = __webpack_require__(3);
         })) {
           return false;
         }
-        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel)) {
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel, {
+          evalMode: true
+        })) {
           return false;
         }
         return true;
@@ -423,33 +425,32 @@ src.install = function (Vue) {
 /* harmony default export */ var form_view = __webpack_exports__["default"] = (src);
 
 /***/ }),
-/* 11 */,
-/* 12 */
+/* 11 */
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/dialog");
 
 /***/ }),
+/* 12 */,
 /* 13 */,
 /* 14 */,
 /* 15 */,
 /* 16 */,
-/* 17 */
+/* 17 */,
+/* 18 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions");
 
 /***/ }),
-/* 18 */
+/* 19 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions-item");
 
 /***/ }),
-/* 19 */,
 /* 20 */,
-/* 21 */,
-/* 22 */
+/* 21 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -524,23 +525,23 @@ var form_view = __webpack_require__(10);
   }
 });
 // EXTERNAL MODULE: external "element-ui/lib/tabs"
-var tabs_ = __webpack_require__(5);
+var tabs_ = __webpack_require__(6);
 var tabs_default = /*#__PURE__*/__webpack_require__.n(tabs_);
 
 // EXTERNAL MODULE: external "element-ui/lib/tab-pane"
-var tab_pane_ = __webpack_require__(6);
+var tab_pane_ = __webpack_require__(7);
 var tab_pane_default = /*#__PURE__*/__webpack_require__.n(tab_pane_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse"
-var collapse_ = __webpack_require__(7);
+var collapse_ = __webpack_require__(8);
 var collapse_default = /*#__PURE__*/__webpack_require__.n(collapse_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse-item"
-var collapse_item_ = __webpack_require__(8);
+var collapse_item_ = __webpack_require__(9);
 var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
 
 // EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(3);
+var external_lodash_ = __webpack_require__(2);
 
 // CONCATENATED MODULE: ./src/components/form-view-group/src/index.js
 
@@ -700,12 +701,9 @@ src.install = function (Vue) {
 /* harmony default export */ var form_view_group = __webpack_exports__["default"] = (src);
 
 /***/ }),
+/* 22 */,
 /* 23 */,
-/* 24 */,
-/* 25 */,
-/* 26 */,
-/* 27 */,
-/* 28 */
+/* 24 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -717,24 +715,21 @@ 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__(12);
+var dialog_ = __webpack_require__(11);
 var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
 
 // EXTERNAL MODULE: external "element-ui/lib/button"
-var button_ = __webpack_require__(4);
+var button_ = __webpack_require__(5);
 var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 
 // EXTERNAL MODULE: ./src/components/form-view/index.js + 5 modules
 var form_view = __webpack_require__(10);
 
 // EXTERNAL MODULE: ./src/components/form-view-group/index.js + 2 modules
-var form_view_group = __webpack_require__(22);
-
-// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
-var formula_ = __webpack_require__(2);
+var form_view_group = __webpack_require__(21);
 
 // EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(3);
+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-dialog/src/index.vue?vue&type=script&lang=js&
 
@@ -747,7 +742,6 @@ var external_lodash_ = __webpack_require__(3);
 
 
 
-
 /* harmony default export */ var srcvue_type_script_lang_js_ = ({
   name: "FormViewDialog",
   componentName: "FormViewDialog",

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

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 22);
+/******/ 	return __webpack_require__(__webpack_require__.s = 21);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -199,41 +199,41 @@ function normalizeComponent(
 /* 2 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+module.exports = require("lodash");
 
 /***/ }),
 /* 3 */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
 /* 4 */,
-/* 5 */
+/* 5 */,
+/* 6 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/tabs");
 
 /***/ }),
-/* 6 */
+/* 7 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/tab-pane");
 
 /***/ }),
-/* 7 */
+/* 8 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/collapse");
 
 /***/ }),
-/* 8 */
+/* 9 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/collapse-item");
 
 /***/ }),
-/* 9 */,
 /* 10 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -241,7 +241,7 @@ 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=1df6f53d&
+// 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=720bd4fc&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -288,21 +288,21 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=1df6f53d&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
-var descriptions_ = __webpack_require__(17);
+var descriptions_ = __webpack_require__(18);
 var descriptions_default = /*#__PURE__*/__webpack_require__.n(descriptions_);
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions-item"
-var descriptions_item_ = __webpack_require__(18);
+var descriptions_item_ = __webpack_require__(19);
 var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
-var formula_ = __webpack_require__(2);
+var formula_ = __webpack_require__(3);
 
 // EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(3);
+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&
 
@@ -359,7 +359,9 @@ var external_lodash_ = __webpack_require__(3);
         })) {
           return false;
         }
-        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel)) {
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel, {
+          evalMode: true
+        })) {
           return false;
         }
         return true;
@@ -424,22 +426,21 @@ src.install = function (Vue) {
 /* 14 */,
 /* 15 */,
 /* 16 */,
-/* 17 */
+/* 17 */,
+/* 18 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions");
 
 /***/ }),
-/* 18 */
+/* 19 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions-item");
 
 /***/ }),
-/* 19 */,
 /* 20 */,
-/* 21 */,
-/* 22 */
+/* 21 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -514,23 +515,23 @@ var form_view = __webpack_require__(10);
   }
 });
 // EXTERNAL MODULE: external "element-ui/lib/tabs"
-var tabs_ = __webpack_require__(5);
+var tabs_ = __webpack_require__(6);
 var tabs_default = /*#__PURE__*/__webpack_require__.n(tabs_);
 
 // EXTERNAL MODULE: external "element-ui/lib/tab-pane"
-var tab_pane_ = __webpack_require__(6);
+var tab_pane_ = __webpack_require__(7);
 var tab_pane_default = /*#__PURE__*/__webpack_require__.n(tab_pane_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse"
-var collapse_ = __webpack_require__(7);
+var collapse_ = __webpack_require__(8);
 var collapse_default = /*#__PURE__*/__webpack_require__.n(collapse_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse-item"
-var collapse_item_ = __webpack_require__(8);
+var collapse_item_ = __webpack_require__(9);
 var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
 
 // EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(3);
+var external_lodash_ = __webpack_require__(2);
 
 // CONCATENATED MODULE: ./src/components/form-view-group/src/index.js
 

package/lib/components/form-view.js

@@ -194,13 +194,13 @@ function normalizeComponent(
 /* 2 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+module.exports = require("lodash");
 
 /***/ }),
 /* 3 */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
 /* 4 */,
@@ -216,7 +216,7 @@ module.exports = require("lodash");
 // 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=1df6f53d&
+// 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=720bd4fc&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -263,21 +263,21 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=1df6f53d&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
-var descriptions_ = __webpack_require__(17);
+var descriptions_ = __webpack_require__(18);
 var descriptions_default = /*#__PURE__*/__webpack_require__.n(descriptions_);
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions-item"
-var descriptions_item_ = __webpack_require__(18);
+var descriptions_item_ = __webpack_require__(19);
 var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
-var formula_ = __webpack_require__(2);
+var formula_ = __webpack_require__(3);
 
 // EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(3);
+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&
 
@@ -334,7 +334,9 @@ var external_lodash_ = __webpack_require__(3);
         })) {
           return false;
         }
-        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel)) {
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel, {
+          evalMode: true
+        })) {
           return false;
         }
         return true;
@@ -399,13 +401,14 @@ src.install = function (Vue) {
 /* 14 */,
 /* 15 */,
 /* 16 */,
-/* 17 */
+/* 17 */,
+/* 18 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions");
 
 /***/ }),
-/* 18 */
+/* 19 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/descriptions-item");