@panpanzhao/component-ui 0.0.17 → 0.0.19

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=5d1533a2&
 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=5d1533a2&
 
 // 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
@@ -412,6 +412,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/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-editable.js

@@ -565,7 +565,8 @@ var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(extern
         render: this.render
       }, this.inputConfig, {
         value: this.value,
-        rowData: this.rowData
+        rowData: this.rowData,
+        row: this.row
       }),
       on: Object.assign({}, this.eventOn, this.actionEventOn, {
         focus: function focus() {

package/lib/components/table-operate.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 80);
+/******/ 	return __webpack_require__(__webpack_require__.s = 81);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -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=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=dfeb985e&
+// 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);
@@ -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
@@ -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") {
@@ -552,7 +554,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 +601,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 +632,7 @@ var external_lodash_ = __webpack_require__(2);
   props: {
     prop: String,
     labelWidth: String,
+    labelPosition: String,
     formItems: {
       type: Array,
       default: function _default() {
@@ -647,8 +650,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);
     },
@@ -1564,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;
@@ -2053,7 +2061,8 @@ module.exports = require("element-ui/lib/message-box");
 /* 77 */,
 /* 78 */,
 /* 79 */,
-/* 80 */
+/* 80 */,
+/* 81 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

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=36fba632&
+var tablevue_type_template_id_36fba632_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_36fba632_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=36fba632&
 
 // 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;
         }
@@ -609,6 +614,11 @@ var external_lodash_ = __webpack_require__(2);
       });
     }
   },
+  created: function created() {
+    if (this.pagination && this.pagination.pageSize) {
+      this.pageSize = this.pagination.pageSize;
+    }
+  },
   mounted: function mounted() {
     if (this.hasInit) {
       this.reset();
@@ -683,7 +693,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_36fba632_render,
   staticRenderFns,
   false,
   null,