hrsass-components 2.1.6 → 2.1.8

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.1.6";
+var version = "2.1.8";
 
 /**
  * 版本号
@@ -4365,7 +4365,7 @@ var HrDynamic = {
         value: value,
         ranges: {
           今天: [moment__default(), moment__default()],
-          当前月: [moment__default(), moment__default().endOf("month")],
+          当前月: [moment__default().startOf('month'), moment__default()],
           上个月: [moment__default().subtract(1, "months").startOf("month"), moment__default().subtract(1, "months").endOf("month")],
           下个月: [moment__default().add(1, "months").startOf("month"), moment__default().add(1, "months").endOf("month")],
           最近一周: [
@@ -14041,11 +14041,16 @@ var index$f = {
     getPopupContainer: function getPopupContainer() {
       var _this = this;
       return function (trigger, dialogContext) {
-        var containerEl = _this.$refs.contentContainer;
-        if (containerEl.parentElement === dialogContext.$refs.body && containerEl.scrollHeight > containerEl.clientHeight) {
-          return containerEl;
+        if (dialogContext) {
+          // 弹出层的容器
+          var containerEl = _this.$refs.contentContainer;
+          if (containerEl.parentElement === dialogContext.$refs.body && containerEl.scrollHeight > containerEl.clientHeight) {
+            return containerEl;
+          } else {
+            return dialogContext.getDialogWrap();
+          }
         } else {
-          return dialogContext.getDialogWrap();
+          return document.body;
         }
       };
     }