hrsass-components 1.7.65 → 1.7.67

package/lib/hrsass-components.js

@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
 var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
 var saveSvgAsPng = require('save-svg-as-png');
 
-var version = "1.7.65";
+var version = "1.7.67";
 
 /**
  * 版本号
@@ -4726,9 +4726,9 @@ var SchemeProps = {
 };
 
 var TableToolbar = {
-  name: 'HrTableToolbar',
+  name: "HrTableToolbar",
   props: initDefaultProps(ToolbarProps, {
-    prefixCls: 'hr-table-base-toolbar',
+    prefixCls: "hr-table-base-toolbar",
     showDownload: false,
     //是否显示下载
     hasReset: false,
@@ -4760,7 +4760,7 @@ var TableToolbar = {
     data: function data(val) {
       val && val.length && this._initResize();
     },
-    '$slots.default': {
+    "$slots.default": {
       handler: function handler(val) {
         var slots = val && val.filter(function (o) {
           return o.tag;
@@ -4776,11 +4776,11 @@ var TableToolbar = {
         return this.data;
       },
       set: function set(val) {
-        this.$emit('input', val);
+        this.$emit("input", val);
       }
     },
     showScheme: function showScheme() {
-      console.log('showMore', this.schemeList, this.schemeList.length > 0);
+      console.log("showMore", this.schemeList, this.schemeList.length > 0);
       return this.schemeList.length > 0;
     }
   },
@@ -4798,7 +4798,7 @@ var TableToolbar = {
       if (this.resized) {
         return;
       }
-      console.log('init resize');
+      console.log("init resize");
       this.resized = true;
       this.$nextTick(function () {
         resizeDetector.addListener(_this.$refs.searchContainerRef.parentElement, _this._resize);
@@ -4830,16 +4830,16 @@ var TableToolbar = {
     reset: function reset(dataVal, slots) {
       var _this3 = this;
       dataVal.map(function (item) {
-        _this3.$set(item, 'value', undefined);
+        _this3.$set(item, "value", undefined);
       });
-      slots["default"] && this.$emit('reset');
+      slots["default"] && this.$emit("reset");
       this.$nextTick(function () {
-        _this3.$emit('change');
+        _this3.$emit("change");
       });
     },
     //选择方案
     selectSchemeHander: function selectSchemeHander(obj) {
-      this.$emit('schemeSearch', obj);
+      this.$emit("schemeSearch", obj);
     },
     renderSearch: function renderSearch() {
       var _this4 = this;
@@ -4864,24 +4864,20 @@ var TableToolbar = {
       var count = compList.length;
       if (count < 1) return null;
       var span = this.span;
-      var rowCount = 24 / span - 1;
-      if (span == 24) {
-        rowCount = 1;
-      }
       var showCount = count < defaultShowCount ? count : defaultShowCount;
       // 如果有方案，展示所有搜索条件
       if (showScheme) {
         showCount = defaultShowCount;
       }
       var btns = h("div", {
-        "class": classNames("".concat(prefixCls, "-btns"), _defineProperty({}, "".concat(prefixCls, "-btns-right"), this.span === 24))
+        "class": classNames("".concat(prefixCls, "-btns"), _defineProperty({}, "".concat(prefixCls, "-btns-right"), showCount % (24 / this.span) === 0))
       }, [h(antDesignVue.Button, {
         attrs: {
           type: "primary"
         },
         on: {
           "click": function click() {
-            _this4.$emit('change');
+            _this4.$emit("change");
           }
         }
       }, [locale.search]), hasReset && h(antDesignVue.Button, {
@@ -4892,7 +4888,7 @@ var TableToolbar = {
         }
       }, [locale.reset]), (isExpand || showCount < count) && h(antDesignVue.Button, {
         attrs: {
-          icon: isExpand ? 'up' : 'down',
+          icon: isExpand ? "up" : "down",
           type: "link"
         },
         on: {
@@ -4902,14 +4898,15 @@ var TableToolbar = {
         }
       }, [isExpand ? locale.fold : locale.more])]);
       var colComp = [],
-        emptyCount = 0;
+        emptyCount = 0,
+        emptyCol = [];
       return h("div", {
         "class": "search-container",
         ref: "searchContainerRef"
       }, [h("div", {
         style: {
-          height: !showScheme || isExpandMore ? 'auto' : '35px',
-          'overflow': 'hidden'
+          height: !showScheme || isExpandMore ? "auto" : "35px",
+          overflow: "hidden"
         }
       }, [this.renderScheme(), h(antDesignVue.Form, {
         attrs: {
@@ -4921,24 +4918,26 @@ var TableToolbar = {
         }
       }, [compList.map(function (item, index) {
         if (!isExpand && index >= showCount) return;
-        if (rowCount > 1 && (index + emptyCount + 1) % (rowCount + 1) === 0) {
-          emptyCount++;
-          colComp.push(h(antDesignVue.Col, {
-            attrs: {
-              span: span
-            }
-          }, [h("div", {
-            "class": "ant-row ant-form-item"
-          }, [h("div", {
-            "class": "empty-item"
-          })])]));
-        }
+        // if (
+        //   rowCount > 1 &&
+        //   (index + emptyCount + 1) % (rowCount + 1) === 0
+        // ) {
+        //   emptyCount++
+
+        //   colComp.push(
+        //     <Col span={span}>
+        //       <div class="ant-row ant-form-item">
+        //         <div class="empty-item" />
+        //       </div>
+        //     </Col>
+        //   )
+        // }
         var slot, title;
         if (hasSlots) {
           slot = item;
-          title = item.data.attrs ? item.data.attrs.label : '';
+          title = item.data.attrs ? item.data.attrs.label : "";
         } else {
-          title = item.name || '';
+          title = item.name || "";
         }
         colComp.push(h(antDesignVue.Col, {
           attrs: {
@@ -4960,20 +4959,41 @@ var TableToolbar = {
             value: item.value,
             name: item.controlType,
             code: item.codeType,
-            tableName: item.codeType || '',
+            tableName: item.codeType || "",
             placeholder: item.placeholder
           },
           on: {
             "search": function search(val) {
-              return _this4.$emit('change');
+              return _this4.$emit("change");
             },
             "change": function change(val) {
-              _this4.$set(item, 'value', val);
+              _this4.$set(item, "value", val);
             }
           }
         })])]));
       }), colComp.map(function (item) {
         return item;
+      }), compList.length > 0 && function () {
+        var spanCount = 24 / span;
+        if (showCount % spanCount === 0 && span < 24) {
+          emptyCount = spanCount - 1;
+          if (emptyCount > 0) {
+            var emptyColumns = Array(emptyCount).fill().map(function () {
+              return h(antDesignVue.Col, {
+                attrs: {
+                  span: span
+                }
+              }, [h("div", {
+                "class": "ant-row ant-form-item"
+              }, [h("div", {
+                "class": "empty-item"
+              })])]);
+            });
+            emptyCol.push.apply(emptyCol, _toConsumableArray(emptyColumns));
+          }
+        }
+      }(), emptyCol.map(function (item) {
+        return item;
       }), h(antDesignVue.Col, {
         attrs: {
           span: span
@@ -4983,7 +5003,7 @@ var TableToolbar = {
       }, [locale.selected, h("span", [selectedRows.length]), locale.items, h("a", {
         on: {
           "click": function click() {
-            _this4.$emit('resultClick');
+            _this4.$emit("resultClick");
           }
         }
       }, [locale.view])])])])])]);
@@ -5008,7 +5028,7 @@ var TableToolbar = {
         }, [h("ul", [h("li", {
           key: "all",
           "class": {
-            'cur': !selectedSchemeId
+            cur: !selectedSchemeId
           },
           on: {
             "click": function click() {
@@ -5018,7 +5038,7 @@ var TableToolbar = {
         }, [locale.all]), _list.map(function (scheme) {
           return h("li", {
             "class": {
-              'cur': selectedSchemeId === scheme.id
+              cur: selectedSchemeId === scheme.id
             },
             key: scheme.id,
             on: {
@@ -5050,11 +5070,11 @@ var TableToolbar = {
     }, [this.renderSearch(), ($slots["default"] || dataVal.length > 0) && h(antDesignVue.Row, {
       "class": "".concat(prefixCls, "-icons"),
       style: {
-        width: schemeList.length > 0 ? '130px' : '106px'
+        width: schemeList.length > 0 ? "130px" : "106px"
       }
     }, [schemeList.length > 0 && h(antDesignVue.Icon, {
       attrs: {
-        type: isExpandMore ? 'up-circle' : 'down-circle',
+        type: isExpandMore ? "up-circle" : "down-circle",
         title: isExpandMore ? locale.fold : locale.more
       },
       on: {
@@ -5069,7 +5089,7 @@ var TableToolbar = {
       },
       on: {
         "click": function click(e) {
-          _this6.$emit('downloadClick', e);
+          _this6.$emit("downloadClick", e);
         }
       }
     }), showFilter && h(antDesignVue.Icon, {
@@ -5079,7 +5099,7 @@ var TableToolbar = {
       },
       on: {
         "click": function click() {
-          _this6.$emit('filterClick');
+          _this6.$emit("filterClick");
         }
       }
     }), h(antDesignVue.Icon, {
@@ -5089,7 +5109,7 @@ var TableToolbar = {
       },
       on: {
         "click": function click() {
-          _this6.$emit('settingClick');
+          _this6.$emit("settingClick");
         }
       }
     })])]);
@@ -7855,8 +7875,9 @@ var index = {
     //是否显示筛选
     autoLoad: true,
     //自动加载数据
+    // action: { fixed: false, width: 100 }, //操作列宽度和锁定
     action: {
-      fixed: false,
+      fixed: 'right',
       width: 100
     },
     //操作列宽度和锁定
@@ -8164,6 +8185,7 @@ var index = {
       var lockLen = columnList.filter(function (o) {
         return o.checked != false && o.lock;
       }).length;
+      if (action.fixed) lockLen++;
       if (lockLen > 0) {
         var paddingWidth = dataSource.length > 0 ? 17 : 0;
         var columns = columnList.filter(function (o) {
@@ -8189,7 +8211,7 @@ var index = {
           }
         }
         var tableWidth = this.$refs.tableBase ? this.$refs.tableBase.$el.clientWidth : 0;
-        var resultWidth = selectionWidth + width + actionWidth;
+        var resultWidth = selectionWidth + width + actionWidth + widthLessColumns.length * 100;
         result = resultWidth > tableWidth ? resultWidth : null;
       }
       this.setState({