@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.1

package/es/dataSetGroup/styles/index.less

@@ -1,146 +1,146 @@
-@import '../../assets/styles/inner.less';
-
-.biz-dataSet-group {
-  position: relative;
-  // width: 100%;
-  min-width: 184px;
-  color: @text-color;
-
-  &-handle {
-    .__select-handle();
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: 100%;
-    min-height: @height-base;
-    padding: 4px 4px 4px 12px;
-    &:hover {
-      .biz-user-group-del {
-        display: inline-block;
-      }
-    }
-  }
-  &-placeholder {
-    flex: 1;
-    color: @input-placeholder-color;
-    pointer-events: none;
-  }
-  &-val {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  &-handle-tags {
-    display: flex;
-    flex: 1;
-    flex-wrap: wrap;
-    gap: 4px 8px;
-
-    &-item.ant-tag {
-      margin: 0;
-      padding: 0 4px;
-    }
-  }
-  &-arrow {
-    flex: none;
-    margin-left: 8px;
-    color: @text-color-secondary;
-    &.open {
-      transform: rotate(180deg);
-    }
-  }
-  &-del {
-    display: none;
-    flex: none;
-    width: 16px;
-    max-height: 24px;
-    margin-left: 6px;
-    text-align: center;
-    border-radius: @border-radius-small;
-    &:hover {
-      color: #fb5547;
-      background-color: #feddda;
-    }
-    &.disabled {
-      color: @disabled-color;
-      cursor: not-allowed;
-      &:hover {
-        background-color: transparent;
-      }
-    }
-  }
-  &-overlay {
-    .__select-panel();
-    display: flex;
-    flex-direction: row;
-    height: auto;
-  }
-  &-typelist {
-    width: 104px;
-    padding-right: @padding-xs;
-    border-right: 1px solid @border-color-split;
-  }
-  &-option {
-    .__select-option();
-  }
-  &-tags {
-    padding: 0;
-    box-shadow: none !important;
-  }
-  &-grouplist {
-    display: flex;
-    flex-direction: column;
-    padding-left: @padding-xs;
-  }
-  &-grouplist-no {
-    display: flex;
-    flex-direction: column;
-  }
-  &-top {
-    flex: none;
-    margin-bottom: @margin-xs;
-  }
-  &-add .bsicon {
-    margin-right: @margin-xs;
-  }
-  &-divider {
-    position: relative;
-    flex: none;
-    height: 0;
-    margin-top: @margin-xs;
-    overflow: visible;
-    border-top: 1px solid @border-color-split;
-    & > span {
-      position: absolute;
-      top: -12px;
-      left: 0;
-      display: inline-block;
-      padding: 0 5px 0 12px;
-      background-color: #fff;
-    }
-    &::after {
-      position: absolute;
-      top: -8px;
-      left: 4px;
-      display: inline-block;
-      width: 3px;
-      height: 14px;
-      background-color: @primary-color;
-      border-radius: 10px;
-      content: '';
-    }
-  }
-  &-list {
-    flex: 1;
-    max-height: 320px;
-    margin-top: @margin-md;
-    overflow: auto;
-  }
-  &-item {
-    .__select-option();
-  }
-  &-empty {
-    .__select-nodata();
-    flex: none;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-dataSet-group {
+  position: relative;
+  // width: 100%;
+  min-width: 184px;
+  color: @text-color;
+
+  &-handle {
+    .__select-handle();
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: 100%;
+    min-height: @height-base;
+    padding: 4px 4px 4px 12px;
+    &:hover {
+      .biz-user-group-del {
+        display: inline-block;
+      }
+    }
+  }
+  &-placeholder {
+    flex: 1;
+    color: @input-placeholder-color;
+    pointer-events: none;
+  }
+  &-val {
+    flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  &-handle-tags {
+    display: flex;
+    flex: 1;
+    flex-wrap: wrap;
+    gap: 4px 8px;
+
+    &-item.ant-tag {
+      margin: 0;
+      padding: 0 4px;
+    }
+  }
+  &-arrow {
+    flex: none;
+    margin-left: 8px;
+    color: @text-color-secondary;
+    &.open {
+      transform: rotate(180deg);
+    }
+  }
+  &-del {
+    display: none;
+    flex: none;
+    width: 16px;
+    max-height: 24px;
+    margin-left: 6px;
+    text-align: center;
+    border-radius: @border-radius-small;
+    &:hover {
+      color: #fb5547;
+      background-color: #feddda;
+    }
+    &.disabled {
+      color: @disabled-color;
+      cursor: not-allowed;
+      &:hover {
+        background-color: transparent;
+      }
+    }
+  }
+  &-overlay {
+    .__select-panel();
+    display: flex;
+    flex-direction: row;
+    height: auto;
+  }
+  &-typelist {
+    width: 104px;
+    padding-right: @padding-xs;
+    border-right: 1px solid @border-color-split;
+  }
+  &-option {
+    .__select-option();
+  }
+  &-tags {
+    padding: 0;
+    box-shadow: none !important;
+  }
+  &-grouplist {
+    display: flex;
+    flex-direction: column;
+    padding-left: @padding-xs;
+  }
+  &-grouplist-no {
+    display: flex;
+    flex-direction: column;
+  }
+  &-top {
+    flex: none;
+    margin-bottom: @margin-xs;
+  }
+  &-add .bsicon {
+    margin-right: @margin-xs;
+  }
+  &-divider {
+    position: relative;
+    flex: none;
+    height: 0;
+    margin-top: @margin-xs;
+    overflow: visible;
+    border-top: 1px solid @border-color-split;
+    & > span {
+      position: absolute;
+      top: -12px;
+      left: 0;
+      display: inline-block;
+      padding: 0 5px 0 12px;
+      background-color: #fff;
+    }
+    &::after {
+      position: absolute;
+      top: -8px;
+      left: 4px;
+      display: inline-block;
+      width: 3px;
+      height: 14px;
+      background-color: @primary-color;
+      border-radius: 10px;
+      content: '';
+    }
+  }
+  &-list {
+    flex: 1;
+    max-height: 320px;
+    margin-top: @margin-md;
+    overflow: auto;
+  }
+  &-item {
+    .__select-option();
+  }
+  &-empty {
+    .__select-nodata();
+    flex: none;
+  }
+}

package/es/datePicker/index.d.ts

@@ -2,5 +2,8 @@ import React from 'react';
 import { DatePickerTypes } from './types';
 import './styles/index.less';
 export declare const classPrefix = "biz-date-picker-wrap";
-declare const BizDatePicker: React.FC<DatePickerTypes.Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizDatePicker: FCWithDefaultProps<DatePickerTypes.Props>;
 export default BizDatePicker;

package/es/datePicker/styles/index.less

@@ -1,53 +1,53 @@
-@import '../../assets/styles/inner.less';
-
-.biz-date-picker-wrap {
-  display: flex;
-
-  &-type {
-    width: 88px;
-  }
-
-  &-list {
-    display: flex;
-    margin: 0 16px 0 0;
-  }
-
-  .biz-select-handle {
-    margin-right: 16px;
-    padding: 0;
-  }
-
-  &-item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 58px;
-    height: @height-base;
-    color: @text-color-secondary;
-    border: 1px solid @border-color-base;
-    cursor: pointer;
-
-    &:first-child {
-      border-radius: @border-radius-small 0px 0px @border-radius-small;
-    }
-
-    &:last-child {
-      border-radius: 0px @border-radius-small @border-radius-small 0px;
-    }
-
-    &:not(:last-child) {
-      border-right: none;
-    }
-
-    &:hover {
-      .__default-hover();
-      border-color: @border-color-base;
-    }
-
-    &.active {
-      color: @primary-color;
-      background: @primary-color-hover;
-      border: 1px solid @primary-color;
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-date-picker-wrap {
+  display: flex;
+
+  &-type {
+    width: 88px;
+  }
+
+  &-list {
+    display: flex;
+    margin: 0 16px 0 0;
+  }
+
+  .biz-select-handle {
+    margin-right: 16px;
+    padding: 0;
+  }
+
+  &-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 58px;
+    height: @height-base;
+    color: @text-color-secondary;
+    border: 1px solid @border-color-base;
+    cursor: pointer;
+
+    &:first-child {
+      border-radius: @border-radius-small 0px 0px @border-radius-small;
+    }
+
+    &:last-child {
+      border-radius: 0px @border-radius-small @border-radius-small 0px;
+    }
+
+    &:not(:last-child) {
+      border-right: none;
+    }
+
+    &:hover {
+      .__default-hover();
+      border-color: @border-color-base;
+    }
+
+    &.active {
+      color: @primary-color;
+      background: @primary-color-hover;
+      border: 1px solid @primary-color;
+    }
+  }
+}

package/es/datePickerV2/demo/index.js

@@ -27,7 +27,6 @@ export default (function () {
   var handleChange = function handleChange(data) {
     setTime(data);
   };
-  console.log(moment().subtract(360, 'days').format('YYYY-MM-DD'));
   function calculateTimeUnits(selectRange, selectRangeUnit, currentType) {
     var duration = moment.duration(1, currentType);
     switch (selectRangeUnit) {
@@ -60,6 +59,7 @@ export default (function () {
     value: time,
     defaultValue: time,
     dateTypeList: [DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.quarter, DatePickerTypes.Unit.custom],
+    openComparison: true,
     selectRange: 365,
     selectRangeUnit: "days",
     onChange: handleChange

package/es/datePickerV2/index.d.ts

@@ -2,5 +2,8 @@ import React from 'react';
 import { DatePickerTypes } from './types';
 import './styles/index.less';
 export declare const classPrefix = "biz-date-picker-old-wrap";
-declare const BizDatePicker: React.FC<DatePickerTypes.Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizDatePicker: FCWithDefaultProps<DatePickerTypes.Props>;
 export default BizDatePicker;

package/es/datePickerV2/index.js

@@ -40,7 +40,8 @@ var BizDatePicker = function BizDatePicker(_ref) {
     selectRangeUnit = _ref.selectRangeUnit,
     timeRangeOpen = _ref.timeRangeOpen,
     hiddenUnitType = _ref.hiddenUnitType,
-    shortcuts = _ref.shortcuts;
+    shortcuts = _ref.shortcuts,
+    openComparison = _ref.openComparison;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     ready = _useState2[0],
@@ -133,7 +134,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
   }, [dateRange, currentType, relative, ready]);
   var renderLabel = function renderLabel() {
     var typeList = getTypeList(currentType === null || currentType === void 0 ? void 0 : currentType.value, includeToday);
-    if (relative) {
+    if (relative && !openComparison) {
       var type = typeList.find(function (item) {
         return item.count == relative[0];
       });
@@ -141,8 +142,16 @@ var BizDatePicker = function BizDatePicker(_ref) {
         if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
           return type.value;
         }
-        return '最近' + type.value;
+        return type.count == 0 ? '今天' : '最近' + type.value;
       } else {
+        if (!includeToday) {
+          if ((currentType === null || currentType === void 0 ? void 0 : currentType.value) == DatePickerTypes.Unit.hour) {
+            setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
+            setRelative([1, 1]);
+            return '昨天';
+          }
+          return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
+        }
         return '最近' + relative[0] + Reflect.get(DateOptionMap, currentType === null || currentType === void 0 ? void 0 : currentType.value);
       }
     } else {
@@ -183,7 +192,7 @@ var BizDatePicker = function BizDatePicker(_ref) {
       setCurrentType(type);
       if (type.value === 'hour') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
-        setRelative([1, 1]);
+        setRelative([1, includeToday ? 0 : 1]);
       }
       if (type.value === 'day') {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));

package/es/datePickerV2/popoverContent.js

@@ -18,7 +18,7 @@ export default (function (props) {
     relative = props.relative,
     selectRangeUnit = props.selectRangeUnit,
     shortcuts = props.shortcuts;
-  var ref = useRef();
+  var ref = useRef(null);
   return /*#__PURE__*/React.createElement(Tabs, {
     defaultActiveKey: relative ? '1' : '2'
   }, currentType != DatePickerTypes.Unit.custom && /*#__PURE__*/React.createElement(Tabs.TabPane, {

package/es/datePickerV2/shortcut.js

@@ -95,7 +95,7 @@ var PickerShortcut = function PickerShortcut(_ref) {
     style: {
       width: '58px'
     },
-    value: numbers,
+    value: numbers === 0 ? undefined : numbers,
     onChange: function onChange(value) {
       return setNumbers(value);
     },