hrsass-components 1.7.32 → 1.7.35

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.32";
+var version = "1.7.35";
 
 /**
  * 版本号
@@ -1564,6 +1564,7 @@ var HrSetId = {
 };
 
 var defaultLocale = {
+  //
   locale: 'zh-cn',
   HrAppendix: {
     uploadBtnText: '上传文件'
@@ -3224,10 +3225,6 @@ var HrAppendix = {
       "default": "default",
       validator: function validator(val) {
         return ["default", "inch-1", "inch-2"].includes(val);
-      },
-      isLanguage: {
-        type: Boolean,
-        "default": false
       }
     }
   },
@@ -3458,13 +3455,11 @@ var HrAppendix = {
         fileList = _ref4$fileList === void 0 ? [] : _ref4$fileList;
       var _file$response = file.response,
         response = _file$response === void 0 ? {} : _file$response;
-      var successText = this.isLanguage ? 'file uploaded successfully' : '文件上传成功';
-      var errorText = this.isLanguage ? 'file upload failed' : '文件上传失败';
       if (file.status === "done") {
         if (response.fileId) {
           var value = this.multiple ? [].concat(_toConsumableArray(this.val), [response.fileId]) : response.fileId;
           this.emitChange(value);
-          this.$message.success("".concat(file.name).concat(successText));
+          this.$message.success("".concat(file.name).concat(locale.successText));
         } else if (response.errorMessage) {
           this.$message.error("".concat(response.errorMessage));
           if (!this.multiple && this.listType === "picture-card") {
@@ -3472,7 +3467,7 @@ var HrAppendix = {
           }
         }
       } else if (file.status === "error") {
-        this.$message.error(response.errorMessage || "".concat(file.name).concat(errorText));
+        this.$message.error(response.errorMessage || "".concat(file.name).concat(locale.errorText));
         if (!this.multiple && this.listType === "picture-card") {
           fileList = [];
         }
@@ -3528,9 +3523,8 @@ var HrAppendix = {
     fileRemove: function fileRemove(file, locale) {
       var _this6 = this;
       // 禁用或只读情况下阻止删除
-      var noRemoveText = this.isLanguage ? 'can not remove file in the status of disabled/readOnly' : '禁用或只读情况下不能删除文件';
       if (this.disabled || this.readOnly) {
-        this.$message.info("".concat(noRemoveText));
+        this.$message.info("".concat(locale.uploadBtnText));
         return false;
       }
       return new Promise(function (resolve, reject) {
@@ -3863,7 +3857,10 @@ var HrSelectEmp = {
       var _this = this;
       queryString = encodeURI(queryString);
       var queryData = this.queryData;
-      this.$axios.post("business/emp/empinfo/empselector/getEmpSelectorInfoDTOList.search?inStr=".concat(queryString || ''), {
+      this.$axios.get("business/emp/empinfo/empselector/getEmpSelectorInfoDTOListNew.search?inStr=".concat(queryString || ''), {
+        headers: {
+          functionid: 'STD-PWSQGL'
+        },
         queryData: queryData
       }).then(function () {
         var res = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -10942,13 +10939,19 @@ var OrganizationCard = {
     //链接线高度
     width: VuePropTypes.number,
     //宽度
-    height: VuePropTypes.number //高度
+    height: VuePropTypes.number,
+    //高度
+    topBorderHeight: VuePropTypes.number,
+    //上边框高度
+    isDownload: VuePropTypes.bool
   }, {
     prefixCls: 'hr-org-chart-organization-card',
     data: {},
     width: 260,
     height: 160,
-    lineHeight: 30
+    lineHeight: 30,
+    topBorderHeight: 4,
+    isDownload: false
   }),
   data: function data() {
     return {};
@@ -10977,13 +10980,19 @@ var OrganizationCard = {
       data = _getOptionProps2.data,
       width = _getOptionProps2.width,
       height = _getOptionProps2.height,
-      lineHeight = _getOptionProps2.lineHeight;
+      lineHeight = _getOptionProps2.lineHeight,
+      topBorderHeight = _getOptionProps2.topBorderHeight,
+      isDownload = _getOptionProps2.isDownload;
     var kind = data.data.kind,
       chargePersonType = data.data.chargePersonType;
     var empMapList = [],
       positionName = data.property.positionName;
     //chargePersonType 2=为职位 1=人员
     //职位时，不显示职位名称(?)
+    var davidColor = {
+      2: '#3FCF8E',
+      3: '#F6A4EB'
+    };
     if (chargePersonType === '2') {
       empMapList = data.property.empMapList || [];
       //人员最多显示3个
@@ -11009,14 +11018,19 @@ var OrganizationCard = {
         width: width,
         height: height
       },
-      "class": "".concat(prefixCls, "-container")
+      "class": "".concat(prefixCls, "-container"),
+      style: "fill: #ffffff;stroke: rgba(0, 0, 0, 0.15);stroke-width: 1px"
     }), h("rect", {
       attrs: {
         x: "0",
         y: "0",
-        width: width
+        width: width,
+        height: topBorderHeight
       },
-      "class": classNames("".concat(prefixCls, "-divider"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-divider-department"), kind == 2), _defineProperty(_classNames, "".concat(prefixCls, "-divider-virtual"), kind == 3), _classNames))
+      "class": classNames("".concat(prefixCls, "-divider"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-divider-department"), kind == 2), _defineProperty(_classNames, "".concat(prefixCls, "-divider-virtual"), kind == 3), _classNames)),
+      style: {
+        fill: kind != 2 && kind != 3 ? '#4285F4' : davidColor[kind]
+      }
     }), h(IconBase, {
       attrs: {
         iconName: "dptIcon",
@@ -11079,6 +11093,9 @@ var OrganizationCard = {
           width: "30",
           height: "30",
           fill: "".concat(emp.photo ? 'url(#circleImage' + emp.photo + ')' : '#d6d6d6')
+        },
+        style: {
+          fill: isDownload ? '#d6d6d6' : ''
         }
       }), h("text", {
         attrs: {
@@ -11127,22 +11144,42 @@ var OrganizationCard = {
         y: height * 0.875
       },
       "class": "".concat(prefixCls, "-text")
-    }, [h("tspan", [data.property.count])])]), data.level > 0 && h("line", {
-      "class": "".concat(prefixCls, "-line"),
-      attrs: {
-        x1: width / 2,
-        x2: width / 2,
-        y1: "0",
-        y2: -lineHeight
-      }
-    }), data.children && data.children.length > 0 && data.property.open && h("line", {
-      "class": "".concat(prefixCls, "-line"),
-      attrs: {
-        x1: width / 2,
-        x2: width / 2,
-        y1: height,
-        y2: height + lineHeight
-      }
+    }, [h("tspan", [data.property.count])])]), data.level > 0 &&
+    // <line
+    //   class={`${prefixCls}-line`}
+    //   style="stroke: rgba(0, 0, 0, 0.7;stroke-width: 1px;"
+    //   x1={width / 2}
+    //   x2={width / 2}
+    //   y1="0"
+    //   y2={-lineHeight}
+    // />
+    //导出时，线条渲染不出来，所以改成rect
+    h("rect", {
+      attrs: {
+        x: width / 2,
+        y: -lineHeight,
+        width: 1,
+        height: lineHeight
+      },
+      style: "fill:#fff;stroke: rgba(0, 0, 0, 0.1);stroke-width: 1px"
+    }), data.children && data.children.length > 0 && data.property.open &&
+    // <line
+    //   class={`${prefixCls}-line`}
+    //   style="stroke: rgba(0, 0, 0, 0.7);stroke-width: 1px;"
+    //   x1={width / 2}
+    //   x2={width / 2}
+    //   y1={height}
+    //   y2={height + lineHeight}
+    // />
+    //导出时，线条渲染不出来，所以改成rect
+    h("rect", {
+      attrs: {
+        x: width / 2,
+        y: height,
+        width: 1,
+        height: lineHeight
+      },
+      style: "fill:#fff;stroke: rgba(0, 0, 0, 0.1);stroke-width: 1px"
     }), data.property.count && data.property.count > 0 && h(IconBase, {
       "class": "".concat(prefixCls, "-action"),
       attrs: {
@@ -11206,7 +11243,8 @@ var index$6 = {
       loading: false,
       dataList: [],
       svgPanZoom: null,
-      standardZoom: 1
+      standardZoom: 1,
+      isDownload: false
     };
   },
   watch: {
@@ -11357,14 +11395,23 @@ var index$6 = {
       var lineXStart = children[0].x + width / 2;
       var lineXEnd = children[children.length - 1].x + width / 2;
       var lineY = level * height + lineHeight * (level * 2 - 1);
-      return h("line", {
-        "class": "hr-org-chart-line",
+      // return <line
+      //   class="hr-org-chart-line"
+      //   x1={lineXStart}
+      //   x2={lineXEnd}
+      //   y1={lineY}
+      //   y2={lineY}
+      //   style="stroke: rgba(0, 0, 0, 0.15);stroke-width: 1px">
+      // </line>
+      //导出时，线条渲染不出来，所以改成rect
+      return h("rect", {
         attrs: {
-          x1: lineXStart,
-          x2: lineXEnd,
-          y1: lineY,
-          y2: lineY
-        }
+          x: lineXStart,
+          y: lineY,
+          height: 1,
+          width: lineXEnd - lineXStart
+        },
+        style: "fill:#fff;stroke: rgba(0, 0, 0, 0.1);stroke-width: 1px"
       });
     },
     _renderOrgChart: function _renderOrgChart(data) {
@@ -11385,7 +11432,8 @@ var index$6 = {
             data: item,
             width: width,
             height: height,
-            lineHeight: lineHeight
+            lineHeight: lineHeight,
+            isDownload: _this4.isDownload
           },
           on: {
             "click": function click(data) {
@@ -11418,7 +11466,7 @@ var index$6 = {
      * @param {Boolean} isOpen 是否展开
      * @param {Object} item 当前节点
      * @param {Object} prevData 上一节点
-     * @param {Array} children 子集
+     * @param {Array} children 子集.
      */
     _handleExpand: function _handleExpand(isOpen, item, prevData, children) {
       var _this5 = this;
@@ -11455,14 +11503,39 @@ var index$6 = {
       });
     },
     exportSvg: function exportSvg(fileName) {
-      var bBox = this.$refs.hrOrgChartSvg.getBBox();
-      saveSvgAsPng.saveSvgAsPng(this.$refs.hrOrgChartSvg, fileName || 'org.png', {
-        scale: 1,
-        width: bBox.width,
-        height: bBox.height,
-        top: bBox.y,
-        left: bBox.x
+      var _this6 = this;
+      var bBox = this.$refs.hrOrgChartSvg.getBBox(),
+        options = {
+          scale: 1,
+          width: bBox.width,
+          height: bBox.height,
+          top: bBox.y,
+          left: bBox.x
+        };
+      this.setState({
+        loading: true,
+        isDownload: true
+      });
+      saveSvgAsPng.svgAsDataUri(this.$refs.hrOrgChartSvg, options).then(function (url) {
+        var dataUrL = url.split('base64,')[1];
+        _this6.$axios.post('/business/org/Company/getOrgDiagram.data', {
+          'base64Str': dataUrL,
+          name: fileName || 'org.png'
+        }).then(function (res) {
+          window.open("".concat(process.env.VUE_APP_API_BASE_URL, "/file.nolog?method=download&fileId=").concat(res));
+          _this6.setState({
+            loading: false,
+            isDownload: false
+          });
+        });
       });
+      // saveSvgAsPng(this.$refs.hrOrgChartSvg, fileName || 'org.png', {
+      //   scale: 1,
+      //   width: bBox.width,
+      //   height: bBox.height,
+      //   top: bBox.y,
+      //   left: bBox.x,
+      // });
     },
     /**
      * 获取当前缩放比例
@@ -11543,13 +11616,16 @@ var ReportCard = {
     //链接线高度
     width: VuePropTypes.number,
     //宽度
-    height: VuePropTypes.number //高度
+    height: VuePropTypes.number,
+    //高度
+    topBorderHeight: VuePropTypes.number //上边框高度
   }, {
     prefixCls: 'hr-report-chart-card',
     data: {},
     width: 260,
     height: 160,
-    lineHeight: 30
+    lineHeight: 30,
+    topBorderHeight: 4
   }),
   data: function data() {
     return {
@@ -11589,7 +11665,8 @@ var ReportCard = {
       data = _getOptionProps3.data,
       width = _getOptionProps3.width,
       height = _getOptionProps3.height,
-      lineHeight = _getOptionProps3.lineHeight;
+      lineHeight = _getOptionProps3.lineHeight,
+      topBorderHeight = _getOptionProps3.topBorderHeight;
     return h("g", {
       "class": prefixCls,
       attrs: {
@@ -11621,7 +11698,8 @@ var ReportCard = {
       attrs: {
         x: "0",
         y: "0",
-        width: width
+        width: width,
+        height: topBorderHeight
       },
       "class": classNames("".concat(prefixCls, "-divider"), "".concat(prefixCls, "-divider-virtual"))
     }), h("g", [h("defs", [h("pattern", {
@@ -11710,6 +11788,8 @@ var ReportCard = {
   }
 };
 
+//109%
+//<canvas width="87737" height="905" style="width: 87737px; height: 905px;"></canvas>
 var HrReportChart = {
   name: 'HrReportChart',
   mixins: [BaseMixin],
@@ -12001,7 +12081,10 @@ var zh_CN = {
     appendixName: '资料名称',
     uploadError: '此附件有问题，请重新上传',
     fileTypeError: '不支持的文件类型',
-    fileSizeError: '文件大小限制'
+    fileSizeError: '文件大小限制',
+    noRemoveText: '禁用或只读情况下不能删除文件',
+    successText: '文件上传成功',
+    errorText: '文件上传失败'
   },
   HrAddrBookCard: {
     viewReportRelate: '查看汇报关系',
@@ -12138,7 +12221,10 @@ var en_US = {
     appendixName: 'Document Name',
     uploadError: 'There is a problem with this attachment. Please upload it again',
     fileTypeError: 'Unsupported file type',
-    fileSizeError: 'File size limit'
+    fileSizeError: 'File size limit',
+    noRemoveText: 'can not remove file in the status of disabled/readOnly',
+    successText: 'file uploaded successfully',
+    errorText: 'file upload failed'
   },
   HrAddrBookCard: {
     viewReportRelate: 'view report relation',