@zgfe/business-lib 1.0.26 → 1.0.27-adanalysis.0

package/es/chart/util/formatData.js

@@ -38,9 +38,8 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
       if (reverseXAxis) {
         x_axis.push(name);
         sData.push({
-          name: data.x_axis[0],
+          name: name,
           value: seriesItem.values[0],
-          label: name,
           itemStyle: {
             normal: {
               color: colorData[sData.length]

package/es/chart/util/formatOption.js

@@ -16,7 +16,11 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params) {
   }
 
   var htmlArray = [];
-  htmlArray.push("<div class=\"biz-chart-tooltip-title\">".concat(xLabel, "</div>"));
+
+  if (params.length > 1) {
+    htmlArray.push("<div class=\"biz-chart-tooltip-title\">".concat(xLabel, "</div>"));
+  }
+
   params.forEach(function (item) {
     var lineLabel = item.value;
 
@@ -26,7 +30,7 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params) {
       lineLabel = util.toThousands(lineLabel);
     }
 
-    var name = (params.length > 1 ? item.seriesName : item.data && item.data.label ? item.data.label : item.name).trim();
+    var name = (params.length > 1 ? item.seriesName : item.name).trim();
     htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <span class=\"biz-chart-tooltip-content\">\n              <span class=\"biz-tooltip-marker\" style=\"background:".concat(item.color, "\"></span>").concat(name, "\n          </span> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
   });
   return htmlArray.join('');
@@ -64,16 +68,28 @@ var mapTooltipFormatter = function mapTooltipFormatter(params) {
   var data = params.data;
 
   if (data.childrenOptions && data.childrenOptions.length) {
-    var htmlArray = [];
-    htmlArray.push("<div class=\"biz-chart-tooltip-title\">".concat(params.name, "</div>"));
+    var series = [];
     var childrenOptions = data.childrenOptions;
     childrenOptions.forEach(function (option) {
-      htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n        <span class=\"biz-chart-tooltip-content\">\n          ".concat(option.name, "\n        </span> \n        <span class=\"biz-chart-tooltip-value\">").concat(util.toThousands(option.value), "</span>\n      </div>"));
+      var label = option.name || option.names.join(',');
+      var value = option.value || option.values;
+
+      if (util.isArray(value)) {
+        value = value[value.length - 1];
+      }
+
+      series.push("<div class=\"biz-chart-tooltip-item\"><span class=\"biz-chart-tooltip-content\">".concat(label, ": </span><span class=\"biz-chart-tooltip-value\" style=\"color:#66ccff;\">").concat(util.toThousands(value), "</span></div>"));
     });
-    return htmlArray.join('');
+    return "".concat(series.join('<br/>'));
+  }
+
+  var dataValue = data.value || data.values;
+
+  if (util.isArray(dataValue)) {
+    dataValue = dataValue[dataValue.length - 1];
   }
 
-  return "<div class=\"biz-chart-tooltip-item\"><span class=\"biz-chart-tooltip-content\">".concat(data.name, ": </span><span>").concat(util.toThousands(data.value), "</span></div>");
+  return "<div class=\"biz-chart-tooltip-item\"><span class=\"biz-chart-tooltip-content\">".concat(data.name || data.names.join(','), ": </span><span style=\"color:#66ccff;\">").concat(util.toThousands(dataValue), "</span></div>");
 };
 
 var legendFormatterDefault = function legendFormatterDefault(label) {

package/es/chart/util/mapUtil.d.ts

@@ -1,6 +1,6 @@
 import { ChartTypes, ItemDataProps } from '../types';
-declare const citySeries: (data: ChartTypes.Value) => ItemDataProps[];
-declare const provinceSeries: (data: ChartTypes.Value) => any;
+declare const citySeries: (data: ChartTypes.Value, haveUserGroup: boolean) => ItemDataProps[];
+declare const provinceSeries: (data: ChartTypes.Value, haveUserGroup?: boolean | undefined) => any;
 declare const maxMinValue: (series: ItemDataProps) => {
     max: number;
     min: number;

package/es/chart/util/mapUtil.js

@@ -10,6 +10,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -20,13 +22,13 @@ import util from '../../utils/util';
 import cityGeoCoord from './data/cityGeoCoord';
 import provinceGeoCoord from './data/provinceGeoCoord';
 
-var citySeries = function citySeries(data) {
+var citySeries = function citySeries(data, haveUserGroup) {
   var backGroundMapSeries = {
     type: 'map',
     map: 'china',
     showLegendSymbol: false,
-    top: 0,
-    bottom: 0,
+    top: 20,
+    bottom: 20,
     data: []
   };
   var scatterSeries = {
@@ -37,29 +39,33 @@ var citySeries = function citySeries(data) {
     data: []
   };
   var provinceMapData = {};
-  var mapStore = formatMapData(data, 'city');
-  mapStore.x_axis.forEach(function (xItem) {
+  data.x_axis.forEach(function (xItem, i) {
     scatterSeries.name = xItem;
-    mapStore.series.forEach(function (cityItem) {
-      var cityName = cityItem.name;
+    data.series.forEach(function (cityItem) {
+      var cityName = cityItem.names[cityItem.names.length - 1];
+      cityName = cityName.replace(/(市|省|自治区)$/, '');
       var cityCoordObj = cityGeoCoord[cityName];
-      var cityValue = cityItem.value;
-      var scatterItem = {
-        name: cityItem.name,
-        isCity: true,
-        value: [cityCoordObj.log, cityCoordObj.lat, cityValue],
-        childrenOptions: cityItem.childrenOptions
-      };
-      scatterSeries.data.push(scatterItem);
-      var provinceObj = cityCoordObj.province;
-      var provinceName = provinceObj ? provinceObj.name.replace(/(省|市)$/, '') : '';
-      var currentMapData = provinceMapData[provinceName];
-      var currentMapOptions = currentMapData ? currentMapData.childrenOptions : [];
-      provinceMapData[provinceName] = {
-        name: provinceName,
-        value: currentMapData ? currentMapData.value + cityValue : cityValue,
-        childrenOptions: currentMapOptions.concat([cityItem])
-      };
+
+      if (cityCoordObj) {
+        var cityValue = cityItem.values[i];
+        var scatterItem = {
+          name: cityCoordObj.name,
+          isCity: true,
+          value: [cityCoordObj.log, cityCoordObj.lat, cityValue],
+          childrenOptions: cityItem.userGroupCompareData
+        };
+        scatterSeries.data.push(scatterItem);
+        var provinceObj = cityCoordObj.province;
+        var provinceName = provinceObj ? provinceObj.name.replace(/(省|市)$/, '') : '';
+        var currentMapData = provinceMapData[provinceName];
+        var currentMapOptions = currentMapData ? currentMapData.childrenOptions : [];
+        provinceMapData[provinceName] = {
+          name: provinceName,
+          isProvince: true,
+          value: currentMapData ? currentMapData.value + cityValue : cityValue,
+          childrenOptions: currentMapOptions.concat(haveUserGroup ? cityItem.userGroupCompareData : [cityItem])
+        };
+      }
     });
   });
 
@@ -75,17 +81,17 @@ var citySeries = function citySeries(data) {
   return [scatterSeries, backGroundMapSeries];
 };
 
-var provinceSeries = function provinceSeries(data) {
+var provinceSeries = function provinceSeries(data, haveUserGroup) {
   var series = [];
-  var mapStore = formatMapData(data, 'province');
-  mapStore.x_axis.forEach(function (xItem) {
+  var mapStore = formatData(data, haveUserGroup);
+  mapStore.x_axis.forEach(function (xItem, i) {
     var item = {
       name: xItem,
       type: 'map',
       map: 'china',
       roam: false,
-      top: 0,
-      bottom: 0,
+      top: 20,
+      bottom: 20,
       label: {
         show: true,
         color: '#565656'
@@ -94,7 +100,21 @@ var provinceSeries = function provinceSeries(data) {
       data: []
     };
     mapStore.series.forEach(function (provinceItem) {
-      item.data.push(provinceItem);
+      var name = provinceItem.name || provinceItem.names;
+      var provinceName = _typeof(name) === 'object' ? name[name.length - 1] : name;
+      provinceName = provinceName.replace(/(市|省|自治区)$/, '');
+      var provinceCoordObj = provinceGeoCoord[provinceName];
+      name = _typeof(name) === 'object' ? name.join('-') : name;
+      name = name.replace(/(市|省|自治区)$/, '');
+
+      if (provinceCoordObj) {
+        item.data.push({
+          name: name,
+          isProvince: true,
+          value: provinceItem.values[i],
+          childrenOptions: provinceItem.userGroupCompareData
+        });
+      }
     });
     series.push(item);
   });
@@ -130,40 +150,36 @@ var maxMinValue = function maxMinValue(series) {
   };
 };
 
-var formatMapData = function formatMapData(seriesData, type) {
-  var store = {
-    x_axis: seriesData.x_axis,
-    series: []
-  };
-  var areaObjMap = {};
-  seriesData.series.forEach(function (item) {
-    var areaName = item.names[0].replace(/(市|省|自治区)$/, '');
-    var targetName = item.names.slice(1).join(',');
-    var targeItem = {
-      name: targetName || areaName,
-      value: item.values[0]
+var formatData = function formatData(seriesData, haveUserGroup) {
+  if (haveUserGroup) {
+    var store = {
+      x_axis: seriesData.x_axis,
+      series: []
     };
+    var areaObjMap = {};
+    seriesData.series.forEach(function (item) {
+      var areaName = item.names[item.names.length - 1];
+
+      if (!areaObjMap[areaName]) {
+        areaObjMap[areaName] = {
+          names: [areaName],
+          values: item.values,
+          userGroupCompareData: [item]
+        };
+      } else {
+        areaObjMap[areaName].values = [areaObjMap[areaName].values[0] + item.values[0]];
+        areaObjMap[areaName].userGroupCompareData.push(item);
+      }
+    });
 
-    if (!areaObjMap[areaName]) {
-      areaObjMap[areaName] = {
-        name: areaName,
-        value: item.values[0],
-        childrenOptions: [targeItem]
-      };
-    } else {
-      areaObjMap[areaName].value += item.values[0];
-      areaObjMap[areaName].childrenOptions.push(targeItem);
-    }
-  });
-  var areaMap = type === 'province' ? provinceGeoCoord : cityGeoCoord;
-
-  for (var area in areaObjMap) {
-    if (areaMap[area]) {
+    for (var area in areaObjMap) {
       store.series.push(areaObjMap[area]);
     }
-  }
 
-  return store;
+    return store;
+  } else {
+    return seriesData;
+  }
 };
 
 export { provinceSeries, citySeries, maxMinValue };

package/es/cycleTime/index.d.ts

@@ -17,6 +17,5 @@ declare const BizCycleTime: React.FC<{
     placeholder?: string;
     onChange?: (val: Value) => void;
     size?: SizeType;
-    disable?: boolean;
 }>;
 export default BizCycleTime;

package/es/cycleTime/index.js

@@ -26,8 +26,7 @@ export var CycleTimeUnit;
 
 var BizCycleTime = function BizCycleTime(props) {
   var multiple = props.multiple,
-      size = props.size,
-      disable = props.disable;
+      size = props.size;
   var classPrefix = 'biz-cycle-time';
   var unitList = [{
     label: '每日',
@@ -158,7 +157,6 @@ var BizCycleTime = function BizCycleTime(props) {
     className: "".concat(classPrefix, "-unit"),
     defaultValue: unit,
     size: size,
-    disable: disable,
     onChange: function onChange(v) {
       setDay([]);
       setTime(undefined);
@@ -171,8 +169,7 @@ var BizCycleTime = function BizCycleTime(props) {
     defaultValue: time ? moment(time, 'hh:mm:ss') : undefined,
     onChange: function onChange(time) {
       setTime(time === null || time === void 0 ? void 0 : time.format('hh:mm:ss'));
-    },
-    disabled: disable
+    }
   }), unit.value === CycleTimeUnit.week && /*#__PURE__*/React.createElement(BizSelect, {
     options: days,
     labelField: "label",
@@ -184,20 +181,16 @@ var BizCycleTime = function BizCycleTime(props) {
     placeholder: props.placeholder,
     onChange: function onChange(v) {
       setDay(v);
-    },
-    disable: disable,
-    enableCreate: false
+    }
   }), unit.value === CycleTimeUnit.month && /*#__PURE__*/React.createElement(MonthDay, {
     placeholder: props.placeholder,
     defaultValue: day,
-    onChange: setDayList,
-    disable: disable
+    onChange: setDayList
   }));
 };
 
 BizCycleTime.defaultProps = {
   multiple: false,
-  size: 'middle',
-  disable: false
+  size: 'middle'
 };
 export default BizCycleTime;

package/es/cycleTime/month.d.ts

@@ -8,6 +8,5 @@ declare const MonthDay: React.FC<{
     defaultValue?: BaseOption<number>[];
     placeholder?: string;
     onChange?: (days: BaseOption<number>[]) => void;
-    disable?: boolean;
 }>;
 export default MonthDay;

package/es/cycleTime/month.js

@@ -18,7 +18,6 @@ import _ from 'lodash';
 
 var MonthDay = function MonthDay(props) {
   var classPrefix = 'biz-month-day';
-  var disable = props.disable;
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -86,7 +85,6 @@ var MonthDay = function MonthDay(props) {
   }
 
   return /*#__PURE__*/React.createElement(Dropdown, {
-    disabled: disable,
     overlay: /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-overlay")
     }, dayList.map(function (item) {
@@ -106,7 +104,7 @@ var MonthDay = function MonthDay(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-wrapper")
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-handle ").concat(props.size, " ").concat(!chosenDayList.length ? "holder" : '', " ").concat(disable ? 'disable' : '')
+    className: "".concat(classPrefix, "-handle ").concat(props.size, " ").concat(!chosenDayList.length ? "holder" : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-val")
   }, chosenDayList.map(function (item) {
@@ -114,7 +112,7 @@ var MonthDay = function MonthDay(props) {
       closable: true,
       key: item.value,
       onClose: function onClose() {
-        !disable && onDelMonthDay(item);
+        onDelMonthDay(item);
       }
     }, item.label);
   }), !chosenDayList.length && /*#__PURE__*/React.createElement("span", {
@@ -125,7 +123,6 @@ var MonthDay = function MonthDay(props) {
 };
 
 MonthDay.defaultProps = {
-  size: 'middle',
-  disable: false
+  size: 'middle'
 };
 export default MonthDay;

package/es/cycleTime/styles/month.less

@@ -47,18 +47,6 @@
     &.ant-dropdown-open > .biz-month-day-handle {
       .__default-focused();
     }
-    .biz-month-day-handle {
-      &.disable {
-        cursor: not-allowed !important;
-        .ant-tag {
-          color: @disabled-color;
-          .anticon-close {
-            color: @disabled-color;
-            cursor: not-allowed;
-          }
-        }
-      }
-    }
   }
   &-overlay {
     .__select-panel();

package/es/datePicker/datePicker.js

@@ -35,9 +35,7 @@ var BizDate = function BizDate(props) {
     setDateRange(props.value ? props.value : initValue);
   }, []);
   useEffect(function () {
-    var _props$dateCount;
-
-    if (!((_props$dateCount = props.dateCount) === null || _props$dateCount === void 0 ? void 0 : _props$dateCount.count)) return;
+    if (!props.dateCount) return;
     var date = getDateRange(props.type, props.dateCount.count, !!includeToday);
     setDateRange(date);
     if (props.onChange) props.onChange(date, true);

package/es/{cycleTime/demo/disable.d.ts → datePicker/demo/day.d.ts}

@@ -1,2 +1,3 @@
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 declare const _default: () => JSX.Element;
 export default _default;

package/es/datePicker/demo/day.js

@@ -0,0 +1,49 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { BizDatePicker } from '@zgfe/business-lib';
+import React, { useState } from 'react';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+import { Divider, Switch } from 'antd';
+export default (function () {
+  var _useState = useState({
+    unit: 'day',
+    begin: '2022-05-03',
+    end: '2022-05-30',
+    relative: [0, 1]
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      time = _useState2[0],
+      setTime = _useState2[1];
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      includeToday = _useState4[0],
+      setIncludeToday = _useState4[1];
+
+  var handleChange = function handleChange(data) {
+    setTime(function () {
+      return data;
+    });
+  };
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
+    defaultChecked: includeToday,
+    onChange: setIncludeToday
+  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePicker, {
+    hideSelector: true,
+    includeTodayAndYesterday: true,
+    onChange: handleChange,
+    includeToday: includeToday,
+    defaultValue: time
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
+});

package/es/datePicker/index.js

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useEffect, useState } from 'react';
-import { dateList } from './utils';
+import { getDateList } from './utils';
 import BizSelect from '../select';
 import BizDate from './datePicker';
 import './styles/index.less';
@@ -25,6 +25,8 @@ import { Skeleton } from 'antd';
 export var classPrefix = 'biz-date-picker';
 
 var BizDatePicker = function BizDatePicker(props) {
+  var dateList = getDateList(props.includeTodayAndYesterday || false);
+
   var _useState = useState(dateList[0]),
       _useState2 = _slicedToArray(_useState, 2),
       currentType = _useState2[0],
@@ -108,7 +110,7 @@ var BizDatePicker = function BizDatePicker(props) {
     paragraph: {
       rows: 1
     }
-  }, /*#__PURE__*/React.createElement(BizSelect, {
+  }, !props.hideSelector ? /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-type"),
     value: currentType,
     labelField: "label",
@@ -116,7 +118,7 @@ var BizDatePicker = function BizDatePicker(props) {
     theme: "secondary",
     options: dateList,
     onChange: onChangeDateType
-  }), /*#__PURE__*/React.createElement("div", {
+  }) : '', /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list")
   }, currentType.children.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {

package/es/datePicker/styles/index.less

@@ -9,10 +9,11 @@
 
   &-list {
     display: flex;
-    margin: 0 16px;
+    margin: 0 16px 0 0;
   }
 
   .biz-select-handle {
+    margin-right: 16px;
     padding: 0;
   }
 

package/es/datePicker/types.d.ts

@@ -12,6 +12,8 @@ export declare namespace DatePickerTypes {
         value?: Value;
         includeToday?: boolean;
         onChange?: (data: Value) => void;
+        includeTodayAndYesterday?: boolean;
+        hideSelector?: boolean;
     }
     interface Option {
         label: string;

package/es/datePicker/utils.d.ts

@@ -1,5 +1,6 @@
 import { DatePickerTypes } from './types';
 export declare const dateList: DatePickerTypes.Option[];
+export declare function getDateList(lastTwoDays: boolean): DatePickerTypes.Option[];
 export declare const getDateRange: (type: 'hour' | 'day' | 'week' | 'month', count: number, includeToday: boolean) => {
     begin: string;
     end: string;

package/es/datePicker/utils.js

@@ -1,4 +1,17 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 import moment from 'moment';
+import _ from 'lodash';
 export var dateList = [{
   label: '按小时',
   value: 'hour',
@@ -49,8 +62,31 @@ export var dateList = [{
     count: 3
   }]
 }];
+export function getDateList(lastTwoDays) {
+  var list = _.cloneDeep(dateList);
+
+  if (lastTwoDays) {
+    var dayData = list.find(function (item) {
+      return item.value == 'day';
+    });
+
+    if (!dayData.children.find(function (item) {
+      return item.value == '今天';
+    })) {
+      dayData.children = [{
+        value: '今天',
+        count: 0
+      }, {
+        value: '昨天',
+        count: 1
+      }].concat(_toConsumableArray(dayData.children));
+    }
+  }
+
+  return list;
+}
 export var getDateRange = function getDateRange(type, count, includeToday) {
-  var endDate = moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD'),
+  var endDate = moment().subtract(includeToday || count == 0 ? 0 : 1, 'days').format('YYYY-MM-DD'),
       startDate = '';
 
   if (type === 'month') {

package/es/eventSelector/index.js

@@ -111,8 +111,8 @@ var BizEventSelector = function BizEventSelector(props) {
     return label;
   };
 
-  var onChange = function onChange(value, isOverview) {
-    if (!defaultSelectAble && !isOverview) {
+  var onChange = function onChange(value) {
+    if (!defaultSelectAble) {
       setVisible(false);
     }