@zgfe/modules-attribution 1.0.1-alpha.2 → 1.0.1-alpha.23

package/es/modules/home/index.js

@@ -7,23 +7,16 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Spin } from 'antd';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
 import './styles/index.less';
 import { AttributableContext } from '../../types';
 import EditTitle from '../../components/title';
 import { getInitDate, initTarget } from '../../constants/initData';
-import { transferEventSearchData } from '../../utils/transfer';
-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 _useContext = useContext(BizGlobalDataContext),
-    userPropList = _useContext.userPropList,
-    eventGroupList = _useContext.eventGroupList,
-    eventEnvList = _useContext.eventEnvList;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
@@ -56,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) {
@@ -69,16 +62,7 @@ var AttributionHome = function AttributionHome(props) {
       if (!initData) {
         initSearch();
       } else {
-        if (initData.module && initData.module !== 'attribution') {
-          initData = transferEventSearchData(initData, userPropList, eventGroupList, eventEnvList);
-        }
-        if (!initData.userGroup || !initData.targets) {
-          setSearchData(function (data) {
-            return _objectSpread(_objectSpread({}, data), initData);
-          });
-        } else {
-          setSearchData(_objectSpread({}, initData));
-        }
+        setSearchData(_objectSpread({}, initData));
       }
     }
     setTimeout(function () {
@@ -96,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) {
@@ -120,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,
@@ -137,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

@@ -8,12 +8,16 @@ import React, { useEffect, useRef, useState, useContext } from 'react';
 import { BizAttributeSelector, BizAttrConditionGroup, BizEventSelector, IconFont } from '@zgfe/business-lib';
 import { AttributableContext } from '../../../types';
 import _ from 'lodash';
-import { Tooltip } from 'antd';
+import { Tooltip, message } from 'antd';
 var AttributableEvents = function AttributableEvents(props) {
   var value = props.value,
-    verify = props.verify,
+    setMincePropCount = props.setMincePropCount,
+    mincePropCount = props.mincePropCount,
+    attrSourceCount = props.attrSourceCount,
     setAttrSourceCount = props.setAttrSourceCount,
-    showOverview = props.showOverview,
+    formData = props.formData,
+    eventIdList = props.eventIdList,
+    selectList = props.selectList,
     onDelete = props.onDelete;
   var _useContext = useContext(AttributableContext),
     setButtonDisable = _useContext.setButtonDisable;
@@ -33,7 +37,7 @@ var AttributableEvents = function AttributableEvents(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     count = _useState8[0],
     setCount = _useState8[1];
-  var _useState9 = useState(true),
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
     isAdd = _useState10[0],
     setIsAdd = _useState10[1];
@@ -44,58 +48,134 @@ var AttributableEvents = function AttributableEvents(props) {
     setEventId = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    aloneAttr = _useState14[0],
-    setAloneAttr = _useState14[1];
+    minceAttr = _useState14[0],
+    setMinceAttr = _useState14[1];
+  var bizEventSelectorDefaultValue = {};
+  if (value && value.eventId && value.eventId != -100) {
+    bizEventSelectorDefaultValue = {
+      event: {
+        id: value.eventId,
+        name: value.eventName
+      }
+    };
+  }
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    bizAttributeSelectorValue = _useState16[0],
+    setBizAttributeSelectorValue = _useState16[1];
   useEffect(function () {
     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.attributionSubdivision && value.attributionSubdivision.conditions) {
+        setBizAttributeSelectorValue({
+          id: value.attributionSubdivision.conditions.attrId,
+          propCategory: value.attributionSubdivision.conditions.propCategory
+        });
+        setAttrSelectShow(true);
+      }
       if ((_value$filters = value.filters) === null || _value$filters === void 0 ? void 0 : _value$filters.conditions) {
         setCount(value.filters.conditions.length);
       }
     }
   }, []);
   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) {
-      setIsAdd(true);
-      setTimeout(function () {
-        conditionRef.current.add();
-      }, 0);
+    if (ReasonData === undefined && bizEventSelectorDefaultValue === undefined) {
+      message.error('请先选择待归因事件');
+      return;
+    }
+    if (count >= 10) {
+      message.error('最多可添加10条属性筛选');
+      return;
+    }
+    setIsAdd(true);
+    setTimeout(function () {
+      conditionRef.current.add();
+    }, 0);
+  };
+  var onMinceProp = function onMinceProp() {
+    if (ReasonData !== undefined || bizEventSelectorDefaultValue !== undefined) {
+      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);
+    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);
+    }
     var filterData = _.cloneDeep(filters);
-    onChangeHandle(reason, filterData, aloneAttr);
+    onChangeHandle(reason, filterData, minceAttr);
   };
   var onChangeAttr = function onChangeAttr(attr) {
-    console.log('归因事件-3', attr);
-    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
+      });
+    }
+    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;
@@ -104,9 +184,8 @@ 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);
     }
   };
@@ -114,19 +193,20 @@ var AttributableEvents = function AttributableEvents(props) {
     className: "attributable-events-box"
   }, /*#__PURE__*/React.createElement("div", {
     className: "select-and-attr"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(verify && ReasonData === undefined ? 'verify-error' : '')
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showBuiltInTarget: true,
-    showAllEvent: showOverview,
+    showAllEvent: false,
+    showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
-    onChange: onChangeReason
-  })), attrSelectShow && /*#__PURE__*/React.createElement(BizAttributeSelector, {
+    onChange: onChangeReason,
+    defaultValue: bizEventSelectorDefaultValue,
+    selectList: selectList
+  }), attrSelectShow && /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: true,
     enableEnvProp: true,
     eventIdList: [eventId],
