hrsass-components 1.7.72 → 1.7.73

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.72";
+var version = "1.7.73";
 
 /**
  * 版本号
@@ -7583,22 +7583,24 @@ var HrTableBase = {
     },
     _getDefaultHeight: function _getDefaultHeight(height) {
       // 定义常量，用于表示表格头部高度、工具栏高度、搜索框高度、布局内边距、表格头部高度以及分页组件高度
-      var headHeight = 48,
-        toolbarHeight = 32,
-        searchHeight = 120,
-        layoutPadding = 60,
-        tableHeaderHeight = 68,
-        // 根据条件判断是否显示分页组件，如果显示则高度为56.5 ，否则为0
-        paginationHeight = this.$props.pagination ? 56.5 : 0,
-        tableRowHeight = 47.5;
-      this.$refs.tableToolbar && (searchHeight = this.$refs.tableToolbar.$el.clientHeight + 24);
-
-      // 默认高度为窗口高度减去以上所有高度
-      var defaultHeight = parseInt(window.innerHeight - headHeight - toolbarHeight - searchHeight - layoutPadding - tableHeaderHeight - paginationHeight);
-      if (this.dataList.length > 0) {
-        var tableHeight = this.$parent.$parent.$el.clientHeight + tableRowHeight * this.dataList.length - searchHeight - tableHeaderHeight - paginationHeight;
-        return tableHeight - defaultHeight > 0 ? defaultHeight : tableHeight;
-      }
+      // var headHeight = 48,
+      //   toolbarHeight = 32,
+      //   searchHeight = 120,
+      //   layoutPadding = 60,
+      //   tableHeaderHeight = 68,
+      //   // 根据条件判断是否显示分页组件，如果显示则高度为56.5 ，否则为0
+      //   paginationHeight = this.$props.pagination ? 56.5 : 0,
+      //   tableRowHeight = 47.5;
+
+      // this.$refs.tableToolbar &&
+      //   (searchHeight = this.$refs.tableToolbar.$el.clientHeight + 24);
+
+      // // 默认高度为窗口高度减去以上所有高度
+      // var defaultHeight = parseInt(window.innerHeight - headHeight - toolbarHeight - searchHeight - layoutPadding - tableHeaderHeight - paginationHeight);
+      // if (this.dataList.length > 0) {
+      //   var tableHeight = this.$parent.$parent.$el.clientHeight + tableRowHeight * this.dataList.length - searchHeight - tableHeaderHeight - paginationHeight;
+      //   return tableHeight - defaultHeight > 0 ? defaultHeight : tableHeight;
+      // }
       return height;
     },
     _renderTableBase: function _renderTableBase(locale) {
@@ -7895,11 +7897,11 @@ var stateMap = {
   loaded: 2
 };
 var index = {
-  name: 'HrTable',
+  name: "HrTable",
   mixins: [BaseMixin],
   props: initDefaultProps(TableProps, {
-    prefixCls: 'hr-table',
-    rowKey: '',
+    prefixCls: "hr-table",
+    rowKey: "",
     multiple: true,
     //是否多选
     columns: [],
@@ -7922,7 +7924,7 @@ var index = {
     //自动加载数据
     // action: { fixed: false, width: 100 }, //操作列宽度和锁定
     action: {
-      fixed: 'right',
+      fixed: "right",
       width: 100
     },
     //操作列宽度和锁定
@@ -8024,7 +8026,7 @@ var index = {
     if (this.$refs.tableBase.$el) {
       resizeDetector.removeListener(this.$refs.tableBase.$el, this._setMaxWidth);
     }
-    console.log('hr-table beforeDestroy');
+    console.log("hr-table beforeDestroy");
   },
   mounted: function mounted() {
     var _getOptionProps = getOptionProps(this),
@@ -8159,7 +8161,7 @@ var index = {
         if (sortColumn) {
           sort = [{
             field: sortColumn.sorterName || sortColumn.columnName,
-            style: sorter.order === 'descend' ? 'DESC' : 'ASC'
+            style: sorter.order === "descend" ? "DESC" : "ASC"
           }];
         }
       }
@@ -8173,7 +8175,16 @@ var index = {
       if (this.selectedSchemeId && this.editSchemeId !== this.selectedSchemeId) {
         _conditionList = _conditionList.concat(conditionListByScheme);
       }
-      console.log('selected id', this.editSchemeId, this.selectedSchemeId, tempConditionListByScheme, conditionListByScheme);
+      var conditonListDeepClone = _.cloneDeep(_conditionList);
+      conditonListDeepClone.map(function (item) {
+        if (item.code === "p_deptHid" && item.codeType === "org_organize_dept_tree_all" || item.controlType === "SELECTOR") {
+          if (_.isArray(item.value)) {
+            item.value = item.value.join(",");
+          }
+          return item;
+        }
+      });
+      console.log("selected id", this.editSchemeId, this.selectedSchemeId, tempConditionListByScheme, conditionListByScheme, conditonListDeepClone);
       this.ajax({
         page: {
           autoCount: true,
@@ -8181,7 +8192,7 @@ var index = {
           pageSize: pagination.pageSize
         },
         sortList: sort,
-        conditionList: _conditionList
+        conditionList: conditonListDeepClone
       }).then(function (res) {
         //外部处理数据
         if (lodash.isFunction(normalizeData)) {
@@ -8194,7 +8205,7 @@ var index = {
           dataSource: res.dataList,
           loading: false
         });
-        _this5.$emit('load');
+        _this5.$emit("load");
       });
     },
     //分页、排序
@@ -8273,7 +8284,7 @@ var index = {
         conditionListByScheme = this.conditionListByScheme;
       console.log(tempConditionListByScheme, conditionListByScheme);
       var _conditionList = conditionList.filter(function (item) {
-        return item.value || item.controlType === 'SWITCH';
+        return item.value || item.controlType === "SWITCH";
       });
       var opts = {
         condition: _conditionList.concat(tempConditionListByScheme, conditionListByScheme),
@@ -8281,7 +8292,7 @@ var index = {
       };
       this.$axios.post("platform/imp/downloadGridData.search?code=".concat(code), opts).then(function (res) {
         //下载完成后动画
-        var div = document.createElement('div');
+        var div = document.createElement("div");
         document.body.appendChild(div);
         var _top = e.clientY - 40,
           _right = document.body.clientWidth - e.clientX - 12;
@@ -8293,9 +8304,9 @@ var index = {
           duration = 2.5;
         }
         var sty = {
-          top: _top + 'px',
-          right: _right + 'px',
-          'animation-duration': duration + 's'
+          top: _top + "px",
+          right: _right + "px",
+          "animation-duration": duration + "s"
         };
         new Vue({
           el: div,
@@ -8414,7 +8425,7 @@ var index = {
             current: 1
           })
         }, function () {
-          _this11.$emit('search', function () {
+          _this11.$emit("search", function () {
             _this11._getData();
           }, _this11);
         });
@@ -8497,7 +8508,7 @@ var index = {
           _this12._downloadHandler(columns, e);
         },
         "rowSelected": function rowSelected(rows) {
-          _this12.$emit('rowSelected', rows);
+          _this12.$emit("rowSelected", rows);
         },
         "schemeChange": function schemeChange(id) {
           _this12.editSchemeId = null;
@@ -8523,7 +8534,7 @@ var index = {
           _this12.searchHandler();
         },
         "cellClick": function cellClick(column, record) {
-          _this12.$emit('cellClick', column, record);
+          _this12.$emit("cellClick", column, record);
         },
         "settingChange": function settingChange(cols) {
           _this12.setState({