@zgfe/modules-attribution 1.0.1-alpha.14 → 1.0.1-alpha.16

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

@@ -17,7 +17,6 @@ import InsightContent 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],
@@ -109,12 +108,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,

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

@@ -16,7 +16,6 @@ var AttributableEvents = function AttributableEvents(props) {
     attrSourceCount = props.attrSourceCount,
     setAttrSourceCount = props.setAttrSourceCount,
     formData = props.formData,
-    showOverview = props.showOverview,
     eventIdList = props.eventIdList,
     onDelete = props.onDelete;
   var _useContext = useContext(AttributableContext),
@@ -33,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],
@@ -51,9 +47,9 @@ var AttributableEvents = function AttributableEvents(props) {
     setEventId = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    aloneAttr = _useState14[0],
-    setAloneAttr = _useState14[1];
-  var bizEventSelectorDefaultValue;
+    minceAttr = _useState14[0],
+    setMinceAttr = _useState14[1];
+  var bizEventSelectorDefaultValue = {};
   if (value && value.eventId && value.eventId != -100) {
     bizEventSelectorDefaultValue = {
       event: {
@@ -67,7 +63,6 @@ var AttributableEvents = function AttributableEvents(props) {
     bizAttributeSelectorValue = _useState16[0],
     setBizAttributeSelectorValue = _useState16[1];
   useEffect(function () {
-    console.log('初始化-1236', value, mincePropCount);
     if (value) {
       var _value$filters;
       setReasonData({
@@ -77,7 +72,7 @@ var AttributableEvents = function AttributableEvents(props) {
         }
       });
       setFilters(value.filters);
-      setAloneAttr(value.propfilters);
+      setMinceAttr(value.propfilters);
       if (eventIdList && eventIdList.length >= 0) {
         setEventId(eventIdList[0]);
       }
@@ -94,12 +89,11 @@ var AttributableEvents = function AttributableEvents(props) {
     }
   }, []);
   useEffect(function () {
-    console.log('判断提交按钮是否可点击-123', ReasonData, count);
     if (ReasonData) {
       handleCount('add', attrSourceCount, setAttrSourceCount, count);
     }
     setTimeout(function () {
-      onChangeHandle(ReasonData, filters, aloneAttr);
+      onChangeHandle(ReasonData, filters, minceAttr);
     }, 0);
   }, [count]);
   var onEventDelete = function onEventDelete() {
@@ -114,7 +108,7 @@ var AttributableEvents = function AttributableEvents(props) {
     onDelete();
   };
   var handleCount = function handleCount(type, _attrCount, _setAttrCount, count) {
-    if (ReasonData) {
+    if (ReasonData && ReasonData.event) {
       var __attrCount = _.cloneDeep(_attrCount);
       if (type === 'add' && count) {
         __attrCount[ReasonData.event.id] = count;
@@ -125,9 +119,8 @@ var AttributableEvents = function AttributableEvents(props) {
     }
   };
   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) {
@@ -151,15 +144,15 @@ var AttributableEvents = function AttributableEvents(props) {
     }
   };
   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);
     if (attr === undefined) {
       handleCount('delete', mincePropCount, setMincePropCount);
     } else {
@@ -168,18 +161,17 @@ var AttributableEvents = function AttributableEvents(props) {
         propCategory: attr.propCategory
       });
     }
-    var _aloneAttr = attr === undefined ? undefined : {
+    var _minceAttr = attr === undefined ? undefined : {
       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) {
-    console.log('为啥呢？', 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;
@@ -188,9 +180,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
+        propfilters: minceAttr
       };
-      console.log('待归因事件-变动-组装数据', data);
       props.onChange(data);
     }
   };
@@ -200,7 +191,6 @@ var AttributableEvents = function AttributableEvents(props) {
     className: "select-and-attr"
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
     showBuiltInTarget: true,
-    showAllEvent: showOverview,
     popupContainer: false,
     defaultSelectAble: false,
     onChange: onChangeReason,

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);

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

@@ -11,7 +11,6 @@ import { Select, Tooltip, message } from 'antd';
 var TargetEvent = function TargetEvent(props) {
   var value = props.value,
     setAttrTargetCount = props.setAttrTargetCount,
-    showOverview = props.showOverview,
     eventIdList = props.eventIdList;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -34,7 +33,7 @@ var TargetEvent = function TargetEvent(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     eventId = _useState10[0],
     setEventId = _useState10[1];
-  var bizEventSelectorDefaultValue;
+  var bizEventSelectorDefaultValue = {};
   if (value && value.eventId && value.eventId != -100) {
     bizEventSelectorDefaultValue = {
       event: {
@@ -62,7 +61,6 @@ var TargetEvent = function TargetEvent(props) {
     }
   }, []);
   var onChangeFilters = function onChangeFilters(data) {
-    console.log('归因事件-2', data);
     setFilters(data);
     onChangeHandle(targetData, data);
   };
@@ -81,25 +79,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;
@@ -118,7 +112,6 @@ var TargetEvent = function TargetEvent(props) {
     className: "selector-content"
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
     showBuiltInTarget: true,
-    showAllEvent: showOverview,
     popupContainer: false,
     defaultSelectAble: false,
     defaultValue: bizEventSelectorDefaultValue,

package/es/modules/searchPanel/index.js

@@ -14,7 +14,7 @@ import SearchContent from './components/index';
 import GlobalAttribute from './components/globalAttribute';
 import './styles/index.less';
 import _ from 'lodash';
-import { targetChangeCallback, submitButtonDisableHandle, removeEmptyValue, verifyHandle } from './utils';
+import { targetChangeCallback, submitButtonDisableHandle } from './utils';
 import { initTarget } from '../../constants/initData';
 import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
@@ -66,13 +66,9 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     mincePropCount = _useState18[0],
     setMincePropCount = _useState18[1];
-  useEffect(function () {
-    console.log('判断提交按钮是否可点击-1234444', mincePropCount);
-  }, [mincePropCount]);
   useEffect(function () {
     if (defaultValue) {
       var data = defaultValue;
-      console.log('初始化', data);
       setFormData(data);
       var eList = [];
       defaultValue.targetFilters.forEach(function (target) {
@@ -80,7 +76,6 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
           eList.push(target.eventId);
         }
       });
-      console.log('初始化11', eList);
       setEventIdList(eList);
       if (defaultValue.windowType !== undefined) {
         setOtherEvent(defaultValue.otherEvent);
@@ -104,7 +99,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setLoading(false);
   }, []);
   var onChange = function onChange(_changedValues, allValues) {
-    console.log(666, allValues);
+    console.log('筛选值发生改变', _changedValues, allValues);
     setFormData(allValues);
     var data = _.cloneDeep(allValues);
     if (_changedValues.targetFilters) {
@@ -119,28 +114,18 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         data.targetFilters = initTarget;
         eList = [-100];
       }
-      console.log('999', eList);
       setEventIdList(eList);
       var targetData = targetChangeCallback(data, eList, eventGroupList);
       form.setFieldsValue(targetData);
     }
     setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount, mincePropCount));
   };
-  var attrChange = function attrChange(e) {
-    var reason = form.getFieldValue('reason');
-    console.log('细分属性变化：', e, reason);
-  };
   var onFinish = function onFinish(isFetchRequest) {
     form.validateFields().then(function (res) {
-      if (verifyHandle(res)) {
-        console.log('表单检验通过', res);
-        res.otherEvent = otherEvent;
-        res.windowCnt = windowCnt;
-        res.windowType = windowType === 1 ? 'day' : windowTypeUnit;
-        var finalData = removeEmptyValue(res);
-        console.log(123123, finalData);
-        props.onChange(finalData, isFetchRequest);
-      }
+      res.otherEvent = otherEvent;
+      res.windowCnt = windowCnt;
+      res.windowType = windowType === 1 ? 'day' : windowTypeUnit;
+      props.onChange(res, isFetchRequest);
     }).catch(function (e) {
       console.log('表单检验失败', e);
     });
@@ -217,10 +202,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }), /*#__PURE__*/React.createElement(SearchContent, {
           type: item.type,
           key: field.key,
-          attrChange: attrChange,
-          enableDelete: fields.length > 1,
           eventIdList: eventIdList,
-          allValues: formData,
           onDelete: function onDelete() {
             return remove(index);
           },

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

@@ -1,7 +1,8 @@
+import { SearchValueProps, FiltersProps } from '../../types';
 export declare namespace SearchPanelTypes {
     interface Props {
-        defaultValue?: any;
-        onChange: (values: any, isFetchRequest: boolean) => void;
+        defaultValue?: SearchValueProps;
+        onChange: (values: SearchValueProps, isFetchRequest: boolean) => void;
     }
     interface FieldProp {
         key: string;
@@ -10,21 +11,16 @@ export declare namespace SearchPanelTypes {
         label: string;
         max: number;
         addLabel: string;
-        options?: any[];
         tips?: string;
         required?: boolean;
     }
     interface PanelProp {
         type: string;
-        value?: any;
-        allValues?: any;
-        enableDelete: boolean;
+        value?: FiltersProps;
         eventIdList?: number[];
-        showOverview?: boolean;
-        onChange?: (data: any) => void;
+        onChange?: (data: FiltersProps) => void;
         onDelete: () => void;
-        attrChange?: (data: any) => void;
-        formData: any;
+        formData: SearchValueProps;
         setAttrTargetCount: Function;
         setAttrSourceCount: Function;
         attrSourceCount: {
@@ -39,4 +35,11 @@ export declare namespace SearchPanelTypes {
         id?: number;
         propCategory?: string;
     }
+    interface targetDataProp {
+        event?: {
+            id: number;
+            name: string;
+            alias?: string;
+        };
+    }
 }

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

@@ -1,8 +1,7 @@
-import { SearchData } from '../../types';
-export declare function removeEmptyValue(source: SearchData): any;
-export declare function verifyHandle(data: SearchData): boolean;
-export declare function targetChangeCallback(data: SearchData, eList: number[], eventGroupList: any): SearchData;
-export declare function submitButtonDisableHandle(data: SearchData, attrSourceCount: {
+import { SearchValueProps } from '../../types';
+import { EventSelectTypes } from '@zgfe/business-lib/es/eventSelector/types';
+export declare function targetChangeCallback(data: SearchValueProps, eList: number[], eventGroupList: EventSelectTypes.Value[]): SearchValueProps;
+export declare function submitButtonDisableHandle(data: SearchValueProps, attrSourceCount: {
     [x: number]: number;
 }, attrTargetCount: number, mincePropCount: {
     [x: number]: number;

package/es/modules/searchPanel/utils.js

@@ -1,87 +1,16 @@
-import _ from 'lodash';
-export function removeEmptyValue(source) {
-  var data = _.cloneDeep(source);
-  var getValue = function getValue(formData) {
-    if (!formData) return formData;
-    var newData = [];
-    formData.forEach(function (item) {
-      if (item) {
-        if (item.filters) {
-          var conditions = getConditionList(item.filters.conditions);
-          if (conditions) {
-            item.filters.conditions = conditions;
-          } else {
-            item.filters = undefined;
-          }
-        }
-        newData.push(item);
-      }
-    });
-    if (newData.length) return newData.length ? newData : undefined;
-  };
-  data.targetFilters = getValue(data.targetFilters)[0];
-  data.sourceFilters = getValue(data.sourceFilters);
-  if (data.globalFilters) {
-    var conditions = getConditionList(data.globalFilters.conditions);
-    if (conditions) {
-      data.globalFilters.conditions = conditions;
-    } else {
-      data.globalFilters = undefined;
-    }
-  }
-  return data;
-}
-export function verifyHandle(data) {
-  console.log('判断表单校验是否通过', data);
-  var targetFilters = data.targetFilters,
-    sourceFilters = data.sourceFilters;
-  var _verify = true;
-  targetFilters.map(function (item) {
-    if (item.eventId === -100 || item === undefined) _verify = false;
-  });
-  sourceFilters.map(function (item) {
-    if (item.eventId === -100 || item === undefined) _verify = false;
-  });
-  return _verify;
-}
-var OperateTypes;
-(function (OperateTypes) {
-  OperateTypes["IsNull"] = "is null";
-  OperateTypes["IsNotNull"] = "is not null";
-})(OperateTypes || (OperateTypes = {}));
-function getConditionList(condition) {
-  if (!condition) return;
-  var conditionList = [];
-  condition.forEach(function (item) {
-    if (!item.attrId && !item.attrName) return;
-    if (!item.values || !item.values.length) {
-      if (item.operator === OperateTypes.IsNotNull || item.operator === OperateTypes.IsNull) {
-        conditionList.push(item);
-      }
-    } else {
-      conditionList.push(item);
-    }
-  });
-  return conditionList.length ? conditionList : undefined;
-}
 export function targetChangeCallback(data, eList, eventGroupList) {
   if (eList[0] === -100) {
     data.globalFilters = undefined;
   } else {
     if (data.globalFilters && data.globalFilters.conditions) {
-      var newFilters = [],
-        flag = true;
+      var flag = true;
       data.globalFilters.conditions.forEach(function (condition) {
         if (condition) {
           if (condition.propCategory === 'eventProp' && condition.attrId) {
             var hasExit = judgeAttrInEvents(eList, condition.attrId, eventGroupList);
-            if (hasExit) {
-              newFilters.push(condition);
-            } else {
+            if (!hasExit) {
               flag = false;
             }
-          } else {
-            newFilters.push(condition);
           }
         }
       });
@@ -92,6 +21,30 @@ export function targetChangeCallback(data, eList, eventGroupList) {
   }
   return data;
 }
+var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
+  var flag = false;
+  if (!eventGroupList) return false;
+  eventGroupList.forEach(function (group) {
+    group.eventList.forEach(function (event) {
+      if (elds.includes(event.id)) {
+        event.attrList.forEach(function (attr) {
+          if (attr.id === attrId) {
+            flag = true;
+            return;
+          }
+        });
+      }
+    });
+  });
+  return flag;
+};
+export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount, mincePropCount) {
+  var flag = false;
+  data.attributionType === undefined ? flag = true : null;
+  buttonDisable(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
+  buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
+  return flag;
+}
 var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
   var flag = false;
   data[type].map(function (item) {
@@ -118,36 +71,10 @@ var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
           ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
         } else {
           var _item$filters4;
-          console.log('问题排查', item, count);
           ((_item$filters4 = item.filters) === null || _item$filters4 === void 0 ? void 0 : _item$filters4.conditions.length) != count[item.eventId] ? flag = true : null;
         }
       }
     }
   });
   return flag;
-};
-export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount, mincePropCount) {
-  var flag = false;
-  data.attributionType === undefined ? flag = true : null;
-  buttonDisable(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
-  buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
-  console.log('判断提交按钮是否可点击', mincePropCount, flag, data);
-  return flag;
-}
-var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
-  var flag = false;
-  if (!eventGroupList) return false;
-  eventGroupList.forEach(function (group) {
-    group.eventList.forEach(function (event) {
-      if (elds.includes(event.id)) {
-        event.attrList.forEach(function (attr) {
-          if (attr.id === attrId) {
-            flag = true;
-            return;
-          }
-        });
-      }
-    });
-  });
-  return flag;
 };