@panpanzhao/component-ui 0.0.47 → 0.0.48

package/lib/component-ui.common.js

@@ -3073,9 +3073,13 @@ form_query_src_form.install = function (Vue) {
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var defaultVal = this.prop ? this._formGroup.formModel[this.prop] : this._formGroup.formModel;
+      this.formModel = defaultVal || {};
     }
+    // if (this.prop && this._formGroup) {
+    //   this._formGroup.formModel[this.prop] = this.formModel;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {
@@ -4614,8 +4618,8 @@ form_view_dialog_src.install = function (Vue) {
   Vue.component(form_view_dialog_src.name, form_view_dialog_src);
 };
 /* harmony default export */ var form_view_dialog = (form_view_dialog_src);
-// 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/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=148cbb91&
+var tablevue_type_template_id_148cbb91_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table" }, [
@@ -4653,7 +4657,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",
@@ -4693,11 +4697,11 @@ var tablevue_type_template_id_7ea6d01a_render = function render() {
       : _vm._e(),
   ])
 }
-var tablevue_type_template_id_7ea6d01a_staticRenderFns = []
-tablevue_type_template_id_7ea6d01a_render._withStripped = true
+var tablevue_type_template_id_148cbb91_staticRenderFns = []
+tablevue_type_template_id_148cbb91_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=148cbb91&
 
 // EXTERNAL MODULE: external "element-ui/lib/table"
 var table_ = __webpack_require__(22);
@@ -4880,6 +4884,20 @@ var index_ = __webpack_require__(3);
     }
   },
   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;
     },
@@ -4906,33 +4924,33 @@ var index_ = __webpack_require__(3);
       });
     },
     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, row);
           }
         }
       });
@@ -4951,19 +4969,19 @@ var index_ = __webpack_require__(3);
       });
     },
     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();
         }
       });
     }
@@ -4987,7 +5005,7 @@ var index_ = __webpack_require__(3);
       this.search();
     },
     search: function search() {
-      var _this4 = this;
+      var _this5 = this;
       if (!(this.requester && this.api.url)) {
         return false;
       }
@@ -5009,22 +5027,22 @@ var index_ = __webpack_require__(3);
         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
         });
@@ -5044,8 +5062,8 @@ var index_ = __webpack_require__(3);
 
 var table_component = normalizeComponent(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_7ea6d01a_render,
-  tablevue_type_template_id_7ea6d01a_staticRenderFns,
+  tablevue_type_template_id_148cbb91_render,
+  tablevue_type_template_id_148cbb91_staticRenderFns,
   false,
   null,
   null,
@@ -8025,8 +8043,8 @@ var badge_default = /*#__PURE__*/__webpack_require__.n(badge_);
 });
 // CONCATENATED MODULE: ./src/components/formula/src/plugin.js
 
-/**
- * @file 扩展 codemirror
+/**
+ * @file 扩展 codemirror
  */
 function replaceStrByIndex(str, idx, key, replaceKey) {
   var from = str.slice(0, idx);

package/lib/components/crud.js

@@ -817,9 +817,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var defaultVal = this.prop ? this._formGroup.formModel[this.prop] : this._formGroup.formModel;
+      this.formModel = defaultVal || {};
     }
+    // if (this.prop && this._formGroup) {
+    //   this._formGroup.formModel[this.prop] = this.formModel;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {

package/lib/components/form-dialog.js

@@ -648,9 +648,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var defaultVal = this.prop ? this._formGroup.formModel[this.prop] : this._formGroup.formModel;
+      this.formModel = defaultVal || {};
     }
+    // if (this.prop && this._formGroup) {
+    //   this._formGroup.formModel[this.prop] = this.formModel;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {

package/lib/components/form-drawer.js

@@ -284,9 +284,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var defaultVal = this.prop ? this._formGroup.formModel[this.prop] : this._formGroup.formModel;
+      this.formModel = defaultVal || {};
     }
+    // if (this.prop && this._formGroup) {
+    //   this._formGroup.formModel[this.prop] = this.formModel;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {

package/lib/components/form-group.js

@@ -638,9 +638,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var defaultVal = this.prop ? this._formGroup.formModel[this.prop] : this._formGroup.formModel;
+      this.formModel = defaultVal || {};
     }
+    // if (this.prop && this._formGroup) {
+    //   this._formGroup.formModel[this.prop] = this.formModel;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {

package/lib/components/formula.js

@@ -652,8 +652,8 @@ var index_ = __webpack_require__(17);
 });
 // CONCATENATED MODULE: ./src/components/formula/src/plugin.js
 
-/**
- * @file 扩展 codemirror
+/**
+ * @file 扩展 codemirror
  */
 function replaceStrByIndex(str, idx, key, replaceKey) {
   var from = str.slice(0, idx);

package/lib/components/table-operate.js

@@ -817,9 +817,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var defaultVal = this.prop ? this._formGroup.formModel[this.prop] : this._formGroup.formModel;
+      this.formModel = defaultVal || {};
     }
+    // if (this.prop && this._formGroup) {
+    //   this._formGroup.formModel[this.prop] = this.formModel;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {

package/lib/components/table.js

@@ -262,8 +262,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=7ea6d01a&
-var tablevue_type_template_id_7ea6d01a_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=148cbb91&
+var tablevue_type_template_id_148cbb91_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_148cbb91_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=148cbb91&
 
 // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
 var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
@@ -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,33 @@ 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, row);
           }
         }
       });
@@ -613,19 +627,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 +663,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 +685,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
         });
@@ -709,7 +723,7 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_7ea6d01a_render,
+  tablevue_type_template_id_148cbb91_render,
   staticRenderFns,
   false,
   null,