@zgfe/business-lib 1.1.34-visual.10 → 1.1.34-visual.11

package/es/addToPanel/index.js

@@ -165,7 +165,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     });
   }
   return /*#__PURE__*/React.createElement(BizDialog, {
-    visible: true,
+    open: true,
     title: props.type === 'edit' ? '修改当前看板指标' : '向看板添加指标',
     width: 503,
     maskClosable: false,
@@ -215,6 +215,12 @@ var BizAddToPanel = function BizAddToPanel(props) {
     hidden: props.type === 'edit',
     rules: [{
       validator: function validator(_, value) {
+        if (props.type === 'edit') {
+          notification.error({
+            message: '指标名称不能为空'
+          });
+          return Promise.reject();
+        }
         if (!value || !/\S+/.test(value)) return Promise.reject('请输入指标名称!');
         if (!/^[\S\s]{1,20}$/.test(value)) return Promise.reject('指标名称最多为20个字符!');
         return Promise.resolve();

package/es/addToScene/index.js

@@ -112,7 +112,7 @@ var BizAddToScene = function BizAddToScene(props) {
   }, []);
   return /*#__PURE__*/React.createElement(BizDialog, {
     title: "\u6DFB\u52A0\u5230\u5E38\u7528\u573A\u666F",
-    visible: true,
+    open: true,
     maskClosable: false,
     onOk: onSave,
     onCancel: onCancel,

package/es/assets/theme.js

@@ -18,7 +18,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
     'box-shadow-base': '0px 4px 10px rgba(0, 0, 0, 0.1)',
     'btn-text-hover-bg': '#cacdd4',
     'warning-color': '#FD9F41',
-    'border-color-split': '#E8EFFF',
-    'icon-color': '#5F6085'
+    'border-color-split': '#E8EFFF'
   };
 });

package/es/attrConditions/components/valuesList.js

@@ -119,6 +119,7 @@ var ValuesList = function ValuesList(props) {
       labelField: "label",
       size: "middle",
       theme: props.theme,
+      overlayWidth: 60,
       className: "".concat(classPrefix, "-input-select"),
       onChange: onChangeUnit,
       options: propSubtype

package/es/attributeSelector/index.js

@@ -87,19 +87,21 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle")
   }, /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(AttrListPanel, _objectSpread(_objectSpread({
-      id: id
-    }, props), {}, {
-      value: currentAttr,
-      onChange: onChange
-    })),
+    dropdownRender: function dropdownRender() {
+      return /*#__PURE__*/React.createElement(AttrListPanel, _objectSpread(_objectSpread({
+        id: id
+      }, props), {}, {
+        value: currentAttr,
+        onChange: onChange
+      }));
+    },
     trigger: ['click'],
     overlayStyle: {
       minWidth: 284,
       width: width
     },
-    visible: visible,
-    onVisibleChange: onVisibleChange,
+    open: visible,
+    onOpenChange: onVisibleChange,
     destroyPopupOnHide: props.destroyPopupOnHide
   }, /*#__PURE__*/React.createElement("div", {
     style: {

package/es/attributeSelector/types.d.ts

@@ -24,6 +24,8 @@ export interface AnalysisEvent {
     isOverview?: boolean;
     eventHidden?: ShowStatus;
     marked?: boolean;
+    isBuiltIn?: boolean;
+    type?: string;
 }
 export interface EventGroup {
     id: number;

package/es/chart/util/formatOption.js

@@ -21,7 +21,7 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params) {
     } else {
       lineLabel = util.toThousands(lineLabel);
     }
-    var name = (params.length > 1 ? item.seriesName : item.data && item.data.label ? item.data.label : item.name).trim();
+    var name = item.seriesName.trim();
     htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n              <span class=\"biz-tooltip-marker\" style=\"background:".concat(item.color, "\"></span>\n              <div class=\"biz-tooltip-name\">").concat(name, "</div>\n          </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
   });
   return htmlArray.join('');

package/es/constants/common.d.ts

@@ -0,0 +1,11 @@
+export declare const BuiltinIndicators: {
+    id: number;
+    name: string;
+    eventList: {
+        name: string;
+        id: number;
+        type: string;
+        isBuiltIn: boolean;
+        attrList: never[];
+    }[];
+};

package/es/constants/common.js

@@ -0,0 +1,35 @@
+export var BuiltinIndicators = {
+  id: -2,
+  name: '整体',
+  eventList: [{
+    name: '新增用户',
+    id: -201,
+    type: 'add',
+    isBuiltIn: true,
+    attrList: []
+  }, {
+    name: '活跃用户',
+    id: -202,
+    type: 'active',
+    isBuiltIn: true,
+    attrList: []
+  }, {
+    name: '访问次数',
+    id: -203,
+    type: 'times',
+    isBuiltIn: true,
+    attrList: []
+  }, {
+    name: '平均使用时长',
+    id: -204,
+    type: 'duration_avg',
+    isBuiltIn: true,
+    attrList: []
+  }, {
+    name: '使用时长分布',
+    id: -205,
+    type: 'duration',
+    isBuiltIn: true,
+    attrList: []
+  }]
+};

package/es/cycleTime/month.js

@@ -69,21 +69,23 @@ var MonthDay = function MonthDay(props) {
   }
   return /*#__PURE__*/React.createElement(Dropdown, {
     disabled: disable,
-    overlay: /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-overlay")
-    }, dayList.map(function (item) {
-      return /*#__PURE__*/React.createElement("span", {
-        key: item.value,
-        className: "".concat(classPrefix, "-day ").concat(chosenDayList.map(function (v) {
-          return v.value;
-        }).indexOf(item.value) > -1 ? 'active' : '', " ").concat(item.value === 32 ? 'lastday' : ''),
-        onClick: function onClick() {
-          onClickMonthDay(item.value);
-        }
-      }, item.label);
-    })),
-    visible: visible,
-    onVisibleChange: setVisible,
+    dropdownRender: function dropdownRender() {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-overlay")
+      }, dayList.map(function (item) {
+        return /*#__PURE__*/React.createElement("span", {
+          key: item.value,
+          className: "".concat(classPrefix, "-day ").concat(chosenDayList.map(function (v) {
+            return v.value;
+          }).indexOf(item.value) > -1 ? 'active' : '', " ").concat(item.value === 32 ? 'lastday' : ''),
+          onClick: function onClick() {
+            onClickMonthDay(item.value);
+          }
+        }, item.label);
+      }));
+    },
+    open: visible,
+    onOpenChange: setVisible,
     trigger: ['click']
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-wrapper")

package/es/eventSelector/demo/index.js

@@ -39,6 +39,7 @@ var EventDemo = function EventDemo() {
       eventGroupList: store.eventGroupList
     }
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
+    showBuiltInTarget: true,
     defaultValue: value,
     alias: "\u522B\u540D",
     onChange: onChange

package/es/eventSelector/index.js

@@ -10,6 +10,7 @@ import SelectHandle from '../select/handle';
 import BizGlobalDataContext from '../context';
 import EventListPanel from './listPanel';
 import './styles/index.less';
+import { BuiltinIndicators } from '../constants/common';
 export var classPrefix = 'biz-event-select';
 var BizEventSelector = function BizEventSelector(props) {
   var alias = props.alias,
@@ -42,13 +43,14 @@ var BizEventSelector = function BizEventSelector(props) {
   var getValue = function getValue(param) {
     var _param$group, _param$event;
     var res = {};
+    var allEvents = props.showBuiltInTarget ? eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.concat(BuiltinIndicators) : eventGroupList;
     if (!((_param$group = param.group) === null || _param$group === void 0 ? void 0 : _param$group.id)) {
       res.group = {
         id: 0,
         name: '所有分组',
         eventList: function () {
           var list = [];
-          eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
+          allEvents === null || allEvents === void 0 ? void 0 : allEvents.forEach(function (group) {
             list = list.concat(group.eventList);
           });
           return list;
@@ -62,7 +64,7 @@ var BizEventSelector = function BizEventSelector(props) {
         attrList: []
       };
     }
-    eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
+    allEvents === null || allEvents === void 0 ? void 0 : allEvents.forEach(function (group) {
       var _param$group2;
       if (group.id === ((_param$group2 = param.group) === null || _param$group2 === void 0 ? void 0 : _param$group2.id)) res.group = group;
       group.eventList.forEach(function (event) {
@@ -100,19 +102,22 @@ var BizEventSelector = function BizEventSelector(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: [classPrefix, border ? 'border' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(EventListPanel, {
-      value: currentValue,
-      onChange: onChange,
-      showOverview: showAllEvent,
-      defaultSelectAble: defaultSelectAble
-    }),
+    dropdownRender: function dropdownRender() {
+      return /*#__PURE__*/React.createElement(EventListPanel, {
+        value: currentValue,
+        onChange: onChange,
+        showOverview: showAllEvent,
+        showBuiltInTarget: props.showBuiltInTarget,
+        defaultSelectAble: defaultSelectAble
+      });
+    },
     trigger: ['click'],
     overlayStyle: {
       minWidth: 0,
       paddingLeft: 8
     },
-    visible: visible,
-    onVisibleChange: onVisibleChange,
+    open: visible,
+    onOpenChange: onVisibleChange,
     getPopupContainer: props.popupContainer ? function () {
       return document.getElementById(selectId);
     } : undefined,

package/es/eventSelector/listPanel.js

@@ -15,6 +15,7 @@ import InfiniteScroll from 'react-infinite-scroll-component';
 import { classPrefix } from '.';
 import { BizGlobalDataContext } from '..';
 import { ShowStatus } from '../attributeSelector/types';
+import { BuiltinIndicators } from '../constants/common';
 import BizSearchInput from '../searchInput';
 import EventListOption from './option';
 var EventListPanel = function EventListPanel(props) {
@@ -68,15 +69,33 @@ var EventListPanel = function EventListPanel(props) {
             }
           });
         });
-        list = [].concat(markList, _toConsumableArray(list));
+        list = props.showBuiltInTarget ? [].concat(_toConsumableArray(BuiltinIndicators.eventList), markList, _toConsumableArray(list)) : [].concat(markList, _toConsumableArray(list));
         return list;
       }(),
       name: '所有分组'
     };
     setGroupList(function (list) {
-      return [group].concat(_toConsumableArray(list));
+      return props.showBuiltInTarget ? [group, BuiltinIndicators].concat(_toConsumableArray(list)) : [group].concat(_toConsumableArray(list));
+    });
+    setCurrentGroup(function () {
+      var _props$value;
+      if (props.defaultSelectAble && ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.group)) {
+        if (props.showBuiltInTarget && props.value.group.id === -2) {
+          return BuiltinIndicators;
+        } else {
+          var _currentGroup = group;
+          eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (eGroup) {
+            var _props$value2, _props$value2$group;
+            if (eGroup.id === ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : (_props$value2$group = _props$value2.group) === null || _props$value2$group === void 0 ? void 0 : _props$value2$group.id)) {
+              _currentGroup = eGroup;
+              return;
+            }
+          });
+          return _currentGroup;
+        }
+      }
+      return group;
     });
-    setCurrentGroup(group);
   }, []);
   useEffect(function () {
     setCurrentValue(props.value);

package/es/eventSelector/types.d.ts

@@ -23,6 +23,7 @@ export declare namespace EventSelectTypes {
         showAllEvent?: boolean;
         defaultSelectAble?: boolean;
         popupContainer?: boolean;
+        showBuiltInTarget?: boolean;
         onVisibleChange?: (visible: boolean) => void;
         border?: boolean;
         theme?: string;
@@ -33,6 +34,7 @@ export declare namespace EventSelectTypes {
     interface DropdownProps {
         value?: Value;
         showOverview?: boolean;
+        showBuiltInTarget?: boolean;
         defaultSelectAble?: boolean;
         onChange?: (value: Value, isOverview?: boolean) => void;
     }

package/es/select/handle.js

@@ -67,7 +67,11 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [focus]);
   var searchInputWidth = useMemo(function () {
-    return textRef.current && searchValue ? textRef.current.offsetWidth : 3;
+    if (textRef.current && searchValue) {
+      textRef.current.innerText = searchValue;
+      return textRef.current.offsetWidth;
+    }
+    return 3;
   }, [searchValue]);
   var onDelete = function onDelete(data) {
     if (props.onDelete) props.onDelete(data);
@@ -122,7 +126,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }), /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-temp"),
       ref: textRef
-    }, searchValue));
+    }));
   }
   return /*#__PURE__*/React.createElement("div", {
     ref: handleRef,

package/es/select/index.js

@@ -146,15 +146,17 @@ var BizSelect = function BizSelect(props) {
     setVisible(true);
   };
   return /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(SelectOverlay, _objectSpread(_objectSpread({}, res), {}, {
-      value: current,
-      labelField: labelField,
-      keyField: keyField,
-      searchValue: searchValue,
-      onChange: onChange,
-      ref: overlayRef,
-      searchPlaceholder: props.searchPlaceholder
-    })),
+    dropdownRender: function dropdownRender() {
+      return /*#__PURE__*/React.createElement(SelectOverlay, _objectSpread(_objectSpread({}, res), {}, {
+        value: current,
+        labelField: labelField,
+        keyField: keyField,
+        searchValue: searchValue,
+        onChange: onChange,
+        ref: overlayRef,
+        searchPlaceholder: props.searchPlaceholder
+      }));
+    },
     disabled: props.disable,
     destroyPopupOnHide: props.destroyPopupOnHide,
     overlayStyle: {
@@ -165,8 +167,8 @@ var BizSelect = function BizSelect(props) {
     getPopupContainer: props.popupContainer ? function () {
       return document.getElementById(selectId);
     } : undefined,
-    visible: visible,
-    onVisibleChange: onVisibleChange
+    open: visible,
+    onOpenChange: onVisibleChange
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle ").concat(props.className ? props.className : ''),
     ref: selectRef,

package/es/targetConditionGroup/components/targetDimension.js

@@ -97,33 +97,35 @@ var BizTargetDimension = function BizTargetDimension(props) {
     overlayClassName: "".concat(classPrefix, "-dropmenu"),
     placement: "bottom",
     trigger: ['click'],
-    overlay: /*#__PURE__*/React.createElement(Menu, null, options.map(function (item) {
-      if (item.children) {
-        return /*#__PURE__*/React.createElement(SubMenu, {
-          popupClassName: "".concat(classPrefix, "-submenu"),
-          key: item.label,
-          title: item.label,
-          className: "".concat((dimensionParent === null || dimensionParent === void 0 ? void 0 : dimensionParent.label) === item.label ? 'active' : '')
-        }, item.children.map(function (sub) {
-          return /*#__PURE__*/React.createElement(Menu.Item, {
-            className: (dimensionParent === null || dimensionParent === void 0 ? void 0 : dimensionParent.value) === item.value && (dimension === null || dimension === void 0 ? void 0 : dimension.value) === sub.value ? 'active' : '',
-            title: sub.label,
-            key: "".concat(item.value, "-").concat(sub.value),
-            onClick: function onClick() {
-              return onChange(sub, item);
-            }
-          }, sub.label);
-        }));
-      }
-      return /*#__PURE__*/React.createElement(Menu.Item, {
-        className: (dimension === null || dimension === void 0 ? void 0 : dimension.value) === item.value ? 'active' : '',
-        key: item.value,
-        onClick: function onClick() {
-          return onChange(item);
-        },
-        title: item.label
-      }, item.label);
-    }))
+    dropdownRender: function dropdownRender() {
+      return /*#__PURE__*/React.createElement(Menu, null, options.map(function (item) {
+        if (item.children) {
+          return /*#__PURE__*/React.createElement(SubMenu, {
+            popupClassName: "".concat(classPrefix, "-submenu"),
+            key: item.label,
+            title: item.label,
+            className: "".concat((dimensionParent === null || dimensionParent === void 0 ? void 0 : dimensionParent.label) === item.label ? 'active' : '')
+          }, item.children.map(function (sub) {
+            return /*#__PURE__*/React.createElement(Menu.Item, {
+              className: (dimensionParent === null || dimensionParent === void 0 ? void 0 : dimensionParent.value) === item.value && (dimension === null || dimension === void 0 ? void 0 : dimension.value) === sub.value ? 'active' : '',
+              title: sub.label,
+              key: "".concat(item.value, "-").concat(sub.value),
+              onClick: function onClick() {
+                return onChange(sub, item);
+              }
+            }, sub.label);
+          }));
+        }
+        return /*#__PURE__*/React.createElement(Menu.Item, {
+          className: (dimension === null || dimension === void 0 ? void 0 : dimension.value) === item.value ? 'active' : '',
+          key: item.value,
+          onClick: function onClick() {
+            return onChange(item);
+          },
+          title: item.label
+        }, item.label);
+      }));
+    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-dimension")
   }, /*#__PURE__*/React.createElement(SelectHandle, {

package/es/targetConditionGroup/data/operates.js

@@ -43,9 +43,6 @@ export var attrOptions = [{
 }, {
   label: '均值',
   value: 'avg'
-}, {
-  label: '分布',
-  value: 'duration_times'
 }, {
   label: '中位数',
   value: 'median'

package/es/targetConditionGroup/demo/index.js

@@ -51,6 +51,7 @@ export default (function () {
     max: 3
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
-    border: false
+    border: false,
+    showBuiltInTarget: true
   }))), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(target)));
 });

package/es/targetConditionGroup/index.js

@@ -1,3 +1,9 @@
+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(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); }
@@ -12,9 +18,10 @@ import BizConditionGroup from '../attrConditions/group';
 import { Skeleton } from 'antd';
 import _ from 'lodash';
 import BizGlobalDataContext from '../context';
+import { BuiltinIndicators } from '../constants/common';
 export var classPrefix = 'biz-target';
 var BizTargetCondition = function BizTargetCondition(props) {
-  var _targetData$value2, _targetData$value2$ev, _targetData$value3, _targetData$value3$ev, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev;
+  var _targetData$value2, _targetData$value2$gr, _targetData$value3, _targetData$value3$ev, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev, _targetData$value6, _targetData$value6$ev, _targetData$value7, _targetData$value7$ev;
   var max = props.max;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -69,14 +76,14 @@ var BizTargetCondition = function BizTargetCondition(props) {
   }, []);
   useEffect(function () {
     if (targetData === null || targetData === void 0 ? void 0 : targetData.value) {
-      var _targetData$value$eve;
+      var _targetData$value$eve, _targetData$value$eve2, _targetData$value$eve3;
       var canAdd = true,
         canDelete = true;
-      if (((_targetData$value$eve = targetData.value.event) === null || _targetData$value$eve === void 0 ? void 0 : _targetData$value$eve.id) === -100) {
-        var _targetData$value$gro;
+      if (((_targetData$value$eve = targetData.value.event) === null || _targetData$value$eve === void 0 ? void 0 : _targetData$value$eve.id) === -100 || ((_targetData$value$eve2 = targetData.value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id) === -204 || ((_targetData$value$eve3 = targetData.value.event) === null || _targetData$value$eve3 === void 0 ? void 0 : _targetData$value$eve3.id) === -205) {
+        var _targetData$value$gro, _targetData$value$eve4;
         canAdd = false;
         setFilters(undefined);
-        if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id)) {
+        if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id) && ((_targetData$value$eve4 = targetData.value.event) === null || _targetData$value$eve4 === void 0 ? void 0 : _targetData$value$eve4.id) === -100) {
           canDelete = false;
         }
       } else {
@@ -109,37 +116,55 @@ var BizTargetCondition = function BizTargetCondition(props) {
           eventList: []
         };
       }
-      if (data.eventId === -100) {
-        target.value.event = {
-          id: -100,
-          name: '事件概览',
-          attrList: []
-        };
+      var hasEvent = false;
+      if (data.isBuiltIn || data.eventId < 0) {
+        if (data.eventGroupId) {
+          target.value.group = {
+            id: data.eventGroupId,
+            name: data.eventGroupId === -2 ? '整体' : '所有分组',
+            eventList: []
+          };
+        }
+        BuiltinIndicators.eventList.forEach(function (item) {
+          if (item.id === data.eventId) {
+            target.value.event = _objectSpread({}, item);
+            hasEvent = true;
+          }
+        });
       }
-      for (var i = 0; i < eventGroupList.length; i++) {
-        var group = eventGroupList[i];
-        if (data.eventId !== -100) {
-          for (var j = 0; j < group.eventList.length; j++) {
-            var event = group.eventList[j];
-            if (event.id === data.eventId) {
-              target.value.event = event;
-              break;
+      if (!hasEvent) {
+        if (data.eventId === -100) {
+          target.value.event = {
+            id: -100,
+            name: '事件概览',
+            attrList: []
+          };
+        }
+        for (var i = 0; i < eventGroupList.length; i++) {
+          var group = eventGroupList[i];
+          if (data.eventId !== -100) {
+            for (var j = 0; j < group.eventList.length; j++) {
+              var event = group.eventList[j];
+              if (event.id === data.eventId) {
+                target.value.event = event;
+                break;
+              }
             }
           }
-        }
-        if (data.eventGroupId && data.eventGroupId === group.id) {
-          target.value.group = group;
-          break;
+          if (data.eventGroupId && data.eventGroupId === group.id) {
+            target.value.group = group;
+            break;
+          }
         }
       }
     }
     return target;
   };
   var onChangeTarget = function onChangeTarget(target) {
-    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve2;
+    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve5;
     setTargetData(target);
     var filterData = _.cloneDeep(filters);
-    if (((_target$value = target.value) === null || _target$value === void 0 ? void 0 : (_target$value$event = _target$value.event) === null || _target$value$event === void 0 ? void 0 : _target$value$event.id) !== (targetData === null || targetData === void 0 ? void 0 : (_targetData$value = targetData.value) === null || _targetData$value === void 0 ? void 0 : (_targetData$value$eve2 = _targetData$value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id)) {
+    if (((_target$value = target.value) === null || _target$value === void 0 ? void 0 : (_target$value$event = _target$value.event) === null || _target$value$event === void 0 ? void 0 : _target$value$event.id) !== (targetData === null || targetData === void 0 ? void 0 : (_targetData$value = targetData.value) === null || _targetData$value === void 0 ? void 0 : (_targetData$value$eve5 = _targetData$value.event) === null || _targetData$value$eve5 === void 0 ? void 0 : _targetData$value$eve5.id)) {
       filterData = undefined;
       setFilters(undefined);
       setIsAdd(false);
@@ -163,19 +188,25 @@ var BizTargetCondition = function BizTargetCondition(props) {
     setFilters(data);
     onChange(dimension, targetData, data);
   };
-  var onChange = function onChange(analysisDimension, target, filterDatas) {
+  var onChange = function onChange(analysisDimension, target, filterData) {
     if (props.onChange) {
-      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group;
+      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group2;
       if (!target || !target.value || !((_target$value$event2 = target.value.event) === null || _target$value$event2 === void 0 ? void 0 : _target$value$event2.id)) return;
+      var type = target.value.event.type;
+      if (!type) {
+        var _target$value$group;
+        type = ((_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id) === -2 ? 'whole' : 'event';
+      }
       var data = {
-        type: 'event',
+        type: type,
         alias: (target === null || target === void 0 ? void 0 : target.alias) || target.value.event.alias || ((_target$value$event3 = target.value.event) === null || _target$value$event3 === void 0 ? void 0 : _target$value$event3.name) || '',
         eventId: (_target$value$event4 = target.value.event) === null || _target$value$event4 === void 0 ? void 0 : _target$value$event4.id,
         eventName: ((_target$value$event5 = target.value.event) === null || _target$value$event5 === void 0 ? void 0 : _target$value$event5.alias) || ((_target$value$event6 = target.value.event) === null || _target$value$event6 === void 0 ? void 0 : _target$value$event6.name),
-        eventGroupId: (_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id,
+        eventGroupId: (_target$value$group2 = target.value.group) === null || _target$value$group2 === void 0 ? void 0 : _target$value$group2.id,
         analysisDimension: analysisDimension,
-        filters: filterDatas,
-        marked: target.value.event.marked
+        filters: filterData,
+        marked: target.value.event.marked,
+        isBuiltIn: target.value.event.isBuiltIn
       };
       props.onChange(data);
     }
@@ -206,8 +237,8 @@ var BizTargetCondition = function BizTargetCondition(props) {
     onAdd: onAdd,
     onDelete: onDelete,
     onChange: onChangeTarget
-  }, props.children), /*#__PURE__*/React.createElement(BizTargetDimension, {
-    eventId: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value2 = targetData.value) === null || _targetData$value2 === void 0 ? void 0 : (_targetData$value2$ev = _targetData$value2.event) === null || _targetData$value2$ev === void 0 ? void 0 : _targetData$value2$ev.id) ? targetData === null || targetData === void 0 ? void 0 : (_targetData$value3 = targetData.value) === null || _targetData$value3 === void 0 ? void 0 : (_targetData$value3$ev = _targetData$value3.event) === null || _targetData$value3$ev === void 0 ? void 0 : _targetData$value3$ev.id : undefined,
+  }, props.children), (targetData === null || targetData === void 0 ? void 0 : (_targetData$value2 = targetData.value) === null || _targetData$value2 === void 0 ? void 0 : (_targetData$value2$gr = _targetData$value2.group) === null || _targetData$value2$gr === void 0 ? void 0 : _targetData$value2$gr.id) === -2 || (targetData === null || targetData === void 0 ? void 0 : (_targetData$value3 = targetData.value) === null || _targetData$value3 === void 0 ? void 0 : (_targetData$value3$ev = _targetData$value3.event) === null || _targetData$value3$ev === void 0 ? void 0 : _targetData$value3$ev.isBuiltIn) ? null : /*#__PURE__*/React.createElement(BizTargetDimension, {
+    eventId: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value4 = targetData.value) === null || _targetData$value4 === void 0 ? void 0 : (_targetData$value4$ev = _targetData$value4.event) === null || _targetData$value4$ev === void 0 ? void 0 : _targetData$value4$ev.id) ? targetData === null || targetData === void 0 ? void 0 : (_targetData$value5 = targetData.value) === null || _targetData$value5 === void 0 ? void 0 : (_targetData$value5$ev = _targetData$value5.event) === null || _targetData$value5$ev === void 0 ? void 0 : _targetData$value5$ev.id : undefined,
     value: dimension,
     onChange: onChangeDimension
   })), (filters || isAdd) && /*#__PURE__*/React.createElement(BizConditionGroup, {
@@ -216,7 +247,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
     onlyAnd: props.onlyAnd,
     enableEventProp: true,
     enableDelete: true,
-    eventIdList: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value4 = targetData.value) === null || _targetData$value4 === void 0 ? void 0 : (_targetData$value4$ev = _targetData$value4.event) === null || _targetData$value4$ev === void 0 ? void 0 : _targetData$value4$ev.id) ? [targetData === null || targetData === void 0 ? void 0 : (_targetData$value5 = targetData.value) === null || _targetData$value5 === void 0 ? void 0 : (_targetData$value5$ev = _targetData$value5.event) === null || _targetData$value5$ev === void 0 ? void 0 : _targetData$value5$ev.id] : undefined,
+    eventIdList: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value6 = targetData.value) === null || _targetData$value6 === void 0 ? void 0 : (_targetData$value6$ev = _targetData$value6.event) === null || _targetData$value6$ev === void 0 ? void 0 : _targetData$value6$ev.id) ? [targetData === null || targetData === void 0 ? void 0 : (_targetData$value7 = targetData.value) === null || _targetData$value7 === void 0 ? void 0 : (_targetData$value7$ev = _targetData$value7.event) === null || _targetData$value7$ev === void 0 ? void 0 : _targetData$value7$ev.id] : undefined,
     onChange: onChangeFilters,
     onConditionsCount: setCount
   })));

package/es/targetConditionGroup/types.d.ts

@@ -20,6 +20,7 @@ export declare namespace TargetConditionTypes {
         eventId: number;
         eventName?: string;
         eventGroupId?: number;
+        isBuiltIn?: boolean;
     }
     interface Props {
         defaultValue?: Value;

package/es/targetSelector/index.js

@@ -103,13 +103,15 @@ var BizTargetSelector = function BizTargetSelector(props) {
     enabled: enableDelete,
     onClick: onClickIcon
   }), targetData && /*#__PURE__*/React.createElement(Dropdown, {
-    visible: visible,
-    onVisibleChange: onVisibleChange,
-    overlay: /*#__PURE__*/React.createElement(BizTargetOptionMenu, {
-      onClick: onClickIcon,
-      enableAdd: enableAdd,
-      enableDelete: enableDelete
-    }),
+    open: visible,
+    onOpenChange: onVisibleChange,
+    dropdownRender: function dropdownRender() {
+      return /*#__PURE__*/React.createElement(BizTargetOptionMenu, {
+        onClick: onClickIcon,
+        enableAdd: enableAdd,
+        enableDelete: enableDelete
+      });
+    },
     trigger: ['click']
   }, /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
     name: "more",

package/es/userTagsSelector/index.js

@@ -81,13 +81,15 @@ var UserTagsSelect = function UserTagsSelect(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: renderOverlay(),
+    dropdownRender: function dropdownRender() {
+      return renderOverlay();
+    },
     trigger: ['click'],
     overlayStyle: {
       minWidth: 0
     },
-    onVisibleChange: onVisibleChange,
-    visible: visible,
+    onOpenChange: onVisibleChange,
+    open: visible,
     destroyPopupOnHide: props.destroyPopupOnHide
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.34-visual.10",
+  "version": "1.1.34-visual.11",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "211636a80ee9071213fc580c4473aafef846f2a5"
+  "gitHead": "c863c8612ff97c5bba6fdf11d161e7fa8098d613"
 }