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

package/es/targetConditionGroup/demo/index.js

@@ -1,9 +1,9 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useState } from 'react';
 import { BizTargetCondition, BizEventSelector, BizGlobalDataContext, convertAttributeData } from '@zgfe/business-lib';
 import eventData from '../../mock/event';

package/es/targetConditionGroup/demo/styles/index.less

@@ -1,29 +1,29 @@
-@import '../../../assets/styles/inner.less';
-
-.biz-add-btn {
-  width: fit-content;
-  padding: 0 4px;
-  line-height: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-
-  span {
-    margin-right: 5px;
-  }
-
-  &.disabled {
-    color: @disabled-color;
-    cursor: not-allowed;
-    span {
-      color: @disabled-color;
-    }
-  }
-
-  &:hover:not(.disabled) {
-    .__default-hover();
-
-    span {
-      color: @primary-color;
-    }
-  }
-}
+@import '../../../assets/styles/inner.less';
+
+.biz-add-btn {
+  width: fit-content;
+  padding: 0 4px;
+  line-height: 20px;
+  background-color: #fff;
+  border-radius: 4px;
+
+  span {
+    margin-right: 5px;
+  }
+
+  &.disabled {
+    color: @disabled-color;
+    cursor: not-allowed;
+    span {
+      color: @disabled-color;
+    }
+  }
+
+  &:hover:not(.disabled) {
+    .__default-hover();
+
+    span {
+      color: @primary-color;
+    }
+  }
+}

package/es/targetConditionGroup/index.d.ts

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

package/es/targetConditionGroup/index.js

@@ -1,15 +1,15 @@
-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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import BizTargetSelector from '../targetSelector';
 import BizTargetDimension from './components/targetDimension';
