hrsass-components 1.7.8 → 1.7.12

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.8";
+var version = "1.7.12";
 
 /**
  * 版本号
@@ -3496,12 +3496,12 @@ var HrAppendix = {
       type: Number,
       "default": 0
     },
-    //支持文件上传类型
+    //支持文件上传类型，多个以逗号隔开（*.jpg,*.gif,*.zip）
     fileTypes: {
       type: String,
-      "default": '*'
+      "default": "*"
     },
-    //限制单个文件大小
+    //限制单个文件大小，单位KB
     fileSizeLimit: {
       type: Number,
       "default": 10240
@@ -3613,9 +3613,9 @@ var HrAppendix = {
     },
     fileTypeArr: function fileTypeArr() {
       if (!this.fileTypes) return [];
-      var fileTypes = this.fileTypes.split(',').filter(Boolean);
+      var fileTypes = this.fileTypes.split(",").filter(Boolean);
       return fileTypes.map(function (type) {
-        return type.replace('.', '\\.').replace('*', '.*');
+        return type.replace(".", "\\.").replace("*", ".*");
       });
     },
     // 值矫正
@@ -3653,7 +3653,7 @@ var HrAppendix = {
       });
 
       var _fileList = _.cloneDeep(cleanFileList).map(function (file) {
-        if (file.name === 'null') {
+        if (file.name === "null") {
           file.name = _this.locale.uploadError;
         }
 
@@ -3695,30 +3695,42 @@ var HrAppendix = {
   },
   methods: {
     beforeUpload: function beforeUpload(file) {
-      //验证文件类型、文件大小
-      var name = file.name,
-          size = file.size;
-      var types = this.fileTypeArr;
-      var result = true;
-
-      if (types.length) {
-        result = types.some(function (type) {
-          return new RegExp(type + '$', 'ig').test(name);
-        });
-      }
+      var _this2 = this;
 
-      if (!result) {
-        this.$message.error("".concat(this.locale.fileTypeError, " (").concat(this.fileTypes, ")"));
-      } else {
-        if (this.fileSizeLimit > 0) {
-          if (this.fileSizeLimit * 1024 < size) {
-            result = false;
-            this.$message.error("".concat(this.locale.fileSizeError, " (").concat(this.fileSizeLimit, "KB)"));
+      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);
+          });
+        }
+
+        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 (num > 0) {
+                num = "".concat(Number(num.toFixed(2)), "MB");
+              } else {
+                num = "".concat(_this2.fileSizeLimit, "KB");
+              }
+
+              _this2.$message.error("".concat(_this2.locale.fileSizeError, " (").concat(num, ")"));
+            }
           }
         }
-      }
 
-      return result;
+        result ? resolve(file) : reject(file);
+      });
     },
     capture: function capture(dataUrl, prefix) {
       var reg0 = new RegExp(String.fromCharCode(0), "g");
@@ -3739,7 +3751,7 @@ var HrAppendix = {
     },
     // 通过接口根据值获取文件列表
     getFileList: function getFileList() {
-      var _this2 = this;
+      var _this3 = this;
 
       var files = _.isArray(this.value) ? _.compact(this.value).join(",") : this.value;
 
@@ -3752,22 +3764,22 @@ var HrAppendix = {
               uid: "".concat(fileId),
               name: fileName,
               status: "done",
-              url: "".concat(_this2.fileUrl).concat(fileId)
+              url: "".concat(_this3.fileUrl).concat(fileId)
             };
 
-            if (_this2.listType !== "text") {
+            if (_this3.listType !== "text") {
               fileObj.type = "image";
             }
 
             return fileObj;
           });
-          _this2.fileList = fileList;
+          _this3.fileList = fileList;
         });
       }
     },
     // 针对原上传组件的change事件做拦截, 同步fileList以及处理value
     change: function change(_ref3) {
-      var _this3 = this;
+      var _this4 = this;
 
       var _ref3$file = _ref3.file,
           file = _ref3$file === void 0 ? {} : _ref3$file,
@@ -3798,7 +3810,7 @@ var HrAppendix = {
 
       fileList = fileList.map(function (file) {
         if (file.response) {
-          file.url = "".concat(_this3.fileUrl).concat(file.response.fileId);
+          file.url = "".concat(_this4.fileUrl).concat(file.response.fileId);
         }
 
         return file;
@@ -3806,7 +3818,7 @@ var HrAppendix = {
       this.fileList = fileList;
     },
     realRemove: function realRemove(file) {
-      var _this4 = this;
+      var _this5 = this;
 
       // 获取问卷标识(分两种情况:1.本次上传的存储在response中 2.预设值的存在uid中)
       var fileId = file.response && file.response.fileId || file.uid;
@@ -3829,18 +3841,18 @@ var HrAppendix = {
       }
 
       return new Promise(function (resolve, reject) {
-        _this4.$axios.get("/file.nolog?method=delete&fileId=".concat(fileId)).then(function (resp) {
-          _this4.fileList = _this4.fileList.filter(function (file) {
+        _this5.$axios.get("/file.nolog?method=delete&fileId=".concat(fileId)).then(function (resp) {
+          _this5.fileList = _this5.fileList.filter(function (file) {
             var fId = file.response && file.response.fileId || file.uid;
             return fId !== fileId;
           });
 
-          if (_this4.multiple) {
-            _this4.emitChange(_this4.value.filter(function (item) {
+          if (_this5.multiple) {
+            _this5.emitChange(_this5.value.filter(function (item) {
               return "".concat(item) !== "".concat(fileId);
             }));
           } else {
-            _this4.emitChange(0);
+            _this5.emitChange(0);
           }
 
           resolve();
@@ -3851,7 +3863,7 @@ var HrAppendix = {
     },
     // 文件删除
     fileRemove: function fileRemove(file, locale) {
-      var _this5 = this;
+      var _this6 = this;
 
       // 禁用或只读情况下阻止删除
       if (this.disabled || this.readOnly) {
@@ -3860,12 +3872,12 @@ var HrAppendix = {
       }
 
       return new Promise(function (resolve, reject) {
-        _this5.$confirm({
+        _this6.$confirm({
           title: locale.isDeleteTip,
           okText: locale.confirm,
           cancelText: locale.cancel,
           onOk: function onOk() {
-            resolve(_this5.realRemove(file));
+            resolve(_this6.realRemove(file));
           },
           onCancel: function onCancel() {
             reject();
@@ -3887,7 +3899,7 @@ var HrAppendix = {
       window.open("".concat(baseUrl, "/file.nolog?method=preview&fileId=").concat(fileId));
     },
     _renderAppendix: function _renderAppendix(locale) {
-      var _this6 = this;
+      var _this7 = this;
 
       var h = this.$createElement;
       this.locale = locale;
@@ -3932,9 +3944,12 @@ var HrAppendix = {
       var options = _objectSpread$6({}, this.options);
 
       options.props.remove = function (file) {
-        return _this6.fileRemove(file, locale);
+        return _this7.fileRemove(file, locale);
       };
 
+      options.props.showUploadList = {
+        showRemoveIcon: !disabled
+      };
       var $appendix;
 
       if (this.listType === "text" && this.$attrs.showUploadList !== false && this.multiple) {
@@ -3953,7 +3968,7 @@ var HrAppendix = {
             change: function change(_ref4) {
               var dataUrl = _ref4.dataUrl,
                   prefix = _ref4.prefix;
-              return _this6.capture(dataUrl, prefix);
+              return _this7.capture(dataUrl, prefix);
             }
           }
         })])]), h("a-table", {
@@ -3992,7 +4007,7 @@ var HrAppendix = {
                 },
                 on: {
                   click: function click() {
-                    return _this6.preview(fileId);
+                    return _this7.preview(fileId);
                   }
                 }
               }), h("a-button", {
@@ -4002,17 +4017,17 @@ var HrAppendix = {
                 },
                 on: {
                   click: function click() {
-                    return _this6.downloadItem(fileId);
+                    return _this7.downloadItem(fileId);
                   }
                 }
-              }), _this6.readOnly ? null : h("a-button", {
+              }), _this7.readOnly ? null : h("a-button", {
                 props: {
                   type: "link",
                   icon: "close"
                 },
                 on: {
                   click: function click() {
-                    return _this6.fileRemove(record, locale);
+                    return _this7.fileRemove(record, locale);
                   }
                 }
               })]);
@@ -4030,7 +4045,7 @@ var HrAppendix = {
           } : {},
           on: {
             change: function change(dataUrl) {
-              return _this6.capture(dataUrl);
+              return _this7.capture(dataUrl);
             }
           }
         })]), h("a-upload", options, [btn ? this.$slots["default"] || btn : null])]);
@@ -4067,6 +4082,10 @@ var HrAvatar = {
       type: String,
       "default": ''
     },
+    ename: {
+      type: String,
+      "default": ''
+    },
     // 存在于文件服务器中的图片只需传此属性
     fileId: {
       type: [String, Number],
@@ -4085,7 +4104,9 @@ var HrAvatar = {
   },
   computed: {
     userName: function userName() {
-      return this.name || this.$slots["default"];
+      var isEn = this.$i18n.locale === 'en_US';
+      var ename = isEn && this.ename;
+      return ename || this.name || this.$slots["default"];
     },
     avatarOptions: function avatarOptions() {
       var props = _.cloneDeep(this.$attrs);
@@ -4827,7 +4848,8 @@ var FilterProps = {
   locale: VuePropTypes.object,
   schemeList: VuePropTypes.array,
   code: VuePropTypes.string,
-  selectedSchemeId: VuePropTypes.any
+  selectedSchemeId: VuePropTypes.any,
+  mask: VuePropTypes.bool
 };
 var ToolbarProps = {
   prefixCls: VuePropTypes.string,
@@ -4852,7 +4874,8 @@ var SettingProps = {
   prefixCls: VuePropTypes.string,
   visible: VuePropTypes.bool,
   data: VuePropTypes.array,
-  locale: VuePropTypes.object
+  locale: VuePropTypes.object,
+  mask: VuePropTypes.bool
 };
 var SchemeProps = {
   prefixCls: VuePropTypes.string,
@@ -5379,7 +5402,8 @@ var Setting = {
   props: initDefaultProps(SettingProps, {
     prefixCls: 'hr-table-base-setting',
     data: [],
-    locale: {}
+    locale: {},
+    mask: true
   }),
   data: function data() {
     return {
@@ -5436,6 +5460,8 @@ var Setting = {
         isCheckAll = this.isCheckAll,
         indeterminate = this.indeterminate;
     var prefixCls = props.prefixCls,
+        _props$mask = props.mask,
+        mask = _props$mask === void 0 ? true : _props$mask,
         cls = props["class"],
         visible = props.visible,
         data = props.data,
@@ -5444,7 +5470,7 @@ var Setting = {
       attrs: {
         width: '300',
         placement: "right",
-        mask: false,
+        mask: mask,
         closable: false,
         visible: visible,
         wrapClassName: classNames(prefixCls, cls)
@@ -6591,8 +6617,9 @@ var Filter = {
     locale: {},
     schemeList: [],
     //方案列表
-    selectedSchemeId: null //选择的方案id
-
+    selectedSchemeId: null,
+    //选择的方案id
+    mask: true
   }),
   data: function data() {
     return {
@@ -7011,6 +7038,8 @@ var Filter = {
         eidtData = this.eidtData;
     var props = getOptionProps(this);
     var prefixCls = props.prefixCls,
+        _props$mask = props.mask,
+        mask = _props$mask === void 0 ? true : _props$mask,
         hasReset = props.hasReset,
         cls = props["class"],
         visible = props.visible,
@@ -7019,7 +7048,7 @@ var Filter = {
       attrs: {
         width: "300",
         placement: "right",
-        mask: false,
+        mask: mask,
         closable: false,
         visible: visible,
         wrapClassName: "".concat(prefixCls)
@@ -8883,7 +8912,8 @@ var index = {
           if (id) {
             _this12._getSchemeList(id);
           } else {
-            _this12.selectedSchemeId = null;
+            // this.selectedSchemeId = null;
+            _this12._getSchemeList();
           }
         },
         "tempSearch": function tempSearch(tempConditionList, schemeId) {
@@ -13164,33 +13194,7 @@ var en_US = {
     selectAll: 'Select all',
     searchPlaceholder: 'Please enter keywords',
     loading: 'Loading'
-  } // Modal: {
-  //   okText: '确定',
-  //   cancelText: '取消',
-  //   justOkText: '知道了',
-  // },
-  // Popconfirm: {
-  //   cancelText: '取消',
-  //   okText: '确定',
-  // },
-  // Transfer: {
-  //   searchPlaceholder: '请输入搜索内容',
-  //   itemUnit: '项',
-  //   itemsUnit: '项',
-  // },
-  // Upload: {
-  //   uploading: '文件上传中',
-  //   removeFile: '删除文件',
-  //   uploadError: '上传错误',
-  //   previewFile: '预览文件',
-  // },
-  // Empty: {
-  //   description: '暂无数据',
-  // },
-  // Icon: {
-  //   icon: '图标',
-  // },
-
+  }
 };
 
 function ownKeys$m(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -13282,6 +13286,7 @@ var index$7 = {
       }
 
       props.name = data.name;
+      props.ename = data.ename;
       return {
         props: props
       };
@@ -13607,6 +13612,7 @@ var HrAddrBookCard = {
           fileId: data.fileId,
           img: data.photo,
           name: data.name,
+          ename: data.english_name,
           size: size
         },
         ref: "avatar"