@zgfe/modules-attribution 1.0.1-alpha.8 → 1.0.2-alpha.0

package/es/modules/home/demo/index.js

@@ -1,51 +1,19 @@
-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 { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { AttributionHome } from '@zgfe/modules-attribution';
 import './styles/index.less';
 import { requestConfig } from '../../../utils/ajaxConfig';
-import { Button } from 'antd';
 export default (function () {
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isDetail = _useState2[0],
-    setIsDetail = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    detailParams = _useState4[0],
-    setDetailParams = _useState4[1];
-  var _useState5 = useState(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    searchParams = _useState6[0],
-    setSearchParams = _useState6[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
   }, []);
   var afterEditTarget = function afterEditTarget(type, data) {
     console.log("".concat(type, "\u56DE\u8C03"), data);
   };
-  var onUserDrill = function onUserDrill(data, searchData) {
-    console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
-  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 21
-  }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
-    onClick: function onClick() {
-      return setIsDetail(false);
-    }
-  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(AttributionHome, {
-    defaultValue: searchParams,
-    enableGenerateReport: true,
-    afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+    defaultApp: 328
+  }, /*#__PURE__*/React.createElement(AttributionHome, {
+    afterEditTarget: afterEditTarget
   }));
 });

package/es/modules/home/demo/scene.js

@@ -1,14 +1,7 @@
-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 React, { useEffect } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import { AttributionHome } from '@zgfe/modules-attribution';
 import { requestConfig } from '../../../utils/ajaxConfig';
-import { Button } from 'antd';
 var defaultValue = {
   source: 'SCENE',
   data: {
@@ -35,40 +28,17 @@ var defaultValue = {
   chosen_data: []
 };
 export default (function () {
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isDetail = _useState2[0],
-    setIsDetail = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    detailParams = _useState4[0],
-    setDetailParams = _useState4[1];
-  var _useState5 = useState(defaultValue),
-    _useState6 = _slicedToArray(_useState5, 2),
-    searchParams = _useState6[0],
-    setSearchParams = _useState6[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
   }, []);
   var afterEditTarget = function afterEditTarget(type, data) {
     console.log("".concat(type, "\u56DE\u8C03"), data);
   };
-  var onUserDrill = function onUserDrill(data, searchData) {
-    console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
-  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
     defaultApp: 21
-  }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
-    onClick: function onClick() {
-      return setIsDetail(false);
-    }
-  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(AttributionHome, {
-    defaultValue: searchParams,
-    afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+  }, /*#__PURE__*/React.createElement(AttributionHome, {
+    defaultValue: defaultValue,
+    afterEditTarget: afterEditTarget
   }));
 });

package/es/modules/home/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './styles/index.less';
-import { InsightProps } from './types';
-declare const AttributionHome: React.FC<InsightProps.Props>;
+import { AttributionProps } from './types';
+declare const AttributionHome: React.FC<AttributionProps.Props>;
 export default AttributionHome;

package/es/modules/home/index.js

@@ -13,11 +13,10 @@ import './styles/index.less';
 import { AttributableContext } from '../../types';
 import EditTitle from '../../components/title';
 import { getInitDate, initTarget } from '../../constants/initData';
-import InsightContent from '../content';
+import AttributionContent from '../content';
 var classPrefix = 'attribution-container';
 var AttributionHome = function AttributionHome(props) {
   var _props$defaultValue;
-  console.log('AttributionHome-props: ', props);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
@@ -50,7 +49,7 @@ var AttributionHome = function AttributionHome(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     buttonDisable = _useState16[0],
     setButtonDisable = _useState16[1];
-  var insightRef = useRef(null);
+  var attributionRef = useRef(null);
   useEffect(function () {
     setPageLoading(true);
     if (!props.defaultValue) {
@@ -63,9 +62,7 @@ var AttributionHome = function AttributionHome(props) {
       if (!initData) {
         initSearch();
       } else {
-        setSearchData(_objectSpread(_objectSpread({}, initData), {}, {
-          targetFilters: [initData.targetFilters]
-        }));
+        setSearchData(_objectSpread({}, initData));
       }
     }
     setTimeout(function () {
@@ -83,13 +80,15 @@ var AttributionHome = function AttributionHome(props) {
     setLoading(flag);
   };
   var onSave = function onSave() {
-    if (insightRef) {
-      insightRef.current.savePanel();
+    if (attributionRef) {
+      attributionRef.current.onGetSearchData();
+      attributionRef.current.savePanel();
     }
   };
   var onSaveAs = function onSaveAs() {
-    if (insightRef) {
-      insightRef.current.saveAsPanel();
+    if (attributionRef) {
+      attributionRef.current.onGetSearchData();
+      attributionRef.current.saveAsPanel();
     }
   };
   if (pageLoading) {
@@ -107,12 +106,9 @@ var AttributionHome = function AttributionHome(props) {
       buttonDisable: buttonDisable,
       setButtonDisable: setButtonDisable,
       includeToday: props.includeToday,
-      defaultSearch: props.defaultValue,
-      enableAddScene: !props.defaultValue || props.defaultValue.source === 'INSIGHT',
-      enableGenerateReport: props.enableGenerateReport,
+      enableAddScene: !props.defaultValue || props.defaultValue.source === 'attribution',
       changeLoading: changeLoading,
-      afterEditTarget: props.afterEditTarget,
-      onUserDrill: props.onUserDrill
+      afterEditTarget: props.afterEditTarget
     }
   }, panelId && /*#__PURE__*/React.createElement(EditTitle, {
     title: title,
@@ -124,8 +120,8 @@ var AttributionHome = function AttributionHome(props) {
     className: "".concat(classPrefix, "-header-title")
   }, "\u5F52\u56E0\u5206\u6790"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content ").concat(panelId ? classPrefix + '-content2' : '')
-  }, /*#__PURE__*/React.createElement(InsightContent, {
-    ref: insightRef,
+  }, /*#__PURE__*/React.createElement(AttributionContent, {
+    ref: attributionRef,
     value: searchData,
     onSearching: function onSearching(val) {
       return setSearching(val);

package/es/modules/home/styles/index.less

@@ -19,7 +19,8 @@
   &-content {
     width: 100%;
     height: 100%;
-    overflow: auto;
+    // overflow: auto;
+    overflow-x: hidden;
     background: #fafafb;
     border-top: 1px solid #eaeaea;
     .attribution-content {

package/es/modules/home/types.d.ts

@@ -1,11 +1,8 @@
-import { SearchValue } from '../../types';
-export declare namespace InsightProps {
+export declare namespace AttributionProps {
     interface Props {
         defaultValue?: Value;
         includeToday?: boolean;
-        enableGenerateReport?: boolean;
         afterEditTarget?: (type: string, value?: any) => void;
-        onUserDrill: (data: any, searchData: SearchValue) => void;
     }
     interface Value {
         panelId?: number;
@@ -14,7 +11,6 @@ export declare namespace InsightProps {
         name?: string;
         id?: number;
         data?: any;
-        chosen_data?: string[];
         [props: string]: any;
     }
 }

package/es/modules/searchPanel/components/attributableEvents.js

@@ -11,8 +11,11 @@ import _ from 'lodash';
 import { Tooltip, message } from 'antd';
 var AttributableEvents = function AttributableEvents(props) {
   var value = props.value,
+    setMincePropCount = props.setMincePropCount,
+    mincePropCount = props.mincePropCount,
+    attrSourceCount = props.attrSourceCount,
     setAttrSourceCount = props.setAttrSourceCount,
-    showOverview = props.showOverview,
+    formData = props.formData,
     eventIdList = props.eventIdList,
     onDelete = props.onDelete;
   var _useContext = useContext(AttributableContext),
@@ -29,9 +32,6 @@ var AttributableEvents = function AttributableEvents(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     filters = _useState6[0],
     setFilters = _useState6[1];
-  useEffect(function () {
-    console.log('初始化-filters', filters);
-  }, [filters]);
   var _useState7 = useState(0),
     _useState8 = _slicedToArray(_useState7, 2),
     count = _useState8[0],
@@ -47,10 +47,10 @@ var AttributableEvents = function AttributableEvents(props) {
     setEventId = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    aloneAttr = _useState14[0],
-    setAloneAttr = _useState14[1];
-  var bizEventSelectorDefaultValue;
-  if (value.eventId && value.eventId != -100) {
+    minceAttr = _useState14[0],
+    setMinceAttr = _useState14[1];
+  var bizEventSelectorDefaultValue = {};
+  if (value && value.eventId && value.eventId != -100) {
     bizEventSelectorDefaultValue = {
       event: {
         id: value.eventId,
@@ -63,17 +63,25 @@ var AttributableEvents = function AttributableEvents(props) {
     bizAttributeSelectorValue = _useState16[0],
     setBizAttributeSelectorValue = _useState16[1];
   useEffect(function () {
-    console.log('初始化-123', value);
     if (value) {
       var _value$filters;
+      setReasonData({
+        event: {
+          id: value.eventId,
+          name: value.eventName
+        }
+      });
       setFilters(value.filters);
+      setMinceAttr(value.attributionSubdivision);
       if (eventIdList && eventIdList.length >= 0) {
         setEventId(eventIdList[0]);
       }
-      if (value.propfilters) {
+      if (value.attributionSubdivision && value.attributionSubdivision.conditions) {
         setBizAttributeSelectorValue({
-          id: value.propfilters.attrId,
-          propCategory: value.propfilters.propCategory
+          id: value.attributionSubdivision.conditions.attrId,
+          propCategory: value.attributionSubdivision.conditions.propCategory,
+          name: value.attributionSubdivision.conditions.attrName,
+          category: value.attributionSubdivision.conditions.category
         });
         setAttrSelectShow(true);
       }
@@ -83,24 +91,46 @@ var AttributableEvents = function AttributableEvents(props) {
     }
   }, []);
   useEffect(function () {
-    console.log('判断提交按钮是否可点击-123', count);
-    setAttrSourceCount(count);
+    if (ReasonData) {
+      handleCount('add', attrSourceCount, setAttrSourceCount, count);
+    }
     setTimeout(function () {
-      onChangeHandle(ReasonData, filters, aloneAttr);
+      onChangeHandle(ReasonData, filters, minceAttr);
     }, 0);
   }, [count]);
+  var onEventDelete = function onEventDelete() {
+    if (formData && formData.sourceFilters.length <= 1) {
+      message.error('至少保留一个待归因事件');
+      return;
+    }
+    if (ReasonData) {
+      handleCount('delete', attrSourceCount, setAttrSourceCount);
+      handleCount('delete', mincePropCount, setMincePropCount);
+    }
+    onDelete();
+  };
+  var handleCount = function handleCount(type, _attrCount, _setAttrCount, count) {
+    if (ReasonData && ReasonData.event) {
+      var __attrCount = _.cloneDeep(_attrCount);
+      if (type === 'add' && count) {
+        __attrCount[ReasonData.event.id] = count;
+      } else {
+        delete __attrCount[ReasonData.event.id];
+      }
+      _setAttrCount(__attrCount);
+    }
+  };
   var onChangeFilters = function onChangeFilters(data) {
-    console.log('归因事件-2', data);
     setFilters(data);
-    onChangeHandle(ReasonData, data, aloneAttr);
+    onChangeHandle(ReasonData, data, minceAttr);
   };
   var onAdd = function onAdd() {
-    if (ReasonData === undefined && bizEventSelectorDefaultValue === undefined) {
+    if (notClickable) {
       message.error('请先选择待归因事件');
       return;
     }
-    if (count >= 10) {
-      message.error('最多可添加10条属性筛选');
+    if (count >= 5) {
+      message.error('最多可添加5条属性筛选');
       return;
     }
     setIsAdd(true);
@@ -108,31 +138,55 @@ var AttributableEvents = function AttributableEvents(props) {
       conditionRef.current.add();
     }, 0);
   };
+  var onMinceProp = function onMinceProp() {
+    if (notClickable) {
+      message.error('请先选择待归因事件');
+      return;
+    }
+    if (attrSelectShow) {
+      return;
+    }
+    setAttrSelectShow(true);
+    setButtonDisable(true);
+    handleCount('add', mincePropCount, setMincePropCount, 1);
+  };
   var onChangeReason = function onChangeReason(reason) {
-    var _reason$event;
-    console.log('归因事件-1', reason);
     setReasonData(reason);
-    setEventId(reason === null || reason === void 0 ? void 0 : (_reason$event = reason.event) === null || _reason$event === void 0 ? void 0 : _reason$event.id);
-    var filterData = _.cloneDeep(filters);
-    onChangeHandle(reason, filterData, aloneAttr);
+    if (reason && reason.event) {
+      var _reason$event;
+      setEventId(reason === null || reason === void 0 ? void 0 : (_reason$event = reason.event) === null || _reason$event === void 0 ? void 0 : _reason$event.id);
+    }
+    setFilters(undefined);
+    setBizAttributeSelectorValue(undefined);
+    setIsAdd(false);
+    setCount(0);
+    onChangeHandle(reason, undefined, undefined);
   };
   var onChangeAttr = function onChangeAttr(attr) {
-    console.log('归因事件-3', attr);
-    setBizAttributeSelectorValue({
-      id: attr.id,
-      propCategory: attr.propCategory
-    });
-    var _aloneAttr = attr === undefined ? undefined : {
-      propCategory: attr.propCategory,
-      type: attr.type,
-      attrId: attr.id,
-      attrName: attr.name,
-      category: attr.category
+    if (attr === undefined) {
+      handleCount('delete', mincePropCount, setMincePropCount);
+    } else {
+      setBizAttributeSelectorValue({
+        id: attr.id,
+        propCategory: attr.propCategory,
+        name: attr.name,
+        category: attr.category
+      });
+    }
+    var _minceAttr = attr === undefined ? undefined : {
+      relation: "and",
+      conditions: {
+        propCategory: attr.propCategory,
+        type: attr.type,
+        attrId: attr.id,
+        attrName: attr.name,
+        category: attr.category
+      }
     };
-    setAloneAttr(_aloneAttr);
-    onChangeHandle(ReasonData, filters, _aloneAttr);
+    setMinceAttr(_minceAttr);
+    onChangeHandle(ReasonData, filters, _minceAttr);
   };
-  var onChangeHandle = function onChangeHandle(reason, filterData, aloneAttr) {
+  var onChangeHandle = function onChangeHandle(reason, filterData, minceAttr) {
     if (props.onChange) {
       var _reason$event2;
       if (!reason || !reason.event || !((_reason$event2 = reason.event) === null || _reason$event2 === void 0 ? void 0 : _reason$event2.id)) return;
@@ -141,23 +195,36 @@ var AttributableEvents = function AttributableEvents(props) {
         eventId: event === null || event === void 0 ? void 0 : event.id,
         eventName: (event === null || event === void 0 ? void 0 : event.alias) || (event === null || event === void 0 ? void 0 : event.name),
         filters: filterData,
-        propfilters: aloneAttr
+        attributionSubdivision: minceAttr
       };
-      console.log('待归因事件-变动-组装数据', data);
       props.onChange(data);
     }
   };
+  var _useState17 = useState(null),
+    _useState18 = _slicedToArray(_useState17, 2),
+    notClickable = _useState18[0],
+    setNotClickable = _useState18[1];
+  useEffect(function () {
+    var _ReasonData$event;
+    if (ReasonData === undefined || (ReasonData === null || ReasonData === void 0 ? void 0 : (_ReasonData$event = ReasonData.event) === null || _ReasonData$event === void 0 ? void 0 : _ReasonData$event.id) === -100 && Object.keys(bizEventSelectorDefaultValue).length <= 0) {
+      setNotClickable(true);
+    } else {
+      setNotClickable(false);
+    }
+  }, [ReasonData]);
   return /*#__PURE__*/React.createElement("div", {
     className: "attributable-events-box"
   }, /*#__PURE__*/React.createElement("div", {
     className: "select-and-attr"
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showBuiltInTarget: true,
-    showAllEvent: showOverview,
+    showAllEvent: false,
+    showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
     onChange: onChangeReason,
-    defaultValue: bizEventSelectorDefaultValue
+    defaultValue: bizEventSelectorDefaultValue,
+    selectList: eventIdList,
+    placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   }), attrSelectShow && /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: true,
@@ -172,26 +239,21 @@ var AttributableEvents = function AttributableEvents(props) {
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "button-box"
-  }, /*#__PURE__*/React.createElement(IconFont, {
+  }, notClickable === false && /*#__PURE__*/React.createElement(IconFont, {
     type: "qingchu",
-    onClick: onDelete
+    onClick: onEventDelete
   }), /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
     title: '添加属性细分'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(attrSelectShow || ReasonData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
+    className: "".concat(attrSelectShow || notClickable ? 'disable' : ''),
     type: "tianjia2",
-    onClick: function onClick() {
-      if (ReasonData !== undefined || bizEventSelectorDefaultValue !== undefined) {
-        setAttrSelectShow(true);
-        setButtonDisable(true);
-      }
-    }
+    onClick: onMinceProp
   })), /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 10 || ReasonData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
+    className: "".concat(count >= 5 || notClickable ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();
@@ -199,6 +261,7 @@ var AttributableEvents = function AttributableEvents(props) {
   })))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filters,
+    onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
     eventIdList: [eventId],

package/es/modules/searchPanel/components/globalAttribute.d.ts

@@ -1,8 +1,10 @@
+import { AttrConditionTypes } from '@zgfe/business-lib';
 import React from 'react';
 declare const GlobalAttribute: React.FC<{
-    value?: any;
+    value?: AttrConditionTypes.GroupValue;
     max?: number;
     eventIdList?: number[];
+    setAttrGlobalCount: Function;
     onChange?: (val: any) => void;
 }>;
 export default GlobalAttribute;

package/es/modules/searchPanel/components/globalAttribute.js

@@ -9,7 +9,8 @@ import React, { useEffect, useRef, useState } from 'react';
 var GlobalAttribute = function GlobalAttribute(props) {
   var classPrefix = 'mi-left-form';
   var max = props.max,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    setAttrGlobalCount = props.setAttrGlobalCount;
   var conditionRef = useRef(null);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -26,26 +27,29 @@ var GlobalAttribute = function GlobalAttribute(props) {
     setInit(false);
   }, []);
   useEffect(function () {
-    console.log('eventIdList', props.eventIdList);
     if (init || props.eventIdList && props.eventIdList[0] === -100) return;
     if (!props.value) {
       conditionRef.current.setValue(props.value);
     }
-  }, [props.eventIdList]);
+  }, [props.eventIdList, props.value]);
   var onAdd = function onAdd() {
     if (props.eventIdList[0] === -100) return;
     conditionRef.current.add();
   };
+  useEffect(function () {
+    setAttrGlobalCount(count);
+  }, [count]);
   return /*#__PURE__*/React.createElement("div", null, props.eventIdList && props.eventIdList[0] === -100 ? '' : /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: props.value,
+    onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
     eventIdList: props.eventIdList,
     onChange: onChange,
     onConditionsCount: setCount
   }), count < max && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-add ").concat(props.eventIdList[0] === -100 ? 'disabled' : ''),
+    className: "".concat(classPrefix, "-add ").concat(props.eventIdList && props.eventIdList.length <= 0 ? 'disabled' : ''),
     onClick: onAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-add-icon"),