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

package/es/eventSelector/styles/index.less

@@ -1,123 +1,127 @@
-@import '../../assets/styles/inner.less';
-
-.biz-event-select {
-  position: relative;
-  border-radius: 4px;
-  .__select-handle();
-
-  &:hover {
-    .biz-target-select-option-icon {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      float: right;
-      margin-top: 4px;
-    }
-  }
-
-  .biz-event-select-handle {
-    border: none !important;
-  }
-
-  &.border {
-    .biz-event-select-handle {
-      .__select-handle();
-    }
-  }
-  &-list-panel {
-    display: flex;
-    flex-direction: row;
-    width: 477px;
-    height: 320px;
-    padding: 0;
-    .__select-panel();
-  }
-
-  &-left {
-    flex: none;
-    width: 192px;
-    padding: @padding-xs;
-    overflow-y: auto;
-    border-right: 1px solid @border-color-base;
-  }
-
-  &-right {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    padding: @padding-xs;
-  }
-
-  &-search {
-    flex: none;
-    margin-bottom: @margin-sm;
-  }
-
-  &-list {
-    flex: 1;
-    overflow-y: auto;
-  }
-  &-nodata-panel {
-    width: 284px;
-    .__select-panel();
-  }
-
-  &-nodata {
-    .__select-nodata();
-  }
-
-  &-like {
-    display: inline-block;
-    width: @font-size-base;
-    margin-right: @margin-xss;
-    color: @warning-color;
-  }
-  &-event-item-wrap {
-    .biz-event-select-option {
-      padding: 0 @padding-xs;
-    }
-  }
-  &-option {
-    .__select-option();
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-    &:hover,
-    &.active {
-      .ant-badge-count {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-    &.disable,
-    &.disable:hover {
-      color: #ccd0d4;
-      background: #fff;
-      cursor: not-allowed;
-    }
-
-    &-label {
-      flex: 1;
-      max-width: 220px;
-      .__default-overflow();
-    }
-
-    .ant-badge {
-      flex: none;
-    }
-
-    .ant-badge-count {
-      color: @text-color;
-      background: none;
-    }
-
-    &:not(.active, :hover) .biz-event-select-highlight {
-      color: @primary-color;
-    }
-  }
-
-  .biz-select-handle-input.active {
-    box-shadow: none;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-event-select {
+  position: relative;
+  border-radius: 4px;
+  .__select-handle();
+
+  &:hover {
+    .biz-target-select-option-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      float: right;
+      margin-top: 4px;
+    }
+  }
+
+  .biz-event-select-handle {
+    border: none !important;
+  }
+
+  &.border {
+    .biz-event-select-handle {
+      .__select-handle();
+    }
+  }
+  &-list-panel {
+    display: flex;
+    flex-direction: row;
+    width: 477px;
+    height: 320px;
+    padding: 0;
+    .__select-panel();
+  }
+
+  &-left {
+    flex: none;
+    width: 192px;
+    padding: @padding-xs;
+    overflow-y: auto;
+    border-right: 1px solid @border-color-base;
+  }
+
+  &-right {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    padding: @padding-xs;
+  }
+
+  &-search {
+    flex: none;
+    margin-bottom: @margin-sm;
+  }
+
+  &-list {
+    flex: 1;
+    overflow-y: auto;
+  }
+  &-nodata-panel {
+    width: 284px;
+    .__select-panel();
+  }
+
+  &-nodata {
+    .__select-nodata();
+  }
+
+  &-like {
+    display: inline-block;
+    width: @font-size-base;
+    margin-right: @margin-xss;
+    color: @warning-color;
+  }
+  &-event-item-wrap {
+    .biz-event-select-option {
+      padding: 0 @padding-xs;
+    }
+  }
+  &-option {
+    .__select-option();
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    &:hover,
+    &.active {
+      .ant-badge-count {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+    &.disable,
+    &.disable:hover {
+      color: #ccd0d4;
+      background: #fff;
+      cursor: not-allowed;
+    }
+
+    &-label {
+      flex: 1;
+      max-width: 220px;
+      .__default-overflow();
+    }
+
+    .ant-badge {
+      flex: none;
+    }
+
+    .ant-badge-count {
+      color: @text-color;
+      background: none;
+    }
+
+    &:not(.active, :hover) .biz-event-select-highlight {
+      color: @primary-color;
+    }
+  }
+
+  .biz-select-handle-input.active {
+    box-shadow: none;
+  }
+
+  &-tip {
+    float: right;
+  }
+}

package/es/eventSelector/types.d.ts

@@ -19,6 +19,7 @@ export declare namespace EventSelectTypes {
         multiple?: boolean;
         maxEventCount?: number;
         showBuiltInTarget?: boolean;
+        showRetentionTarget?: number;
         defaultSelectAble?: boolean;
         selectList?: number[];
         disableList?: number[];

package/es/formulaTarget/components/formula/index.js

@@ -115,7 +115,8 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       },
       onDelete: function onDelete() {
         return _onDelete(target.id);
-      }
+      },
+      onlyAnd: props.onlyAnd
     });
   }), targetList.length < 9 ? /*#__PURE__*/React.createElement(Tooltip, {
     title: "\u6DFB\u52A0\u6307\u6807\u8FD0\u7B97"

package/es/formulaTarget/components/formula/index.less

@@ -1,76 +1,76 @@
-@import '../../../assets/styles/inner.less';
-
-.formula-container {
-  display: flex;
-  align-items: center;
-  &-target {
-    display: flex;
-    &:hover {
-      .formula-container-option:not(.active) {
-        display: flex;
-        color: #b9ceff;
-        &.disabled {
-          color: #ccd0d4;
-        }
-      }
-    }
-    &-handle {
-      min-width: 88px;
-      &.focus {
-        .biz-select-handle-input {
-          border-color: @primary-color;
-        }
-      }
-      &-icon {
-        margin-left: 4px;
-        color: @text-color-middle;
-      }
-      &-name {
-        margin-left: 4px;
-      }
-    }
-  }
-
-  &-format {
-    display: flex;
-    align-items: center;
-    margin-left: 40px;
-    & > span {
-      margin-right: 12px;
-    }
-
-    .biz-select-handle {
-      min-width: 136px;
-    }
-  }
-  &-add {
-    margin-left: 8px;
-    color: @primary-color;
-    font-size: 18px !important;
-    cursor: pointer;
-  }
-  &-option {
-    display: flex;
-    align-items: center;
-    color: transparent;
-    cursor: pointer;
-    &.active {
-      display: flex;
-      color: #354354;
-    }
-    &.disabled {
-      cursor: not-allowed;
-    }
-
-    &:first-child {
-      margin-right: 4px;
-    }
-    &:last-child {
-      margin-left: 4px;
-    }
-  }
-
-  &-symbol {
-    margin: 0 12px;
-  }
-}
+@import '../../../assets/styles/inner.less';
+
+.formula-container {
+  display: flex;
+  align-items: center;
+  &-target {
+    display: flex;
+    &:hover {
+      .formula-container-option:not(.active) {
+        display: flex;
+        color: #b9ceff;
+        &.disabled {
+          color: #ccd0d4;
+        }
+      }
+    }
+    &-handle {
+      min-width: 88px;
+      &.focus {
+        .biz-select-handle-input {
+          border-color: @primary-color;
+        }
+      }
+      &-icon {
+        margin-left: 4px;
+        color: @text-color-middle;
+      }
+      &-name {
+        margin-left: 4px;
+      }
+    }
+  }
+
+  &-format {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+    & > span {
+      margin-right: 12px;
+    }
+
+    .biz-select-handle {
+      min-width: 136px;
+    }
+  }
+  &-add {
+    margin-left: 8px;
+    color: @primary-color;
+    font-size: 18px !important;
+    cursor: pointer;
+  }
+  &-option {
+    display: flex;
+    align-items: center;
+    color: transparent;
+    cursor: pointer;
+    &.active {
+      display: flex;
+      color: #354354;
+    }
+    &.disabled {
+      cursor: not-allowed;
+    }
+
+    &:first-child {
+      margin-right: 4px;
+    }
+    &:last-child {
+      margin-left: 4px;
+    }
+  }
+
+  &-symbol {
+    margin: 0 12px;
+  }
+}

package/es/formulaTarget/components/formula/types.d.ts

@@ -5,6 +5,7 @@ export declare namespace FormulaContainerTypes {
         formula?: string;
         resultFormat?: string;
         onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, result?: string) => void;
+        onlyAnd?: boolean;
     }
     type Value = null | string | TargetConditionTypes.Value;
     interface FormulaItemValue {

package/es/formulaTarget/components/formulaItem/index.js

@@ -166,7 +166,8 @@ var FormulaItem = function FormulaItem(props) {
         onDelete: props.onDelete,
         onSubmit: function onSubmit() {
           return setOpen(false);
-        }
+        },
+        onlyAnd: props.onlyAnd
       });
     },
     trigger: ['click'],
