@panpanzhao/component-ui 0.0.9 → 0.0.12

package/lib/components/table-column.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 70);
+/******/ 	return __webpack_require__(__webpack_require__.s = 71);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -199,25 +199,33 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 11:
+/***/ 17:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/table-column");
 
 /***/ }),
 
-/***/ 19:
+/***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("lodash");
+
+/***/ }),
+
+/***/ 20:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 
 // EXPORTS
-__webpack_require__.d(__webpack_exports__, "d", function() { return /* reexport */ uuid; });
-__webpack_require__.d(__webpack_exports__, "a", function() { return /* reexport */ findTree; });
-__webpack_require__.d(__webpack_exports__, "b", function() { return /* reexport */ findTreeIndex; });
-__webpack_require__.d(__webpack_exports__, "c", function() { return /* reexport */ spliceTreeSelf; });
+__webpack_require__.d(__webpack_exports__, "e", function() { return /* reexport */ uuid; });
+__webpack_require__.d(__webpack_exports__, "a", function() { return /* reexport */ eachTree; });
+__webpack_require__.d(__webpack_exports__, "b", function() { return /* reexport */ findTree; });
+__webpack_require__.d(__webpack_exports__, "c", function() { return /* reexport */ findTreeIndex; });
+__webpack_require__.d(__webpack_exports__, "d", function() { return /* reexport */ spliceTreeSelf; });
 
-// UNUSED EXPORTS: mapTree, eachTree, getTree, filterTree, everyTree, someTree, spliceTree, getTreeDepth, getTreeAncestors, getTreeParent
+// UNUSED EXPORTS: mapTree, getTree, filterTree, everyTree, someTree, spliceTree, getTreeDepth, getTreeAncestors, getTreeParent
 
 // CONCATENATED MODULE: ./src/utils/helper.js
 // 参考 https://github.com/streamich/v4-uuid
@@ -553,56 +561,56 @@ function spliceTreeSelf(tree, idx, deleteCount) {
 
 /***/ }),
 
-/***/ 25:
+/***/ 28:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/radio");
 
 /***/ }),
 
-/***/ 30:
+/***/ 35:
 /***/ (function(module, exports) {
 
 module.exports = require("dayjs");
 
 /***/ }),
 
-/***/ 31:
+/***/ 36:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/link");
 
 /***/ }),
 
-/***/ 4:
+/***/ 5:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/button");
 
 /***/ }),
 
-/***/ 50:
+/***/ 55:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/dropdown");
 
 /***/ }),
 
-/***/ 51:
+/***/ 56:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/dropdown-item");
 
 /***/ }),
 
-/***/ 52:
+/***/ 57:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/dropdown-menu");
 
 /***/ }),
 
-/***/ 70:
+/***/ 71:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -614,7 +622,7 @@ 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/table-column"
-var table_column_ = __webpack_require__(11);
+var table_column_ = __webpack_require__(17);
 var table_column_default = /*#__PURE__*/__webpack_require__.n(table_column_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/default.vue?vue&type=script&lang=js&
@@ -741,7 +749,7 @@ var sequence_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var sequence = (sequence_component.exports);
 // EXTERNAL MODULE: external "element-ui/lib/radio"
-var radio_ = __webpack_require__(25);
+var radio_ = __webpack_require__(28);
 var radio_default = /*#__PURE__*/__webpack_require__.n(radio_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/selection.vue?vue&type=script&lang=js&
@@ -872,7 +880,7 @@ datevue_type_template_id_3d682315_render._withStripped = true
 // CONCATENATED MODULE: ./src/components/table/src/column/date.vue?vue&type=template&id=3d682315&
 
 // EXTERNAL MODULE: external "dayjs"
-var external_dayjs_ = __webpack_require__(30);
+var external_dayjs_ = __webpack_require__(35);
 var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/date.vue?vue&type=script&lang=js&
@@ -934,8 +942,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=1da75cb2&
-var dictvue_type_template_id_1da75cb2_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=512d00c0&
+var dictvue_type_template_id_512d00c0_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -973,11 +981,11 @@ var dictvue_type_template_id_1da75cb2_render = function render() {
     )
   )
 }
-var dictvue_type_template_id_1da75cb2_staticRenderFns = []
-dictvue_type_template_id_1da75cb2_render._withStripped = true
+var dictvue_type_template_id_512d00c0_staticRenderFns = []
+dictvue_type_template_id_512d00c0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=1da75cb2&
+// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=512d00c0&
 
 // 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&
 