@@ -21,7 +21,7 @@ import { BuiltinIndicators } from '../constants/common';
 import { BizAttrConditionGroup, IconFont } from '..';
 export var classPrefix = 'biz-target';
 var BizTargetCondition = function BizTargetCondition(props) {
-  var _targetData$value3, _targetData$value3$gr, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev, _targetData$value6, _targetData$value6$ev, _targetData$value7, _targetData$value8, _targetData$value8$ev, _targetData$value9, _targetData$value9$ev, _targetData$value10, _targetData$value10$e, _targetData$value11, _targetData$value11$e;
+  var _targetData$value3, _targetData$value3$gr, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev, _targetData$value6, _targetData$value6$ev, _targetData$value7, _targetData$value8, _targetData$value8$ev, _targetData$value9, _targetData$value9$ev, _targetData$value0, _targetData$value0$ev, _targetData$value1, _targetData$value1$ev;
   var max = props.max;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -47,22 +47,22 @@ var BizTargetCondition = function BizTargetCondition(props) {
     enableAdd = _useState8[0],
     setEnableAdd = _useState8[1];
   var _useState9 = useState(props.enableDelete),
-    _useState10 = _slicedToArray(_useState9, 2),
-    enableDelete = _useState10[0],
-    setEnableDelete = _useState10[1];
-  var _useState11 = useState(0),
+    _useState0 = _slicedToArray(_useState9, 2),
+    enableDelete = _useState0[0],
+    setEnableDelete = _useState0[1];
+  var _useState1 = useState(0),
+    _useState10 = _slicedToArray(_useState1, 2),
+    count = _useState10[0],
+    setCount = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    count = _useState12[0],
-    setCount = _useState12[1];
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    isAdd = _useState14[0],
-    setIsAdd = _useState14[1];
+    isAdd = _useState12[0],
+    setIsAdd = _useState12[1];
   var conditionRef = useRef(null);
-  var _useState15 = useState(true),
-    _useState16 = _slicedToArray(_useState15, 2),
-    loading = _useState16[0],
-    setLoading = _useState16[1];
+  var _useState13 = useState(true),
+    _useState14 = _slicedToArray(_useState13, 2),
+    loading = _useState14[0],
+    setLoading = _useState14[1];
   useEffect(function () {
     var value = props.defaultValue || props.value;
     if (value) {
@@ -78,14 +78,14 @@ var BizTargetCondition = function BizTargetCondition(props) {
   }, []);
   useEffect(function () {
     if (targetData === null || targetData === void 0 ? void 0 : targetData.value) {
-      var _targetData$value$eve, _targetData$value$eve2, _targetData$value$eve3;
+      var _targetData$value$eve;
       var canAdd = true,
         canDelete = true;
-      if (((_targetData$value$eve = targetData.value.event) === null || _targetData$value$eve === void 0 ? void 0 : _targetData$value$eve.id) === -100 || ((_targetData$value$eve2 = targetData.value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id) === -204 || ((_targetData$value$eve3 = targetData.value.event) === null || _targetData$value$eve3 === void 0 ? void 0 : _targetData$value$eve3.id) === -205) {
-        var _targetData$value$gro, _targetData$value$eve4;
+      if ([-100, -201, -202, -203, -204, -205].indexOf((_targetData$value$eve = targetData.value.event) === null || _targetData$value$eve === void 0 ? void 0 : _targetData$value$eve.id) != -1) {
+        var _targetData$value$gro, _targetData$value$eve2;
         canAdd = false;
         setFilters(undefined);
-        if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id) && ((_targetData$value$eve4 = targetData.value.event) === null || _targetData$value$eve4 === void 0 ? void 0 : _targetData$value$eve4.id) === -100) {
+        if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id) && ((_targetData$value$eve2 = targetData.value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id) === -100) {
           canDelete = false;
         }
       } else {
@@ -165,10 +165,10 @@ var BizTargetCondition = function BizTargetCondition(props) {
     return target;
   };
   var onChangeTarget = function onChangeTarget(target) {
-    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve5;
+    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve3;
     setTargetData(target);
     var filterData = _.cloneDeep(filters);
-    if (((_target$value = target.value) === null || _target$value === void 0 ? void 0 : (_target$value$event = _target$value.event) === null || _target$value$event === void 0 ? void 0 : _target$value$event.id) !== (targetData === null || targetData === void 0 ? void 0 : (_targetData$value = targetData.value) === null || _targetData$value === void 0 ? void 0 : (_targetData$value$eve5 = _targetData$value.event) === null || _targetData$value$eve5 === void 0 ? void 0 : _targetData$value$eve5.id)) {
+    if (((_target$value = target.value) === null || _target$value === void 0 ? void 0 : (_target$value$event = _target$value.event) === null || _target$value$event === void 0 ? void 0 : _target$value$event.id) !== (targetData === null || targetData === void 0 ? void 0 : (_targetData$value = targetData.value) === null || _targetData$value === void 0 ? void 0 : (_targetData$value$eve3 = _targetData$value.event) === null || _targetData$value$eve3 === void 0 ? void 0 : _targetData$value$eve3.id)) {
       filterData = undefined;
       setFilters(undefined);
       setIsAdd(false);
@@ -204,6 +204,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
       var data = {
         type: type,
         alias: (target === null || target === void 0 ? void 0 : target.alias) || target.value.event.alias || ((_target$value$event3 = target.value.event) === null || _target$value$event3 === void 0 ? void 0 : _target$value$event3.name) || '',
+        stepAlias: (target === null || target === void 0 ? void 0 : target.alias) || '',
         eventId: (_target$value$event4 = target.value.event) === null || _target$value$event4 === void 0 ? void 0 : _target$value$event4.id,
         eventName: ((_target$value$event5 = target.value.event) === null || _target$value$event5 === void 0 ? void 0 : _target$value$event5.alias) || ((_target$value$event6 = target.value.event) === null || _target$value$event6 === void 0 ? void 0 : _target$value$event6.name),
         eventGroupId: (_target$value$group2 = target.value.group) === null || _target$value$group2 === void 0 ? void 0 : _target$value$group2.id,
@@ -240,31 +241,32 @@ var BizTargetCondition = function BizTargetCondition(props) {
     className: "".concat(classPrefix, "-content")
   }, /*#__PURE__*/React.createElement(BizTargetSelector, {
     value: targetData,
-    onChange: onChangeTarget
-  }, props.children), (targetData === null || targetData === void 0 ? void 0 : (_targetData$value3 = targetData.value) === null || _targetData$value3 === void 0 ? void 0 : (_targetData$value3$gr = _targetData$value3.group) === null || _targetData$value3$gr === void 0 ? void 0 : _targetData$value3$gr.id) === -2 || (targetData === null || targetData === void 0 ? void 0 : (_targetData$value4 = targetData.value) === null || _targetData$value4 === void 0 ? void 0 : (_targetData$value4$ev = _targetData$value4.event) === null || _targetData$value4$ev === void 0 ? void 0 : _targetData$value4$ev.isBuiltIn) ? null : /*#__PURE__*/React.createElement(BizTargetDimension, {
+    onChange: onChangeTarget,
+    isFunnelEvent: props.isFunnelEvent
+  }, props.children), (targetData === null || targetData === void 0 ? void 0 : (_targetData$value3 = targetData.value) === null || _targetData$value3 === void 0 ? void 0 : (_targetData$value3$gr = _targetData$value3.group) === null || _targetData$value3$gr === void 0 ? void 0 : _targetData$value3$gr.id) === -2 || (targetData === null || targetData === void 0 ? void 0 : (_targetData$value4 = targetData.value) === null || _targetData$value4 === void 0 ? void 0 : (_targetData$value4$ev = _targetData$value4.event) === null || _targetData$value4$ev === void 0 ? void 0 : _targetData$value4$ev.isBuiltIn) || props.isFunnelEvent ? null : (/*#__PURE__*/React.createElement(BizTargetDimension, {
     eventId: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value5 = targetData.value) === null || _targetData$value5 === void 0 ? void 0 : (_targetData$value5$ev = _targetData$value5.event) === null || _targetData$value5$ev === void 0 ? void 0 : _targetData$value5$ev.id) ? targetData === null || targetData === void 0 ? void 0 : (_targetData$value6 = targetData.value) === null || _targetData$value6 === void 0 ? void 0 : (_targetData$value6$ev = _targetData$value6.event) === null || _targetData$value6$ev === void 0 ? void 0 : _targetData$value6$ev.id : undefined,
     value: dimension,
     onChange: onChangeDimension
-  }), /*#__PURE__*/React.createElement(Tooltip, {
+  })), (props === null || props === void 0 ? void 0 : props.isFunnelEvent) ? null : (/*#__PURE__*/React.createElement(Tooltip, {
     title: "\u6DFB\u52A0\u5C5E\u6027\u7B5B\u9009"
   }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-icon ").concat(!enableAdd ? 'disabled' : ''),
     type: "shaixuan",
     onClick: onAdd
-  })), /*#__PURE__*/React.createElement(IconFont, {
+  }))), props.isFunnelEvent ? null : (/*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-icon delete ").concat(!(props.enableDelete !== undefined ? props.enableDelete || !(targetData === null || targetData === void 0 ? void 0 : (_targetData$value7 = targetData.value) === null || _targetData$value7 === void 0 ? void 0 : _targetData$value7.event) : enableDelete) ? 'disabled' : ''),
     type: "qingchu",
     onClick: onDelete
-  })), (targetData === null || targetData === void 0 ? void 0 : (_targetData$value8 = targetData.value) === null || _targetData$value8 === void 0 ? void 0 : (_targetData$value8$ev = _targetData$value8.event) === null || _targetData$value8$ev === void 0 ? void 0 : _targetData$value8$ev.id) && eventIdMap && eventIdMap[targetData === null || targetData === void 0 ? void 0 : (_targetData$value9 = targetData.value) === null || _targetData$value9 === void 0 ? void 0 : (_targetData$value9$ev = _targetData$value9.event) === null || _targetData$value9$ev === void 0 ? void 0 : _targetData$value9$ev.id] && (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
+  }))), (targetData === null || targetData === void 0 ? void 0 : (_targetData$value8 = targetData.value) === null || _targetData$value8 === void 0 ? void 0 : (_targetData$value8$ev = _targetData$value8.event) === null || _targetData$value8$ev === void 0 ? void 0 : _targetData$value8$ev.id) && eventIdMap && eventIdMap[targetData === null || targetData === void 0 ? void 0 : (_targetData$value9 = targetData.value) === null || _targetData$value9 === void 0 ? void 0 : (_targetData$value9$ev = _targetData$value9.event) === null || _targetData$value9$ev === void 0 ? void 0 : _targetData$value9$ev.id] && (filters || isAdd) && (/*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filters,
     onlyAnd: props.onlyAnd,
     enableEventProp: true,
     enableDelete: true,
-    eventIdList: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value10 = targetData.value) === null || _targetData$value10 === void 0 ? void 0 : (_targetData$value10$e = _targetData$value10.event) === null || _targetData$value10$e === void 0 ? void 0 : _targetData$value10$e.id) ? [targetData === null || targetData === void 0 ? void 0 : (_targetData$value11 = targetData.value) === null || _targetData$value11 === void 0 ? void 0 : (_targetData$value11$e = _targetData$value11.event) === null || _targetData$value11$e === void 0 ? void 0 : _targetData$value11$e.id] : undefined,
+    eventIdList: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value0 = targetData.value) === null || _targetData$value0 === void 0 ? void 0 : (_targetData$value0$ev = _targetData$value0.event) === null || _targetData$value0$ev === void 0 ? void 0 : _targetData$value0$ev.id) ? [targetData === null || targetData === void 0 ? void 0 : (_targetData$value1 = targetData.value) === null || _targetData$value1 === void 0 ? void 0 : (_targetData$value1$ev = _targetData$value1.event) === null || _targetData$value1$ev === void 0 ? void 0 : _targetData$value1$ev.id] : undefined,
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  })));
+  }))));
 };
 BizTargetCondition.defaultProps = {
   max: 5

package/es/targetConditionGroup/styles/index.less

@@ -1,53 +1,53 @@
-@import '../../assets/styles/inner.less';
-
-.biz-target {
-  &-content {
-    display: flex;
-    align-items: center;
-  }
-
-  .biz-target-select {
-    min-width: 160px;
-    max-width: calc(100% - 208px);
-    &:hover {
-      .biz-event-select {
-        max-width: calc(100% - 18px);
-      }
-    }
-    .biz-event-select {
-      max-width: 100%;
-    }
-    .biz-select-handle-content {
-      max-width: calc(100% - 19px);
-    }
-  }
-
-  .biz-attr-condition-group {
-    margin-top: 12px;
-  }
-
-  &-dimension {
-    width: 100px;
-    margin-left: 16px;
-  }
-  &-dropmenu,
-  &-submenu {
-    width: 120px;
-  }
-
-  &-icon {
-    margin-left: 16px;
-    .__icon();
-
-    &.shaixuan {
-      font-size: 20px !important;
-    }
-
-    &.delete {
-      font-size: 16px !important;
-    }
-  }
-  .biz-event-select.focus {
-    box-shadow: none;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-target {
+  &-content {
+    display: flex;
+    align-items: center;
+  }
+
+  .biz-target-select {
+    min-width: 160px;
+    max-width: calc(100% - 208px);
+    &:hover {
+      .biz-event-select {
+        max-width: calc(100% - 18px);
+      }
+    }
+    .biz-event-select {
+      max-width: 100%;
+    }
+    .biz-select-handle-content {
+      max-width: calc(100% - 19px);
+    }
+  }
+
+  .biz-attr-condition-group {
+    margin-top: 12px;
+  }
+
+  &-dimension {
+    width: 100px;
+    margin-left: 16px;
+  }
+  &-dropmenu,
+  &-submenu {
+    width: 120px;
+  }
+
+  &-icon {
+    margin-left: 16px;
+    .__icon();
+
+    &.shaixuan {
+      font-size: 20px !important;
+    }
+
+    &.delete {
+      font-size: 16px !important;
+    }
+  }
+  .biz-event-select.focus {
+    box-shadow: none;
+  }
+}

package/es/targetConditionGroup/types.d.ts

@@ -31,6 +31,7 @@ export declare namespace TargetConditionTypes {
         max?: number;
         children: ReactNode;
         onlyAnd?: boolean;
+        isFunnelEvent?: boolean;
         enableDelete?: boolean;
         onChange?: (value: Value) => void;
         onDelete?: (value?: Value) => void;

package/es/targetSelector/demo/index.js

@@ -1,9 +1,9 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useState } from 'react';
 import { BizTargetSelector, BizEventSelector, convertAttributeData, BizGlobalDataContext } from '@zgfe/business-lib';
 import eventData from '../../mock/event';

package/es/targetSelector/editBox.d.ts

@@ -4,5 +4,6 @@ declare const BizEventNameEditBox: React.FC<{
     disabled?: string;
     onCancel: () => void;
     onChange: (alias: string) => void;
+    isFunnelEvent?: boolean;
 }>;
 export default BizEventNameEditBox;

package/es/targetSelector/editBox.js

@@ -1,9 +1,9 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { Button, Input, message } from 'antd';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { classPrefix } from '.';
@@ -25,7 +25,7 @@ var BizEventNameEditBox = function BizEventNameEditBox(props) {
   }, [alias]);
   var onClick = function onClick() {
     if (aliasStatus) {
-      if (props.disabled && props.disabled === alias) {
+      if (props.disabled && props.disabled === alias && !props.isFunnelEvent) {
         message.error('不能与事件名相同!');
         return;
       }
@@ -56,13 +56,18 @@ var BizEventNameEditBox = function BizEventNameEditBox(props) {
     className: "".concat(classPrefix, "-tip ").concat(!aliasStatus ? classPrefix + '-error' : '')
   }, "\u8BF7\u8F93\u5165\u6570\u5B57\u3001\u5B57\u6BCD\u6216\u6C49\u5B57"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-footer")
-  }, /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement("span", {
+    onClick: function onClick() {
+      setAlias(props.disabled || '');
+    },
+    className: "".concat(classPrefix, "-footer-left")
+  }, "\u4F7F\u7528\u539F\u59CB\u540D"), /*#__PURE__*/React.createElement(Button, {
     onClick: onCancel,
     type: "text",
     className: "".concat(classPrefix, "-mr8")
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     onClick: onClick,
     type: "primary"
-  }, "\u786E\u5B9A")));
+  }, "\u4FDD\u5B58")));
 };
 export default BizEventNameEditBox;

package/es/targetSelector/index.js

@@ -1,9 +1,9 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useEffect, useState } from 'react';
 import BizEventNameEditBox from './editBox';
 import './styles/index.less';
