@zgfe/business-lib 1.2.70-hxd.11 → 1.2.70-hxd.19

package/es/quickDatePicker/styles/index.less

@@ -1,138 +1,141 @@
-@import '../../assets/styles/inner.less';
-
-.biz-quick-date-picker-wrap {
-  position: relative;
-  display: inline-block;
-  height: 34px;
-  padding: 4px 8px;
-  background: #fafafb;
-  border: 1px solid #fafafb;
-  border-radius: 4px;
-  &-tip {
-    position: absolute;
-    top: 4px;
-    left: 8px;
-    z-index: 2;
-    border-radius: 2px;
-  }
-  .ant-picker-range-arrow {
-    display: none !important;
-  }
-  .ant-picker-focused {
-    box-shadow: none !important;
-  }
-  > :nth-child(1) {
-    float: left;
-    height: 24px;
-    margin-right: 8px;
-    padding: 2px 8px;
-    color: @primary-color;
-    vertical-align: middle;
-    background: #e8efff;
-  }
-  .ant-picker {
-    padding: 0;
-    vertical-align: middle;
-    border: none;
-    border-radius: 0 !important;
-    .ant-picker-clear {
-      right: 0;
-    }
-  }
-  .ant-picker:hover {
-    .ant-picker-input > input,
-    .ant-picker-range-separator {
-      color: #021429 !important;
-    }
-  }
-  &-content {
-    float: left;
-    .ant-picker-panel-container {
-      display: flex;
-      flex-direction: row-reverse;
-      border-radius: 8px;
-      .ant-picker-footer {
-        width: auto;
-        min-width: auto;
-        border-bottom: 1px solid #e8efff;
-        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-      }
-    }
-    &-options {
-      width: 170px;
-      padding-bottom: 25px;
-      color: #67727f;
-      ol,
-      li {
-        margin: 0;
-        padding: 0;
-        list-style: none;
-        list-style-type: none;
-      }
-      > :nth-child(1),
-      > :nth-child(2) {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        margin-top: 16px;
-        padding-bottom: 4px;
-        border-bottom: 1px solid #ecedf0;
-        li {
-          width: 81px;
-          height: 24px;
-          margin-bottom: 8px;
-          line-height: 24px;
-          text-align: center;
-          background: #fafafb;
-          border-radius: 24px;
-          cursor: pointer;
-        }
-      }
-      > :nth-child(2) {
-        margin-top: 14px;
-        li {
-          border-radius: 2px;
-        }
-      }
-      > :nth-child(3) {
-        display: flex;
-        justify-content: space-between;
-        width: 100%;
-        height: 32px;
-        margin-top: 12px;
-        padding: 0 12px;
-        line-height: 32px;
-        background: #fafafb;
-        border-radius: 2px;
-        > :first-child {
-          transform: rotate(180deg);
-        }
-      }
-      .active,
-      li.active {
-        color: @primary-color;
-        background: #e8efff;
-      }
-    }
-  }
-}
-
-.biz-quick-date-picker-wrap:hover {
-  border: 1px solid @primary-color;
-}
-.biz-quick-date-picker-wrap.focus {
-  border: 1px solid @primary-color;
-  box-shadow: 0 0 0 4px #f0f7ff;
-}
-
-.clearfix:after {
-  display: block;
-  clear: both;
-  height: 0;
-  content: '';
-}
-
-.clearfix {
-  /* 触发 hasLayout */
-  zoom: 1;
-}
+@import '../../assets/styles/inner.less';
+
+.biz-quick-date-picker-wrap {
+  position: relative;
+  display: inline-block;
+  height: 34px;
+  padding: 4px 8px;
+  background: #fafafb;
+  border: 1px solid #fafafb;
+  border-radius: 4px;
+  &-tip {
+    position: absolute;
+    top: 4px;
+    left: 8px;
+    z-index: 2;
+    border-radius: 2px;
+  }
+  .ant-picker-range-arrow {
+    display: none !important;
+  }
+  .ant-picker-focused {
+    box-shadow: none !important;
+  }
+  > :nth-child(1) {
+    float: left;
+    height: 24px;
+    margin-right: 8px;
+    padding: 2px 8px;
+    color: @primary-color;
+    vertical-align: middle;
+    background: #e8efff;
+  }
+  .ant-picker {
+    padding: 0;
+    vertical-align: middle;
+    border: none;
+    border-radius: 0 !important;
+    .ant-picker-clear {
+      right: 0;
+    }
+  }
+  .ant-picker:not(.disabled):hover {
+    .ant-picker-input > input,
+    .ant-picker-range-separator {
+      color: #021429 !important;
+    }
+  }
+  &-content {
+    float: left;
+    .ant-picker-panel-container {
+      display: flex;
+      flex-direction: row-reverse;
+      border-radius: 8px;
+      .ant-picker-footer {
+        width: auto;
+        min-width: auto;
+        border-bottom: 1px solid #e8efff;
+        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
+    &-options {
+      width: 170px;
+      padding-bottom: 25px;
+      color: #67727f;
+      ol,
+      li {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+        list-style-type: none;
+      }
+      &-defaultOptions,
+      &-customOptions {
+        > :nth-child(1),
+        > :nth-child(2) {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: space-between;
+          margin-top: 16px;
+          padding-bottom: 4px;
+          border-bottom: 1px solid #ecedf0;
+          li {
+            width: 81px;
+            height: 24px;
+            margin-bottom: 8px;
+            line-height: 24px;
+            text-align: center;
+            background: #fafafb;
+            border-radius: 24px;
+            cursor: pointer;
+          }
+        }
+        > :nth-child(2) {
+          margin-top: 14px;
+          li {
+            border-radius: 2px;
+          }
+        }
+      }
+      .customTime {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        height: 32px;
+        margin-top: 12px;
+        padding: 0 12px;
+        line-height: 32px;
+        background: #fafafb;
+        border-radius: 2px;
+        > :first-child {
+          transform: rotate(180deg);
+        }
+      }
+      .active,
+      li.active {
+        color: @primary-color;
+        background: #e8efff;
+      }
+    }
+  }
+}
+
+.biz-quick-date-picker-wrap:not(.disabled):hover {
+  border: 1px solid @primary-color;
+}
+.biz-quick-date-picker-wrap.focus {
+  border: 1px solid @primary-color;
+  box-shadow: 0 0 0 4px #f0f7ff;
+}
+
+.clearfix:after {
+  display: block;
+  clear: both;
+  height: 0;
+  content: '';
+}
+
+.clearfix {
+  /* 触发 hasLayout */
+  zoom: 1;
+}

package/es/quickDatePicker/types.d.ts

@@ -4,6 +4,10 @@ export declare namespace QuickDatePickerTypes {
         value: number;
         type: 'week' | 'month' | 'day';
         width: number;
+        isDefaultVsTime?: boolean;
+        begin?: string;
+        end?: string;
+        unit?: 'day' | 'week' | 'month';
     }
     interface Range {
         begin: string;
@@ -12,11 +16,20 @@ export declare namespace QuickDatePickerTypes {
     interface Value extends Range {
         unit: 'day' | 'week' | 'month';
         relative?: number;
+        value?: number;
+        width?: number;
+        label?: string;
+        isDefaultVsTime?: boolean;
     }
     interface Props {
         defaultValue?: Value;
         value?: Value;
         onChange?: (data: Value) => void;
+        disabled?: boolean;
+        isShowDefaultQuick?: boolean;
+        customQuickModuleOptions?: Options[];
+        isComparison?: boolean;
+        defaultOpen?: boolean;
     }
     interface ListOption {
         count: number;

package/es/quickDatePicker/utils.d.ts

@@ -1,3 +1,4 @@
+import moment from 'moment';
 export declare const quickModuleOneOptions: {
     label: string;
     value: number;
@@ -10,3 +11,8 @@ export declare const quickModuleTwoOptions: {
     type: 'day';
     width: number;
 }[];
+export declare function getPreviousTimePeriod(startDate: any, endDate: any, unit?: string, samePeriodLastYear?: boolean): {
+    previousStart: moment.Moment;
+    previousEnd: moment.Moment;
+    isLastYear: boolean;
+};

package/es/quickDatePicker/utils.js

@@ -1,3 +1,4 @@
+import moment from 'moment';
 export var quickModuleOneOptions = [{
   label: '本周',
   value: 1,
@@ -49,4 +50,56 @@ export var quickModuleTwoOptions = [{
   value: 180,
   type: 'day',
   width: 90
-}];
+}];
+export function getPreviousTimePeriod(startDate, endDate) {
+  var unit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'day';
+  var samePeriodLastYear = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var start = moment(startDate);
+  var end = moment(endDate);
+  if (!start.isValid() || !end.isValid()) {
+    throw new Error('Invalid date input');
+  }
+  if (samePeriodLastYear) {
+    return {
+      previousStart: start.clone().subtract(1, 'year'),
+      previousEnd: end.clone().subtract(1, 'year'),
+      isLastYear: true
+    };
+  }
+  var duration = moment.duration(end.diff(start));
+  var previousStart;
+  var previousEnd;
+  switch (unit.toLowerCase()) {
+    case 'hour':
+      previousEnd = start.clone().subtract(1, 'millisecond');
+      previousStart = previousEnd.clone().subtract(duration);
+      break;
+    case 'day':
+      previousEnd = start.clone().subtract(1, 'millisecond');
+      previousStart = previousEnd.clone().subtract(duration);
+      break;
+    case 'week':
+      previousEnd = start.clone().subtract(1, 'millisecond');
+      previousStart = previousEnd.clone().subtract(duration, 'week');
+      break;
+    case 'month':
+      previousEnd = start.clone().subtract(1, 'millisecond');
+      previousStart = previousEnd.clone().subtract(duration, 'month');
+      if (start.date() !== previousStart.date()) {
+        previousStart.endOf('month');
+      }
+      break;
+    case 'year':
+      previousEnd = start.clone().subtract(1, 'millisecond');
+      previousStart = previousEnd.clone().subtract(duration, 'year');
+      break;
+    default:
+      previousEnd = start.clone().subtract(1, 'millisecond');
+      previousStart = previousEnd.clone().subtract(duration);
+  }
+  return {
+    previousStart: previousStart,
+    previousEnd: previousEnd,
+    isLastYear: false
+  };
+}

package/es/select/demo/index.js

@@ -10,7 +10,8 @@ import { Button } from 'antd';
 var stringOperate = [{
   name: '是',
   value: 'equal',
-  tip: 'ttttttttttt'
+  tip: 'ttttttttttt',
+  replaceLabel: '嘿嘿嘿？怎么个事'
 }, {
   name: '包含',
   value: 'contains'

package/es/select/handle.js

@@ -27,7 +27,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setFocus = _useState2[1];
   var handleRef = useRef(null);
   var inputRef = useRef(null);
-  var textRef = useRef();
+  var textRef = useRef(null);
   var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     searchValue = _useState4[0],
@@ -114,7 +114,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
         color: "#fff"
       }, /*#__PURE__*/React.createElement(Tag, {
         closable: true,
-        className: "".concat(classPrefix, "-tag ").concat(disable || disableKeyMap[item[keyField]] ? 'disable' : ''),
+        className: "".concat(classPrefix, "-tag state-").concat(item.ancestryState, " ").concat(disable || disableKeyMap[item[keyField]] ? 'disable' : ''),
         onClose: function onClose() {
           !disable && !disableKeyMap[item[keyField]] && onDelete(item);
         }
@@ -175,11 +175,4 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     type: 'qingchu'
   }))));
 });
-SelectHandle.defaultProps = {
-  labelField: 'label',
-  keyField: 'id',
-  border: true,
-  showSelectIcon: true,
-  extraLabel: ''
-};
 export default SelectHandle;

package/es/select/index.d.ts

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

package/es/select/option.js

@@ -71,7 +71,7 @@ var SelectOption = function SelectOption(props) {
     });
   }
   function renderLabel(option) {
-    var dom = getLabel(option[props.aliasField || ''] || option[props.labelField]);
+    var dom = getLabel((option === null || option === void 0 ? void 0 : option.replaceLabel) || option[props.aliasField || ''] || option[props.labelField]);
     return customLabel ? customLabel(dom, option) : dom;
   }
   if (group) {

package/es/select/overlay.js

@@ -98,7 +98,7 @@ var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var tempOption = null;
     var useTemp = true;
     list.forEach(function (option) {
-      if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test(option[aliasField || ''] || option[labelField])) return;
+      if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test((option === null || option === void 0 ? void 0 : option.replaceLabel) || option[aliasField || ''] || option[labelField])) return;
       if (searchValue && searchValue === option[labelField] && !option.isTemp) useTemp = false;
       var disabled = false;
       disableItemList === null || disableItemList === void 0 ? void 0 : disableItemList.forEach(function (item) {
@@ -197,7 +197,7 @@ var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-overlay ").concat(overlayClassName),
     ref: ref
-  }, props.enableSearch && !props.multiple && /*#__PURE__*/React.createElement(BizSearchInput, {
+  }, props.enableSearch && /*#__PURE__*/React.createElement(BizSearchInput, {
     className: "".concat(classPrefix, "-search"),
     onChange: onSearch,
     placeholder: props.searchPlaceholder || '请输入'