@zgfe/business-lib 1.2.71-hxd.8 → 1.2.86-h5.1

package/es/eventSelector/index.js

@@ -1,16 +1,16 @@
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+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(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; }
+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; }
 import { Dropdown } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
 import SelectHandle from '../select/handle';
 import BizGlobalDataContext from '../context';
 import EventListPanel from './listPanel';
 import './styles/index.less';
-import { BuiltinIndicators, RetentionTarget } from '../constants/common';
+import { BuiltinIndicators } 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.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;
+    var allEvents = 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) {
@@ -151,13 +151,13 @@ var BizEventSelector = function BizEventSelector(props) {
   }, [visible]);
   return /*#__PURE__*/React.createElement("div", {
     className: [classPrefix, border ? 'border' : ''].join(' ')
-  }, enableDelete ? (/*#__PURE__*/React.createElement(BizTargetOptionIcon, {
+  }, enableDelete ? /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
     name: "delete",
     icon: "qingchu",
     title: "\u5220\u9664",
     enabled: true,
     onClick: onDelete
-  })) : null, /*#__PURE__*/React.createElement(Dropdown, {
+  }) : null, /*#__PURE__*/React.createElement(Dropdown, {
     dropdownRender: function dropdownRender() {
       return /*#__PURE__*/React.createElement(EventListPanel, {
         value: props.multiple ? checkedEventList : currentValue,
@@ -166,7 +166,6 @@ 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

@@ -1,19 +1,19 @@
-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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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(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; }
+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; }
 import { Skeleton } from 'antd';
 import _ from 'lodash';
 import React, { useContext, useEffect, useState } from 'react';
@@ -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, RetentionTarget } from '../constants/common';
+import { BuiltinIndicators } from '../constants/common';
 import BizSearchInput from '../searchInput';
 import EventListOption from './option';
 var EventListPanel = function EventListPanel(props) {
@@ -66,21 +66,21 @@ var EventListPanel = function EventListPanel(props) {
     currentGroup = _useState8[0],
     setCurrentGroup = _useState8[1];
   var _useState9 = useState([]),
-    _useState0 = _slicedToArray(_useState9, 2),
-    searchEventList = _useState0[0],
-    setSearchEventList = _useState0[1];
-  var _useState1 = useState(props.multiple ? props.value : undefined),
-    _useState10 = _slicedToArray(_useState1, 2),
-    currentValue = _useState10[0],
-    setCurrentValue = _useState10[1];
-  var _useState11 = useState(props.multiple ? props.value || [] : []),
+    _useState10 = _slicedToArray(_useState9, 2),
+    searchEventList = _useState10[0],
+    setSearchEventList = _useState10[1];
+  var _useState11 = useState(props.multiple ? props.value : undefined),
     _useState12 = _slicedToArray(_useState11, 2),
-    checkedEventList = _useState12[0],
-    setCheckedEventList = _useState12[1];
-  var _useState13 = useState(false),
+    currentValue = _useState12[0],
+    setCurrentValue = _useState12[1];
+  var _useState13 = useState(props.multiple ? props.value || [] : []),
     _useState14 = _slicedToArray(_useState13, 2),
-    ready = _useState14[0],
-    setReady = _useState14[1];
+    checkedEventList = _useState14[0],
+    setCheckedEventList = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    ready = _useState16[0],
+    setReady = _useState16[1];
   var scrollableId = 'scrollableDiv' + Math.random();
   var overviewData = {
     id: -100,
@@ -108,7 +108,7 @@ var EventListPanel = function EventListPanel(props) {
             }
           });
         });
-        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));
+        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.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));
+      var result = 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,10 +141,8 @@ 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, _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) {
+          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) {
             resultGroup = BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type);
           } else {
             var _currentGroup = group;
@@ -171,7 +169,7 @@ var EventListPanel = function EventListPanel(props) {
   useEffect(function () {
     var list = [];
     currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.eventList.forEach(function (event) {
-      if (searchValue && !(new RegExp(_.escapeRegExp(searchValue), 'i').test("".concat(event.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(event.alias)) || new RegExp(_.escapeRegExp(searchValue), 'i').test("".concat(event.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(event.name)))) return;
+      if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test("".concat(event.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(event.alias || event.name))) return;
       list.push(event);
     });
     if (showOverview) list.unshift(overviewData);
@@ -290,14 +288,14 @@ export var InfiniteScrollList = function InfiniteScrollList(_ref) {
     multiple = _ref.multiple,
     maxEventCount = _ref.maxEventCount,
     checkedIdList = _ref.checkedIdList;
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    showList = _useState16[0],
-    setShowList = _useState16[1];
   var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    canShowList = _useState18[0],
-    setCanShowList = _useState18[1];
+    showList = _useState18[0],
+    setShowList = _useState18[1];
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    canShowList = _useState20[0],
+    setCanShowList = _useState20[1];
   useEffect(function () {
     var data = searchEventList.filter(function (item) {
       return item.eventHidden !== ShowStatus.hidden;

package/es/eventSelector/option.js

@@ -42,11 +42,11 @@ var EventListOption = function EventListOption(props) {
   }, props.multiple && /*#__PURE__*/React.createElement(Checkbox, {
     checked: checked,
     disabled: disable
-  }), data.attrList && (/*#__PURE__*/React.createElement("span", {
+  }), data.attrList && /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-like")
   }, data.marked ? /*#__PURE__*/React.createElement(IconFont, {
     type: "shoucang"
-  }) : null)), getLabel(label || '')), showTip && (/*#__PURE__*/React.createElement(Tooltip, {
+  }) : null), getLabel(label || '')), showTip && /*#__PURE__*/React.createElement(Tooltip, {
     overlayInnerStyle: {
       width: '402px'
     },
@@ -56,7 +56,7 @@ var EventListOption = function EventListOption(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishi",
     className: "".concat(classPrefix, "-tip")
-  }))), showCount && /*#__PURE__*/React.createElement(Badge, {
+  })), showCount && /*#__PURE__*/React.createElement(Badge, {
     count: count
   }));
 };

package/es/eventSelector/types.d.ts

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

@@ -1,9 +1,9 @@
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+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(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; }
+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; }
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import { formatTarget, getBrackets, targetsFormat } from './util';
 import './index.less';
@@ -115,16 +115,15 @@ 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, {
+  }), targetList.length < 9 ? /*#__PURE__*/React.createElement(Tooltip, {
     title: "\u6DFB\u52A0\u6307\u6807\u8FD0\u7B97"
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tianjia",
     className: "".concat(classPrefix, "-add"),
     onClick: onAdd
-  }))) : null, /*#__PURE__*/React.createElement("div", {
+  })) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-format")
   }, /*#__PURE__*/React.createElement("span", null, "\u8BA1\u7B97\u7ED3\u679C"), /*#__PURE__*/React.createElement(BizSelect, {
     value: resultFormat,

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

@@ -34,7 +34,7 @@
   &-format {
     display: flex;
     align-items: center;
-    margin-left: 10px;
+    margin-left: 40px;
     & > span {
       margin-right: 12px;
     }

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

@@ -5,7 +5,6 @@ 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/formula/util.js

@@ -1,9 +1,9 @@
-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 _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); }
 import _ from 'lodash';
 import { attrOptions, normalOptions } from '../../../targetConditionGroup/data/operates';
 import { util } from '../../../utils';

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

@@ -1,9 +1,9 @@
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+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(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; }
+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; }
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { classPrefix } from '../formula';
 import { getDimension, getFilters, isDisable, judgeHaveFilter, validator } from '../formula/util';
