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

package/es/layout/optionTitle/styles/layout.less

@@ -1,90 +1,90 @@
-@import '~@zgfe/business-lib/es/assets/styles/variable.less';
-
-.biz-option-layout {
-  height: 100%;
-  border-radius: @border-radius-normal;
-  &-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    height: 64px;
-    padding: 0 16px;
-    background-color: #fff;
-    border-bottom: 1px solid @border-color-base;
-
-    &-title {
-      display: flex;
-      align-items: center;
-      &-text {
-        margin-right: @margin-md;
-        color: @text-color-secondary;
-      }
-      &-btn {
-        color: @text-color-secondary;
-        &:hover {
-          color: @primary-color;
-        }
-      }
-      &-icon {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 20px;
-        height: 20px;
-        margin-left: 8px;
-        color: #5f6085;
-        font-size: 12px;
-        background: #f2f3f4;
-        border-radius: 10px;
-      }
-      &-icon:hover {
-        color: #165dff;
-        background: #e8efff;
-      }
-    }
-    &-option {
-      display: flex;
-      flex: 1;
-      flex-direction: row-reverse;
-      align-items: center;
-      justify-content: space-between;
-    }
-  }
-
-  &-content {
-    width: 100%;
-    height: calc(100% - 64px);
-    overflow: auto;
-  }
-
-  &-panel-content {
-    z-index: 1000;
-    width: 284px;
-    max-height: 304px;
-    padding: 0;
-    overflow: auto;
-    background: #fff;
-    border-radius: 10px;
-    box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-    .ant-popover-arrow {
-      display: none !important;
-    }
-    .ant-popover-inner-content {
-      width: 100%;
-      padding: 8px;
-    }
-    .ant-tabs {
-      .ant-tabs-tab-btn {
-        font-size: 16px;
-      }
-      .ant-tabs-nav {
-        margin-bottom: 4px;
-        padding-left: 45px;
-      }
-      .ant-tabs-nav::before {
-        border: none !important;
-      }
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/variable.less';
+
+.biz-option-layout {
+  height: 100%;
+  border-radius: @border-radius-normal;
+  &-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    height: 64px;
+    padding: 0 16px;
+    background-color: #fff;
+    border-bottom: 1px solid @border-color-base;
+
+    &-title {
+      display: flex;
+      align-items: center;
+      &-text {
+        margin-right: @margin-md;
+        color: @text-color-secondary;
+      }
+      &-btn {
+        color: @text-color-secondary;
+        &:hover {
+          color: @primary-color;
+        }
+      }
+      &-icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 20px;
+        height: 20px;
+        margin-left: 8px;
+        color: #5f6085;
+        font-size: 12px;
+        background: #f2f3f4;
+        border-radius: 10px;
+      }
+      &-icon:hover {
+        color: #116acc;
+        background: #e8efff;
+      }
+    }
+    &-option {
+      display: flex;
+      flex: 1;
+      flex-direction: row-reverse;
+      align-items: center;
+      justify-content: space-between;
+    }
+  }
+
+  &-content {
+    width: 100%;
+    height: calc(100% - 64px);
+    overflow: auto;
+  }
+
+  &-panel-content {
+    z-index: 1000;
+    width: 284px;
+    max-height: 304px;
+    padding: 0;
+    overflow: auto;
+    background: #fff;
+    border-radius: 10px;
+    box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+    .ant-popover-arrow {
+      display: none !important;
+    }
+    .ant-popover-inner-content {
+      width: 100%;
+      padding: 8px;
+    }
+    .ant-tabs {
+      .ant-tabs-tab-btn {
+        font-size: 16px;
+      }
+      .ant-tabs-nav {
+        margin-bottom: 4px;
+        padding-left: 45px;
+      }
+      .ant-tabs-nav::before {
+        border: none !important;
+      }
+    }
+  }
+}

package/es/layout/optionTitle/styles/search.less

@@ -1,27 +1,27 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.search-title {
-  display: flex;
-  align-items: center;
-  height: 24px;
-  transition: all 0.3s;
-
-  &-title {
-    margin-right: 15px;
-  }
-
-  &-input {
-    min-width: 100px;
-    max-width: 200px;
-    height: 24px;
-    background-color: #fff !important;
-    .ant-input {
-      background-color: #fff !important;
-    }
-  }
-
-  &-icon {
-    color: #5f6085;
-    font-size: 12px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.search-title {
+  display: flex;
+  align-items: center;
+  height: 24px;
+  transition: all 0.3s;
+
+  &-title {
+    margin-right: 15px;
+  }
+
+  &-input {
+    min-width: 100px;
+    max-width: 200px;
+    height: 24px;
+    background-color: #fff !important;
+    .ant-input {
+      background-color: #fff !important;
+    }
+  }
+
+  &-icon {
+    color: #5f6085;
+    font-size: 12px;
+  }
+}

package/es/platformSelector/styles/index.less

@@ -20,7 +20,7 @@
   }
   &:hover {
     .biz-select-option-icon .bsicon {
-      color: #165dff;
+      color: #116acc;
     }
   }
 }

package/es/productCondition/conditionTypeList.d.ts

@@ -6,5 +6,8 @@ export interface ConditionTypeListPropsI {
     label?: string | React.ReactNode;
     show?: boolean;
 }
-declare const ConditionTypeList: React.FC<ConditionTypeListPropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const ConditionTypeList: FCWithDefaultProps<ConditionTypeListPropsI>;
 export default ConditionTypeList;

