@panpanzhao/component-ui 1.0.0 → 1.0.2

package/lib/components/table-search.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 75);
+/******/ 	return __webpack_require__(__webpack_require__.s = 76);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -190,13 +190,6 @@ function normalizeComponent(
 }
 
 
-/***/ }),
-
-/***/ 2:
-/***/ (function(module, exports) {
-
-module.exports = require("lodash");
-
 /***/ }),
 
 /***/ 5:
@@ -206,28 +199,28 @@ module.exports = require("element-ui/lib/button");
 
 /***/ }),
 
-/***/ 59:
+/***/ 60:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-query");
 
 /***/ }),
 
-/***/ 60:
+/***/ 61:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/table");
 
 /***/ }),
 
-/***/ 75:
+/***/ 76:
 /***/ (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-search/src/index.vue?vue&type=template&id=94c19230&
+// CONCATENATED MODULE: ./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib??vue-loader-options!./src/components/table-search/src/index.vue?vue&type=template&id=1e4d345a
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -359,29 +352,25 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=94c19230&
+// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=1e4d345a
 
 // EXTERNAL MODULE: external "element-ui/lib/button"
 var button_ = __webpack_require__(5);
 var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-query"
-var form_query_ = __webpack_require__(59);
+var form_query_ = __webpack_require__(60);
 var form_query_default = /*#__PURE__*/__webpack_require__.n(form_query_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table"
-var table_ = __webpack_require__(60);
+var table_ = __webpack_require__(61);
 var table_default = /*#__PURE__*/__webpack_require__.n(table_);
 
-// 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-search/src/index.vue?vue&type=script&lang=js&
-
+// CONCATENATED MODULE: ./node_modules/.pnpm/babel-loader@8.3.0_@babel+core@7.23.9_webpack@4.47.0/node_modules/babel-loader/lib!./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib??vue-loader-options!./src/components/table-search/src/index.vue?vue&type=script&lang=js
 
 
 
-/* harmony default export */ var srcvue_type_script_lang_js_ = ({
+/* harmony default export */ var srcvue_type_script_lang_js = ({
   name: "TableSearch",
   componentName: "TableSearch",
   components: {
@@ -391,22 +380,30 @@ var external_lodash_ = __webpack_require__(2);
   },
   props: {
     request: Function,
-    search: Object,
+    search: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
     table: Object
   },
   computed: {
     formProps: function formProps() {
       return Object.assign({
         formModel: this.searchData,
-        showHiddenNum: true
-      }, this.search.form);
+        showHiddenNum: true,
+        on: this.search.on
+      }, this.search && this.search.form);
     },
     tableProps: function tableProps() {
-      return Object(external_lodash_["merge"])(this.table, {
+      var table = Object.assign({
         api: {
-          data: this.searchData
+          data: null
         }
-      });
+      }, this.table);
+      table.api.data = this.searchData;
+      return table;
     }
   },
   data: function data() {
@@ -450,9 +447,9 @@ var external_lodash_ = __webpack_require__(2);
     }
   }
 });
-// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=script&lang=js&
- /* harmony default export */ var table_search_srcvue_type_script_lang_js_ = (srcvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
+// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=script&lang=js
+ /* harmony default export */ var table_search_srcvue_type_script_lang_js = (srcvue_type_script_lang_js); 
+// EXTERNAL MODULE: ./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./src/components/table-search/src/index.vue
@@ -464,7 +461,7 @@ var componentNormalizer = __webpack_require__(1);
 /* normalize component */
 
 var component = Object(componentNormalizer["a" /* default */])(
-  table_search_srcvue_type_script_lang_js_,
+  table_search_srcvue_type_script_lang_js,
   render,
   staticRenderFns,
   false,

package/lib/components/table.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 74);
+/******/ 	return __webpack_require__(__webpack_require__.s = 75);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -199,7 +199,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 17:
+/***/ 18:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/utils/index");
@@ -220,7 +220,7 @@ module.exports = require("element-ui/lib/table-column");
 
 /***/ }),
 
-/***/ 28:
+/***/ 29:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/table-column");
@@ -234,7 +234,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
 
-/***/ 31:
+/***/ 32:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/table");
@@ -248,22 +248,22 @@ module.exports = require("element-ui/lib/button");
 
 /***/ }),
 
-/***/ 55:
+/***/ 56:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/pagination");
 
 /***/ }),
 