+    value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
@@ -137,24 +217,19 @@ var AttributableEvents = function AttributableEvents(props) {
     className: "button-box"
   }, /*#__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 ? 'disable' : ''),
+    className: "".concat(attrSelectShow || ReasonData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
     type: "tianjia2",
-    onClick: function onClick() {
-      if (ReasonData !== undefined) {
-        setAttrSelectShow(true);
-        setButtonDisable(true);
-      }
-    }
+    onClick: onMinceProp
   })), /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 10 || ReasonData === undefined ? 'disable' : ''),
+    className: "".concat(count >= 10 || ReasonData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();

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

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

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

@@ -26,7 +26,6 @@ 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);
@@ -45,7 +44,7 @@ var GlobalAttribute = function GlobalAttribute(props) {
     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"),

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

@@ -10,9 +10,9 @@ import _ from 'lodash';
 import { Select, Tooltip, message } from 'antd';
 var TargetEvent = function TargetEvent(props) {
   var value = props.value,
-    verify = props.verify,
     setAttrTargetCount = props.setAttrTargetCount,
-    showOverview = props.showOverview;
+    eventIdList = props.eventIdList,
+    selectList = props.selectList;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     targetData = _useState2[0],
@@ -34,26 +34,39 @@ var TargetEvent = function TargetEvent(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     eventId = _useState10[0],
     setEventId = _useState10[1];
+  var bizEventSelectorDefaultValue = {};
+  if (value && value.eventId && value.eventId != -100) {
+    bizEventSelectorDefaultValue = {
+      event: {
+        id: value.eventId,
+        name: value.eventName
+      }
+    };
+  }
   useEffect(function () {
     if (value) {
       var _value$filters;
-      console.log(123);
+      setTargetData({
+        event: {
+          id: value.eventId,
+          name: value.eventName
+        }
+      });
       setFilters(value.filters);
+      if (eventIdList && eventIdList.length >= 0) {
+        setEventId(eventIdList[0]);
+      }
       if ((_value$filters = value.filters) === null || _value$filters === void 0 ? void 0 : _value$filters.conditions) {
         setCount(value.filters.conditions.length);
       }
     }
   }, []);
-  useEffect(function () {
-    console.log('verify', verify);
-  }, [verify]);
   var onChangeFilters = function onChangeFilters(data) {
-    console.log('归因事件-2', data);
     setFilters(data);
     onChangeHandle(targetData, data);
   };
   var onAdd = function onAdd() {
-    if (targetData === undefined) {
+    if (targetData === undefined && bizEventSelectorDefaultValue === undefined) {
       message.error('请先选择目标事件');
       return;
     }
@@ -67,25 +80,21 @@ var TargetEvent = function TargetEvent(props) {
     }, 0);
   };
   var onChangeTarget = function onChangeTarget(target) {
-    var _target$event;
-    console.log('目标事件变更', target);
     setTargetData(target);
-    setEventId(target === null || target === void 0 ? void 0 : (_target$event = target.event) === null || _target$event === void 0 ? void 0 : _target$event.id);
+    if (target && target.event) {
+      var _target$event;
+      setEventId(target === null || target === void 0 ? void 0 : (_target$event = target.event) === null || _target$event === void 0 ? void 0 : _target$event.id);
+    }
     var filterData = _.cloneDeep(filters);
     onChangeHandle(target, filterData);
   };
   useEffect(function () {
-    console.log(1111111111, targetData);
-  }, [targetData]);
-  useEffect(function () {
-    console.log('判断提交按钮是否可点击-123', count);
     setAttrTargetCount(count);
     setTimeout(function () {
       onChangeHandle(targetData, filters);
     }, 0);
   }, [count]);
   var onChangeHandle = function onChangeHandle(reason, filterData) {
-    console.log('变动了', reason, filterData);
     if (props.onChange) {
       var _reason$event;
       if (!reason || !reason.event || !((_reason$event = reason.event) === null || _reason$event === void 0 ? void 0 : _reason$event.id)) return;
@@ -102,15 +111,15 @@ var TargetEvent = function TargetEvent(props) {
     className: "target-events-box"
   }, /*#__PURE__*/React.createElement("div", {
     className: "selector-content"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(verify && targetData === undefined ? 'verify-error' : '')
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showBuiltInTarget: true,
-    showAllEvent: showOverview,
+    showAllEvent: false,
+    showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
-    onChange: onChangeTarget
-  })), /*#__PURE__*/React.createElement(Select, {
+    defaultValue: bizEventSelectorDefaultValue,
+    onChange: onChangeTarget,
+    selectList: selectList
+  }), /*#__PURE__*/React.createElement(Select, {
     defaultValue: 1,
     style: {
       width: 88
@@ -129,14 +138,12 @@ var TargetEvent = function TargetEvent(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 5 || targetData === undefined ? 'disable' : ''),
+    className: "".concat(count >= 5 || targetData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();
     }
-  }))), verify && targetData === undefined && /*#__PURE__*/React.createElement("div", {
-    className: "error-tips"
-  }, "\u8BF7\u9009\u62E9\u76EE\u6807\u4E8B\u4EF6"), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
+  }))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filters,
     enableEventProp: true,

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

@@ -2,5 +2,5 @@ import React from 'react';
 import { SearchPanelTypes } from './types';
 import './styles/index.less';
 export declare const classPrefix = "mi-left-form";
-declare const SearchPanel: React.FC<SearchPanelTypes.Props>;
+declare const SearchPanel: React.ForwardRefExoticComponent<SearchPanelTypes.Props & React.RefAttributes<any>>;
 export default SearchPanel;