@zgfe/modules-attribution 1.0.1-alpha.30 → 1.0.1-alpha.32

package/es/modules/content/index.js

@@ -57,7 +57,9 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
     request(Apis.getAnalyseData, {
       method: 'post',
-      data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time)
+      data: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time), {}, {
+        searchType: 0
+      })
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
         var _data = handleTableData(res === null || res === void 0 ? void 0 : res.data);

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

@@ -99,19 +99,6 @@ var defaultValue = {
         }
       }
     }],
-    "globalFilters": {
-      "relation": "and",
-      "conditions": [{
-        "attrId": 31331,
-        "propCategory": "eventProp",
-        "type": 2,
-        "operator": "gt",
-        "values": ["55"],
-        "dimensionSub": "event_attr",
-        "label": "price",
-        "attrName": "price"
-      }]
-    },
     "attributionType": 3,
     "otherEvent": true,
     "windowCnt": 2,

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

@@ -10,6 +10,7 @@ import { AttributableContext } from '../../../types';
 import _ from 'lodash';
 import { Tooltip, message } from 'antd';
 var AttributableEvents = function AttributableEvents(props) {
+  var _ReasonData$event3, _ReasonData$event4;
   var value = props.value,
     setMincePropCount = props.setMincePropCount,
     mincePropCount = props.mincePropCount,
@@ -126,7 +127,8 @@ var AttributableEvents = function AttributableEvents(props) {
     onChangeHandle(ReasonData, data, minceAttr);
   };
   var onAdd = function onAdd() {
-    if (ReasonData === undefined && bizEventSelectorDefaultValue === undefined) {
+    var _ReasonData$event;
+    if ((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)) {
       message.error('请先选择待归因事件');
       return;
     }
@@ -140,15 +142,17 @@ var AttributableEvents = function AttributableEvents(props) {
     }, 0);
   };
   var onMinceProp = function onMinceProp() {
-    console.log('attrSelectShow', attrSelectShow);
-    if (attrSelectShow) {
+    var _ReasonData$event2;
+    if ((ReasonData === null || ReasonData === void 0 ? void 0 : (_ReasonData$event2 = ReasonData.event) === null || _ReasonData$event2 === void 0 ? void 0 : _ReasonData$event2.id) === -100 && Object.keys(bizEventSelectorDefaultValue)) {
+      message.error('请先选择待归因事件');
       return;
     }
-    if (ReasonData !== undefined || bizEventSelectorDefaultValue !== undefined) {
-      setAttrSelectShow(true);
-      setButtonDisable(true);
-      handleCount('add', mincePropCount, setMincePropCount, 1);
+    if (attrSelectShow) {
+      return;
     }
+    setAttrSelectShow(true);
+    setButtonDisable(true);
+    handleCount('add', mincePropCount, setMincePropCount, 1);
   };
   var onChangeReason = function onChangeReason(reason) {
     setReasonData(reason);
@@ -156,8 +160,10 @@ var AttributableEvents = function AttributableEvents(props) {
       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, minceAttr);
+    setFilters(undefined);
+    setBizAttributeSelectorValue(undefined);
+    setIsAdd(false);
+    onChangeHandle(reason, undefined, undefined);
   };
   var onChangeAttr = function onChangeAttr(attr) {
     if (attr === undefined) {
@@ -230,14 +236,14 @@ var AttributableEvents = function AttributableEvents(props) {
     placement: "top",
     title: '添加属性细分'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(attrSelectShow || ReasonData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
+    className: "".concat(attrSelectShow || (ReasonData === null || ReasonData === void 0 ? void 0 : (_ReasonData$event3 = ReasonData.event) === null || _ReasonData$event3 === void 0 ? void 0 : _ReasonData$event3.id) === -100 && Object.keys(bizEventSelectorDefaultValue).length <= 0 ? 'disable' : ''),
     type: "tianjia2",
     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 >= 10 || (ReasonData === null || ReasonData === void 0 ? void 0 : (_ReasonData$event4 = ReasonData.event) === null || _ReasonData$event4 === void 0 ? void 0 : _ReasonData$event4.id) === -100 && Object.keys(bizEventSelectorDefaultValue).length <= 0 ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();

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

@@ -31,7 +31,7 @@ var GlobalAttribute = function GlobalAttribute(props) {
     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();

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

@@ -6,9 +6,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useRef, useState } from 'react';
 import { BizAttrConditionGroup, BizEventSelector, IconFont } from '@zgfe/business-lib';
-import _ from 'lodash';
 import { Select, Tooltip, message } from 'antd';
 var TargetEvent = function TargetEvent(props) {
+  var _targetData$event2;
   var value = props.value,
     setAttrTargetCount = props.setAttrTargetCount,
     eventIdList = props.eventIdList,
@@ -66,7 +66,9 @@ var TargetEvent = function TargetEvent(props) {
     onChangeHandle(targetData, data);
   };
   var onAdd = function onAdd() {
-    if (targetData === undefined && bizEventSelectorDefaultValue === undefined) {
+    var _targetData$event;
+    console.log('添加筛选', targetData, bizEventSelectorDefaultValue);
+    if ((targetData === null || targetData === void 0 ? void 0 : (_targetData$event = targetData.event) === null || _targetData$event === void 0 ? void 0 : _targetData$event.id) === -100 && Object.keys(bizEventSelectorDefaultValue).length <= 0) {
       message.error('请先选择目标事件');
       return;
     }
@@ -85,8 +87,9 @@ var TargetEvent = function TargetEvent(props) {
       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);
+    setFilters(undefined);
+    setIsAdd(false);
+    onChangeHandle(target, undefined);
   };
   useEffect(function () {
     setAttrTargetCount(count);
@@ -138,14 +141,14 @@ var TargetEvent = function TargetEvent(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 5 || targetData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
+    className: "".concat(count >= 5 || (targetData === null || targetData === void 0 ? void 0 : (_targetData$event2 = targetData.event) === null || _targetData$event2 === void 0 ? void 0 : _targetData$event2.id) === -100 && Object.keys(bizEventSelectorDefaultValue).length <= 0 ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();
     }
   }))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
-    value: filters,
+    value: undefined,
     onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,

package/es/modules/searchPanel/index.js

@@ -105,7 +105,6 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   useEffect(function () {
     if (defaultValue && reset !== null) {
       var data = defaultValue;
-      console.log('初始化', data);
       if (reset) {
         data = {
           targetFilters: initTarget,

package/es/modules/searchPanel/utils.js

@@ -41,10 +41,11 @@ var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList)
 export function operableOrNotHandle(data, attrSourceCount, attrTargetCount, mincePropCount, attrGlobalCount) {
   var flag = false;
   data.attributionType === undefined ? flag = true : null;
-  subsetHandle(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
-  subsetHandle(data, 'targetFilters', attrTargetCount) ? flag = true : null;
-  if (data.globalFilters) {
-    conditionsHandle('globalFilters', data.globalFilters, attrGlobalCount, 0) ? flag = true : null;
+  if (subsetHandle(data, 'sourceFilters', attrSourceCount, mincePropCount)) flag = true;
+  if (subsetHandle(data, 'targetFilters', attrTargetCount)) flag = true;
+  if (attrGlobalCount && data.globalFilters === undefined) flag = true;
+  if (data.globalFilters && conditionsHandle('globalFilters', data.globalFilters, attrGlobalCount, 0)) {
+    flag = true;
   }
   return flag;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.30",
+  "version": "1.0.1-alpha.32",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d9314ca0a5f0d92e1e048db27d6006e23ba9271b"
+  "gitHead": "fe9209c32059c9521177c19e1858b2efaa089125"
 }