@@ -179,7 +180,11 @@ var FormulaItem = function FormulaItem(props) {
   }, /*#__PURE__*/React.createElement(SelectHandle, {
     label: label,
     open: open
-  }, /*#__PURE__*/React.createElement("span", null, label), haveFilter ? /*#__PURE__*/React.createElement(IconFont, {
+  }, !label && /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: '#9797AE'
+    }
+  }, label ? label : '请选择'), /*#__PURE__*/React.createElement("span", null, label), haveFilter ? /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-target-handle-icon"),
     type: "a-shaixuan2"
   }) : null, /*#__PURE__*/React.createElement("span", {

package/es/formulaTarget/components/formulaItem/types.d.ts

@@ -7,4 +7,5 @@ export interface FormulaItemProps {
     onChange?: (data: FormulaContainerTypes.Item) => void;
     onDelete?: () => void;
     onSubmit?: () => void;
+    onlyAnd?: boolean;
 }

package/es/formulaTarget/components/panel/index.js

@@ -166,7 +166,8 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onBack: function onBack() {
       return setCurrentValue(null);
     },
-    onChange: onChangeFilter
+    onChange: onChangeFilter,
+    onlyAnd: props.onlyAnd
   }) : /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right")
   }, type === FormulaTypes.EVENT ? /*#__PURE__*/React.createElement(BizSearchInput, {

package/es/formulaTarget/components/panel/item.js

@@ -63,14 +63,18 @@ var PanelItem = function PanelItem(props) {
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filterList,
-    showHandle: false,
+    showHandle: !props.onlyAnd,
     enableDelete: true,
     enableEventProp: true,
     enableEnvProp: true,
     enableUserProp: true,
     eventIdList: [props.value.eventId],
     onChange: setFilterList,
+    onlyAnd: props.onlyAnd,
     onConditionsCount: setCount
   })));
 };