package/es/productCondition/conditions/cdpCshCondition.js

@@ -15,17 +15,20 @@ import BizSelect from '../../select';
 import { PropType } from '../types';
 import './styles/cdpCshCondition.less';
 import _ from 'lodash';
-import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2 } from '../../attrConditions/utils/operates';
+import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2, stringOperate1 } from '../../attrConditions/utils/operates';
 import { DatePicker, Input } from 'antd';
 import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
+import BizGlobalDataContext from '../../context';
 var classPrefix = 'biz-user-condition-cdp-csh';
 var CdpConditionItem = function CdpConditionItem(props) {
-  var _useContext = useContext(BizUserConditionContext),
-    _useContext$datasetLi = _useContext.datasetList,
-    datasetList = _useContext$datasetLi === void 0 ? [] : _useContext$datasetLi;
+  var _useContext = useContext(BizGlobalDataContext),
+    basicConfig = _useContext.basicConfig;
+  var _useContext2 = useContext(BizUserConditionContext),
+    _useContext2$datasetL = _useContext2.datasetList,
+    datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
   var _useState = useState(function () {
       if (props.value) {
         return _objectSpread(_objectSpread({}, props.value), {}, {
@@ -287,7 +290,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
         list = numberOperateCsh;
         break;
       case PropType.STRING2:
-        list = stringOperate;
+        list = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
         break;
       default:
         list = [];
@@ -314,7 +317,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       options: optionList,
       labelField: "name",
       keyField: "value",
-      overlayWidth: 96,
+      overlayWidth: 120,
       value: operator,
       onChange: function onChange(v) {
         onOperateChange(v);

package/es/productCondition/conditions/constants.d.ts

@@ -13,6 +13,8 @@ export declare const operatorMap: {
     'not begin with': string;
     'end with': string;
     'not end with': string;
+    regexp: string;
+    'not regexp': string;
     '=': string;
     '<': string;
     '>': string;

package/es/productCondition/conditions/constants.js

@@ -13,6 +13,8 @@ export var operatorMap = {
   'not begin with': '开头不是',
   'end with': '结尾是',
   'not end with': '结尾不是',
+  regexp: '正则匹配',
+  'not regexp': '正则不匹配',
   '=': '=',
   '<': '<',
   '>': '>',

package/es/productCondition/conditions/order/runPeriodCondition.js

@@ -16,7 +16,8 @@ var RangePicker = DatePicker.RangePicker;
 var RunPeriodCondition = function RunPeriodCondition(props) {
   var onChange = props.onChange,
     condition = props.condition,
-    isEvent = props.isEvent;
+    _props$isEvent = props.isEvent,
+    isEvent = _props$isEvent === void 0 ? false : _props$isEvent;
   var options = [{
     text: '最近',
     value: 'relative'
@@ -126,7 +127,4 @@ var RunPeriodCondition = function RunPeriodCondition(props) {
     onChange: onChange
   }))));
 };
-RunPeriodCondition.defaultProps = {
-  isEvent: false
-};
 export default RunPeriodCondition;

package/es/productCondition/conditions/periodCondition.d.ts

@@ -7,5 +7,8 @@ export interface PeriodConditionPropsI extends AllConditionBasePropsI<RunPeriodI
     runPeriod: RunPeriodI;
     isRealTime?: boolean;
 }
-declare const PeriodCondition: React.FC<PeriodConditionPropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const PeriodCondition: FCWithDefaultProps<PeriodConditionPropsI>;
 export default PeriodCondition;

package/es/productCondition/conditions/propCondition.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import { PropConditionType } from '../types';
 import './styles/propCondition.less';
-declare const PropCondition: React.FC<PropConditionType.PropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const PropCondition: FCWithDefaultProps<PropConditionType.PropsI>;
 export default PropCondition;

package/es/productCondition/conditions/styles/periodCondition.less

@@ -12,7 +12,7 @@
     }
   }
   &-operator {
-    width: 129px;
+    width: 100px;
   }
   &-values {
     .ant-picker-range.ant-picker-larg {

package/es/productCondition/index.d.ts

@@ -3,5 +3,8 @@ import { BizProductConditionT } from './types';
 import './styles/index.less';
 export declare const BizUserConditionContext: React.Context<BizProductConditionT.GlobalContext>;
 export declare const classPrefix = "biz-user-condition";
-declare const BizUserCondition: React.FC<BizProductConditionT.PropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizUserCondition: FCWithDefaultProps<BizProductConditionT.PropsI>;
 export default BizUserCondition;

package/es/productCondition/styles/conditionTypeList.less

@@ -12,7 +12,8 @@
     list-style: none;
     .condition-type {
       padding: @padding-xss 12px;
-      background-color: @background-color-base;
+      background-color: #fff;
+      border: 1px solid #ecedf0;
       border-radius: @border-radius-large;
       cursor: pointer;
       &:nth-child(n + 2) {
@@ -20,7 +21,8 @@
       }
       &:hover {
         color: @primary-color;
-        background-color: @primary-color-hover;
+        // background-color: @primary-color-hover;
+        border: 1px solid #b9ceff;
       }
       &:active {
         border-color: @primary-color;

package/es/productCondition/styles/relationLabel.less

@@ -3,7 +3,7 @@
   position: relative;
   width: 2px;
   margin-right: @margin-lg;
-  background-color: @border-color-split;
+  background-color: #b9ceff;
   &-label {
     position: absolute;
     top: 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
   })));
 });