hrsass-components 1.7.17 → 1.7.20

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.17";
+var version = "1.7.20";
 
 /**
  * 版本号
@@ -3698,44 +3698,77 @@ var HrAppendix = {
     beforeUpload: function beforeUpload(file) {
       var _this2 = this;
 
-      return new Promise(function (resolve, reject) {
-        //验证文件类型、文件大小
-        var name = file.name,
-            size = file.size;
-        var types = _this2.fileTypeArr;
-        var result = true;
-
-        if (types.length) {
-          result = types.some(function (type) {
-            return new RegExp(type + "$", "ig").test(name);
-          });
-        }
+      return new Promise( /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(resolve, reject) {
+          var name, size, types, result, num;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  //验证文件类型、文件大小
+                  name = file.name, size = file.size;
+                  types = _this2.fileTypeArr;
+                  result = true;
+
+                  if (types.length) {
+                    result = types.some(function (type) {
+                      return new RegExp(type + "$", "ig").test(name);
+                    });
+                  }
 
-        if (!result) {
-          _this2.$message.error("".concat(_this2.locale.fileTypeError, " (").concat(_this2.fileTypes, ")"));
-        } else {
-          if (_this2.fileSizeLimit > 0) {
-            if (_this2.fileSizeLimit * 1024 < size) {
-              result = false;
-              var num = _this2.fileSizeLimit / 1024;
+                  if (!result) {
+                    _this2.$message.error("".concat(_this2.locale.fileTypeError, " (").concat(_this2.fileTypes, ")"));
+                  } else {
+                    if (_this2.fileSizeLimit > 0) {
+                      if (_this2.fileSizeLimit * 1024 < size) {
+                        result = false;
+                        num = _this2.fileSizeLimit / 1024;
+
+                        if (num > 0) {
+                          num = "".concat(Number(num.toFixed(2)), "MB");
+                        } else {
+                          num = "".concat(_this2.fileSizeLimit, "KB");
+                        }
+
+                        _this2.$message.error("".concat(_this2.locale.fileSizeError, " (").concat(num, ")"));
+                      }
+                    }
+                  }
 
-              if (num > 0) {
-                num = "".concat(Number(num.toFixed(2)), "MB");
-              } else {
-                num = "".concat(_this2.fileSizeLimit, "KB");
-              }
+                  if (!_this2.customBeforeUpload) {
+                    _context.next = 15;
+                    break;
+                  }
 
-              _this2.$message.error("".concat(_this2.locale.fileSizeError, " (").concat(num, ")"));
-            }
-          }
-        }
+                  _context.prev = 6;
+                  _context.next = 9;
+                  return _this2.customBeforeUpload(file);
 
-        if (_this2.customBeforeUpload) {
-          result = _this2.customBeforeUpload(file);
-        }
+                case 9:
+                  result = _context.sent;
+                  _context.next = 15;
+                  break;
 
-        result ? resolve(file) : reject(file);
-      });
+                case 12:
+                  _context.prev = 12;
+                  _context.t0 = _context["catch"](6);
+                  result = false;
+
+                case 15:
+                  result ? resolve(file) : reject(file);
+
+                case 16:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[6, 12]]);
+        }));
+
+        return function (_x, _x2) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
     },
     capture: function capture(dataUrl, prefix) {
       var reg0 = new RegExp(String.fromCharCode(0), "g");
@@ -3762,9 +3795,9 @@ var HrAppendix = {
 
       if (files) {
         this.$axios.get("/file.nolog?method=getFileName&fileId=".concat(files)).then(function (files) {
-          var fileList = files.map(function (_ref2) {
-            var fileId = _ref2.fileId,
-                fileName = _ref2.fileName;
+          var fileList = files.map(function (_ref3) {
+            var fileId = _ref3.fileId,
+                fileName = _ref3.fileName;
             var fileObj = {
               uid: "".concat(fileId),
               name: fileName,
@@ -3783,13 +3816,13 @@ var HrAppendix = {
       }
     },
     // 针对原上传组件的change事件做拦截, 同步fileList以及处理value
-    change: function change(_ref3) {
+    change: function change(_ref4) {
       var _this4 = this;
 
-      var _ref3$file = _ref3.file,
-          file = _ref3$file === void 0 ? {} : _ref3$file,
-          _ref3$fileList = _ref3.fileList,
-          fileList = _ref3$fileList === void 0 ? [] : _ref3$fileList;
+      var _ref4$file = _ref4.file,
+          file = _ref4$file === void 0 ? {} : _ref4$file,
+          _ref4$fileList = _ref4.fileList,
+          fileList = _ref4$fileList === void 0 ? [] : _ref4$fileList;
       var _file$response = file.response,
           response = _file$response === void 0 ? {} : _file$response;
 
@@ -3978,9 +4011,9 @@ var HrAppendix = {
             display: "none"
           } : {},
           on: {
-            change: function change(_ref4) {
-              var dataUrl = _ref4.dataUrl,
-                  prefix = _ref4.prefix;
+            change: function change(_ref5) {
+              var dataUrl = _ref5.dataUrl,
+                  prefix = _ref5.prefix;
               return _this7.capture(dataUrl, prefix);
             }
           }
@@ -4396,7 +4429,8 @@ var HrDynamic = {
     onlyLeafSelectable: VuePropTypes.bool,
     isEncrypt: VuePropTypes.bool,
     fileSizeLimit: VuePropTypes.number,
-    fileTypes: VuePropTypes.string
+    fileTypes: VuePropTypes.string,
+    customBeforeUpload: VuePropTypes.func
   }, {
     prefixCls: 'hr-dynamic'
   }),
@@ -4436,7 +4470,8 @@ var HrDynamic = {
         isEncrypt = _getOptionProps$isEnc === void 0 ? false : _getOptionProps$isEnc,
         onlyLeafSelectable = _getOptionProps.onlyLeafSelectable,
         fileSizeLimit = _getOptionProps.fileSizeLimit,
-        fileTypes = _getOptionProps.fileTypes;
+        fileTypes = _getOptionProps.fileTypes,
+        customBeforeUpload = _getOptionProps.customBeforeUpload;
 
     var hrDynamicProps = {
       "class": classNames(prefixCls, cls, _defineProperty({}, "".concat(prefixCls, "-read-only"), !isEncrypt && readOnly)),
@@ -4732,6 +4767,7 @@ var HrDynamic = {
         fileTypes: fileTypes,
         readOnly: readOnly,
         disabled: disabled,
+        customBeforeUpload: customBeforeUpload,
         queryData: queryData
       },
       on: {
@@ -4747,7 +4783,8 @@ var HrDynamic = {
         multiple: true,
         queryData: queryData,
         readOnly: readOnly,
-        disabled: disabled
+        disabled: disabled,
+        customBeforeUpload: customBeforeUpload
       },
       on: {
         "change": function change(val) {
@@ -4762,6 +4799,7 @@ var HrDynamic = {
         listType: "picture-card",
         queryData: queryData,
         disabled: disabled,
+        customBeforeUpload: customBeforeUpload,
         readOnly: readOnly
       },
       on: {
@@ -4778,6 +4816,7 @@ var HrDynamic = {
         listType: "picture-card",
         queryData: queryData,
         disabled: disabled,
+        customBeforeUpload: customBeforeUpload,
         readOnly: readOnly
       },
       on: {
@@ -7621,15 +7660,17 @@ var HrTableBase = {
       var _rowKey = rowKey || 'id';
 
       var id = record[_rowKey];
-      var encryptObj = record.encryptObj || {
-        isReal: false
+      var encryptObj = record.encryptObj || {};
+      encryptObj[columnName] = encryptObj[columnName] || {
+        isReal: flase
       };
+      var filedEncryptObj = encryptObj[columnName];
       console.log(encryptObj);
 
-      if (encryptObj.isReal) {
-        record[columnName] = encryptObj.encryptValue;
-      } else if (encryptObj.realValue) {
-        record[columnName] = encryptObj.realValue;
+      if (filedEncryptObj.isReal) {
+        record[columnName] = filedEncryptObj.encryptValue;
+      } else if (filedEncryptObj.realValue) {
+        record[columnName] = filedEncryptObj.realValue;
       } else {
         this.$axios.post("/platform/metadata/getSingleData.search", {
           gridCode: code,
@@ -7641,15 +7682,15 @@ var HrTableBase = {
             return;
           }
 
-          encryptObj.encryptValue = record[columnName]; //加密值
+          filedEncryptObj.encryptValue = record[columnName]; //加密值
 
-          record[columnName] = encryptObj.realValue = res; //真实值
+          record[columnName] = filedEncryptObj.realValue = res; //真实值
 
           _this5.$set(record, columnName, res);
         });
       }
 
-      encryptObj.isReal = !encryptObj.isReal;
+      filedEncryptObj.isReal = !filedEncryptObj.isReal;
       this.$set(record, 'encryptObj', encryptObj);
     },
     _renderCellText: function _renderCellText(item, v, record) {
@@ -7662,6 +7703,8 @@ var HrTableBase = {
 
       var cellClass = classNames("".concat(prefixCls, "-text"), _defineProperty({}, "".concat(prefixCls, "-text-active"), item.pass));
       var text = !this._isEmpty(v) ? v.name || this._getFormatValue(item.controlType, v) : '';
+      var encryptObj = record.encryptObj || {};
+      var filedEncryptOjb = encryptObj[item.dataIndex];
       return h("div", {
         attrs: {
           title: text
@@ -7678,7 +7721,7 @@ var HrTableBase = {
         },
         slot: "suffix",
         attrs: {
-          type: record.encryptObj && record.encryptObj.isReal ? "eye" : "eye-invisible"
+          type: filedEncryptOjb && filedEncryptOjb.isReal ? "eye" : "eye-invisible"
         },
         style: "margin-left:4px;color: rgba(0,0,0,.25)"
       })]);