@zgfe/modules-attribution 1.0.2-alpha.0 → 1.0.2-alpha.10

package/es/components/option/index.js

@@ -50,7 +50,7 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
           panel: {
             id: panelId
           },
-          name: panelName ? panelName + '(1)' : '归因分析'
+          name: panelName ? panelName + '(1)' : '归因'
         };
         setPanelValue(item);
         setShowPanelDialog(true);

package/es/components/tableList/styles/index.less

@@ -1,5 +1,8 @@
 .table-list {
   margin-top: 25px;
+  .ant-table-wrapper{
+    margin-bottom: 40px;
+  }
   &-empty-tips {
     margin-top: 112px;
     text-align: center;

package/es/components/title/index.js

@@ -182,7 +182,7 @@ var EditTitle = function EditTitle(props) {
   }, "\u4FDD\u5B58")));
 };
 EditTitle.defaultProps = {
-  title: '归因分析',
+  title: '归因',
   type: 'edit'
 };
 export default EditTitle;

package/es/constants/fields.d.ts

@@ -5,3 +5,7 @@ export declare const chartTypes: {
     value: string;
 }[];
 export declare const searchFields: SearchPanelTypes.FieldProp[];
+export declare const attributionTypeTooltips: {
+    text: string;
+    title: string;
+}[];

package/es/constants/fields.js

@@ -29,4 +29,17 @@ export var searchFields = [{
   max: 5,
   addLabel: '添加属性',
   required: false
+}];
+export var attributionTypeTooltips = [{
+  text: '首次触点归因',
+  title: '完成目标事件的「待归因事件」中，第一个「待归因事件」贡献为100%'
+}, {
+  text: '末次触点归因',
+  title: '完成目标事件的「待归因事件」中，最后一个「待归因事件」贡献为100%'
+}, {
+  text: '线性归因',
+  title: '完成目标事件的「待归因事件」中，所有「待归因事件」平均分配贡献'
+}, {
+  text: '位置归因',
+  title: '完成目标事件的「待归因事件」中，首位和末位「待归因事件」各获40%贡献，其余「待归因事件」平分20%贡献'
 }];

package/es/modules/content/index.js

@@ -106,6 +106,8 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-top-content")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-content-box")
   }, /*#__PURE__*/React.createElement(SearchPanel, {
@@ -113,7 +115,7 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     defaultValue: searchData,
     onChange: onChangeSearch,
     resetTime: resetTime
-  })), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-bottom-content-box")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-bottom-content-box-times")

package/es/modules/home/index.js

@@ -118,7 +118,7 @@ var AttributionHome = function AttributionHome(props) {
     onEditTitle: setTitle
   }), !panelId && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header-title")