@@ -72,11 +72,12 @@ var BizTargetSelector = function BizTargetSelector(props) {
     onClick: function onClick() {
       return setShowEditModal(true);
     }
-  }), showEditModal && /*#__PURE__*/React.createElement(BizEventNameEditBox, {
+  }), showEditModal && (/*#__PURE__*/React.createElement(BizEventNameEditBox, {
     defaultValue: alias,
     disabled: targetData === null || targetData === void 0 ? void 0 : (_targetData$event = targetData.event) === null || _targetData$event === void 0 ? void 0 : _targetData$event.name,
     onCancel: onCancelEdit,
-    onChange: onChangeAlias
-  }));
+    onChange: onChangeAlias,
+    isFunnelEvent: props.isFunnelEvent
+  })));
 };
 export default BizTargetSelector;

package/es/targetSelector/optionIcon.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
-declare const BizTargetOptionIcon: React.FC<{
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizTargetOptionIcon: FCWithDefaultProps<{
     enabled?: boolean;
     title?: string;
     name: string;

package/es/targetSelector/optionIcon.js

@@ -13,6 +13,9 @@ var BizTargetOptionIcon = function BizTargetOptionIcon(props) {
     key: props.name
   }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-option-icon ").concat(enabled ? '' : 'disabled', " ").concat(props.name === 'delete' ? classPrefix + '-del-icon' : ''),
+    style: {
+      backgroundColor: '#E8EFFF'
+    },
     type: props.icon,
     onClick: onClick
   }));