@zgfe/business-lib 1.0.0-beta.3 → 1.0.0-beta.6

package/es/targetConditionGroup/group.js

@@ -0,0 +1,204 @@
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+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(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(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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["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 from '.';
+import IconFont from '../components/iconFont';
+
+var BizTargetConditionGroup = function BizTargetConditionGroup(props) {
+  var defaultValue = props.defaultValue,
+      value = props.value,
+      _props$max = props.max,
+      max = _props$max === void 0 ? 10 : _props$max,
+      options = props.options,
+      _props$fieldNames = props.fieldNames,
+      fieldNames = _props$fieldNames === void 0 ? {
+    label: 'event_name',
+    value: 'event_id',
+    groupLabel: 'groupName',
+    groupValue: 'groupId',
+    children: 'eventList'
+  } : _props$fieldNames,
+      onChange = props.onChange,
+      onDelete = props.onDelete; // 初始值：所有分组-事件概览
+
+  var initData = {
+    eventId: -2,
+    eventGroupId: -2,
+    analysisIndex: 'number'
+  };
+
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      conditionGroup = _useState2[0],
+      setConditionGroup = _useState2[1];
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isChange = _useState4[0],
+      setIsChange = _useState4[1];
+
+  var _useState5 = useState(true),
+      _useState6 = _slicedToArray(_useState5, 2),
+      showOverview = _useState6[0],
+      setShowOverview = _useState6[1];
+
+  var _useState7 = useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      cantClick = _useState8[0],
+      setCantClick = _useState8[1];
+
+  var getInitData = function getInitData() {
+    return [{
+      key: Math.random().toString(),
+      data: initData
+    }];
+  }; // 添加指标
+
+
+  var addGroup = function addGroup() {
+    var newData = {
+      key: Math.random().toString()
+    };
+    setIsChange(false);
+    setConditionGroup(function (group) {
+      return [].concat(_toConsumableArray(group), [newData]);
+    });
+  };
+
+  useEffect(function () {
+    // 初始化值
+    var data = defaultValue || value || [];
+
+    if (!data.length) {
+      setConditionGroup(function () {
+        return getInitData();
+      });
+      setCantClick(true);
+      setIsChange(true);
+    } else {
+      var result = [];
+
+      if (data) {
+        result = data.map(function (item) {
+          return {
+            key: Math.random().toString(),
+            data: item
+          };
+        });
+      }
+
+      setConditionGroup(result);
+
+      if (data[0].eventId && data[0].eventId < 0) {
+        setShowOverview(true);
+        setCantClick(true);
+      } else {
+        setCantClick(false);
+        setShowOverview(false);
+      }
+    }
+  }, [defaultValue, value]);
+  useEffect(function () {
+    if (!isChange) return;
+    var result = [];
+
+    var _iterator = _createForOfIteratorHelper(conditionGroup),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var group = _step.value;
+
+        if (group.data) {
+          result.push(group.data);
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+
+    onChange && onChange(result); // 当选择非事件概览时，事件概览隐藏
+    // 选择事件概览时，不能再添加指标
+
+    if (result[0].eventId && result[0].eventId < 0) {
+      setShowOverview(true);
+      setCantClick(true);
+    } else {
+      setCantClick(false);
+      setShowOverview(false);
+    }
+  }, [conditionGroup]);
+  return /*#__PURE__*/React.createElement("div", null, conditionGroup.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(BizTargetCondition, {
+      className: "biz-group-item",
+      key: item.key,
+      value: item.data,
+      options: options,
+      fieldNames: fieldNames,
+      showOverview: showOverview,
+      onChange: function onChange(data) {
+        setConditionGroup(function (group) {
+          group[index].data = _objectSpread({}, data);
+          return _toConsumableArray(group);
+        });
+        setIsChange(true); // onChange && onChange(data)
+      },
+      onDelete: function onDelete() {
+        if (conditionGroup.length <= 1) {
+          setConditionGroup(function () {
+            return getInitData();
+          });
+        } else {
+          setConditionGroup(function (group) {
+            group.splice(index, 1);
+            return _toConsumableArray(group);
+          });
+        }
+
+        setIsChange(true);
+      }
+    });
+  }), conditionGroup.length < max && /*#__PURE__*/React.createElement("div", {
+    className: "biz-icon-add ".concat(cantClick ? 'biz-disabled' : ''),
+    onClick: function onClick() {
+      if (!cantClick) {
+        addGroup();
+      }
+    }
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    className: "biz-icon",
+    type: 'icon-tianjia1'
+  }), /*#__PURE__*/React.createElement("span", {
+    className: "biz-icon-text"
+  }, "\u6DFB\u52A0\u6307\u6807")));
+};
+
+export default BizTargetConditionGroup;

package/es/targetConditionGroup/index.d.ts

@@ -24,6 +24,12 @@ interface TargetConditionProps {
      * @default          3
      */
     max?: number;
+    /**
+     * @description 是否展示事件概览
+     * @default   true
+     */
+    showOverview?: boolean;
+    className?: string;
     /**
      * @description       自定义指标下拉框 label、value 的字段
      * @description.zh-CN

package/es/targetConditionGroup/index.js

@@ -1,8 +1,4 @@
-var _excluded = ["option"];
-
-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; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -12,8 +8,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 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; }
@@ -48,58 +42,106 @@ var BizTargetCondition = function BizTargetCondition(props) {
       options = props.options,
       _props$max = props.max,
       max = _props$max === void 0 ? 3 : _props$max,
+      className = props.className,
+      _props$showOverview = props.showOverview,
+      showOverview = _props$showOverview === void 0 ? true : _props$showOverview,
       _props$fieldNames = props.fieldNames,
       fieldNames = _props$fieldNames === void 0 ? {
-    label: 'name',
-    value: 'id',
-    groupLabel: 'name',
-    groupValue: 'id',
-    children: 'children'
+    label: 'event_name',
+    value: 'event_id',
+    groupLabel: 'groupName',
+    groupValue: 'groupId',
+    children: 'eventList'
   } : _props$fieldNames,
       onChange = props.onChange,
       onDelete = props.onDelete;
 
   var _useState = useState({}),
       _useState2 = _slicedToArray(_useState, 2),
-      targetData = _useState2[0],
-      setTargetData = _useState2[1];
+      currentTarget = _useState2[0],
+      setCurrentTarget = _useState2[1];
 
-  var _useState3 = useState({}),
+  var _useState3 = useState(),
       _useState4 = _slicedToArray(_useState3, 2),
-      attrsData = _useState4[0],
-      setAttrsData = _useState4[1];
+      eventGroupId = _useState4[0],
+      setEventGroupId = _useState4[1];
 
-  var _useState5 = useState(dimensionOperate[0]),
+  var _useState5 = useState({}),
       _useState6 = _slicedToArray(_useState5, 2),
-      dimension = _useState6[0],
-      setDimension = _useState6[1];
+      targetData = _useState6[0],
+      setTargetData = _useState6[1];
+
+  var _useState7 = useState({}),
+      _useState8 = _slicedToArray(_useState7, 2),
+      attrsData = _useState8[0],
+      setAttrsData = _useState8[1];
+
+  var _useState9 = useState(dimensionOperate[0]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      dimension = _useState10[0],
+      setDimension = _useState10[1]; // 禁止筛选
+
+
+  var _useState11 = useState(false),
+      _useState12 = _slicedToArray(_useState11, 2),
+      addDisable = _useState12[0],
+      setAddDisable = _useState12[1];
+
+  var _useState13 = useState(false),
+      _useState14 = _slicedToArray(_useState13, 2),
+      noDelete = _useState14[0],
+      setNoDelete = _useState14[1];
+
+  var _useState15 = useState(showOverview),
+      _useState16 = _slicedToArray(_useState15, 2),
+      showAll = _useState16[0],
+      setShowAll = _useState16[1];
 
   useEffect(function () {
     var attrData = Object.keys(defaultValue).length > 0 ? defaultValue : value;
-    var attrs = attrData.attrs,
-        operator = attrData.operator,
-        eventId = attrData.eventId,
-        aliasName = attrData.aliasName,
-        dimension = attrData.dimension;
-    var arr = [];
-
-    if (attrs) {
-      arr = attrs.map(function (item) {
-        var data = _objectSpread({}, item);
 
+    if (JSON.stringify(currentTarget) !== JSON.stringify(attrData)) {
+      setCurrentTarget(function () {
+        return _objectSpread({}, attrData);
+      });
+    }
+  }, [defaultValue, value]);
+  useEffect(function () {
+    setShowAll(function () {
+      return showOverview;
+    });
+  }, [showOverview]);
+  useEffect(function () {
+    var alias = currentTarget.alias,
+        eventId = currentTarget.eventId,
+        eventGroupId = currentTarget.eventGroupId,
+        analysisIndex = currentTarget.analysisIndex,
+        filters = currentTarget.filters;
+    var arr = []; // 属性组添加key
+
+    if (filters && filters.conditions) {
+      arr = filters.conditions.map(function (item) {
         var attrId = Math.random().toString();
-        return {
-          attrId: attrId,
-          data: data
-        };
+        return _objectSpread({
+          key: attrId
+        }, item);
       });
-    } else {
-      arr = [{
-        attrId: Math.random().toString()
-      }];
     }
 
-    if (dimension) {
+    var relation = filters && filters.relation || '';
+    var filterData = {
+      relation: relation,
+      conditions: _toConsumableArray(arr)
+    };
+
+    if (JSON.stringify(filterData) !== JSON.stringify(attrsData)) {
+      setAttrsData(function () {
+        return _objectSpread({}, filterData);
+      });
+    } // 维度赋值
+
+
+    if (analysisIndex && analysisIndex !== dimension.value) {
       var getDefault = function getDefault(data) {
         var _iterator = _createForOfIteratorHelper(data),
             _step;
@@ -108,7 +150,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var _value = _step.value;
 
-            if (_value.value === dimension) {
+            if (_value.value === analysisIndex) {
               return _value;
             }
           }
@@ -118,49 +160,62 @@ var BizTargetCondition = function BizTargetCondition(props) {
           _iterator.f();
         }
 
-        return {
-          name: ''
-        };
+        return data[0];
       };
 
-      var _data = getDefault(dimensionOperate);
-
+      var data = getDefault(dimensionOperate);
       setDimension(function () {
-        return _objectSpread({}, _data);
+        return _objectSpread({}, data);
       });
+    } // 事件下拉赋值
+
+
+    var target = {};
+
+    if (alias) {
+      target.alias = alias;
     }
 
-    var data = {
-      option: eventId,
-      aliasName: aliasName
-    };
-    setTargetData(function () {
-      return _objectSpread({}, data);
-    });
-    setAttrsData(function () {
-      return {
-        operator: operator,
-        attrs: _toConsumableArray(arr)
-      };
-    });
-  }, []);
+    if (eventId) {
+      // 事件概览时id为-1，此时有事件的分组
+      target.option = eventId < 0 ? "".concat(eventId, ",").concat(eventGroupId || -2) : eventId;
+      target.eventId = eventId;
+      target.eventGroupId = eventGroupId;
+      setAddDisable(function () {
+        return eventId < 0;
+      });
+      var flag = !!(eventGroupId && eventGroupId < 0);
+      setNoDelete(function () {
+        return eventId < 0 && flag;
+      });
+    }
+
+    if (JSON.stringify(targetData) !== JSON.stringify(target)) {
+      setTargetData(function () {
+        return target;
+      });
+    }
+  }, [currentTarget]);
 
   var _onChange = function _onChange(target, attr) {
     var dimensionData = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : dimension;
-    var attrArray = attr.attrs ? attr.attrs.map(function (item) {
-      return item.data;
+    var attrArray = attr.conditions ? attr.conditions.map(function (item) {
+      delete item.key;
+      return item;
     }) : [];
-    var operate = attrArray.length > 1 ? attr.operator : '';
-
-    var option = target.option,
-        res = _objectWithoutProperties(target, _excluded);
-
-    onChange && onChange(_objectSpread(_objectSpread({}, res), {}, {
-      dimension: dimensionData.value || '',
-      eventId: option,
-      operator: operate,
-      attrs: attrArray ? _toConsumableArray(attrArray) : []
-    }));
+    var option = target.option;
+    var eArr = String(option).split(',');
+    onChange && onChange({
+      type: 'event',
+      eventId: eArr[0],
+      eventGroupId: eArr[1] || '',
+      alias: target.alias,
+      analysisIndex: dimensionData.value || '',
+      filters: {
+        relation: attr.relation,
+        conditions: _toConsumableArray(attrArray)
+      }
+    });
   };
 
   var _onDimensionClick = function _onDimensionClick(data) {
@@ -171,17 +226,27 @@ var BizTargetCondition = function BizTargetCondition(props) {
     _onChange(targetData, attrsData, data);
   };
 
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
+    className: className
+  }, /*#__PURE__*/React.createElement("div", {
     className: "biz-target-condition-container"
   }, /*#__PURE__*/React.createElement(BizTargetSelector, {
     defaultValue: targetData,
+    addDisable: addDisable,
+    delDisable: noDelete,
+    showOverview: showAll,
     onChange: function onChange(data) {
       setTargetData(function () {
         return _objectSpread({}, data);
       });
 
       if (data.option != targetData.option) {
-        // 切换了事件
+        // 选择了事件概览，不能筛选
+        var eid = String(data.option).split(',')[0];
+        setAddDisable(function () {
+          return parseFloat(eid) < 0;
+        }); // 切换了事件,属性清空
+
         setAttrsData(function () {
           return {};
         });
@@ -193,18 +258,18 @@ var BizTargetCondition = function BizTargetCondition(props) {
       }
     },
     onAdd: function onAdd() {
-      if (attrsData.attrs && attrsData.attrs.length >= max) {
+      if (attrsData.conditions && attrsData.conditions.length >= max) {
         return;
       } else {
         setAttrsData(function (data) {
-          var arr = [{
-            attrId: Math.random().toString()
-          }];
+          var item = {
+            key: Math.random().toString()
+          };
 
-          if (!data.attrs) {
-            data.attrs = arr;
+          if (!data.conditions) {
+            data.conditions = [item];
           } else {
-            data.attrs = data.attrs.concat(arr);
+            data.conditions.push(item);
           }
 
           return _objectSpread({}, data);
@@ -252,7 +317,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
   }))))), /*#__PURE__*/React.createElement(BizConditionGroup, {
     defaultValue: attrsData,
     options: options === null || options === void 0 ? void 0 : options.attrOption,
-    eventIds: targetData.option,
+    eventId: targetData.option,
     onChange: function onChange(data) {
       setAttrsData(function () {
         return _objectSpread({}, data);

package/es/targetConditionGroup/index.less

@@ -62,3 +62,15 @@
     }
   }
 }
+
+.biz-group-item {
+  &:not(:last-child) {
+    margin-bottom: 24px;
+  }
+  &:last-child {
+    margin-bottom: 12px;
+  }
+  &:nth-last-child(1) {
+    margin-bottom: 12px;
+  }
+}

package/es/targetConditionGroup/type.d.ts

@@ -28,16 +28,61 @@ export interface OptionType {
     eventOption?: Array<Option>;
     attrOption?: Array<object>;
 }
+export interface AttrItem {
+    key?: string;
+    operation?: string;
+    /**
+     * 属性类型:事件属性、用户属性、环境属性
+     */
+    type?: string;
+    /**
+     * 属性名称
+     */
+    attrName?: string;
+    /**
+     * 属性id
+     */
+    attrId?: string | number;
+    values?: Array<number | string>;
+    /**
+     * 1 string 2 number 3 date
+     */
+    attrType?: number;
+    dimension_sub?: string;
+    dimensionId?: string;
+}
+export interface AttrGroup {
+    relation?: string;
+    conditions?: Array<AttrItem>;
+}
 export interface TargetCondition {
-    aliasName?: string;
+    type?: string;
+    alias?: string;
+    filters?: AttrGroup;
+    analysisIndex?: string | number;
     eventId?: string | number;
+    eventGroupId?: string | number;
+    key?: string;
+    aliasName?: string;
     operator?: string;
     attrs?: Array<AttrType>;
     dimension?: string | number;
 }
+export interface TargetConditionGroup {
+    /**
+     * 指标组
+     */
+    target?: Array<TargetCondition>;
+    /**
+     * -1 整体事件概览、其他:指定事件分组概览
+     */
+    eventGroupId?: number;
+}
 export interface TargetType {
-    aliasName?: string;
+    alias?: string;
     option?: string | number;
+    eventId?: string | number;
+    eventGroupId?: string | number;
 }
 export interface CurrentType {
     operator?: string;

package/es/targetSelector/demo/form.js

@@ -97,7 +97,7 @@ var EventDemo = function EventDemo() {
     onFinishFailed: onFinishFailed,
     initialValues: {
       target: {
-        aliasName: '别名',
+        alias: '别名',
         option: 'xiasha2'
       }
     }

package/es/targetSelector/demo/index.js

@@ -84,7 +84,7 @@ var EventDemo = function EventDemo() {
 
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizTargetSelector, {
     defaultValue: {
-      aliasName: '别名',
+      alias: '别名',
       option: 'xiasha2'
     },
     onChange: handleChange,

package/es/targetSelector/index.d.ts

@@ -1,8 +1,9 @@
 import React, { ReactNode } from 'react';
 import './index.less';
 interface ValueType {
-    aliasName?: string;
+    alias?: string;
     option?: object | string | number;
+    showAll?: boolean;
 }
 interface EventBoxProps {
     /**
@@ -20,6 +21,21 @@ interface EventBoxProps {
      * @default         -
      */
     children?: ReactNode;
+    /**
+     * @describe 是否禁止筛选
+     * @default false
+     */
+    addDisable?: boolean;
+    /**
+     * @describe 是否禁止删除
+     * @default false
+     */
+    delDisable?: boolean;
+    /**
+     * @description 是否展示事件概览
+     * @default   true
+     */
+    showOverview?: boolean;
     /**
      * @description     添加筛选的回调
      * @default         -