-  }, "\u5F52\u56E0\u5206\u6790"), /*#__PURE__*/React.createElement("div", {
+  }, "\u5F52\u56E0"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content ").concat(panelId ? classPrefix + '-content2' : '')
   }, /*#__PURE__*/React.createElement(AttributionContent, {
     ref: attributionRef,

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

@@ -14,20 +14,24 @@
     font-weight: 500;
     font-size: 16px;
     line-height: 48px;
-    border-bottom: 1px solid #f2f3f4;
   }
   &-content {
     width: 100%;
     height: 100%;
     // overflow: auto;
     overflow-x: hidden;
-    background: #fafafb;
+    background: #fff;
     border-top: 1px solid #eaeaea;
     .attribution-content {
-      &-top-content-box {
-        margin: 16px 24px;
-        padding: 24px;
-        background: #fff;
+      &-top-content {
+        background: #fafafb;
+        padding: 16px 24px;
+        &-box{
+          padding: 24px;
+          background: #fff;
+          border: 1px solid #ECEDF0;
+          border-radius: 8px;
+        }
       }
       &-bottom-content-box {
         min-height: 382px;

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

@@ -11,6 +11,7 @@ import _ from 'lodash';
 import { Tooltip, message } from 'antd';
 var AttributableEvents = function AttributableEvents(props) {
   var value = props.value,
+    fieldsLength = props.fieldsLength,
     setMincePropCount = props.setMincePropCount,
     mincePropCount = props.mincePropCount,
     attrSourceCount = props.attrSourceCount,
@@ -38,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 = {
@@ -58,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;
@@ -91,16 +96,19 @@ 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) {
-      message.error('至少保留一个待归因事件');
+      setReasonData(undefined);
+      setAttrSelectShow(false);
+      setFilters(undefined);
+      setIsAdd(false);
+      setBizAttributeSelectorValue(undefined);
+      onChangeHandle(undefined, undefined, undefined);
       return;
     }
     if (ReasonData) {
@@ -133,6 +141,10 @@ var AttributableEvents = function AttributableEvents(props) {
       message.error('最多可添加5条属性筛选');
       return;
     }
+    if (countLoading) {
+      return;
+    }
+    setCountLoading(true);
     setIsAdd(true);
     setTimeout(function () {
       conditionRef.current.add();
@@ -189,7 +201,11 @@ var AttributableEvents = function AttributableEvents(props) {
   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;
+      if (!reason || !reason.event || !((_reason$event2 = reason.event) === null || _reason$event2 === void 0 ? void 0 : _reason$event2.id)) {
+        props.onChange(undefined);
+        return;
+      }
+      ;
       var event = reason.event;
       var data = {
         eventId: event === null || event === void 0 ? void 0 : event.id,
@@ -200,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) {
@@ -222,7 +238,7 @@ var AttributableEvents = function AttributableEvents(props) {
     popupContainer: false,
     defaultSelectAble: false,
     onChange: onChangeReason,
-    defaultValue: bizEventSelectorDefaultValue,
+    value: bizEventSelectorDefaultValue,
     selectList: eventIdList,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   }), attrSelectShow && /*#__PURE__*/React.createElement(BizAttributeSelector, {
@@ -239,7 +255,7 @@ var AttributableEvents = function AttributableEvents(props) {
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "button-box"
-  }, notClickable === false && /*#__PURE__*/React.createElement(IconFont, {
+  }, (notClickable === false || fieldsLength && fieldsLength > 1) && /*#__PURE__*/React.createElement(IconFont, {
     type: "qingchu",
     onClick: onEventDelete
   }), /*#__PURE__*/React.createElement(Tooltip, {
@@ -258,7 +274,9 @@ var AttributableEvents = function AttributableEvents(props) {
     onClick: function onClick() {
       return onAdd();
     }
-  })))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
+  })))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(count > 0 ? 'attr-box-show' : '')
+  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filters,
     onlyAnd: true,
@@ -267,6 +285,6 @@ var AttributableEvents = function AttributableEvents(props) {
     eventIdList: [eventId],
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  })));
+  }))));
 };
 export default AttributableEvents;

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

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizAttrConditionGroup, IconFont } from '@zgfe/business-lib';
 import React, { useEffect, useRef, useState } from 'react';
 var GlobalAttribute = function GlobalAttribute(props) {
-  var classPrefix = 'mi-left-form';
+  var classPrefix = 'form-box';
   var max = props.max,
     onChange = props.onChange,
     setAttrGlobalCount = props.setAttrGlobalCount;
@@ -33,13 +33,15 @@ var GlobalAttribute = function GlobalAttribute(props) {
     }
   }, [props.eventIdList, props.value]);
   var onAdd = function onAdd() {
-    if (props.eventIdList[0] === -100) return;
+    if (props.eventIdList && props.eventIdList.length <= 0 || 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, {
+  return /*#__PURE__*/React.createElement("div", null, props.eventIdList && props.eventIdList[0] === -100 ? '' : /*#__PURE__*/React.createElement("div", {
+    className: "".concat(count > 0 ? 'attr-box-show' : '')
+  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: props.value,
     onlyAnd: true,
@@ -48,7 +50,7 @@ var GlobalAttribute = function GlobalAttribute(props) {
     eventIdList: props.eventIdList,
     onChange: onChange,
     onConditionsCount: setCount
-  }), count < max && /*#__PURE__*/React.createElement("div", {
+  })), count < max && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-add ").concat(props.eventIdList && props.eventIdList.length <= 0 ? 'disabled' : ''),
     onClick: onAdd
   }, /*#__PURE__*/React.createElement(IconFont, {

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) {
@@ -147,7 +143,9 @@ var TargetEvent = function TargetEvent(props) {
     onClick: function onClick() {
       return onAdd();
     }
-  }))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
+  }))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(count > 0 ? 'attr-box-show' : '')
+  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: undefined,
     onlyAnd: true,
