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

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

@@ -1,20 +1,20 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition-tags-condition {
-  display: flex;
-  &-label {
-    margin-right: @margin-xs;
-  }
-  &-value {
-    margin-left: @margin-xs;
-  }
-  &-label {
-    line-height: 32px;
-  }
-  &-value {
-    flex: 1;
-    min-width: 0;
-  }
-  &-operator {
-    width: 96px;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-condition-tags-condition {
+  display: flex;
+  &-label {
+    margin-right: @margin-xs;
+  }
+  &-value {
+    margin-left: @margin-xs;
+  }
+  &-label {
+    line-height: 32px;
+  }
+  &-value {
+    flex: 1;
+    min-width: 0;
+  }
+  &-operator {
+    width: 96px;
+  }
+}

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

@@ -1,17 +1,17 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition {
-  &-text-desc {
-    color: @text-color-secondary;
-    font-size: 14px;
-    &-or {
-      margin: 0 @margin-xs;
-    }
-    &-label {
-    }
-    &-operator {
-    }
-    &-value {
-      color: @text-color;
-    }
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-condition {
+  &-text-desc {
+    color: @text-color-secondary;
+    font-size: 14px;
+    &-or {
+      margin: 0 @margin-xs;
+    }
+    &-label {
+    }
+    &-operator {
+    }
+    &-value {
+      color: @text-color;
+    }
+  }
+}

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

@@ -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/conditionWrap.less

@@ -1,18 +1,18 @@
-@import '../../assets//styles/variable.less';
-.biz-user-condition-item-wrap {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  margin-bottom: @margin-xs;
-  .biz-user-condition-item {
-    flex: 1;
-  }
-  .biz-user-condition-item-delete {
-    display: flex;
-    align-items: center;
-    //对齐第一行
-    height: 32px;
-    margin-left: @margin-lg;
-    cursor: pointer;
-  }
-}
+@import '../../assets//styles/variable.less';
+.biz-user-condition-item-wrap {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  margin-bottom: @margin-xs;
+  .biz-user-condition-item {
+    flex: 1;
+  }
+  .biz-user-condition-item-delete {
+    display: flex;
+    align-items: center;
+    //对齐第一行
+    height: 32px;
+    margin-left: @margin-lg;
+    cursor: pointer;
+  }
+}

package/es/productCondition/styles/index.less

@@ -1,33 +1,33 @@
-@import '../../assets/styles/variable.less';
-.biz-user-condition {
-  width: 100%;
-  min-width: 0;
-  &-conditions-content {
-    display: flex;
-    .biz-user-condition-and-conditions-wrap {
-      flex: 1;
-      margin-bottom: @margin-lg;
-      &.text-mode {
-        display: flex;
-        flex-wrap: wrap;
-        min-width: 0;
-        margin-bottom: 0;
-        line-height: 32px;
-        border: none;
-        .biz-user-condition-and-desc {
-          margin: 0 @margin-xs;
-        }
-      }
-    }
-    .biz-user-condition-and-conditions-empty {
-      margin-bottom: 0;
-    }
-  }
-  &-tip {
-    margin-top: @margin-lg;
-    color: @warning-color;
-    span {
-      margin-right: @margin-xs;
-    }
-  }
-}
+@import '../../assets/styles/variable.less';
+.biz-user-condition {
+  width: 100%;
+  min-width: 0;
+  &-conditions-content {
+    display: flex;
+    .biz-user-condition-and-conditions-wrap {
+      flex: 1;
+      margin-bottom: @margin-lg;
+      &.text-mode {
+        display: flex;
+        flex-wrap: wrap;
+        min-width: 0;
+        margin-bottom: 0;
+        line-height: 32px;
+        border: none;
+        .biz-user-condition-and-desc {
+          margin: 0 @margin-xs;
+        }
+      }
+    }
+    .biz-user-condition-and-conditions-empty {
+      margin-bottom: 0;
+    }
+  }
+  &-tip {
+    margin-top: @margin-lg;
+    color: @warning-color;
+    span {
+      margin-right: @margin-xs;
+    }
+  }
+}

package/es/productCondition/styles/orConditions.less

@@ -1,34 +1,34 @@
-@import '../../assets/styles/variable.less';
-.biz-user-condition-or {
-  &:not(:last-child) {
-    margin-bottom: @margin-lg;
-  }
-  &.text-mode {
-    display: flex;
-    min-width: 0;
-    // align-items: center;
-    margin-bottom: 0;
-    .biz-user-condition-or-content {
-      margin-bottom: 0;
-      border: none;
-      .biz-user-condition-conditions {
-        padding: 0;
-      }
-    }
-  }
-  &-content {
-    display: flex;
-    width: 100%;
-
-    background: #ffffff;
-    border: 1px solid @border-color-base;
-    border-radius: @border-radius-small;
-    &:not(:last-child) {
-      margin-bottom: @margin-md;
-    }
-    .biz-user-condition-conditions {
-      flex: 1;
-      padding: @padding-xs @padding-md 0 0;
-    }
-  }
-}
+@import '../../assets/styles/variable.less';
+.biz-user-condition-or {
+  &:not(:last-child) {
+    margin-bottom: @margin-lg;
+  }
+  &.text-mode {
+    display: flex;
+    min-width: 0;
+    // align-items: center;
+    margin-bottom: 0;
+    .biz-user-condition-or-content {
+      margin-bottom: 0;
+      border: none;
+      .biz-user-condition-conditions {
+        padding: 0;
+      }
+    }
+  }
+  &-content {
+    display: flex;
+    width: 100%;
+
+    background: #ffffff;
+    border: 1px solid @border-color-base;
+    border-radius: @border-radius-small;
+    &:not(:last-child) {
+      margin-bottom: @margin-md;
+    }
+    .biz-user-condition-conditions {
+      flex: 1;
+      padding: @padding-xs @padding-md 0 0;
+    }
+  }
+}

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
   })));
 });