@panpanzhao/component-ui 0.0.17 → 0.0.18

package/lib/components/form-drawer.js

@@ -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=dfeb985e&
+// 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&
 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=dfeb985e&
+// 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);
@@ -783,7 +783,7 @@ var external_lodash_ = __webpack_require__(2);
         if (item.show === false) {
           return false;
         }
-        if (typeof item.show === "function" && !item.show.call(_this, {
+        if (typeof item.show === "function" && !item.show.call(_this, _this.formModel, {
           form: _this,
           formModel: _this.formModel,
           config: item
@@ -1111,9 +1111,12 @@ var external_lodash_ = __webpack_require__(2);
   },
   methods: {
     open: function open(model) {
+      var _this2 = this;
       this.show = true;
       if (model) {
-        this.setFormModel(model);
+        this.$nextTick(function () {
+          _this2.setFormModel(model);
+        });
       }
     },
     close: function close() {
@@ -1127,31 +1130,31 @@ var external_lodash_ = __webpack_require__(2);
       this.$refs.form && this.$refs.form.reset();
     },
     submit: function submit(button) {
-      var _this2 = this;
+      var _this3 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
-        var reqData = Object(external_lodash_["merge"])(_this2.api.data || {}, _this2.formModel);
-        if (!(_this2.api.url && _this2.request)) {
-          _this2.$emit("success", null, reqData);
-          _this2.reset();
-          _this2.close();
+        var reqData = Object(external_lodash_["merge"])(_this3.api.data || {}, _this3.formModel);
+        if (!(_this3.api.url && _this3.request)) {
+          _this3.$emit("success", null, reqData);
+          _this3.reset();
+          _this3.close();
           return false;
         }
         button.loading = true;
-        _this2.request({
-          url: Object(formula_["evaluate"])(_this2.api.url, reqData),
-          method: _this2.api.method || "POST",
+        _this3.request({
+          url: Object(formula_["evaluate"])(_this3.api.url, reqData),
+          method: _this3.api.method || "POST",
           data: reqData
         }).then(function (res) {
           button.loading = false;
-          _this2.$emit("success", res, reqData);
-          _this2.reset();
-          _this2.close();
+          _this3.$emit("success", res, reqData);
+          _this3.reset();
+          _this3.close();
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", error, reqData);
+          _this3.$emit("error", error, reqData);
         });
       });
     },
@@ -1171,16 +1174,28 @@ var external_lodash_ = __webpack_require__(2);
       }, param]));
     },
     renderTitle: function renderTitle(h) {
-      if (typeof this.slots.title === "function") {
-        return this.slots.title.call(this, this.formModel);
+      if (this.$scopedSlots.title) {
+        return this.$scopedSlots.title.call(this, {
+          formModel: this.formModel
+        });
+      } else if (typeof this.slots.title === "function") {
+        return this.slots.title.call(this, {
+          formModel: this.formModel
+        });
       }
-      return this.slots.title || this.drawer.title;
+      return this.$slots.title || this.slots.title || this.drawer.title;
     },
     renderTools: function renderTools(h) {
-      if (typeof this.slots.footer === "function") {
-        return this.slots.footer.call(this, this.formModel);
+      if (this.$scopedSlots.footer) {
+        return this.$scopedSlots.footer.call(this, {
+          formModel: this.formModel
+        });
+      } else if (typeof this.slots.footer === "function") {
+        return this.slots.footer.call(this, {
+          formModel: this.formModel
+        });
       }
-      return h("div", [(this.tools || this.defaultTools).map(function (item) {
+      return h("div", [this.$slots.footer || (this.tools || this.defaultTools).map(function (item) {
         var toolParam = {
           attrs: Object.assign({}, item),
           on: item.on
@@ -1190,7 +1205,7 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this4 = this;
     var param = {
       attrs: Object.assign({
         visible: this.show,
@@ -1199,7 +1214,7 @@ var external_lodash_ = __webpack_require__(2);
       }, this.drawer),
       on: Object.assign(this.on, {
         close: function close() {
-          _this3.close();
+          _this4.close();
         }
       })
     };

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=dfeb985e&
+// 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&
 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=dfeb985e&
+// 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);
@@ -382,7 +382,7 @@ var external_lodash_ = __webpack_require__(2);
         if (item.show === false) {
           return false;
         }
-        if (typeof item.show === "function" && !item.show.call(_this, {
+        if (typeof item.show === "function" && !item.show.call(_this, _this.formModel, {
           form: _this,
           formModel: _this.formModel,
           config: item

package/lib/components/form-item.js

@@ -218,11 +218,30 @@ var external_lodash_ = __webpack_require__(2);
         };
       });
       return relItemOn;
+    },
+    _rules: function _rules() {
+      var _this = this;
+      if (!this.rules) {
+        return [];
+      }
+      var rulesList = Array.isArray(this.rules) ? this.rules : [this.rules];
+      return rulesList.filter(function (item) {
+        return item.disabled !== true;
+      }).map(function (item) {
+        if (typeof item.validator === "function") {
+          item.validator = item.validator.bind({
+            form: _this.form,
+            formModel: _this.form.formModel,
+            formItemLayout: _this.form.formItemLayout
+          });
+        }
+        return item;
+      });
     }
   },
   methods: {
     execEvent: function execEvent(eventName) {
-      var _this = this,
+      var _this2 = this,
         _itemEvent$exec;
       for (var _len = arguments.length, arg = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         arg[_key - 1] = arguments[_key];
@@ -244,7 +263,7 @@ var external_lodash_ = __webpack_require__(2);
       var targetConfig = {};
       if (Array.isArray(itemEvent.target)) {
         itemEvent.target.forEach(function (tarItem) {
-          targetConfig[tarItem] = _this.form.formItemLayout[tarItem];
+          targetConfig[tarItem] = _this2.form.formItemLayout[tarItem];
         });
       } else if (typeof itemEvent.target === "string") {
         targetConfig[itemEvent.target] = this.form.formItemLayout[itemEvent.target];
@@ -268,7 +287,7 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   render: function render(h) {
-    var _this2 = this;
+    var _this3 = this;
     if (typeof this.render === "function") {
       return this.render(h, {
         form: this.form,
@@ -291,12 +310,12 @@ var external_lodash_ = __webpack_require__(2);
       }),
       on: Object.assign({}, this.eventOn, this.actionEventOn, {
         input: function input(val) {
-          _this2.setValue(val);
-          _this2.execEvent("input", val);
+          _this3.setValue(val);
+          _this3.execEvent("input", val);
         },
         change: function change(val, selectOption) {
-          _this2.setValue(val);
-          _this2.execEvent("change", val, selectOption);
+          _this3.setValue(val);
+          _this3.execEvent("change", val, selectOption);
         }
       })
     };
@@ -304,7 +323,7 @@ var external_lodash_ = __webpack_require__(2);
       "attrs": {
         "label": this.label,
         "prop": this.prop,
-        "rules": this.rules,
+        "rules": this._rules,
         "labelWidth": this.labelWidth,
         "size": this.size
       }

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

@@ -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=720bd4fc&
+// 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
@@ -293,7 +293,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=32454b68&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
 var descriptions_ = __webpack_require__(18);
@@ -324,6 +324,7 @@ var external_lodash_ = __webpack_require__(2);
   props: {
     prop: String,
     labelWidth: String,
+    labelPosition: String,
     formItems: {
       type: Array,
       default: function _default() {
@@ -341,8 +342,10 @@ var external_lodash_ = __webpack_require__(2);
     formProps: function formProps() {
       return Object.assign({
         border: true,
+        direction: this.labelPosition === "top" ? "vertical" : "horizontal",
         labelStyle: {
-          width: this.labelWidth
+          width: this.labelWidth,
+          textAlign: this.labelPosition
         }
       }, this.$attrs);
     },

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

@@ -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=720bd4fc&
+// 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
@@ -288,7 +288,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=32454b68&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
 var descriptions_ = __webpack_require__(18);
@@ -319,6 +319,7 @@ var external_lodash_ = __webpack_require__(2);
   props: {
     prop: String,
     labelWidth: String,
+    labelPosition: String,
     formItems: {
       type: Array,
       default: function _default() {
@@ -336,8 +337,10 @@ var external_lodash_ = __webpack_require__(2);
     formProps: function formProps() {
       return Object.assign({
         border: true,
+        direction: this.labelPosition === "top" ? "vertical" : "horizontal",
         labelStyle: {
-          width: this.labelWidth
+          width: this.labelWidth,
+          textAlign: this.labelPosition
         }
       }, this.$attrs);
     },

package/lib/components/form-view.js

@@ -216,7 +216,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-view/src/index.vue?vue&type=template&id=720bd4fc&
+// 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
@@ -263,7 +263,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=32454b68&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
 var descriptions_ = __webpack_require__(18);
@@ -294,6 +294,7 @@ var external_lodash_ = __webpack_require__(2);
   props: {
     prop: String,
     labelWidth: String,
+    labelPosition: String,
     formItems: {
       type: Array,
       default: function _default() {
@@ -311,8 +312,10 @@ var external_lodash_ = __webpack_require__(2);
     formProps: function formProps() {
       return Object.assign({
         border: true,
+        direction: this.labelPosition === "top" ? "vertical" : "horizontal",
         labelStyle: {
-          width: this.labelWidth
+          width: this.labelWidth,
+          textAlign: this.labelPosition
         }
       }, this.$attrs);
     },

package/lib/components/form.js

@@ -210,7 +210,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=dfeb985e&
+// 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&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -281,7 +281,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
+// 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);
@@ -377,7 +377,7 @@ var external_lodash_ = __webpack_require__(2);
         if (item.show === false) {
           return false;
         }
-        if (typeof item.show === "function" && !item.show.call(_this, {
+        if (typeof item.show === "function" && !item.show.call(_this, _this.formModel, {
           form: _this,
           formModel: _this.formModel,
           config: item

package/lib/components/table-column.js

@@ -227,6 +227,13 @@ module.exports = require("element-ui/lib/radio");
 
 /***/ }),
 
+/***/ 3:
+/***/ (function(module, exports) {
+
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+
+/***/ }),
+
 /***/ 35:
 /***/ (function(module, exports) {
 
@@ -493,8 +500,8 @@ var selection_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var selection = (selection_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/date.vue?vue&type=template&id=3d682315&
-var datevue_type_template_id_3d682315_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/table/src/column/date.vue?vue&type=template&id=44c029a9&
+var datevue_type_template_id_44c029a9_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -532,11 +539,11 @@ var datevue_type_template_id_3d682315_render = function render() {
     )
   )
 }
-var datevue_type_template_id_3d682315_staticRenderFns = []
-datevue_type_template_id_3d682315_render._withStripped = true
+var datevue_type_template_id_44c029a9_staticRenderFns = []
+datevue_type_template_id_44c029a9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/column/date.vue?vue&type=template&id=3d682315&
+// CONCATENATED MODULE: ./src/components/table/src/column/date.vue?vue&type=template&id=44c029a9&
 
 // EXTERNAL MODULE: external "dayjs"
 var external_dayjs_ = __webpack_require__(35);
@@ -552,7 +559,7 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
   },
   props: {
     format: {
-      type: [String, Function],
+      type: String,
       default: "YYYY-MM-DD"
     }
   },
@@ -568,10 +575,10 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
   },
   methods: {
     formatDate: function formatDate(slotProps) {
-      if (typeof this.format === "function") {
-        return this.format.call(this, slotProps);
-      }
       var colVal = slotProps.row && slotProps.row[this.attrs.prop];
+      if (typeof slotProps.column.formatter === "function") {
+        return slotProps.column.formatter.call(this, slotProps.row, slotProps.column, colVal, slotProps.$index);
+      }
       if (colVal && this.format && external_dayjs_default()(colVal).isValid()) {
         return external_dayjs_default()(colVal).format(this.format);
       }
@@ -591,8 +598,8 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
 
 var date_component = Object(componentNormalizer["a" /* default */])(
   column_datevue_type_script_lang_js_,
-  datevue_type_template_id_3d682315_render,
-  datevue_type_template_id_3d682315_staticRenderFns,
+  datevue_type_template_id_44c029a9_render,
+  datevue_type_template_id_44c029a9_staticRenderFns,
   false,
   null,
   null,
@@ -601,8 +608,8 @@ var date_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var date = (date_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=template&id=1a393e81&
-var dictvue_type_template_id_1a393e81_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/table/src/column/dict.vue?vue&type=template&id=2b543e49&
+var dictvue_type_template_id_2b543e49_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -640,11 +647,11 @@ var dictvue_type_template_id_1a393e81_render = function render() {
     )
   )
 }
-var dictvue_type_template_id_1a393e81_staticRenderFns = []
-dictvue_type_template_id_1a393e81_render._withStripped = true
+var dictvue_type_template_id_2b543e49_staticRenderFns = []
+dictvue_type_template_id_2b543e49_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=1a393e81&
+// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=2b543e49&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=script&lang=js&
 
@@ -659,7 +666,7 @@ dictvue_type_template_id_1a393e81_render._withStripped = true
       type: Array
     },
     optionProp: {
-      type: [Object, Function],
+      type: Object,
       default: function _default() {
         return {
           value: "value",
@@ -699,10 +706,10 @@ dictvue_type_template_id_1a393e81_render._withStripped = true
   },
   methods: {
     renderOption: function renderOption(slotProps) {
-      if (typeof this.optionProp === "function") {
-        return this.optionProp.call(this, slotProps, this.options);
-      }
       var colVal = slotProps.row && slotProps.row[this.attrs.prop];
+      if (typeof slotProps.column.formatter === "function") {
+        return slotProps.column.formatter.call(this, slotProps.row, slotProps.column, colVal, slotProps.$index);
+      }
       if (colVal && this.optionMap[colVal]) {
         return this.optionMap[colVal] && this.optionMap[colVal][this.optionProp.label || "label"];
       }
@@ -722,8 +729,8 @@ dictvue_type_template_id_1a393e81_render._withStripped = true
 
 var dict_component = Object(componentNormalizer["a" /* default */])(
   column_dictvue_type_script_lang_js_,
-  dictvue_type_template_id_1a393e81_render,
-  dictvue_type_template_id_1a393e81_staticRenderFns,
+  dictvue_type_template_id_2b543e49_render,
+  dictvue_type_template_id_2b543e49_staticRenderFns,
   false,
   null,
   null,
@@ -752,6 +759,9 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 var link_ = __webpack_require__(36);
 var link_default = /*#__PURE__*/__webpack_require__.n(link_);
 
+// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
+var formula_ = __webpack_require__(3);
+
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/index"
 var index_ = __webpack_require__(20);
 
@@ -774,6 +784,7 @@ var external_lodash_ = __webpack_require__(2);
 
 
 
+
 /* harmony default export */ var operatevue_type_script_lang_js_ = ({
   name: "Operate",
   props: {
@@ -820,7 +831,12 @@ var external_lodash_ = __webpack_require__(2);
       var _this = this;
       var filterItems = Object(external_lodash_["sortBy"])(this.items, ['sort']).filter(function (row) {
         if (typeof row.show === "function") {
-          return row.show.call(_this, scoped, row);
+          return row.show.call(_this, scoped.row, scoped);
+        }
+        if (typeof row.show === "string") {
+          return Object(formula_["evaluate"])(row.show, scoped.row, {
+            evalMode: true
+          });
         }
         return row.show !== false;
       });
@@ -916,7 +932,7 @@ var external_lodash_ = __webpack_require__(2);
       props: {
         label: String,
         parentData: Object,
-        show: [Boolean, Function],
+        show: [Boolean, String, Function],
         on: Object
       },
       data: function data() {
@@ -957,7 +973,7 @@ var external_lodash_ = __webpack_require__(2);
       props: {
         label: String,
         parentData: Object,
-        show: [Boolean, Function],
+        show: [Boolean, String, Function],
         on: Object
       },
       computed: {

package/lib/components/table-operate.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=dfeb985e&
+// 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&
 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=dfeb985e&
+// 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);
@@ -382,7 +382,7 @@ var external_lodash_ = __webpack_require__(2);
         if (item.show === false) {
           return false;
         }
-        if (typeof item.show === "function" && !item.show.call(_this, {
+        if (typeof item.show === "function" && !item.show.call(_this, _this.formModel, {
           form: _this,
           formModel: _this.formModel,
           config: item
@@ -552,7 +552,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=720bd4fc&
+// 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
@@ -599,7 +599,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=32454b68&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
 var descriptions_ = __webpack_require__(18);
@@ -630,6 +630,7 @@ var external_lodash_ = __webpack_require__(2);
   props: {
     prop: String,
     labelWidth: String,
+    labelPosition: String,
     formItems: {
       type: Array,
       default: function _default() {
@@ -647,8 +648,10 @@ var external_lodash_ = __webpack_require__(2);
     formProps: function formProps() {
       return Object.assign({
         border: true,
+        direction: this.labelPosition === "top" ? "vertical" : "horizontal",
         labelStyle: {
-          width: this.labelWidth
+          width: this.labelWidth,
+          textAlign: this.labelPosition
         }
       }, this.$attrs);
     },