@@ -156,6 +154,6 @@ var TargetEvent = function TargetEvent(props) {
     eventIdList: [eventId],
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  })));
+  }))));
 };
 export default TargetEvent;

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

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

package/es/modules/searchPanel/index.js

@@ -16,9 +16,9 @@ import GlobalAttribute from './components/globalAttribute';
 import './styles/index.less';
 import _ from 'lodash';
 import { targetChangeCallback, operableOrNotHandle } from './utils';
-import { searchFields } from '../../constants/fields';
+import { searchFields, attributionTypeTooltips } from '../../constants/fields';
 import { AttributableContext } from '../../types';
-export var classPrefix = 'mi-left-form';
+export var classPrefix = 'form-box';
 var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue,
     resetTime = props.resetTime;
@@ -173,9 +173,21 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState24 = _slicedToArray(_useState23, 2),
     windowType = _useState24[0],
     setWindowType = _useState24[1];
+  var attributionTypeTooltip = function attributionTypeTooltip(type) {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      overlayClassName: "attribution-type-tooltip ".concat(type === 2 || type === 3 ? 'attribution-type-tooltip-distance' : ''),
+      placement: "right",
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById('attribution-type');
+      },
+      title: attributionTypeTooltips[type].title
+    }, /*#__PURE__*/React.createElement("p", null, attributionTypeTooltips[type].text));
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement(Skeleton, {
+  }, /*#__PURE__*/React.createElement("p", {
+    className: "".concat(classPrefix, "-bottom-form-title")
+  }, "\u9009\u62E9\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Skeleton, {
     loading: loading,
     active: true,
     paragraph: {
@@ -189,9 +201,10 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, searchFields.map(function (item) {
     if (item.type === 'globalFilters') {
       return /*#__PURE__*/React.createElement(Form.Item, {
-        key: item.key
+        key: item.key,
+        className: "".concat(classPrefix, "-form-item")
       }, /*#__PURE__*/React.createElement(Form.Item, {
-        className: "".concat(classPrefix, "-title")
+        className: "".concat(classPrefix, "-title global-attr")
       }, item.label), /*#__PURE__*/React.createElement(Form.Item, {
         className: "".concat(classPrefix, "-item"),
         name: item.name
@@ -208,6 +221,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var add = _ref.add,
         remove = _ref.remove;
       return /*#__PURE__*/React.createElement(Form.Item, {
+        className: "".concat(classPrefix, "-form-item"),
         key: "".concat(item.key, "-item-").concat(index)
       }, /*#__PURE__*/React.createElement(Form.Item, {
         className: "".concat(classPrefix, "-title")
@@ -216,7 +230,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
           color: 'red'
         }
       }, "* "), item.label, /*#__PURE__*/React.createElement(Tooltip, {
-        placement: "left",
+        placement: "right",
         title: item.tips
       }, /*#__PURE__*/React.createElement(IconFont, {
         type: "tishiicon"
@@ -225,6 +239,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
           key: field.key,
           className: "".concat(classPrefix, "-item")
         }), /*#__PURE__*/React.createElement(SearchContent, {
+          fieldsLength: fields.length,
           type: item.type,
           key: field.key,
           eventIdList: eventIdList,
@@ -265,7 +280,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       color: 'red'
     }
   }, "* "), "\u5F52\u56E0\u6A21\u578B"), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-bottom-form")
+    className: "".concat(classPrefix, "-bottom-form"),
+    id: "attribution-type"
   }, /*#__PURE__*/React.createElement("p", {
     className: "p"
   }, "\u5206\u6790\u6A21\u578B"), /*#__PURE__*/React.createElement(Form.Item, {
@@ -275,23 +291,32 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       message: '请选择分析模型'
     }]
   }, /*#__PURE__*/React.createElement(Select, {
-    className: "attributionType",
+    className: "attribution-type",
+    getPopupContainer: function getPopupContainer() {
+      return document.getElementById('attribution-type');
+    },
     placeholder: "\u8BF7\u9009\u62E9",
     style: {
       width: 208
     },
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#021429'
+      }
+    }),
     options: [{
       value: 1,
-      label: '首次触点归因'
+      label: attributionTypeTooltip(0)
     }, {
       value: 2,
-      label: '末次触点归因'
+      label: attributionTypeTooltip(1)
     }, {
       value: 3,
-      label: '线性归因'
+      label: attributionTypeTooltip(2)
     }, {
       value: 4,
-      label: '位置归因'
+      label: attributionTypeTooltip(3)
     }]
   })), /*#__PURE__*/React.createElement("p", {
     className: "p"
@@ -306,6 +331,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     style: {
       width: 208
     },
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#021429'
+      }
+    }),
     onChange: function onChange(e) {
       setWindowType(e);
       e === 1 ? setWindowCnt(-1) : setWindowCnt(1);
@@ -337,6 +368,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onChange: function onChange(e) {
       return setwindowTypeUnit(e);
     },
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#021429'
+      }
+    }),
     options: [{
       value: 'day',
       label: '天'
@@ -356,6 +393,6 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onClick: function onClick() {
       return onFinish(true);
     }
-  }, "\u63D0\u4EA4")))));
+  }, "\u67E5\u8BE2")))));
 });
 export default SearchPanel;

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