@@ -33,24 +33,24 @@ var FormulaItem = function FormulaItem(props) {
     label = _useState8[0],
     setLabel = _useState8[1];
   var _useState9 = useState(false),
-    _useState0 = _slicedToArray(_useState9, 2),
-    haveFilter = _useState0[0],
-    setHaveFilter = _useState0[1];
-  var _useState1 = useState(''),
-    _useState10 = _slicedToArray(_useState1, 2),
-    dimension = _useState10[0],
-    setDimension = _useState10[1];
-  var _useState11 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    haveFilter = _useState10[0],
+    setHaveFilter = _useState10[1];
+  var _useState11 = useState(''),
     _useState12 = _slicedToArray(_useState11, 2),
-    isValidate = _useState12[0],
-    setIsValidate = _useState12[1];
+    dimension = _useState12[0],
+    setDimension = _useState12[1];
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    isValidate = _useState14[0],
+    setIsValidate = _useState14[1];
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     currentApp = _useContext.currentApp;
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    open = _useState14[0],
-    setOpen = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    open = _useState16[0],
+    setOpen = _useState16[1];
   var panelRef = useRef(null);
   var handleRef = useRef(null);
   useEffect(function () {
@@ -166,8 +166,7 @@ var FormulaItem = function FormulaItem(props) {
         onDelete: props.onDelete,
         onSubmit: function onSubmit() {
           return setOpen(false);
-        },
-        onlyAnd: props.onlyAnd
+        }
       });
     },
     trigger: ['click'],
