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

package/es/formulaTarget/components/panel/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, 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),
-    _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
-  var _useState11 = useState(),
-    _useState12 = _slicedToArray(_useState11, 2),
-    currentValue = _useState12[0],
-    setCurrentValue = _useState12[1];
+    _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 _useState13 = useState(''),
+  var _useState11 = useState(''),
+    _useState12 = _slicedToArray(_useState11, 2),
+    validateData = _useState12[0],
+    setValidateData = _useState12[1];
+  var _useState13 = useState(0),
     _useState14 = _slicedToArray(_useState13, 2),
-    validateData = _useState14[0],
-    setValidateData = _useState14[1];
-  var _useState15 = useState(0),
-    _useState16 = _slicedToArray(_useState15, 2),
-    timer = _useState16[0],
-    setTimer = _useState16[1];
+    timer = _useState14[0],
+    setTimer = _useState14[1];
   var _useContext2 = useContext(BizValidatorContext),
     setValidate = _useContext2.setValidate;
   useEffect(function () {
@@ -161,19 +161,20 @@ 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
-  }) : /*#__PURE__*/React.createElement("div", {
+    onChange: onChangeFilter,
+    onlyAnd: props.onlyAnd
+  })) : (/*#__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,
@@ -186,17 +187,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",

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

@@ -1,139 +1,139 @@
-@import '../../../assets/styles/inner.less';
-
-.formula-panel {
-  .__select-panel();
-  display: flex;
-  flex-direction: column;
-  width: fit-content;
-  min-width: 328px;
-  max-width: 700px;
-  height: 368px;
-  padding: 0;
-  background: #fff;
-
-  &-content {
-    display: flex;
-    height: 320px;
-  }
-
-  &-left {
-    width: 76px;
-    height: 100%;
-    padding: 8px;
-    border-right: 1px solid #ecedf0;
-    &-item {
-      .__select-option();
-    }
-  }
-
-  &-right {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    padding: 12px 8px;
-
-    &-search {
-      width: 100%;
-      margin-bottom: 12px;
-    }
-
-    &-list {
-      max-height: calc(100% - 44px);
-      // flex: 1;
-
-      overflow: auto;
-    }
-    &-item {
-      .__select-option();
-    }
-
-    &-number.ant-input-number {
-      min-width: 184px;
-      background-color: @background-color-base;
-      border: 1px solid @background-color-base;
-      border-radius: @border-radius-small;
-      &:hover,
-      &.ant-input-number-focused {
-        background-color: #fff;
-        border-color: @primary-color;
-      }
-    }
-  }
-
-  &-detail {
-    width: 100%;
-    height: 100%;
-
-    &-title {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 48px;
-      padding: 0 12px;
-      border-bottom: 1px solid #f2f3f4;
-      &-left {
-        display: flex;
-        align-items: center;
-        &-icon {
-          margin-right: 10px;
-          color: @text-color-secondary;
-          font-size: 16px !important;
-          line-height: 16px;
-          cursor: pointer;
-        }
-      }
-
-      &-right {
-        display: flex;
-        align-items: center;
-        margin-right: 4px;
-        margin-left: 16px;
-        color: #9aa1a9;
-        cursor: pointer;
-        .bsicon {
-          margin-right: 8px;
-          font-size: 16px !important;
-        }
-
-        &:hover {
-          color: @primary-color;
-        }
-      }
-    }
-
-    &-content {
-      display: flex;
-      flex-direction: column;
-      max-height: calc(100% - 48px);
-      padding: 12px;
-      overflow: auto;
-
-      .biz-attr-condition:not(:last-child) {
-        margin-bottom: 12px;
-      }
-    }
-  }
-
-  &-footer {
-    display: flex;
-    align-items: center;
-    justify-content: end;
-    padding: 8px 16px;
-    border-top: 1px solid #ecedf0;
-
-    .ant-btn:not(:last-child) {
-      margin-right: 16px;
-    }
-    .ant-btn-text {
-      &:hover {
-        color: @error-color !important;
-        background: #f2f3f4 !important;
-      }
-    }
-  }
-
-  &-error {
-    color: @error-color;
-  }
-}
+@import '../../../assets/styles/inner.less';
+
+.formula-panel {
+  .__select-panel();
+  display: flex;
+  flex-direction: column;
+  width: fit-content;
+  min-width: 328px;
+  max-width: 700px;
+  height: 368px;
+  padding: 0;
+  background: #fff;
+
+  &-content {
+    display: flex;
+    height: 320px;
+  }
+
+  &-left {
+    width: 76px;
+    height: 100%;
+    padding: 8px;
+    border-right: 1px solid #ecedf0;
+    &-item {
+      .__select-option();
+    }
+  }
+
+  &-right {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+    padding: 12px 8px;
+
+    &-search {
+      width: 100%;
+      margin-bottom: 12px;
+    }
+
+    &-list {
+      max-height: calc(100% - 44px);
+      // flex: 1;
+
+      overflow: auto;
+    }
+    &-item {
+      .__select-option();
+    }
+
+    &-number.ant-input-number {
+      min-width: 184px;
+      background-color: @background-color-base;
+      border: 1px solid @background-color-base;
+      border-radius: @border-radius-small;
+      &:hover,
+      &.ant-input-number-focused {
+        background-color: #fff;
+        border-color: @primary-color;
+      }
+    }
+  }
+
+  &-detail {
+    width: 100%;
+    height: 100%;
+
+    &-title {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 48px;
+      padding: 0 12px;
+      border-bottom: 1px solid #f2f3f4;
+      &-left {
+        display: flex;
+        align-items: center;
+        &-icon {
+          margin-right: 10px;
+          color: @text-color-secondary;
+          font-size: 16px !important;
+          line-height: 16px;
+          cursor: pointer;
+        }
+      }
+
+      &-right {
+        display: flex;
+        align-items: center;
+        margin-right: 4px;
+        margin-left: 16px;
+        color: #9aa1a9;
+        cursor: pointer;
+        .bsicon {
+          margin-right: 8px;
+          font-size: 16px !important;
+        }
+
+        &:hover {
+          color: @primary-color;
+        }
+      }
+    }
+
+    &-content {
+      display: flex;
+      flex-direction: column;
+      max-height: calc(100% - 48px);
+      padding: 12px;
+      overflow: auto;
+
+      .biz-attr-condition:not(:last-child) {
+        margin-bottom: 12px;
+      }
+    }
+  }
+
+  &-footer {
+    display: flex;
+    align-items: center;
+    justify-content: end;
+    padding: 8px 16px;
+    border-top: 1px solid #ecedf0;
+
+    .ant-btn:not(:last-child) {
+      margin-right: 16px;
+    }
+    .ant-btn-text {
+      &:hover {
+        color: @error-color !important;
+        background: #f2f3f4 !important;
+      }
+    }
+  }
+
+  &-error {
+    color: @error-color;
+  }
+}

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

@@ -1,16 +1,22 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+var _excluded = ["onlyAnd"];
+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; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import React, { useEffect, useRef, useState } from 'react';
 import { BizAttrConditionGroup, IconFont } from '../../..';
 import BizTargetDimension from '../../../targetConditionGroup/components/targetDimension';
 import './index.less';
 import { classPrefix } from '.';
 import { filterData } from './data';
-var PanelItem = function PanelItem(props) {
+var PanelItem = function PanelItem(_ref) {
+  var _ref$onlyAnd = _ref.onlyAnd,
+    onlyAnd = _ref$onlyAnd === void 0 ? true : _ref$onlyAnd,
+    props = _objectWithoutProperties(_ref, _excluded);
   var prefix = "".concat(classPrefix, "-detail");
   var _useState = useState(props.value.analysisDimension),
     _useState2 = _slicedToArray(_useState, 2),
@@ -49,27 +55,28 @@ var PanelItem = function PanelItem(props) {
     className: "".concat(prefix, "-title-left-icon"),
     type: "fanhuiicon",
     onClick: onBack
-  }), /*#__PURE__*/React.createElement("span", null, props.value.eventName), props.value.type === 'event' ? /*#__PURE__*/React.createElement(BizTargetDimension, {
+  }), /*#__PURE__*/React.createElement("span", null, props.value.eventName), props.value.type === 'event' ? (/*#__PURE__*/React.createElement(BizTargetDimension, {
     eventId: props.value.eventId,
     value: props.value.analysisDimension,
     onChange: onChangeDimension
-  }) : null), count < 5 ? /*#__PURE__*/React.createElement("div", {
+  })) : null), count < 5 ? (/*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "-title-right"),
     onClick: onAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "shaixuan"
-  }), /*#__PURE__*/React.createElement("span", null, "\u7B5B\u9009")) : null), /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("span", null, "\u7B5B\u9009"))) : null), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "-content")
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filterList,
-    showHandle: false,
+    showHandle: !onlyAnd,
     enableDelete: true,
     enableEventProp: true,
     enableEnvProp: true,
     enableUserProp: true,
     eventIdList: [props.value.eventId],
     onChange: setFilterList,
