@zgfe/modules-attribution 1.0.2-alpha.3 → 1.0.2-alpha.4

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

@@ -39,17 +39,21 @@ var AttributableEvents = function AttributableEvents(props) {
     setCount = _useState8[1];
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    isAdd = _useState10[0],
-    setIsAdd = _useState10[1];
-  var conditionRef = useRef(null);
-  var _useState11 = useState(-1),
+    countLoading = _useState10[0],
+    setCountLoading = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    eventId = _useState12[0],
-    setEventId = _useState12[1];
-  var _useState13 = useState(),
+    isAdd = _useState12[0],
+    setIsAdd = _useState12[1];
+  var conditionRef = useRef(null);
+  var _useState13 = useState(-1),
     _useState14 = _slicedToArray(_useState13, 2),
-    minceAttr = _useState14[0],
-    setMinceAttr = _useState14[1];
+    eventId = _useState14[0],
+    setEventId = _useState14[1];
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    minceAttr = _useState16[0],
+    setMinceAttr = _useState16[1];
   var bizEventSelectorDefaultValue = {};
   if (value && value.eventId && value.eventId != -100) {
     bizEventSelectorDefaultValue = {
@@ -59,10 +63,10 @@ var AttributableEvents = function AttributableEvents(props) {
       }
     };
   }
-  var _useState15 = useState(),
-    _useState16 = _slicedToArray(_useState15, 2),
-    bizAttributeSelectorValue = _useState16[0],
-    setBizAttributeSelectorValue = _useState16[1];
+  var _useState17 = useState(),
+    _useState18 = _slicedToArray(_useState17, 2),
+    bizAttributeSelectorValue = _useState18[0],
+    setBizAttributeSelectorValue = _useState18[1];
   useEffect(function () {
     if (value) {
       var _value$filters;
@@ -92,12 +96,10 @@ var AttributableEvents = function AttributableEvents(props) {
     }
   }, []);
   useEffect(function () {
+    setCountLoading(false);
     if (ReasonData) {
       handleCount('add', attrSourceCount, setAttrSourceCount, count);
     }
-    setTimeout(function () {
-      onChangeHandle(ReasonData, filters, minceAttr);
-    }, 0);
   }, [count]);
   var onEventDelete = function onEventDelete() {
     if (formData && formData.sourceFilters.length <= 1) {
@@ -139,6 +141,10 @@ var AttributableEvents = function AttributableEvents(props) {
       message.error('最多可添加5条属性筛选');
       return;
     }
+    if (countLoading) {
+      return;
+    }
+    setCountLoading(true);
     setIsAdd(true);
     setTimeout(function () {
       conditionRef.current.add();
@@ -210,10 +216,10 @@ var AttributableEvents = function AttributableEvents(props) {
       props.onChange(data);
     }
   };
-  var _useState17 = useState(null),
-    _useState18 = _slicedToArray(_useState17, 2),
-    notClickable = _useState18[0],
-    setNotClickable = _useState18[1];
+  var _useState19 = useState(null),
+    _useState20 = _slicedToArray(_useState19, 2),
+    notClickable = _useState20[0],
+    setNotClickable = _useState20[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) {

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

@@ -66,7 +66,6 @@ var TargetEvent = function TargetEvent(props) {
   };
   var onAdd = function onAdd() {
     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;
@@ -93,9 +92,6 @@ var TargetEvent = function TargetEvent(props) {
   };
   useEffect(function () {
     setAttrTargetCount(count);
-    setTimeout(function () {
-      onChangeHandle(targetData, filters);
-    }, 0);
   }, [count]);
   var onChangeHandle = function onChangeHandle(reason, filterData) {
     if (props.onChange) {

package/es/modules/searchPanel/index.js

@@ -280,7 +280,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       message: '请选择分析模型'
     }]
   }, /*#__PURE__*/React.createElement(Select, {
-    className: "attributionType",
+    className: "attribution-type",
     placeholder: "\u8BF7\u9009\u62E9",
     style: {
       width: 208
@@ -293,16 +293,28 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }),
     options: [{
       value: 1,
-      label: '首次触点归因'
+      label: /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "right",
+        title: "\u5B8C\u6210\u76EE\u6807\u4E8B\u4EF6\u7684\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u4E2D\uFF0C\u7B2C\u4E00\u4E2A\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u8D21\u732E\u4E3A100%"
+      }, "\u9996\u6B21\u89E6\u70B9\u5F52\u56E0")
     }, {
       value: 2,
-      label: '末次触点归因'
+      label: /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "right",
+        title: "\u5B8C\u6210\u76EE\u6807\u4E8B\u4EF6\u7684\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u4E2D\uFF0C\u6700\u540E\u4E00\u4E2A\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u8D21\u732E\u4E3A100%"
+      }, "\u672B\u6B21\u89E6\u70B9\u5F52\u56E0")
     }, {
       value: 3,
-      label: '线性归因'
+      label: /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "right",
+        title: "\u5B8C\u6210\u76EE\u6807\u4E8B\u4EF6\u7684\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u4E2D\uFF0C\u6240\u6709\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u5E73\u5747\u5206\u914D\u8D21\u732E"
+      }, "\u7EBF\u6027\u5F52\u56E0")
     }, {
       value: 4,
-      label: '位置归因'
+      label: /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "right",
+        title: "\u5B8C\u6210\u76EE\u6807\u4E8B\u4EF6\u7684\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u4E2D\uFF0C\u9996\u4F4D\u548C\u672B\u4F4D\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u5404\u83B740%\u8D21\u732E\uFF0C\u5176\u4F59\u300C\u5F85\u5F52\u56E0\u4E8B\u4EF6\u300D\u5E73\u520620%\u8D21\u732E"
+      }, "\u4F4D\u7F6E\u5F52\u56E0")
     }]
   })), /*#__PURE__*/React.createElement("p", {
     className: "p"

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

@@ -1,16 +1,16 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
 .form-box {
-  .xiangxia{
-    font-size: 14px!important;
+  .xiangxia {
+    font-size: 14px !important;
   }
-  &-form-item{
+  &-form-item {
     margin-bottom: 16px;
-    .attr-box-show{
-      margin-top: 12px;
+    .attr-box-show {
+      margin: 12px 0px;
     }
   }
-  
+
   &-bottom-form-title {
     margin-top: 34px;
     margin-bottom: 16px;
@@ -33,7 +33,7 @@
         color: #9aa1a9;
       }
     }
-    .attributionType {
+    .attribution-type {
       margin-right: 24px;
     }
     .windowCnt {
@@ -106,8 +106,8 @@
     }
   }
 
-  .global-attr{
-    margin-bottom: 0!important;
+  .global-attr {
+    margin-bottom: 0 !important;
   }
 
   .biz-condition-item-input {
@@ -119,8 +119,8 @@
   }
   .attributable-events-box {
     .select-and-attr {
-      margin-bottom: 12px;
       display: flex;
+      margin-bottom: 12px;
       .ant-dropdown-trigger {
         width: 208px;
         margin-right: 16px;
@@ -207,3 +207,6 @@
     color: #fb5547;
   }
 }
+.attribution-type-options {
+  
+}

package/es/modules/searchPanel/utils.js

@@ -39,50 +39,43 @@ var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList)
   return flag;
 };
 export function operableOrNotHandle(data, attrSourceCount, attrTargetCount, mincePropCount, attrGlobalCount) {
-  var flag = false;
-  data.attributionType === undefined ? 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;
+  var flagList = [];
+  if (data.attributionType === undefined) return true;
+  subsetHandle(flagList, data, 'sourceFilters', attrSourceCount, mincePropCount);
+  subsetHandle(flagList, data, 'targetFilters', attrTargetCount);
+  if (attrGlobalCount && data.globalFilters === undefined) return true;
+  data.globalFilters && conditionsHandle('globalFilters', data.globalFilters, attrGlobalCount, 0, flagList);
+  return flagList.indexOf(true) !== -1;
 }
-var subsetHandle = function subsetHandle(data, type, count, mincePropCount) {
-  var flag = false;
+var subsetHandle = function subsetHandle(flagList, data, type, count, mincePropCount) {
   data[type].map(function (item) {
-    item === undefined ? flag = true : null;
+    item === undefined ? flagList.push(true) : null;
     if (item !== undefined) {
-      var _item$filters;
-      (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flag = true : null;
+      (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flagList.push(true) : null;
       if (type === 'targetFilters') {
-        item.filters === undefined && count != 0 ? flag = true : null;
+        item.filters === undefined && count != 0 ? flagList.push(true) : null;
       } else {
-        item.filters === undefined && Object.keys(count).length > 0 && count[item.eventId] !== undefined ? flag = true : null;
+        item.filters === undefined && Object.keys(count).length > 0 && count[item.eventId] !== undefined ? flagList.push(true) : null;
         if (mincePropCount != undefined) {
-          item.attributionSubdivision === undefined && Object.keys(mincePropCount).length > 0 && mincePropCount[item.eventId] !== undefined ? flag = true : null;
+          item.attributionSubdivision === undefined && Object.keys(mincePropCount).length > 0 && mincePropCount[item.eventId] !== undefined ? flagList.push(true) : null;
         }
       }
-      if ((item === null || item === void 0 ? void 0 : item.filters) && ((_item$filters = item.filters) === null || _item$filters === void 0 ? void 0 : _item$filters.conditions.length) > 0) {
-        flag = conditionsHandle(type, item.filters, count, item.eventId);
-      }
+      (item === null || item === void 0 ? void 0 : item.filters) && conditionsHandle(type, item.filters, count, item.eventId, flagList);
     }
   });
-  return flag;
 };
-var conditionsHandle = function conditionsHandle(type, data, count, eventId) {
-  var flag = false;
-  data.conditions.map(function (_item) {
-    if (_item.operator !== 'is null' && _item.operator !== 'is not null') {
-      var _item$values;
-      _item.values && ((_item$values = _item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 ? flag = true : null;
-    }
-  });
+var conditionsHandle = function conditionsHandle(type, data, count, eventId, flagList) {
+  if (data.conditions.length > 0) {
+    data.conditions.map(function (_item) {
+      if (_item.operator !== 'is null' && _item.operator !== 'is not null') {
+        var _item$values;
+        _item.values && (((_item$values = _item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || _item.values[0] === '') ? flagList.push(true) : null;
+      }
+    });
+  }
   if (type === 'targetFilters' || type === 'globalFilters') {
-    data.conditions.length != count ? flag = true : null;
+    data.conditions.length != count ? flagList.push(true) : null;
   } else {
-    data.conditions.length != count[eventId] ? flag = true : null;
+    count[eventId] && data.conditions.length != count[eventId] ? flagList.push(true) : null;
   }
-  return flag;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.2-alpha.3",
+  "version": "1.0.2-alpha.4",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -37,7 +37,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.41-attribution.16",
+    "@zgfe/business-lib": "1.1.41-attribution.17",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "1f756584bf9a984a8017f88908113edf14ee5286"
+  "gitHead": "234183e85542399536f200d3b12884c4802c8429"
 }