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

package/es/dnd/styles/index.less

@@ -1,19 +1,19 @@
-@import '../../assets/styles/inner.less';
-.biz-dnd {
-  &-item {
-    cursor: move;
-    user-select: none;
-    &.disable,
-    &.handle {
-      cursor: inherit;
-      user-select: inherit;
-    }
-  }
-  &-handle {
-    cursor: move;
-    user-select: none;
-  }
-  &-temp {
-    pointer-events: none;
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-dnd {
+  &-item {
+    cursor: move;
+    user-select: none;
+    &.disable,
+    &.handle {
+      cursor: inherit;
+      user-select: inherit;
+    }
+  }
+  &-handle {
+    cursor: move;
+    user-select: none;
+  }
+  &-temp {
+    pointer-events: none;
+  }
+}

package/es/eventSelector/index.d.ts

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

package/es/eventSelector/index.js

@@ -10,7 +10,7 @@ import SelectHandle from '../select/handle';
 import BizGlobalDataContext from '../context';
 import EventListPanel from './listPanel';
 import './styles/index.less';
-import { BuiltinIndicators } from '../constants/common';
+import { BuiltinIndicators, RetentionTarget } from '../constants/common';
 import _ from 'lodash';
 import useChanged from '../hooks/useChanged';
 import BizTargetOptionIcon from '../targetSelector/optionIcon';
@@ -68,7 +68,7 @@ var BizEventSelector = function BizEventSelector(props) {
   }
   var getValue = function getValue(param) {
     var res = {};
-    var allEvents = props.showBuiltInTarget ? eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.concat(BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type)) : eventGroupList;
+    var allEvents = props.showRetentionTarget ? eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.concat(RetentionTarget(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type, props.showRetentionTarget)) : props.showBuiltInTarget ? eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.concat(BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type)) : eventGroupList;
     if (props.multiple) {
       var params = param;
       return params.filter(function (item) {
@@ -166,6 +166,7 @@ var BizEventSelector = function BizEventSelector(props) {
         multiple: props.multiple,
         maxEventCount: props.maxEventCount,
         showBuiltInTarget: props.showBuiltInTarget,
+        showRetentionTarget: props.showRetentionTarget,
         defaultSelectAble: defaultSelectAble,
         selectList: props.selectList,
         disableList: props.disableList,

package/es/eventSelector/listPanel.js

@@ -21,7 +21,7 @@ import InfiniteScroll from 'react-infinite-scroll-component';
 import { classPrefix } from '.';
 import { BizGlobalDataContext, useChanged } from '..';
 import { ShowStatus } from '../attributeSelector/types';
-import { BuiltinIndicators } from '../constants/common';
+import { BuiltinIndicators, RetentionTarget } from '../constants/common';
 import BizSearchInput from '../searchInput';
 import EventListOption from './option';
 var EventListPanel = function EventListPanel(props) {
@@ -108,7 +108,7 @@ var EventListPanel = function EventListPanel(props) {
             }
           });
         });
-        list = props.showBuiltInTarget ? [].concat(_toConsumableArray(BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type).eventList), markList, _toConsumableArray(list)) : [].concat(markList, _toConsumableArray(list));
+        list = props.showRetentionTarget ? [].concat(_toConsumableArray(RetentionTarget(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type, props.showRetentionTarget).eventList), markList, _toConsumableArray(list)) : props.showBuiltInTarget ? [].concat(_toConsumableArray(BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type).eventList), markList, _toConsumableArray(list)) : [].concat(markList, _toConsumableArray(list));
         if (props.extendEvents) {
           list = [].concat(_toConsumableArray(props.extendEvents), _toConsumableArray(list));
         }