+    onlyAnd: onlyAnd,
     onConditionsCount: setCount
   })));
 };

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

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

package/es/formulaTarget/components/symbol/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 { Popover } from 'antd';
 import React, { useEffect, useState } from 'react';
 import './index.less';

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

@@ -1,49 +1,49 @@
-.formula-symbol {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 16px;
-  height: 16px;
-  margin: 0 4px;
-  color: #354354;
-
-  &-group {
-    display: flex;
-    align-items: center;
-  }
-  &-item {
-    color: #b9ceff;
-    cursor: pointer;
-    &.active {
-      color: #354354;
-    }
-  }
-
-  &-line {
-    width: 1px;
-    height: 16px;
-    margin: 0 12px;
-    background-color: #e6e7ea;
-  }
-
-  &-pop {
-    &.ant-popover-placement-top,
-    &.ant-popover-placement-topLeft,
-    &.ant-popover-placement-topRight {
-      padding-bottom: 0px;
-    }
-    .ant-popover-inner {
-      border-radius: 10px;
-    }
-    .ant-popover-inner-content {
-      padding: 8px 16px;
-    }
-    .ant-popover-content {
-      margin-bottom: 8px;
-    }
-    // .ant-popover-arrow {
-    //   display: none;
-    //   transform: none;
-    // }
-  }
-}
+.formula-symbol {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  margin: 0 4px;
+  color: #354354;
+
+  &-group {
+    display: flex;
+    align-items: center;
+  }
+  &-item {
+    color: #b9ceff;
+    cursor: pointer;
+    &.active {
+      color: #354354;
+    }
+  }
+
+  &-line {
+    width: 1px;
+    height: 16px;
+    margin: 0 12px;
+    background-color: #e6e7ea;
+  }
+
+  &-pop {
+    &.ant-popover-placement-top,
+    &.ant-popover-placement-topLeft,
+    &.ant-popover-placement-topRight {
+      padding-bottom: 0px;
+    }
+    .ant-popover-inner {
+      border-radius: 10px;
+    }
+    .ant-popover-inner-content {
+      padding: 8px 16px;
+    }
+    .ant-popover-content {
+      margin-bottom: 8px;
+    }
+    // .ant-popover-arrow {
+    //   display: none;
+    //   transform: none;
+    // }
+  }
+}