@panpanzhao/component-ui 0.0.16 → 0.0.18

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);
     },
@@ -1610,15 +1613,6 @@ var external_lodash_ = __webpack_require__(2);
           }, {
             button: button
           });
-          if (typeof _this3.on.success === "function") {
-            _this3.on.success.call(_this3, {
-              request: _this3.requester,
-              reqData: reqData,
-              expandData: _this3.expandModel
-            }, {
-              button: button
-            });
-          }
           return false;
         }
         button.loading = true;
@@ -1637,14 +1631,6 @@ var external_lodash_ = __webpack_require__(2);
             resData: res,
             expandData: _this3.expandModel
           });
-          if (typeof _this3.on.success === "function") {
-            _this3.on.success.call(_this3, {
-              request: _this3.requester,
-              reqData: reqData,
-              resData: res,
-              expandData: _this3.expandModel
-            });
-          }
         }).catch(function (error) {
           button.loading = false;
           _this3.$emit("error", {
@@ -1653,14 +1639,6 @@ var external_lodash_ = __webpack_require__(2);
             resError: error,
             expandData: _this3.expandModel
           });
-          if (typeof _this3.on.error === "function") {
-            _this3.on.error.call(_this3, {
-              request: _this3.requester,
-              reqData: reqData,
-              resError: error,
-              expandData: _this3.expandModel
-            });
-          }
         });
       });
     },

package/lib/components/table.js

@@ -255,8 +255,8 @@ module.exports = require("element-ui/lib/pagination");
 // 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/table/src/table.vue?vue&type=template&id=a8e62da6&
-var tablevue_type_template_id_a8e62da6_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/table.vue?vue&type=template&id=0a336d65&
+var tablevue_type_template_id_0a336d65_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table" }, [
@@ -335,10 +335,10 @@ var tablevue_type_template_id_a8e62da6_render = function render() {
   ])
 }
 var staticRenderFns = []
-tablevue_type_template_id_a8e62da6_render._withStripped = true
+tablevue_type_template_id_0a336d65_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=a8e62da6&
+// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=0a336d65&
 
 // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
 var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
@@ -395,7 +395,7 @@ var external_lodash_ = __webpack_require__(2);
       props: {
         label: String,
         show: {
-          type: [Boolean, Function],
+          type: [Boolean, String, Function],
           default: true
         },
         on: Object,
@@ -419,6 +419,11 @@ var external_lodash_ = __webpack_require__(2);
         if (this.show === false) {
           return null;
         }
+        if (typeof this.show === "string" && !Object(formula_["evaluate"])(this.show, this.$parent.selection[0], {
+          evalMode: true
+        })) {
+          return null;
+        }
         if (typeof this.show === "function" && !this.show.call(this, this.$parent.selection, this)) {
           return null;
         }
@@ -683,7 +688,7 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_a8e62da6_render,
+  tablevue_type_template_id_0a336d65_render,
   staticRenderFns,
   false,
   null,