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

package/es/productCondition/styles/conditionTypeList.less

@@ -1,30 +1,32 @@
-@import '../../assets/styles/inner.less';
-.biz-user-condition-type-list {
-  display: flex;
-  align-items: center;
-  .biz-user-condition-type-label {
-    margin-right: 10px;
-  }
-  .biz-user-condition-type-container {
-    display: flex;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    .condition-type {
-      padding: @padding-xss 12px;
-      background-color: @background-color-base;
-      border-radius: @border-radius-large;
-      cursor: pointer;
-      &:nth-child(n + 2) {
-        margin-left: @margin-md;
-      }
-      &:hover {
-        color: @primary-color;
-        background-color: @primary-color-hover;
-      }
-      &:active {
-        border-color: @primary-color;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-condition-type-list {
+  display: flex;
+  align-items: center;
+  .biz-user-condition-type-label {
+    margin-right: 10px;
+  }
+  .biz-user-condition-type-container {
+    display: flex;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    .condition-type {
+      padding: @padding-xss 12px;
+      background-color: #fff;
+      border: 1px solid #ecedf0;
+      border-radius: @border-radius-large;
+      cursor: pointer;
+      &:nth-child(n + 2) {
+        margin-left: @margin-md;
+      }
+      &:hover {
+        color: @primary-color;
+        // background-color: @primary-color-hover;
+        border: 1px solid #b9ceff;
+      }
+      &:active {
+        border-color: @primary-color;
+      }
+    }
+  }
+}

package/es/productCondition/styles/relationLabel.less

@@ -1,19 +1,19 @@
-@import '../../assets/styles/inner.less';
-.biz-user-condition-relation {
-  position: relative;
-  width: 2px;
-  margin-right: @margin-lg;
-  background-color: @border-color-split;
-  &-label {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 24px;
-    height: 24px;
-    line-height: 24px;
-    text-align: center;
-    background-color: @border-color-split;
-    border-radius: @border-radius-small;
-    transform: translate(-50%, -50%);
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-condition-relation {
+  position: relative;
+  width: 2px;
+  margin-right: @margin-lg;
+  background-color: #b9ceff;
+  &-label {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
+    text-align: center;
+    background-color: @border-color-split;
+    border-radius: @border-radius-small;
+    transform: translate(-50%, -50%);
+  }
+}

package/es/productCondition/types.d.ts

@@ -73,7 +73,7 @@ export declare namespace BizProductConditionT {
         condition: BizProductConditionT.BusinessCondition;
         openBusinessDataCondition?: boolean;
         openOrderDataCondition?: boolean;
-        label?: string | React.ReactDOM;
+        label?: string | any;
         index?: number;
         onChange: (dataId: number, newData: BizProductConditionT.AttrCondition[]) => void;
     }
@@ -94,12 +94,14 @@ export declare namespace BizProductConditionT {
         userAmount: number;
         layerNum: number;
         endProcessTime: string;
+        ancestryState?: number;
         layers: {
             layerLabelId: number;
             layerLabelName: string;
             layerRemark: string;
             layerCondition: Condition[][];
             sequence: number;
+            ancestryState?: number;
         }[];
     }
     interface AttrCondition {

package/es/productCondition/util.d.ts

@@ -13,6 +13,7 @@ export declare function buildSelectLayer(data: BizProductConditionT.UserTagsData
     labelCreateType?: undefined;
     layerLabelId?: undefined;
     layerLabelName?: undefined;
+    ancestryState?: undefined;
 } | {
     id: number;
     labelName: string;
@@ -20,9 +21,11 @@ export declare function buildSelectLayer(data: BizProductConditionT.UserTagsData
     labelGroup?: undefined;
     layerLabelId?: undefined;
     layerLabelName?: undefined;
+    ancestryState?: undefined;
 } | {
     layerLabelId: string;
     layerLabelName: string;
+    ancestryState: number | undefined;
     labelGroup?: undefined;
     id?: undefined;
     labelName?: undefined;
@@ -30,6 +33,7 @@ export declare function buildSelectLayer(data: BizProductConditionT.UserTagsData
 } | {
     layerLabelId: number;
     layerLabelName: string;
+    ancestryState: number | undefined;
     labelGroup?: undefined;
     id?: undefined;
     labelName?: undefined;

package/es/productCondition/util.js

@@ -110,10 +110,12 @@ export function buildSelectLayer(data) {
       labelCreateType: data[j].labelCreateType
     }, type === LabelCreateType.firstAndLastUpdate || type === LabelCreateType.fundingSource || type === LabelCreateType.eventPreference || type === LabelCreateType.sqlCreateTable ? {
       layerLabelId: layerLabelId,
-      layerLabelName: ''
+      layerLabelName: '',
+      ancestryState: data[j].ancestryState
     } : {
       layerLabelId: data[j].layers[i].layerLabelId,
-      layerLabelName: data[j].layers[i].layerLabelName
+      layerLabelName: data[j].layers[i].layerLabelName,
+      ancestryState: data[j].layers[i].ancestryState
     }];
   };
 }

package/es/quickDatePicker/demo/index.js

@@ -1,3 +1,9 @@
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }
@@ -10,17 +16,27 @@ import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import { ConfigProvider } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
 export default (function () {
-  var _useState = useState({
-      unit: 'month',
-      begin: '2023-06-23',
-      end: '2023-06-30',
-      relative: 2
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    time = _useState2[0],
-    setTime = _useState2[1];
+  var _useState = useState([{
+      label: '上一时间段',
+      value: 5,
+      width: 96
+    }, {
+      label: '去年同期',
+      value: 6,
+      width: 80
+    }]),
+    _useState2 = _slicedToArray(_useState, 1),
+    customQuickModuleOptions = _useState2[0];
+  var _useState3 = useState(_objectSpread({
+      unit: 'hour',
+      begin: '2025-05-25',
+      end: '2025-05-25',
+      relative: 0
+    }, customQuickModuleOptions[0])),
+    _useState4 = _slicedToArray(_useState3, 2),
+    time = _useState4[0],
+    setTime = _useState4[1];
   var onChange = function onChange(data) {
-    console.log('onChange', data);
     setTime(data);
   };
   return /*#__PURE__*/React.createElement(ConfigProvider, {
@@ -35,6 +51,10 @@ export default (function () {
     }
   }, "\u9009\u62E9\u65F6\u95F4\uFF1A"), /*#__PURE__*/React.createElement(BizQuickDatePicker, {
     defaultValue: time,
-    onChange: onChange
+    onChange: onChange,
+    isComparison: true,
+    isShowDefaultQuick: false,
+    defaultOpen: true,
+    customQuickModuleOptions: customQuickModuleOptions
   })));
 });

package/es/quickDatePicker/index.js

@@ -1,3 +1,9 @@
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }
@@ -7,14 +13,19 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState, useRef } from 'react';
 import './styles/index.less';
 import moment from 'moment';
-import { quickModuleOneOptions, quickModuleTwoOptions } from './utils';
+import { quickModuleOneOptions, quickModuleTwoOptions, getPreviousTimePeriod } from './utils';
 import IconFont from '../icon/iconFont';
 import { DatePicker } from 'antd';
 import { util } from '../utils';
 var RangePicker = DatePicker.RangePicker;
 export var classPrefix = 'biz-quick-date-picker-wrap';
 var BizQuickDatePicker = function BizQuickDatePicker(props) {
-  var defaultValue = props.defaultValue;
+  var defaultValue = props.defaultValue,
+    disabled = props.disabled,
+    isShowDefaultQuick = props.isShowDefaultQuick,
+    customQuickModuleOptions = props.customQuickModuleOptions,
+    isComparison = props.isComparison,
+    defaultOpen = props.defaultOpen;
   var domId = util.guid();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -28,32 +39,48 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     unit = _useState6[0],
     setUnit = _useState6[1];
-  var _useState7 = useState([moment().subtract(6, 'day'), moment()]),
+  var _useState7 = useState(0),
     _useState8 = _slicedToArray(_useState7, 2),
-    value = _useState8[0],
-    setValue = _useState8[1];
-  var _useState9 = useState('过去7天'),
+    type = _useState8[0],
+    setType = _useState8[1];
+  var _useState9 = useState([moment().subtract(6, 'day'), moment()]),
     _useState10 = _slicedToArray(_useState9, 2),
-    showText = _useState10[0],
-    setShowText = _useState10[1];
-  var _useState11 = useState(50),
+    value = _useState10[0],
+    setValue = _useState10[1];
+  var _useState11 = useState('过去7天'),
     _useState12 = _slicedToArray(_useState11, 2),
-    tipWidth = _useState12[0],
-    setTipWidth = _useState12[1];
-  var _useState13 = useState(true),
+    showText = _useState12[0],
+    setShowText = _useState12[1];
+  var _useState13 = useState(80),
     _useState14 = _slicedToArray(_useState13, 2),
-    initialize = _useState14[0],
-    setInitialize = _useState14[1];
+    tipWidth = _useState14[0],
+    setTipWidth = _useState14[1];
+  var _useState15 = useState(true),
+    _useState16 = _slicedToArray(_useState15, 2),
+    initialize = _useState16[0],
+    setInitialize = _useState16[1];
   useEffect(function () {
     if (!initialize) return;
     var _value = defaultValue || props.value;
+    if (isComparison && showText !== '自定义') {
+      setType((defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.value) || 0);
+      var comparisonValue = {
+        type: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.unit) || 'day',
+        value: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.value) || 0,
+        width: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.width) || 50,
+        label: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.label) || '自定义',
+        isDefaultVsTime: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.isDefaultVsTime) || false
+      };
+      customQuickModuleHandle(_objectSpread({}, comparisonValue));
+      return;
+    }
     if (_value && _value.begin !== '') {
       _value.relative && setRelative(_value.relative);
       _value.unit && setUnit(_value.unit);
       if (_value.relative === -1) {
         setValue([moment(_value.begin), moment(_value.end)]);
         setShowText('自定义');
-        setTipWidth(62);
+        isComparison ? setTipWidth(92) : setTipWidth(62);
       } else if (_value.relative !== undefined) {
         setInitialize(false);
         setTimeHandle(_value.unit, _value.relative);
@@ -61,7 +88,7 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
         _data.map(function (item) {
           if (item.value === _value.relative && item.type === _value.unit) {
             setShowText(item.label);
-            setTipWidth(item.width);
+            setTipWidth(isComparison ? item.width + 30 : item.width);
           }
         });
       }
@@ -72,7 +99,8 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
   };
   var onChange = function onChange(date, dateString) {
     setShowText('自定义');
-    setTipWidth(62);
+    setType(0);
+    isComparison ? setTipWidth(92) : setTipWidth(62);
     setRelative(-1);
     if (date === null) {
       setValue(undefined);
@@ -95,7 +123,11 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
     }
   };
   var disabledDate = function disabledDate(current) {
-    return current && current > moment().endOf('month');
+    if (isComparison) {
+      return current && (current < moment().subtract(13, 'months').startOf('day') || current > moment().endOf('day'));
+    } else {
+      return current && current > moment().endOf('month');
+    }
   };
   var setTimeHandle = function setTimeHandle(type, value) {
     var _value;
@@ -123,16 +155,72 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
     }
   };
   var quickModuleHandle = function quickModuleHandle(item) {
-    setTipWidth(item.width);
+    setTipWidth(isComparison ? item.width + 30 : item.width);
     setRelative(item.value);
     setUnit(item.type);
     setShowText(item.label);
     setTimeHandle(item.type, item.value);
   };
   var RangePickerRef = useRef(null);
+  var customQuickModuleHandle = function customQuickModuleHandle(item) {
+    var isDefaultVsTime = item.isDefaultVsTime,
+      width = item.width,
+      type = item.type,
+      value = item.value,
+      label = item.label;
+    var isLastYear = value === 6;
+    setTipWidth(isComparison ? width + 30 : width);
+    setType(value);
+    setShowText(label);
+    var dateRange;
+    if (isDefaultVsTime) {
+      dateRange = {
+        start: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.begin,
+        end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end
+      };
+    } else {
+      var _value = {
+        begin: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.begin,
+        end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end,
+        unit: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.unit,
+        isLastYear: isLastYear
+      };
+      var previousPeriod = getPreviousTimePeriod(_value.begin, _value.end, _value.unit, isLastYear ? true : false);
+      dateRange = {
+        start: previousPeriod.previousStart,
+        end: previousPeriod.previousEnd
+      };
+    }
+    if (dateRange.start && dateRange.end) {
+      var _props$onChange;
+      setValue([moment(dateRange.start), moment(dateRange.end)]);
+      var changeValue = {
+        unit: type,
+        begin: moment(dateRange.start).format('YYYY-MM-DD'),
+        end: moment(dateRange.end).format('YYYY-MM-DD'),
+        relative: 0,
+        value: value,
+        label: label || '上一段时间'
+      };
+      (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, changeValue);
+      setInitialize(false);
+    }
+  };
   var renderExtraFooter = function renderExtraFooter() {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-content-options")
+    }, customQuickModuleOptions && isComparison && /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content-options-customOptions")
+    }, /*#__PURE__*/React.createElement("ol", null, customQuickModuleOptions && customQuickModuleOptions.map(function (item) {
+      return /*#__PURE__*/React.createElement("li", {
+        className: "".concat(item.value == type ? 'active' : ''),
+        key: item.label,
+        onClick: function onClick() {
+          return customQuickModuleHandle(item);
+        }
+      }, item.label);
+    }))), isShowDefaultQuick && /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content-options-defaultOptions")
     }, /*#__PURE__*/React.createElement("ol", null, quickModuleOneOptions.map(function (item) {
       return /*#__PURE__*/React.createElement("li", {
         className: "".concat(item.type === unit && item.value === relative ? 'active' : ''),
@@ -149,15 +237,15 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
           return quickModuleHandle(item);
         }
       }, item.label);
-    })), /*#__PURE__*/React.createElement("div", {
-      className: "".concat(relative === -1 ? 'active' : '')
+    }))), /*#__PURE__*/React.createElement("div", {
+      className: "customTime ".concat(relative === -1 ? 'active' : '')
     }, "\u81EA\u5B9A\u4E49\u65F6\u95F4", /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
       type: "fanhuiicon"
     }))));
   };
   return /*#__PURE__*/React.createElement("div", {
     id: domId,
-    className: "".concat(classPrefix, " clearfix ").concat(show ? 'focus' : '')
+    className: "".concat(classPrefix, " clearfix ").concat(show ? 'focus' : '', " ").concat(disabled ? 'disabled' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-tip"),
     style: {
@@ -168,16 +256,27 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
       paddingLeft: "".concat(tipWidth, "px")
     },
     popupClassName: "".concat(classPrefix, "-content"),
+    className: "".concat(disabled ? 'disabled' : ''),
     ref: RangePickerRef,
     getPopupContainer: function getPopupContainer() {
       return document.getElementById(domId);
     },
     separator: '至',
     value: value,
+    disabled: disabled,
+    defaultOpen: defaultOpen,
     onOpenChange: onOpenChange,
     disabledDate: disabledDate,
     onChange: onChange,
-    renderExtraFooter: renderExtraFooter
+    renderExtraFooter: renderExtraFooter,
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "rili-2"
+    })
   }));
 };
+BizQuickDatePicker.defaultProps = {
+  isShowDefaultQuick: true,
+  isComparison: false,
+  defaultOpen: false
+};
 export default BizQuickDatePicker;