fix: bug

packages/base-components/BasicTools/src/index.js

@@ -66,16 +66,16 @@ const getTimeRange = (type) => {
         .endOf('month');
       break;
     case 'lastWeek': // 上周
-      start = moment().subtract(14, 'days');
-      end = moment().subtract(7, 'days');
+      start = moment().startOf('week').subtract(1, 'week');
+      end = moment().endOf('week').subtract(1, 'week');
       break;
     case 'thisWeek': // 本周
-      start = moment().subtract(6, 'days');
-      end = moment();
+      start = moment().startOf('week');
+      end = moment().endOf('week');
       break;
     case 'nextWeek': // 下周
-      start = moment().subtract(-1, 'days');
-      end = moment().subtract(-7, 'days');
+      start = moment().startOf('week').subtract(-1, 'week');
+      end = moment().endOf('week').subtract(-1, 'week');
       break;
     case 'lastDay': // 昨天
       start = moment().subtract(1, 'days');

packages/base-components/DeviceTree/src/index.less

@@ -13,7 +13,7 @@
   }
 
   .ant-tree-checkbox {
-    margin: 4px 2px 0 0;
+    margin: 7px 2px 0 0;
   }
 
   .ant-tree-title {
@@ -24,14 +24,26 @@
     width: 100%;
   }
 
+  .ant-tree-switcher {
+    line-height: 30px;
+  }
+
   .ant-tree-switcher-noop {
     width: 14px;
   }
 
   .ant-tree-node-content-wrapper {
     flex: 1;
+    min-height: 30px;
     overflow: hidden;
+    line-height: 30px;
     text-overflow: ellipsis;
+    border-radius: 3px;
+  }
+
+  .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
+    color: #1890ff;
+    background-color: #eaf1fe;
   }
 
   &-content {

packages/base-components/TimeRangePicker/src/demos/Basic.tsx

@@ -23,12 +23,12 @@ const Demo = () => {
         end = moment().format(endFormat);
         break;
       case 'thisWeek':
-        start = moment().subtract(6, 'days').format(startFormat);
-        end = moment().format(endFormat);
+        start = moment().startOf('week').format(startFormat);
+        end = moment().endOf('week').format(endFormat);
         break;
       case 'lastWeek':
-        start = moment().subtract(14, 'days').format(startFormat);
-        end = moment().subtract(7, 'days').format(endFormat);
+        start = moment().startOf('week').subtract(1, 'week').format(startFormat);
+        end = moment().endOf('week').subtract(1, 'week').format(endFormat);
         break;
       case 'thisMonth':
         start = moment().startOf('month').format(startFormat);
@@ -151,7 +151,7 @@ export default Demo;
 const startFormat = 'YYYY-MM-DD 00:00:00';
 const endFormat = 'YYYY-MM-DD 23:59:59';
 
-const timeFormat = 'YYYY-MM-DD kk:mm:ss';
+const timeFormat = 'YYYY-MM-DD hh:mm:ss';
 
 const dateList = [
   {

packages/extend-components/EC_HistoryInfo/src/index.js

@@ -325,7 +325,7 @@ const HistoryInfo = (props) => {
       resData.forEach((child, index) => {
         child.dataModel.forEach((value, j) => {
           const formatTime = moment(value.pt).format(format);
-          if (timeData[i] === formatTime) item[`value${index + 1}`] = value.pv;
+          if (timeData[i] === formatTime) item[`value${index + 1}`] = value.pv || '--';
         });
       });
     });