hrsass-components 2.3.8 → 2.4.0

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.8";
+var version = "2.4.0";
 
 /**
  * 版本号
@@ -3666,7 +3666,7 @@ var HrAppendix = {
         this.$emit("save", dataSource);
         $appendix = h("div", {
           "class": "hr-appendix hr-appendix-table hr-appendix-".concat(this.imageSize)
-        }, [(!disabled || btn) && h("header", [h("a-upload", _objectSpread$6(_objectSpread$6({}, options), {}, {
+        }, [(!disabled || btn) && (this.readOnly || h("header", [h("a-upload", _objectSpread$6(_objectSpread$6({}, options), {}, {
           props: _objectSpread$6(_objectSpread$6({}, options.props), {}, {
             showUploadList: false
           })
@@ -3683,7 +3683,7 @@ var HrAppendix = {
               return _this7.capture(dataUrl, prefix);
             }
           }
-        })])]), h("a-table", {
+        })])])), h("a-table", {
           attrs: {
             size: "small",
             bordered: true,
@@ -4898,7 +4898,8 @@ var TableProps = {
   normalizeConfig: VuePropTypes.func,
   normalizeData: VuePropTypes.func,
   selectedRowsList: VuePropTypes.array,
-  keepSelected: VuePropTypes.bool
+  keepSelected: VuePropTypes.bool,
+  showFile: VuePropTypes.bool
   // dataSource: PropTypes.array,
 };
 var FilterProps = {
@@ -7080,8 +7081,6 @@ var Filter = {
 var _excluded$2 = ["rules"];
 function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-// import './style/index'
-
 var TABLE_COLUMN_GROUP_NAME = "hr-table-column-group";
 var TABLE_COLUMN_NAME = "hr-table-column";
 var HR_BUTTON = "hr-button";
@@ -7118,7 +7117,8 @@ var HrTableBase = {
     schemeList: VuePropTypes.array,
     defaultShowCount: VuePropTypes.number,
     selectedSchemeId: VuePropTypes.any,
-    selectedUpdateRows: VuePropTypes.array
+    selectedUpdateRows: VuePropTypes.array,
+    showFile: VuePropTypes.bool
   }, {
     prefixCls: "hr-table-base",
     multiple: true,
@@ -7155,7 +7155,9 @@ var HrTableBase = {
     //搜索条件默认显示数
     selectedSchemeId: null,
     //选择的方案Id
-    selectedUpdateRows: [] //选中行列表
+    selectedUpdateRows: [],
+    //选中行列表
+    showFile: false //是否显示文件列
   }),
   data: function data() {
     return {
@@ -7575,12 +7577,23 @@ var HrTableBase = {
         }
       });
     },
+    _renderCellFile: function _renderCellFile(item, v, record) {
+      var h = this.$createElement;
+      return h(HrAppendix, {
+        attrs: {
+          "read-only": true,
+          multiple: ['MUTIFILE', 'MUTIIMG'].indexOf(item.controlType) !== -1,
+          value: v
+        }
+      });
+    },
     _renderColumns: function _renderColumns(columnList) {
       var _this8 = this;
       var h = this.$createElement;
       var _getOptionProps6 = getOptionProps(this),
         editable = _getOptionProps6.editable,
-        maxWidth = _getOptionProps6.maxWidth;
+        maxWidth = _getOptionProps6.maxWidth,
+        showFile = _getOptionProps6.showFile;
       return columnList.map(function (item) {
         if (item.children && item.children.length > 0) {
           var checkedLen = item.children.filter(function (o) {
@@ -7601,6 +7614,8 @@ var HrTableBase = {
             r = function r(v, record) {
               if (editable && item.isEdit) {
                 return _this8._renderCellComp(item, v, record);
+              } else if (['IMG', 'SINGLEFILE', 'MUTIFILE', 'MUTIIMG'].indexOf(item.controlType) >= 0 && showFile) {
+                return _this8._renderCellFile(item, v, record);
               } else {
                 return _this8._renderCellText(item, v, record);
               }
@@ -8135,7 +8150,9 @@ var index = {
     normalizeData: function normalizeData(data) {
       return data;
     },
-    keepSelected: false //是否保持跨页选中
+    keepSelected: false,
+    //是否保持跨页选中
+    showFile: false //是否显示文件列
   }),
   data: function data() {
     return {
@@ -8724,7 +8741,8 @@ var index = {
       rowKey = _getOptionProps6.rowKey,
       showDownload = _getOptionProps6.showDownload,
       showFilter = _getOptionProps6.showFilter,
-      code = _getOptionProps6.code;
+      code = _getOptionProps6.code,
+      showFile = _getOptionProps6.showFile;
     return h("div", {
       "class": classNames(prefixCls, cls)
     }, [h(HrTableBase, {
@@ -8737,6 +8755,7 @@ var index = {
         columns: columnList,
         code: code,
         multiple: multiple,
+        showFile: showFile,
         rowKey: rowKey,
         selection: selection,
         dataSource: dataSource,
@@ -11465,6 +11484,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: {
@@ -11643,9 +11663,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 &&
@@ -11730,7 +11750,8 @@ var index$6 = {
       dataList: [],
       svgPanZoom: null,
       standardZoom: 1,
-      isDownload: false
+      isDownload: false,
+      globalMap: new Map()
     };
   },
   watch: {
@@ -11795,14 +11816,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) {
@@ -11820,12 +11843,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) {
           //第一个节点
@@ -11864,13 +11890,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;
@@ -11913,7 +11962,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,