@@ -117,7 +117,7 @@ var EventListPanel = function EventListPanel(props) {
       name: '所有分组'
     };
     setGroupList(function (list) {
-      var result = props.showBuiltInTarget ? [group, BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type)].concat(_toConsumableArray(list)) : [group].concat(_toConsumableArray(list));
+      var result = props.showRetentionTarget ? [group, RetentionTarget(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type, props.showRetentionTarget)].concat(_toConsumableArray(list)) : props.showBuiltInTarget ? [group, BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type)].concat(_toConsumableArray(list)) : [group].concat(_toConsumableArray(list));
       if (!props.filter) return result;
       var finalList = [];
       result.forEach(function (group) {
@@ -141,8 +141,10 @@ var EventListPanel = function EventListPanel(props) {
       if (!props.multiple) {
         var _props$value;
         if (props.defaultSelectAble && ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.group)) {
-          var _props$value$group;
-          if (props.showBuiltInTarget && ((_props$value$group = props.value.group) === null || _props$value$group === void 0 ? void 0 : _props$value$group.id) === -2) {
+          var _props$value$group, _props$value$group2;
+          if (props.showRetentionTarget && ((_props$value$group = props.value.group) === null || _props$value$group === void 0 ? void 0 : _props$value$group.id) === -2) {
+            resultGroup = RetentionTarget(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type, props.showRetentionTarget);
+          } else if (props.showBuiltInTarget && ((_props$value$group2 = props.value.group) === null || _props$value$group2 === void 0 ? void 0 : _props$value$group2.id) === -2) {
             resultGroup = BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type);
           } else {
             var _currentGroup = group;
@@ -166,13 +168,6 @@ var EventListPanel = function EventListPanel(props) {
     });
     setReady(true);
   }, [eventGroupListData]);
-  useChanged(function () {
-    if (props.multiple) {
-      setCheckedEventList(_.cloneDeep(props.value) || []);
-    } else {
-      setCurrentValue(_.cloneDeep(props.value));
-    }
-  }, props.value);
   useEffect(function () {
     var list = [];
     currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.eventList.forEach(function (event) {
@@ -355,7 +350,8 @@ export var InfiniteScrollList = function InfiniteScrollList(_ref) {
       },
       multiple: multiple,
       data: e,
-      onClick: onClick
+      onClick: onClick,
+      showTip: e.id === -205
     });
   }));
 };

package/es/eventSelector/option.d.ts

@@ -14,5 +14,6 @@ declare const EventListOption: React.FC<{
     };
     data?: EventGroup | AnalysisEvent;
     onClick?: (data: any) => void;
+    showTip?: boolean;
 }>;
 export default EventListOption;

package/es/eventSelector/option.js

@@ -1,4 +1,4 @@
-import { Badge, Checkbox } from 'antd';
+import { Badge, Checkbox, Tooltip } from 'antd';
 import React from 'react';
 import { classPrefix } from '.';
 import IconFont from '../icon/iconFont';
@@ -11,7 +11,8 @@ var EventListOption = function EventListOption(props) {
     highlight = props.highlight,
     onClick = props.onClick,
     data = props.data,
-    disable = props.disable;
+    disable = props.disable,
+    showTip = props.showTip;
   var _onClick = function _onClick(e) {
     if (disable) return;
     e.stopPropagation();
@@ -45,7 +46,17 @@ var EventListOption = function EventListOption(props) {
     className: "".concat(classPrefix, "-like")
   }, data.marked ? /*#__PURE__*/React.createElement(IconFont, {
     type: "shoucang"
-  }) : null), getLabel(label || '')), showCount && /*#__PURE__*/React.createElement(Badge, {
+  }) : null), getLabel(label || '')), showTip && /*#__PURE__*/React.createElement(Tooltip, {
+    overlayInnerStyle: {
+      width: '402px'
+    },
+    title: "\u4F7F\u7528\u65F6\u957F\u4E3A\u4F1A\u8BDD\u65F6\u957F\uFF0C\u5047\u8BBE\u4E00\u4E2A\u7528\u6237\u4EA7\u751F\u4E86\u591A\u6B21\u4F1A\u8BDD\uFF0C\u7B2C\u4E00\u6B21\u4F1A\u8BDD\u65F6\u957F3\u79D2\uFF0C\u7B2C\u4E8C\u6B2145\u79D2\uFF0C\u90A3\u4E48\u8FD9\u4E2A\u7528\u6237\u4F1A\u5206\u522B\u843D\u52301-5\u79D2\uFF0C31-60\u79D2\u7684\u533A\u95F4\u5185\u3002",
+    placement: "right",
+    zIndex: 999999
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "tishi",
+    className: "".concat(classPrefix, "-tip")
+  })), showCount && /*#__PURE__*/React.createElement(Badge, {
     count: count
   }));
 };

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, {