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

package/es/select/styles/handle.less

@@ -1,193 +1,206 @@
-@import '../../assets/styles/inner.less';
-
-.biz-select-handle {
-  &-input {
-    position: relative;
-    display: flex;
-    flex: 1;
-    padding: 0px 6px 0 8px;
-    &.disable {
-      .__disable();
-      .bsicon {
-        color: @disabled-color;
-      }
-    }
-
-    .__select-default();
-
-    &.secondary {
-      .__select-normal-secondary();
-    }
-
-    &.borderless {
-      border: none;
-    }
-
-    &.large {
-      height: @height-lg;
-      font-size: @font-size-lg;
-      line-height: @height-lg;
-    }
-
-    &.small {
-      height: @height-sm;
-      line-height: @height-sm;
-    }
-
-    &.middle {
-      height: @height-base;
-      line-height: @height-base;
-    }
-  }
-
-  &-input-multiple {
-    display: flex;
-    align-items: center;
-    height: auto;
-    line-height: 1;
-    &.small {
-      height: auto;
-      min-height: @height-sm;
-    }
-
-    &.middle {
-      height: auto;
-      min-height: @height-base;
-    }
-    .biz-select-handle-tag {
-      display: flex;
-      align-items: center;
-      margin: 2px 4px 2px 0;
-      padding: 0 4px;
-      padding-top: 1px;
-      padding-bottom: 1px;
-      background: none;
-      border-color: #cacdd4;
-      border-radius: @border-radius-small;
-      &-label {
-        min-width: 0;
-        max-width: 100px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-      &:not(.disable) {
-        &:hover {
-          .__default-hover();
-          .anticon {
-            color: @primary-color;
-          }
-        }
-      }
-      &.disable {
-        &:hover {
-          cursor: not-allowed;
-          .anticon-close {
-            cursor: not-allowed;
-          }
-        }
-        .biz-select-handle-tag-label,
-        .ant-tag-close-icon {
-          color: #ccd0d4 !important;
-        }
-      }
-    }
-  }
-  &-multiple-content {
-    display: flex;
-    flex: 1;
-    flex-wrap: wrap;
-    align-items: center;
-    overflow: visible;
-  }
-
-  &-search.ant-input {
-    width: auto;
-    padding: 0;
-    background-color: transparent;
-    border: none;
-    box-shadow: none;
-
-    &:focus,
-    &.active {
-      box-shadow: none !important;
-    }
-  }
-  &-temp {
-    position: absolute;
-    top: -999999999999999px;
-    padding: 0 @padding-sm;
-    font-size: @font-size-base;
-  }
-
-  &-holder {
-    color: @input-placeholder-color;
-    line-height: 20px;
-  }
-  &-content {
-    display: flex;
-    flex: 1;
-    align-items: center;
-    width: 100%;
-    &-label {
-      // width: 100%;
-      .__default-overflow();
-    }
-    &-icon-list {
-      display: flex;
-      // flex: 1;
-      flex-direction: row;
-      align-items: center;
-      justify-content: end;
-    }
-    &-icon-qingchu-box {
-      display: none;
-      gap: 10px;
-      align-items: center;
-      justify-content: center;
-      width: 16px;
-      height: 24px;
-      margin-left: 8px;
-      padding: 10px;
-      border-radius: 4px;
-    }
-    &-icon-qingchu-box:hover {
-      color: #fb5547;
-      background: #feddda;
-    }
-  }
-  &-input:hover {
-    .biz-select-handle-content-icon-qingchu-box {
-      display: flex;
-    }
-  }
-  &-expand-icon {
-    width: 14px;
-    margin-left: 5px;
-    color: @text-color-secondary;
-    &.open {
-      transform: rotate(180deg);
-    }
-  }
-
-  &-tooltip {
-    .ant-tooltip-inner {
-      color: @black;
-      background-color: @white;
-    }
-  }
-
-  &-icon {
-    margin-right: @margin-xss;
-  }
-
-  &-status-error {
-    border-color: @error-color;
-    &.biz-select-handle-input:hover {
-      border-color: @error-color;
-    }
-    &.biz-select-handle-input.active:not(.disable) {
-      border-color: @error-color;
-      box-shadow: 0 0 0 4px rgba(#ff8170, 0.2) !important;
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-select-handle {
+  &-input {
+    position: relative;
+    display: flex;
+    flex: 1;
+    padding: 0px 6px 0 8px;
+    &.disable {
+      .__disable();
+      .bsicon {
+        color: @disabled-color;
+      }
+    }
+
+    .__select-default();
+
+    &.secondary {
+      .__select-normal-secondary();
+    }
+
+    &.borderless {
+      border: none;
+    }
+
+    &.large {
+      height: @height-lg;
+      font-size: @font-size-lg;
+      line-height: @height-lg;
+    }
+
+    &.small {
+      height: @height-sm;
+      line-height: @height-sm;
+    }
+
+    &.middle {
+      height: @height-base;
+      line-height: @height-base;
+    }
+  }
+
+  &-input-multiple {
+    display: flex;
+    align-items: center;
+    height: auto;
+    line-height: 1;
+    &.small {
+      height: auto;
+      min-height: @height-sm;
+    }
+
+    &.middle {
+      height: auto;
+      min-height: @height-base;
+    }
+    .biz-select-handle-tag {
+      display: flex;
+      align-items: center;
+      margin: 2px 4px 2px 0;
+      padding: 0 4px;
+      padding-top: 1px;
+      padding-bottom: 1px;
+      background: none;
+      border-color: #cacdd4;
+      border-radius: @border-radius-small;
+      &-label {
+        min-width: 0;
+        max-width: 100px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      &:not(.disable) {
+        &:hover {
+          .__default-hover();
+          .anticon {
+            color: @primary-color;
+          }
+        }
+      }
+      &.disable {
+        &:hover {
+          cursor: not-allowed;
+          .anticon-close {
+            cursor: not-allowed;
+          }
+        }
+        .biz-select-handle-tag-label,
+        .ant-tag-close-icon {
+          color: #ccd0d4 !important;
+        }
+      }
+    }
+    .biz-select-handle-tag:is(.state-2, .state-3, .state-4) {
+      color: #fb5547;
+      border-color: #fb5547;
+      .ant-tag-close-icon {
+        color: #fb5547 !important;
+      }
+      &:not(.disable) {
+        &:hover {
+          color: #fb5547;
+          border-color: #fb5547;
+        }
+      }
+    }
+  }
+  &-multiple-content {
+    display: flex;
+    flex: 1;
+    flex-wrap: wrap;
+    align-items: center;
+    overflow: visible;
+  }
+
+  &-search.ant-input {
+    width: auto;
+    padding: 0;
+    background-color: transparent;
+    border: none !important;
+    box-shadow: none;
+
+    &:focus,
+    &.active {
+      box-shadow: none !important;
+    }
+  }
+  &-temp {
+    position: absolute;
+    top: -999999999999999px;
+    padding: 0 @padding-sm;
+    font-size: @font-size-base;
+  }
+
+  &-holder {
+    color: @input-placeholder-color;
+    line-height: 20px;
+  }
+  &-content {
+    display: flex;
+    flex: 1;
+    align-items: center;
+    width: calc(100% - 19px);
+    &-label {
+      // width: 100%;
+      .__default-overflow();
+    }
+    &-icon-list {
+      display: flex;
+      // flex: 1;
+      flex-direction: row;
+      align-items: center;
+      justify-content: end;
+    }
+    &-icon-qingchu-box {
+      display: none;
+      gap: 10px;
+      align-items: center;
+      justify-content: center;
+      width: 16px;
+      height: 24px;
+      margin-left: 8px;
+      padding: 10px;
+      border-radius: 4px;
+    }
+    &-icon-qingchu-box:hover {
+      color: #fb5547;
+      background: #feddda;
+    }
+  }
+  &-input:hover {
+    .biz-select-handle-content-icon-qingchu-box {
+      display: flex;
+    }
+  }
+  &-expand-icon {
+    width: 14px;
+    margin-left: 5px;
+    color: @text-color-secondary;
+    &.open {
+      transform: rotate(180deg);
+    }
+  }
+
+  &-tooltip {
+    .ant-tooltip-inner {
+      color: @black;
+      background-color: @white;
+    }
+  }
+
+  &-icon {
+    margin-right: @margin-xss;
+  }
+
+  &-status-error {
+    border-color: @error-color;
+    &.biz-select-handle-input:hover {
+      border-color: @error-color;
+    }
+    &.biz-select-handle-input.active:not(.disable) {
+      border-color: @error-color;
+      box-shadow: 0 0 0 4px rgba(#ff8170, 0.2) !important;
+    }
+  }
+}

package/es/socket/demo/demo.js

@@ -28,8 +28,8 @@ var ChatPanel = function ChatPanel(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     online = _useState6[0],
     setOnline = _useState6[1];
-  var formRef = useRef();
-  var historyRef = useRef();
+  var formRef = useRef(null);
+  var historyRef = useRef(null);
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   useEffect(function () {

package/es/subjectWrapper/index.js

@@ -76,7 +76,9 @@ var SubjectWrapper = function SubjectWrapper(_ref) {
     className: "lib-subjectWrapper ".concat(className, " ").concat(useBizStoreLoading ? 'lib-subjectWrapper-loading' : '')
   }, (useBizStoreLoading || loading) && /*#__PURE__*/React.createElement(Spin, null), !(useBizStoreLoading || loading) && /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: _objectSpread(_objectSpread({}, globalData), {}, {
-      currentApp: _objectSpread(_objectSpread({}, currentApp), {}, {
+      currentApp: _objectSpread(_objectSpread({
+        platform: 0
+      }, currentApp), {}, {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id
       }),
       eventGroupList: eventGroupList,

package/es/table/demo/data/color.js

@@ -1 +1 @@
-export var chartColors = ['#165DFF', '#CDDBFD', '#80E1D9', '#CDF3F0', '#65789B', '#CED4DE', '#F8BC3B', '#FCE7B9', '#6F66ED', '#D1CEFD', '#66AFED', '#D3E7F9', '#9661BC', '#DFCFEA', '#FF7557', '#FFD1C7', '#4DB273', '#BBDEC8', '#F08BB4', '#FFE0ED'];
+export var chartColors = ['#116ACC', '#CDDBFD', '#80E1D9', '#CDF3F0', '#65789B', '#CED4DE', '#F8BC3B', '#FCE7B9', '#6F66ED', '#D1CEFD', '#66AFED', '#D3E7F9', '#9661BC', '#DFCFEA', '#FF7557', '#FFD1C7', '#4DB273', '#BBDEC8', '#F08BB4', '#FFE0ED'];

package/es/table/index.js

@@ -5,16 +5,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Table } from 'antd';
-import React, { useState } from 'react';
+import React from 'react';
 import './styles/index.less';
 import _ from 'lodash';
 var BizTable = function BizTable(props) {
@@ -24,26 +18,6 @@ var BizTable = function BizTable(props) {
     scroll = props.scroll,
     pagination = props.pagination,
     res = _objectWithoutProperties(props, _excluded);
-  var _useState = useState(scroll),
-    _useState2 = _slicedToArray(_useState, 2),
-    scrollData = _useState2[0],
-    setScrollData = _useState2[1];
-  var onChangePage = function onChangePage(page, pageSize) {
-    var count = page * pageSize;
-    var totalCount = total || dataSource.length;
-    if (pageSize > 10 && (count <= totalCount || totalCount - (page - 1) * pageSize > 10)) {
-      setScrollData(function (data) {
-        return _objectSpread(_objectSpread({}, data), {}, {
-          y: (scroll === null || scroll === void 0 ? void 0 : scroll.y) || 490
-        });
-      });
-    } else {
-      setScrollData(function (data) {
-        data === null || data === void 0 ? true : delete data.y;
-        return _objectSpread({}, data);
-      });
-    }
-  };
   return /*#__PURE__*/React.createElement(Table, _objectSpread(_objectSpread({}, res), {}, {
     columns: columns,
     dataSource: dataSource,
@@ -57,10 +31,9 @@ var BizTable = function BizTable(props) {
         return /*#__PURE__*/React.createElement("span", null, "\u5171 ", /*#__PURE__*/React.createElement("a", {
           className: "biz-table-total"
         }, totalNum), " \u6761");
-      },
-      onChange: onChangePage
+      }
     }),
-    scroll: scrollData
+    scroll: scroll
   }));
 };
 export default BizTable;

package/es/targetConditionGroup/components/targetDimension.d.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import { TargetConditionTypes } from '../types';
-declare const BizTargetDimension: React.FC<{
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizTargetDimension: FCWithDefaultProps<{
     value?: TargetConditionTypes.DimensionValue;
     eventId?: number;
     isExtend?: boolean;

package/es/targetConditionGroup/demo/group.js

@@ -11,12 +11,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; }
 import React, { useEffect, useState } from 'react';
-import { BizTargetCondition, BizEventSelector, BizGlobalDataContext, IconFont, convertAttributeData } from '@zgfe/business-lib';
-import eventData from '../../mock/event';
-import envData from '../../mock/env';
-import userData from '../../mock/user';
+import { BizTargetCondition, BizEventSelector, IconFont } from '@zgfe/business-lib';
 import './styles/index.less';
 import { Form } from 'antd';
+import InnerDemo from '../../demoWrapper/innerDemo';
 var initValue = {
   type: 'event',
   alias: '',
@@ -48,11 +46,6 @@ export default (function () {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var store = convertAttributeData({
-    eventList: eventData,
-    userPropList: userData,
-    envPropList: envData
-  });
   var onValuesChange = function onValuesChange() {
     for (var _len = arguments.length, res = new Array(_len), _key = 0; _key < _len; _key++) {
       res[_key] = arguments[_key];
@@ -78,13 +71,7 @@ export default (function () {
     setShowOverview(show);
     setEnableAdd(flag);
   }, [target === null || target === void 0 ? void 0 : target.targets]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
-    value: {
-      eventGroupList: store.eventGroupList,
-      userPropList: store.userPropList,
-      eventEnvList: store.envPropList
-    }
-  }, /*#__PURE__*/React.createElement(Form, {
+  return /*#__PURE__*/React.createElement(InnerDemo, null, /*#__PURE__*/React.createElement(Form, {
     initialValues: target,
     form: form,
     name: "target_form",
@@ -104,7 +91,7 @@ export default (function () {
           remove(field.name);
         }
       }, /*#__PURE__*/React.createElement(BizEventSelector, {
-        showBuiltInTarget: true,
+        showRetentionTarget: true,
         showAllEvent: showOverview,
         popupContainer: false,
         border: false,
@@ -119,5 +106,5 @@ export default (function () {
       className: "biz-icon",
       type: 'tianjia1'
     }), "\u6DFB\u52A0\u6307\u6807")));
-  }))), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(target)));
+  })));
 });

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

@@ -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,18 +241,19 @@ 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

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/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

@@ -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;