@@ -1,6 +1,16 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
-.mi-left-form {
+.form-box {
+  .xiangxia {
+    font-size: 14px !important;
+  }
+  &-form-item {
+    margin-bottom: 16px;
+    .attr-box-show {
+      margin: 12px 0px;
+    }
+  }
+
   &-bottom-form-title {
     margin-top: 34px;
     margin-bottom: 16px;
@@ -23,13 +33,29 @@
         color: #9aa1a9;
       }
     }
-    .attributionType {
+    .attribution-type {
       margin-right: 24px;
     }
     .windowCnt {
       margin: 0 16px;
     }
   }
+  
+  #attribution-type{
+    position: relative;
+    .ant-select-dropdown{
+      z-index: 998;
+    }
+    .attribution-type-tooltip {
+      z-index: 999;
+      right: 0px!important;
+      // left: 200px!important;
+      &-distance{
+        // left: 170px!important;
+      }
+    }
+  }
+
   &-otherEvent {
     color: #021429;
     font-size: 14px;
@@ -71,13 +97,12 @@
   }
 
   &-item.ant-form-item {
-    margin-bottom: 12px;
+    margin-bottom: 0px;
   }
 
   &-add {
     width: fit-content;
     height: 20px;
-    margin-top: 8px;
     color: #165dff;
     font-size: 14px;
     line-height: 20px;
@@ -97,6 +122,10 @@
     }
   }
 
+  .global-attr {
+    margin-bottom: 0 !important;
+  }
+
   .biz-condition-item-input {
     border-color: transparent;
   }
@@ -128,18 +157,13 @@
             right: 40px;
           }
         }
-        // .biz-attr-select-handle:hover{
-        //   .xiangxia{
-        //     display: none;
-        //   }
-        // }
       }
       .button-box {
         .qingchu,
         .tianjia2,
         .shaixuan {
           margin-top: 2px;
-          margin-right: 20px;
+          margin-right: 16px;
           // color: #CCD0D4;
           color: #9aa1a9;
           font-size: 20px !important;
@@ -162,7 +186,6 @@
   .target-events-box {
     .selector-content {
       display: flex;
-      margin-bottom: 12px;
       .ant-dropdown-trigger {
         width: 208px;
         margin-right: 16px;
@@ -175,7 +198,7 @@
       }
     }
     .shaixuan {
-      margin: 2px 0 0 20px;
+      margin: 2px 0 0 16px;
       color: #9aa1a9;
       font-size: 20px !important;
       cursor: pointer;
@@ -199,4 +222,4 @@
     margin-top: -14px;
     color: #fb5547;
   }
-}
+}

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

@@ -18,8 +18,9 @@ export declare namespace SearchPanelTypes {
     interface PanelProp {
         type: string;
         value?: FiltersProps;
+        fieldsLength?: number;
         eventIdList?: number[];
-        onChange?: (data: FiltersProps) => void;
+        onChange?: (data: FiltersProps | undefined) => void;
         onDelete: () => void;
         formData: SearchValueProps;
         setAttrTargetCount: Function;

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.0",
+  "version": "1.0.2-alpha.10",
   "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.10",
+    "@zgfe/business-lib": "1.1.41-attribution.19",
     "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": "7765039dbcf529e5a42e5bf9dd849f0c9f1405a6"
+  "gitHead": "03e43cb109cc415ae8b55772cbff5a7e79f7ab0f"
 }