@@ -180,14 +179,10 @@ var FormulaItem = function FormulaItem(props) {
   }, /*#__PURE__*/React.createElement(SelectHandle, {
     label: label,
     open: open
-  }, !label && /*#__PURE__*/React.createElement("span", {
-    style: {
-      color: '#9797AE'
-    }
-  }, label ? label : '请选择'), /*#__PURE__*/React.createElement("span", null, label), haveFilter ? (/*#__PURE__*/React.createElement(IconFont, {
+  }, /*#__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", {
+  }) : null, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-target-handle-name")
   }, dimension)))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option ").concat((formulaValue === null || formulaValue === void 0 ? void 0 : formulaValue.right) ? 'active' : '').concat(disableRight ? ' disabled' : ''),

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

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

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

@@ -1,15 +1,15 @@
-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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(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; }
+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; }
 import React, { useContext, useEffect, useState } from 'react';
 import './index.less';
 import { Button, InputNumber, Spin } from 'antd';
@@ -44,22 +44,22 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     allList = _useState8[0],
     setAllList = _useState8[1];
   var _useState9 = useState(true),
-    _useState0 = _slicedToArray(_useState9, 2),
-    loading = _useState0[0],
-    setLoading = _useState0[1];
-  var _useState1 = useState(),
-    _useState10 = _slicedToArray(_useState1, 2),
-    currentValue = _useState10[0],
-    setCurrentValue = _useState10[1];
-  var scrollableId = 'scrollableFormula' + Math.random();
-  var _useState11 = useState(''),
+    _useState10 = _slicedToArray(_useState9, 2),
+    loading = _useState10[0],
+    setLoading = _useState10[1];
+  var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    validateData = _useState12[0],
-    setValidateData = _useState12[1];
-  var _useState13 = useState(0),
+    currentValue = _useState12[0],
+    setCurrentValue = _useState12[1];
+  var scrollableId = 'scrollableFormula' + Math.random();
+  var _useState13 = useState(''),
     _useState14 = _slicedToArray(_useState13, 2),
-    timer = _useState14[0],
-    setTimer = _useState14[1];
+    validateData = _useState14[0],
+    setValidateData = _useState14[1];
+  var _useState15 = useState(0),
+    _useState16 = _slicedToArray(_useState15, 2),
+    timer = _useState16[0],
+    setTimer = _useState16[1];
   var _useContext2 = useContext(BizValidatorContext),
     setValidate = _useContext2.setValidate;
   useEffect(function () {
@@ -161,20 +161,19 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         return onClickMenu(item.value);
       }
     }, item.name);
-  })), currentValue && currentValue.eventId && getParentType(currentValue.type) === type ? (/*#__PURE__*/React.createElement(PanelItem, {
+  })), currentValue && currentValue.eventId && getParentType(currentValue.type) === type ? /*#__PURE__*/React.createElement(PanelItem, {
     value: currentValue,
     onBack: function onBack() {
       return setCurrentValue(null);
     },
-    onChange: onChangeFilter,
-    onlyAnd: props.onlyAnd
-  })) : (/*#__PURE__*/React.createElement("div", {
+    onChange: onChangeFilter
+  }) : /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right")
-  }, type === FormulaTypes.EVENT ? (/*#__PURE__*/React.createElement(BizSearchInput, {
+  }, type === FormulaTypes.EVENT ? /*#__PURE__*/React.createElement(BizSearchInput, {
     value: searchValue,
     className: "".concat(classPrefix, "-right-search"),
     onChange: setSearchValue
-  })) : null, type === FormulaTypes.CONSTANT ? (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InputNumber, {
+  }) : null, type === FormulaTypes.CONSTANT ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InputNumber, {
     className: "".concat(classPrefix, "-right-number"),
     value: typeof currentValue === 'string' || typeof currentValue === 'number' ? currentValue : undefined,
     autoFocus: true,
@@ -187,17 +186,17 @@ var FormulaPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onBlur: onBlur
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
-  }, validateData))) : (/*#__PURE__*/React.createElement("div", {
+  }, validateData)) : /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right-list"),
     id: scrollableId
-  }, loading ? (/*#__PURE__*/React.createElement(Spin, null)) : allList[type].length ? (/*#__PURE__*/React.createElement(InfiniteScrollList, {
+  }, loading ? /*#__PURE__*/React.createElement(Spin, null) : allList[type].length ? /*#__PURE__*/React.createElement(InfiniteScrollList, {
     scrollableTarget: scrollableId,
     searchEventList: allList[type],
     searchValue: searchValue,
     groupId: type,
     currentId: currentValue === null || currentValue === void 0 ? void 0 : currentValue.eventId,
     onClick: onClick
-  })) : '暂无数据'))))), /*#__PURE__*/React.createElement("div", {
+  }) : '暂无数据'))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-footer")
   }, /*#__PURE__*/React.createElement(Button, {
     type: "text",