-/***/ 74:
+/***/ 75:
 /***/ (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/src/table.vue?vue&type=template&id=7ea6d01a&
-var tablevue_type_template_id_7ea6d01a_render = function render() {
+// CONCATENATED MODULE: ./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/table.vue?vue&type=template&id=1a5269fa
+var tablevue_type_template_id_1a5269fa_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table" }, [
@@ -301,7 +301,7 @@ var tablevue_type_template_id_7ea6d01a_render = function render() {
             _vm.tableListeners
           ),
           [
-            _vm._l(_vm.columns, function (column) {
+            _vm._l(_vm.filterColumns, function (column) {
               return [
                 _c(
                   "TableColumn",
@@ -342,10 +342,10 @@ var tablevue_type_template_id_7ea6d01a_render = function render() {
   ])
 }
 var staticRenderFns = []
-tablevue_type_template_id_7ea6d01a_render._withStripped = true
+tablevue_type_template_id_1a5269fa_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=7ea6d01a&
+// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=1a5269fa
 
 // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
 var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
@@ -356,7 +356,7 @@ var button_ = __webpack_require__(5);
 var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 
 // EXTERNAL MODULE: external "element-ui/lib/table"
-var table_ = __webpack_require__(31);
+var table_ = __webpack_require__(32);
 var table_default = /*#__PURE__*/__webpack_require__.n(table_);
 
 // EXTERNAL MODULE: external "element-ui/lib/table-column"
@@ -364,23 +364,23 @@ var table_column_ = __webpack_require__(20);
 var table_column_default = /*#__PURE__*/__webpack_require__.n(table_column_);
 
 // EXTERNAL MODULE: external "element-ui/lib/pagination"
-var pagination_ = __webpack_require__(55);
+var pagination_ = __webpack_require__(56);
 var pagination_default = /*#__PURE__*/__webpack_require__.n(pagination_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-column"
-var components_table_column_ = __webpack_require__(28);
+var components_table_column_ = __webpack_require__(29);
 var components_table_column_default = /*#__PURE__*/__webpack_require__.n(components_table_column_);
 
 // 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__(17);
+var index_ = __webpack_require__(18);
 
 // 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/table.vue?vue&type=script&lang=js&
+// CONCATENATED MODULE: ./node_modules/.pnpm/babel-loader@8.3.0_@babel+core@7.23.9_webpack@4.47.0/node_modules/babel-loader/lib!./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/table.vue?vue&type=script&lang=js
 
 
 
@@ -390,7 +390,7 @@ var external_lodash_ = __webpack_require__(2);
 
 
 
-/* harmony default export */ var tablevue_type_script_lang_js_ = ({
+/* harmony default export */ var tablevue_type_script_lang_js = ({
   name: "Table",
   componentName: "Table",
   components: {
@@ -542,6 +542,20 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   computed: {
+    filterColumns: function filterColumns() {
+      var _this2 = this;
+      return this.columns.filter(function (item) {
+        if (item.show === false) {
+          return false;
+        }
+        if (typeof item.show === "function" && !item.show.call(_this2, {
+          item: item
+        })) {
+          return false;
+        }
+        return true;
+      });
+    },
     requester: function requester() {
       return this.api.request || this.request || (this.$COMPONENT || {}).request;
     },
@@ -568,33 +582,32 @@ var external_lodash_ = __webpack_require__(2);
       });
     },
     tableListeners: function tableListeners() {
-      var _this2 = this;
+      var _this3 = this;
       return Object.assign({}, this.$listeners, this.on, {
         "row-click": function rowClick(row) {
-          var selectColumns = _this2.columns.filter(function (item) {
+          var selectColumns = _this3.columns.filter(function (item) {
             return item.control === "Selection";
           });
           if (selectColumns && selectColumns.length > 0) {
             var selectColumn = selectColumns[0];
             if (selectColumn.type === "radio") {
-              var key = selectColumn.prop || _this2.tableProps.rowKey;
-              _this2.rowId = row[key];
-              _this2.selection = [row];
+              var key = selectColumn.prop || _this3.tableProps.rowKey;
+              _this3.rowId = row[key];
+              _this3.selection = [row];
             } else {
-              _this2.$refs.table.toggleRowSelection(row); // 点击选中
+              _this3.$refs.table.toggleRowSelection(row); // 点击选中
             }
           }
-
-          _this2.$emit("row-click", row);
-          if (typeof _this2.on["row-click"] === "function") {
-            _this2.on["row-click"].call(_this2, row);
+          _this3.$emit("row-click", row);
+          if (typeof _this3.on["row-click"] === "function") {
+            _this3.on["row-click"].call(_this3, row);
           }
         },
         "selection-change": function selectionChange(selection) {
-          _this2.selection = selection;
-          _this2.$emit("selection-change", selection);
-          if (typeof _this2.on["selection-change"] === "function") {
-            _this2.on["selection-change"].call(_this2, row);
+          _this3.selection = selection;
+          _this3.$emit("selection-change", selection);
+          if (typeof _this3.on["selection-change"] === "function") {
+            _this3.on["selection-change"].call(_this3, selection);
           }
         }
       });
@@ -613,19 +626,19 @@ var external_lodash_ = __webpack_require__(2);
       });
     },
     paginationListeners: function paginationListeners() {
-      var _this3 = this;
+      var _this4 = this;
       return Object.assign({}, this.pagination.on, {
         "size-change": function sizeChange(pageSize) {
-          _this3.$emit("size-change", pageSize);
-          _this3.pageSize = pageSize;
-          _this3.$emit("pageChange", _this3.paginationProps.currentPage, pageSize);
-          _this3.search();
+          _this4.$emit("size-change", pageSize);
+          _this4.pageSize = pageSize;
+          _this4.$emit("pageChange", _this4.paginationProps.currentPage, pageSize);
+          _this4.search();
         },
         "current-change": function currentChange(currentPage) {
-          _this3.$emit("current-change", currentPage);
-          _this3.currentPage = currentPage;
-          _this3.$emit("pageChange", currentPage, _this3.paginationProps.pageSize);
-          _this3.search();
+          _this4.$emit("current-change", currentPage);
+          _this4.currentPage = currentPage;
+          _this4.$emit("pageChange", currentPage, _this4.paginationProps.pageSize);
+          _this4.search();
         }
       });
     }
@@ -649,7 +662,7 @@ var external_lodash_ = __webpack_require__(2);
       this.search();
     },
     search: function search() {
-      var _this4 = this;
+      var _this5 = this;
       if (!(this.requester && this.api.url)) {
         return false;
       }
@@ -671,22 +684,22 @@ var external_lodash_ = __webpack_require__(2);
         headers: this.api.headers,
         data: reqData
       }).then(function (res) {
-        if (typeof _this4.api.after === "function") {
-          res = _this4.api.after.call(_this4, res);
+        if (typeof _this5.api.after === "function") {
+          res = _this5.api.after.call(_this5, res);
         }
-        _this4.remoteData = _this4.remoteDataProp.data ? Object(external_lodash_["get"])(res, _this4.remoteDataProp.data, []) : res;
-        if (_this4.pagination) {
-          _this4.total = Object(external_lodash_["get"])(res, _this4.remoteDataProp.total, 0);
+        _this5.remoteData = _this5.remoteDataProp.data ? Object(external_lodash_["get"])(res, _this5.remoteDataProp.data, []) : res;
+        if (_this5.pagination) {
+          _this5.total = Object(external_lodash_["get"])(res, _this5.remoteDataProp.total, 0);
         }
-        _this4.$emit("success", {
-          request: _this4.requester,
+        _this5.$emit("success", {
+          request: _this5.requester,
           reqData: reqData,
           resData: res
         });
       }).catch(function (error) {
-        _this4.remoteData = [], _this4.total = 0;
-        _this4.$emit("error", {
-          request: _this4.requester,
+        _this5.remoteData = [], _this5.total = 0;
+        _this5.$emit("error", {
+          request: _this5.requester,
           reqData: reqData,
           resError: error
         });
@@ -694,9 +707,9 @@ var external_lodash_ = __webpack_require__(2);
     }
   }
 });
-// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_tablevue_type_script_lang_js_ = (tablevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
+// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=script&lang=js
+ /* harmony default export */ var src_tablevue_type_script_lang_js = (tablevue_type_script_lang_js); 
+// EXTERNAL MODULE: ./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./src/components/table/src/table.vue
@@ -708,8 +721,8 @@ var componentNormalizer = __webpack_require__(1);
 /* normalize component */
 
 var component = Object(componentNormalizer["a" /* default */])(
-  src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_7ea6d01a_render,
+  src_tablevue_type_script_lang_js,
+  tablevue_type_template_id_1a5269fa_render,
   staticRenderFns,
   false,
   null,