coolcare-lite-scada-component 1.0.32 → 1.0.34

package/es/components/DialogHistory/index.js

@@ -100,38 +100,37 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (idList === null || idList === void 0 ? void 0 : idList.length) {
-              _context.next = 3;
+              _context.next = 2;
               break;
             }
-            message.info('请至少查询一个点位');
             return _context.abrupt("return");
-          case 3:
+          case 2:
             if (!(ranges.length !== 2)) {
-              _context.next = 6;
+              _context.next = 5;
               break;
             }
             message.info('请选择时间范围');
             return _context.abrupt("return");
-          case 6:
+          case 5:
             if (!(typeof interval !== 'number' || interval < 0)) {
-              _context.next = 9;
+              _context.next = 8;
               break;
             }
             message.info('请正确输入时间间隔');
             return _context.abrupt("return");
-          case 9:
-            _context.prev = 9;
+          case 8:
+            _context.prev = 8;
             diff = moment(ranges[1]).valueOf() - moment(ranges[0]).valueOf();
             if (!(diff > oneYearTime)) {
-              _context.next = 14;
+              _context.next = 13;
               break;
             }
             message.error('历史数据最大查询范围是一年');
             return _context.abrupt("return");
-          case 14:
+          case 13:
             // 获取点位数据
             setLoading(true);
-            _context.next = 17;
+            _context.next = 16;
             return GetPointHistoryData({
               timeQuantum: {
                 startDate: moment(ranges[0]).format('YYYY-MM-DD HH:mm'),
@@ -140,7 +139,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               pointIdList: idList,
               interval: interval
             });
-          case 17:
+          case 16:
             res = _context.sent;
             if (res.success) {
               data = res.data;
@@ -309,23 +308,23 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               setIsNoData(true);
               message.error(res.message);
             }
-            _context.next = 26;
+            _context.next = 25;
             break;
-          case 21:
-            _context.prev = 21;
-            _context.t0 = _context["catch"](9);
+          case 20:
+            _context.prev = 20;
+            _context.t0 = _context["catch"](8);
             console.error(_context.t0);
             setIsNoData(true);
             setChartOptions(undefined);
-          case 26:
-            _context.prev = 26;
+          case 25:
+            _context.prev = 25;
             setLoading(false);
-            return _context.finish(26);
-          case 29:
+            return _context.finish(25);
+          case 28:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[9, 21, 26, 29]]);
+      }, _callee, null, [[8, 20, 25, 28]]);
     }));
     return function (_x, _x2, _x3) {
       return _ref2.apply(this, arguments);
@@ -401,7 +400,8 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     rules: [{
       required: true,
       message: '请选择时间范围'
-    }]
+    }],
+    className: "temperatureDateRange"
   }, /*#__PURE__*/React.createElement(RangePicker, {
     disabled: loading,
     style: {
@@ -416,7 +416,10 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
       近一周: [moment().subtract(7, 'day'), moment()],
       近一个月: [moment().subtract(30, 'day'), moment()]
     },
-    format: "YYYY-MM-DD HH:mm"
+    format: "YYYY-MM-DD HH:mm",
+    getPopupContainer: function getPopupContainer() {
+      return document.querySelector(".temperatureDateRange") || document.body;
+    }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "interval",
     label: "\u95F4\u9694\uFF08\u5206\u949F\uFF09",

package/es/components/ModalChoosePoint/index.js

@@ -203,6 +203,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     return /*#__PURE__*/React.createElement(Form.Item, {
       name: "pointIdList",
       label: "\u5C5E\u6027",
+      className: "temperature2Select",
       rules: [{
         required: true,
         message: '请选择'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "scripts": {
     "start": "umi dev",
     "build:prod": "UMI_ENV=prod umi build",