hrsass-components 2.3.9 → 2.4.1

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 = "2.3.9";
+var version = "2.4.1";
 
 /**
  * 版本号
@@ -3353,6 +3353,7 @@ var HrAppendix = {
         if (_this.listType === "picture-card" && file.status === "done") {
           var response = file.response,
             rest = _objectWithoutProperties(file, _excluded);
+          response.fileId && (rest.uid = response.fileId);
           return rest;
         } else {
           return file;
@@ -11484,6 +11485,7 @@ var OrganizationCard = {
       fill: color || '#4285f4',
       height: "4px"
     };
+    var levelGap = data.parent && data.parent.property.departmentLevel == data.parent.level && data.property.departmentLevel - data.level > 0 ? data.property.departmentLevel - data.level : 0;
     return h("g", {
       "class": prefixCls,
       attrs: {
@@ -11662,9 +11664,9 @@ var OrganizationCard = {
     h("rect", {
       attrs: {
         x: width / 2,
-        y: -lineHeight,
+        y: -(lineHeight + (height + lineHeight * 2) * levelGap),
         width: 1,
-        height: lineHeight
+        height: lineHeight + (height + lineHeight * 2) * levelGap
       },
       style: "fill:#fff;stroke: rgb(217, 217, 217);stroke-width: 1px"
     }), data.children && data.children.length > 0 && data.property.open &&
@@ -11749,7 +11751,8 @@ var index$6 = {
       dataList: [],
       svgPanZoom: null,
       standardZoom: 1,
-      isDownload: false
+      isDownload: false,
+      globalMap: new Map()
     };
   },
   watch: {
@@ -11814,14 +11817,16 @@ var index$6 = {
       return result;
     },
     _reSetX: function _reSetX(data, map) {
-      data.x = (data.children[0].x + data.children[data.children.length - 1].x) / 2;
-      if (map.has(data.level)) {
-        if (data.x > map.get(data.level)) {
-          map.set(data.level, data.x);
+      if (data.children && data.children.length > 0) {
+        data.x = (data.children[0].x + data.children[data.children.length - 1].x) / 2;
+        if (map.has(data.level)) {
+          if (data.x > map.get(data.level)) {
+            map.set(data.level, data.x);
+          }
+        }
+        if (data.parent) {
+          this._reSetX(data.parent, map);
         }
-      }
-      if (data.parent) {
-        this._reSetX(data.parent, map);
       }
     },
     _getHalfDistance: function _getHalfDistance(length) {
@@ -11839,12 +11844,15 @@ var index$6 = {
     },
     _treeLayout: function _treeLayout(list, parent, level, map) {
       var _this3 = this;
+      if (!map) {
+        map = this.globalMap;
+      }
       var _getOptionProps4 = getOptionProps(this),
         width = _getOptionProps4.width,
         height = _getOptionProps4.height,
         gutter = _getOptionProps4.gutter,
         lineHeight = _getOptionProps4.lineHeight;
-      return list.map(function (item, index) {
+      var result = list.map(function (item, index) {
         var children = item.children || [];
         if (index === 0) {
           //第一个节点
@@ -11883,13 +11891,36 @@ var index$6 = {
         }
         item.level = level;
         item.property.open = item.property.open !== undefined ? item.property.open : true;
-        item.parent = parent;
         item.y = (height + lineHeight * 2) * level;
+        //对比层级和level，进行高度计算和map维护
+        if (item.property.departmentLevel > level) {
+          item.y = (height + lineHeight * 2) * item.property.departmentLevel;
+          var max = item.x;
+          for (var i = level; i < item.property.departmentLevel; i++) {
+            if (map.has(i + 1)) {
+              if (item.x > map.get(i + 1)) {
+                map.set(i + 1, item.x);
+              } else {
+                max = map.get(i + 1);
+              }
+            } else {
+              map.set(i + 1, item.x);
+            }
+          }
+          if (max !== item.x) {
+            item.x = max + width + gutter;
+            item.pointX = max + width + gutter;
+            _this3._reSetX(parent, map);
+          }
+        }
+        item.parent = parent;
         if (_this3._isOpen(item) && children.length > 0) {
           item.children = _this3._treeLayout(children, item, level + 1, map);
         }
         return item;
       });
+      this.globalMap = map;
+      return result;
     },
     _renderOrgChartLine: function _renderOrgChartLine(level, children) {
       var h = this.$createElement;
@@ -11932,7 +11963,7 @@ var index$6 = {
       return h("g", [data.map(function (item) {
         var children = item.children || [];
         var Comp = _this4._getComponent(type);
-        return h("g", [item.property.open && children.length > 0 && _this4._renderOrgChartLine(item.level + 1, children), h(Comp, {
+        return h("g", [item.property.open && children.length > 0 && _this4._renderOrgChartLine(parseInt(item.property.departmentLevel || item.level) + 1, children), h(Comp, {
           attrs: {
             data: item,
             width: width,