+PanelItem.defaultProps = {
+  onlyAnd: true
+};
 export default PanelItem;

package/es/formulaTarget/components/panel/types.d.ts

@@ -5,11 +5,13 @@ export interface FormulaPanelProps {
     onChange?: (data?: FormulaContainerTypes.Value) => void;
     onDelete?: () => void;
     onSubmit?: () => void;
+    onlyAnd?: boolean;
 }
 export interface PanelItemProps {
     value: TargetConditionTypes.Value;
     onBack?: () => void;
     onChange?: (dimension: TargetConditionTypes.DimensionValue, filters?: AttrConditionTypes.GroupValue) => void;
+    onlyAnd?: boolean;
 }
 export declare enum FormulaTypes {
     EVENT = "event",

package/es/formulaTarget/index.d.ts

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

package/es/formulaTarget/index.js

@@ -211,7 +211,8 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     value: condition.customCondition,
     formula: condition.formula,
     resultFormat: condition.resultFormat,
-    onChange: onChange
+    onChange: onChange,
+    onlyAnd: props.onlyAnd
   }));
 };
 BizFormulaTarget.defaultProps = {

package/es/formulaTarget/types.d.ts

@@ -6,6 +6,7 @@ export declare namespace BizFormulaTargetTypes {
         enableDelete?: boolean;
         onChange?: (data: Value) => void;
         onDelete?: () => void;
+        onlyAnd?: boolean;
     }
     interface Value {
         eventName?: string;

package/es/icon/iconFont.d.ts

@@ -6,5 +6,8 @@ interface Props extends IconFontProps {
     size?: number;
     className?: string;
 }
-declare const IconFont: React.FC<Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const IconFont: FCWithDefaultProps<Props>;
 export default IconFont;

package/es/index.d.ts

@@ -48,13 +48,14 @@ import useBizStore from './hooks/useBizStore';
 import useChanged from './hooks/useChanged';
 import useSubject from './hooks/useSubject';
 import BizPlatformSelector from './platformSelector';
+import BizAmountSelector from './amountSelector';
 import DataSetGroup from './dataSetGroup';
 import BizDatePickerV2 from './datePickerV2';
 import SubjectWrapper from './subjectWrapper';
 import StyleList from './addToPanel/components/styleList';
 import BizEditText from './layout/optionTitle/components/title';
 import ValuesList from './attrConditions/components/valuesList';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizEmpty, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector, SubjectWrapper, StyleList, BizEditText, ValuesList, };
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizEmpty, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector, BizAmountSelector, SubjectWrapper, StyleList, BizEditText, ValuesList, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizProductConditionT } from './productCondition/types';
 export type { BizSelectTypes } from './select/types';

package/es/index.js

@@ -47,10 +47,11 @@ import useBizStore from './hooks/useBizStore';
 import useChanged from './hooks/useChanged';
 import useSubject from './hooks/useSubject';
 import BizPlatformSelector from './platformSelector';
+import BizAmountSelector from './amountSelector';
 import DataSetGroup from './dataSetGroup';
 import BizDatePickerV2 from './datePickerV2';
 import SubjectWrapper from './subjectWrapper';
 import StyleList from './addToPanel/components/styleList';
 import BizEditText from './layout/optionTitle/components/title';
 import ValuesList from './attrConditions/components/valuesList';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizEmpty, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector, SubjectWrapper, StyleList, BizEditText, ValuesList };
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizEmpty, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector, BizAmountSelector, SubjectWrapper, StyleList, BizEditText, ValuesList };

package/es/layout/analysisLayout/index.d.ts

@@ -11,5 +11,8 @@ type AnalysisLayoutProps = {
     maxWidthOfLeft?: number;
     onCollapse?: (flag: boolean) => void;
 };
-declare const BizAnalysisLayout: React.FC<AnalysisLayoutProps>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizAnalysisLayout: FCWithDefaultProps<AnalysisLayoutProps>;
 export default BizAnalysisLayout;

package/es/layout/columnLayout/index.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import { LayoutTypes } from './types';
 import './index.less';
-declare const BizLayout: React.FC<LayoutTypes.Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizLayout: FCWithDefaultProps<LayoutTypes.Props>;
 export default BizLayout;