@@ -987,6 +995,7 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
     elTableColumn: table_column_default.a
   },
   props: {
+    dictCode: String,
     options: {
       type: Array,
       required: true
@@ -1010,11 +1019,18 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
         "show-overflow-tooltip": true
       }, this.$attrs);
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionMap: function optionMap() {
       var _this = this;
-      if (Array.isArray(this.options)) {
+      var options = this.options || this.dictOption;
+      if (Array.isArray(options)) {
         var map = {};
-        this.options.forEach(function (item) {
+        options.forEach(function (item) {
           var valueKey = item[_this.optionProp.value || "value"];
           map[valueKey] = item;
         });
@@ -1048,8 +1064,8 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
 
 var dict_component = Object(componentNormalizer["a" /* default */])(
   column_dictvue_type_script_lang_js_,
-  dictvue_type_template_id_1da75cb2_render,
-  dictvue_type_template_id_1da75cb2_staticRenderFns,
+  dictvue_type_template_id_512d00c0_render,
+  dictvue_type_template_id_512d00c0_staticRenderFns,
   false,
   null,
   null,
@@ -1059,27 +1075,30 @@ var dict_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var dict = (dict_component.exports);
 // EXTERNAL MODULE: external "element-ui/lib/dropdown"
-var dropdown_ = __webpack_require__(50);
+var dropdown_ = __webpack_require__(55);
 var dropdown_default = /*#__PURE__*/__webpack_require__.n(dropdown_);
 
 // EXTERNAL MODULE: external "element-ui/lib/dropdown-item"
-var dropdown_item_ = __webpack_require__(51);
+var dropdown_item_ = __webpack_require__(56);
 var dropdown_item_default = /*#__PURE__*/__webpack_require__.n(dropdown_item_);
 
 // EXTERNAL MODULE: external "element-ui/lib/dropdown-menu"
-var dropdown_menu_ = __webpack_require__(52);
+var dropdown_menu_ = __webpack_require__(57);
 var dropdown_menu_default = /*#__PURE__*/__webpack_require__.n(dropdown_menu_);
 
 // 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: external "element-ui/lib/link"
-var link_ = __webpack_require__(31);
+var link_ = __webpack_require__(36);
 var link_default = /*#__PURE__*/__webpack_require__.n(link_);
 
 // EXTERNAL MODULE: ./src/utils/index.js + 2 modules
-var utils = __webpack_require__(19);
+var utils = __webpack_require__(20);
+
+// EXTERNAL MODULE: external "lodash"
+var external_lodash_ = __webpack_require__(2);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/operate.vue?vue&type=script&lang=js&
 
@@ -1096,6 +1115,7 @@ var utils = __webpack_require__(19);
 
 
 
+
 /* harmony default export */ var operatevue_type_script_lang_js_ = ({
   name: "Operate",
   props: {
@@ -1108,7 +1128,6 @@ var utils = __webpack_require__(19);
     },
     items: {
       type: Array,
-      required: true,
       default: function _default() {
         return [];
       }
@@ -1117,7 +1136,7 @@ var utils = __webpack_require__(19);
   computed: {
     attrs: function attrs() {
       return Object.assign({
-        "show-overflow-tooltip": true
+        "show-overflow-tooltip": false
       }, this.$attrs, this.$props);
     },
     defaultItem: function defaultItem() {
@@ -1132,16 +1151,16 @@ var utils = __webpack_require__(19);
     }
   },
   created: function created() {
-    this.items.filter(function (row) {
+    this.items.forEach(function (row) {
       if (!row.key) {
-        row.key = Object(utils["d" /* uuid */])();
+        row.key = Object(utils["e" /* uuid */])();
       }
     });
   },
   methods: {
     renderItems: function renderItems(h, scoped) {
       var _this = this;
-      var filterItems = this.items.filter(function (row) {
+      var filterItems = Object(external_lodash_["sortBy"])(this.items, ['sort']).filter(function (row) {
         if (typeof row.show === "function") {
           return row.show.call(_this, scoped, row);
         }
@@ -1166,9 +1185,7 @@ var utils = __webpack_require__(19);
       return template;
     },
     itemVNode: function itemVNode(h, itemRow, scoped) {
-      var cloneItem = Object.assign({
-        control: this.defaultItem.control
-      }, itemRow);
+      var cloneItem = Object(external_lodash_["merge"])({}, this.defaultItem, itemRow);
       cloneItem.parentData = scoped;
       if (typeof cloneItem.render === "function") {
         return cloneItem.render.call(this, h, scoped, cloneItem);
@@ -1369,12 +1386,19 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       required: false,
       default: "Default"
     },
+    show: {
+      type: Boolean,
+      default: true
+    },
     slots: {
       type: Object
     }
   },
   render: function render(h) {
     var _this = this;
+    if (this.show === false) {
+      return;
+    }
     var param = {
       attrs: Object.assign({}, this.$attrs),
       on: this.$listeners,

package/lib/components/table-editable.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 71);
+/******/ 	return __webpack_require__(__webpack_require__.s = 72);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -199,18 +199,19 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 19:
+/***/ 20:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 
 // EXPORTS
-__webpack_require__.d(__webpack_exports__, "d", function() { return /* reexport */ uuid; });
-__webpack_require__.d(__webpack_exports__, "a", function() { return /* reexport */ findTree; });
-__webpack_require__.d(__webpack_exports__, "b", function() { return /* reexport */ findTreeIndex; });
-__webpack_require__.d(__webpack_exports__, "c", function() { return /* reexport */ spliceTreeSelf; });
+__webpack_require__.d(__webpack_exports__, "e", function() { return /* reexport */ uuid; });
+__webpack_require__.d(__webpack_exports__, "a", function() { return /* reexport */ eachTree; });
+__webpack_require__.d(__webpack_exports__, "b", function() { return /* reexport */ findTree; });
+__webpack_require__.d(__webpack_exports__, "c", function() { return /* reexport */ findTreeIndex; });
+__webpack_require__.d(__webpack_exports__, "d", function() { return /* reexport */ spliceTreeSelf; });
 
-// UNUSED EXPORTS: mapTree, eachTree, getTree, filterTree, everyTree, someTree, spliceTree, getTreeDepth, getTreeAncestors, getTreeParent
+// UNUSED EXPORTS: mapTree, getTree, filterTree, everyTree, someTree, spliceTree, getTreeDepth, getTreeAncestors, getTreeParent
 
 // CONCATENATED MODULE: ./src/utils/helper.js
 // 参考 https://github.com/streamich/v4-uuid
@@ -546,50 +547,50 @@ function spliceTreeSelf(tree, idx, deleteCount) {
 
 /***/ }),
 
-/***/ 23:
+/***/ 25:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-input");
 
 /***/ }),
 
-/***/ 24:
+/***/ 26:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/table-column");
 
 /***/ }),
 
-/***/ 26:
+/***/ 29:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/table");
 
 /***/ }),
 
-/***/ 55:
+/***/ 60:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/popover");
 
 /***/ }),
 
-/***/ 56:
+/***/ 61:
 /***/ (function(module, exports) {
 
 module.exports = require("async-validator");
 
 /***/ }),
 
-/***/ 71:
+/***/ 72:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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-editable/src/index.vue?vue&type=template&id=2cd18efc&
-var srcvue_type_template_id_2cd18efc_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-editable/src/index.vue?vue&type=template&id=aabdd8e6&
+var srcvue_type_template_id_aabdd8e6_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -632,13 +633,13 @@ var srcvue_type_template_id_2cd18efc_render = function render() {
   )
 }
 var staticRenderFns = []
-srcvue_type_template_id_2cd18efc_render._withStripped = true
+srcvue_type_template_id_aabdd8e6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue?vue&type=template&id=2cd18efc&
+// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue?vue&type=template&id=aabdd8e6&
 
 // EXTERNAL MODULE: external "element-ui/lib/table"
-var table_ = __webpack_require__(26);
+var table_ = __webpack_require__(29);
 var table_default = /*#__PURE__*/__webpack_require__.n(table_);
 
 // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
@@ -646,19 +647,19 @@ 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/table-column"
-var table_column_ = __webpack_require__(24);
+var table_column_ = __webpack_require__(26);
 var table_column_default = /*#__PURE__*/__webpack_require__.n(table_column_);
 
 // 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 "element-ui/lib/popover"
-var popover_ = __webpack_require__(55);
+var popover_ = __webpack_require__(60);
 var popover_default = /*#__PURE__*/__webpack_require__.n(popover_);
 
 // EXTERNAL MODULE: external "async-validator"
-var external_async_validator_ = __webpack_require__(56);
+var external_async_validator_ = __webpack_require__(61);
 var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(external_async_validator_);
 
 // CONCATENATED MODULE: ./src/components/table-editable/src/form-item.js
@@ -1018,7 +1019,7 @@ var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(extern
   }
 });
 // EXTERNAL MODULE: ./src/utils/index.js + 2 modules
-var utils = __webpack_require__(19);
+var utils = __webpack_require__(20);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-editable/src/index.vue?vue&type=script&lang=js&
 
@@ -1276,7 +1277,7 @@ var utils = __webpack_require__(19);
     },
     addRow: function addRow(data, parentRow) {
       var _Object$assign;
-      var rowData = Object.assign((_Object$assign = {}, _Object$assign[this.rowKey] = Object(utils["d" /* uuid */])(), _Object$assign), this.rowData, data);
+      var rowData = Object.assign((_Object$assign = {}, _Object$assign[this.rowKey] = Object(utils["e" /* uuid */])(), _Object$assign), this.rowData, data);
       if (this.hasChildren && !rowData.children) {
         rowData.children = [];
       }
@@ -1292,10 +1293,10 @@ var utils = __webpack_require__(19);
     deleteByIndex: function deleteByIndex(index) {
       this.data && this.data.splice(index, 1);
     },
-    deleteByRow: function deleteByRow(row) {
-      var _this4 = this;
-      Object(utils["c" /* spliceTreeSelf */])(this.data, Object(utils["b" /* findTreeIndex */])(this.data, function (item) {
-        return item[_this4.rowKey] === row[_this4.rowKey];
+    deleteByRow: function deleteByRow(row, id) {
+      var refId = row[this.rowKey] ? this.rowKey : "id";
+      Object(utils["d" /* spliceTreeSelf */])(this.data, Object(utils["c" /* findTreeIndex */])(this.data, function (item) {
+        return item[id || refId] === row[id || refId];
       }), 1);
     }
   }
@@ -1315,7 +1316,7 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   table_editable_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_2cd18efc_render,
+  srcvue_type_template_id_aabdd8e6_render,
   staticRenderFns,
   false,
   null,