@zgfe/modules-attribution 1.0.1-alpha.8 → 1.0.2-alpha.0

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

@@ -6,12 +6,11 @@ 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,
-    showOverview = props.showOverview,
     eventIdList = props.eventIdList;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -34,8 +33,8 @@ var TargetEvent = function TargetEvent(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     eventId = _useState10[0],
     setEventId = _useState10[1];
-  var bizEventSelectorDefaultValue;
-  if (value.eventId && value.eventId != -100) {
+  var bizEventSelectorDefaultValue = {};
+  if (value && value.eventId && value.eventId != -100) {
     bizEventSelectorDefaultValue = {
       event: {
         id: value.eventId,
@@ -46,6 +45,12 @@ var TargetEvent = function TargetEvent(props) {
   useEffect(function () {
     if (value) {
       var _value$filters;
+      setTargetData({
+        event: {
+          id: value.eventId,
+          name: value.eventName
+        }
+      });
       setFilters(value.filters);
       if (eventIdList && eventIdList.length >= 0) {
         setEventId(eventIdList[0]);
@@ -56,12 +61,13 @@ var TargetEvent = function TargetEvent(props) {
     }
   }, []);
   var onChangeFilters = function onChangeFilters(data) {
-    console.log('归因事件-2', data);
     setFilters(data);
     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;
     }
@@ -75,25 +81,23 @@ 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);
-    var filterData = _.cloneDeep(filters);
-    onChangeHandle(target, filterData);
+    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);
+    }
+    setFilters(undefined);
+    setIsAdd(false);
+    setCount(0);
+    onChangeHandle(target, undefined);
   };
   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;
@@ -111,12 +115,14 @@ var TargetEvent = function TargetEvent(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "selector-content"
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showBuiltInTarget: true,
-    showAllEvent: showOverview,
+    showAllEvent: false,
+    showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
     defaultValue: bizEventSelectorDefaultValue,
-    onChange: onChangeTarget
+    onChange: onChangeTarget,
+    selectList: eventIdList,
+    placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   }), /*#__PURE__*/React.createElement(Select, {
     defaultValue: 1,
     style: {
@@ -136,14 +142,15 @@ 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,
     eventIdList: [eventId],

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;

package/es/modules/searchPanel/index.js

@@ -7,25 +7,27 @@ 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, useState } from 'react';
+import React, { useContext, useEffect, useState, useImperativeHandle } from 'react';
 import { IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { Button, Form, Skeleton, Tooltip, Checkbox, Select, InputNumber } from 'antd';
+import { initTarget } from '../../constants/initData';
 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 { initTarget } from '../../constants/initData';
+import { targetChangeCallback, operableOrNotHandle } from './utils';
 import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
 export var classPrefix = 'mi-left-form';
-var SearchPanel = function SearchPanel(props) {
-  var defaultValue = props.defaultValue;
-  console.log('SearchPanel', defaultValue);
+var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var defaultValue = props.defaultValue,
+    resetTime = props.resetTime;
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
-    setButtonDisable = _useContext.setButtonDisable;
-  console.log('defaultValue', defaultValue);
+    setButtonDisable = _useContext.setButtonDisable,
+    searching = _useContext.searching;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    eventGroupList = _useContext2.eventGroupList;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -41,13 +43,17 @@ var SearchPanel = function SearchPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     formData = _useState6[0],
     setFormData = _useState6[1];
-  var _useState7 = useState([-100]),
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
     eventIdList = _useState8[0],
     setEventIdList = _useState8[1];
-  var _useContext2 = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext2.eventGroupList;
-  var _useState9 = useState(0),
+  useEffect(function () {
+    if (formData) {
+      var targetData = targetChangeCallback(formData, eventIdList, eventGroupList);
+      form.setFieldsValue(targetData);
+    }
+  }, [eventIdList, formData]);
+  var _useState9 = useState(-1),
     _useState10 = _slicedToArray(_useState9, 2),
     windowCnt = _useState10[0],
     setWindowCnt = _useState10[1];
@@ -59,85 +65,114 @@ var SearchPanel = function SearchPanel(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     attrTargetCount = _useState14[0],
     setAttrTargetCount = _useState14[1];
-  var _useState15 = useState(0),
+  var _useState15 = useState({}),
     _useState16 = _slicedToArray(_useState15, 2),
     attrSourceCount = _useState16[0],
     setAttrSourceCount = _useState16[1];
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    mincePropCount = _useState18[0],
+    setMincePropCount = _useState18[1];
+  var _useState19 = useState(0),
+    _useState20 = _slicedToArray(_useState19, 2),
+    attrGlobalCount = _useState20[0],
+    setAttrGlobalCount = _useState20[1];
+  var getSelectEventIdList = function getSelectEventIdList(data, type, eList) {
+    if (data[type]) {
+      data[type].forEach(function (target) {
+        if (target && target.eventId && target.eventId !== -100) {
+          eList.push(target.eventId);
+        }
+      });
+    }
+    return eList;
+  };
+  var setSelectEventIdList = function setSelectEventIdList(data) {
+    var eList = [];
+    getSelectEventIdList(data, 'targetFilters', eList);
+    getSelectEventIdList(data, 'sourceFilters', eList);
+    setEventIdList(eList);
+  };
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    reset = _useState22[0],
+    setReset = _useState22[1];
   useEffect(function () {
-    if (defaultValue) {
+    if (defaultValue && reset !== null) {
       var data = defaultValue;
-      console.log('初始化', data);
+      if (reset) {
+        data = {
+          targetFilters: initTarget,
+          sourceFilters: initTarget
+        };
+        setReset(null);
+      }
       setFormData(data);
-      var eList = [];
-      defaultValue.targetFilters.forEach(function (target) {
-        if (target && target.eventId) {
-          eList.push(target.eventId);
+      setSelectEventIdList(data);
+      if (data.windowType !== undefined) {
+        setOtherEvent(data.otherEvent);
+        setWindowCnt(data.windowCnt);
+        setwindowTypeUnit(data.windowType);
+        data.windowCnt == -1 ? setWindowType(1) : setWindowType(2);
+      }
+      var _attrCount = {};
+      var _sourceCount = {};
+      data.sourceFilters.map(function (item) {
+        if (item.attributionSubdivision != undefined) {
+          _attrCount[item.eventId] = 1;
+        }
+        if (item.filters != undefined) {
+          _sourceCount[item.eventId] = item.filters.conditions.length;
         }
       });
-      console.log('初始化11', eList);
-      setEventIdList(eList);
-      if (defaultValue.windowType !== undefined) {
-        setOtherEvent(defaultValue.otherEvent);
-        setWindowCnt(defaultValue.windowCnt);
-        setwindowTypeUnit(defaultValue.windowType);
-        defaultValue.windowCnt == 0 ? setWindowType(1) : setWindowType(2);
-      }
+      setMincePropCount(_attrCount);
+      setAttrSourceCount(_sourceCount);
     }
     setLoading(false);
-  }, []);
+  }, [reset]);
   var onChange = function onChange(_changedValues, allValues) {
-    console.log(666, allValues);
-    var data = _.cloneDeep(allValues);
-    if (_changedValues.targetFilters) {
-      var eList = [];
-      if (allValues.targetFilters.length) {
-        allValues.targetFilters.forEach(function (target) {
-          if (target && target.eventId) {
-            eList.push(target.eventId);
-          }
-        });
-      } else {
-        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));
+    setFormData(allValues);
+    setSelectEventIdList(_.cloneDeep(allValues));
   };
-  var attrChange = function attrChange(e) {
-    var reason = form.getFieldValue('reason');
-    console.log('细分属性变化：', e, reason);
-  };
-  var onFinish = function onFinish() {
+  useEffect(function () {
+    if (formData) {
+      setButtonDisable(operableOrNotHandle(formData, attrSourceCount, attrTargetCount, mincePropCount, attrGlobalCount));
+    }
+  }, [formData, attrSourceCount, attrTargetCount, mincePropCount, attrGlobalCount]);
+  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);
-      }
+      res.otherEvent = otherEvent;
+      res.windowCnt = windowCnt;
+      res.windowType = windowType === 1 ? 'day' : windowTypeUnit;
+      props.onChange(res, isFetchRequest);
     }).catch(function (e) {
       console.log('表单检验失败', e);
     });
   };
+  useImperativeHandle(ref, function () {
+    return {
+      onGetSearchData: function onGetSearchData() {
+        onFinish(false);
+      }
+    };
+  });
   var otherEventChange = function otherEventChange(e) {
     setOtherEvent(e.target.checked);
   };
   var onReset = function onReset() {
     setButtonDisable(true);
-    form.resetFields();
+    setReset(true);
+    setTimeout(function () {
+      form.resetFields();
+      resetTime && resetTime();
+    }, 20);
     setWindowType(1);
+    setOtherEvent(false);
   };
-  var _useState17 = useState(1),
-    _useState18 = _slicedToArray(_useState17, 2),
-    windowType = _useState18[0],
-    setWindowType = _useState18[1];
+  var _useState23 = useState(1),
+    _useState24 = _slicedToArray(_useState23, 2),
+    windowType = _useState24[0],
+    setWindowType = _useState24[1];
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -162,7 +197,8 @@ var SearchPanel = function SearchPanel(props) {
         name: item.name
       }, /*#__PURE__*/React.createElement(GlobalAttribute, {
         max: item.max,
-        eventIdList: eventIdList
+        eventIdList: eventIdList,
+        setAttrGlobalCount: setAttrGlobalCount
       })));
     }
     return /*#__PURE__*/React.createElement(Form.List, {
@@ -191,15 +227,16 @@ var SearchPanel = function SearchPanel(props) {
         }), /*#__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);
           },
           setAttrTargetCount: setAttrTargetCount,
-          setAttrSourceCount: setAttrSourceCount
+          setAttrSourceCount: setAttrSourceCount,
+          setMincePropCount: setMincePropCount,
+          attrSourceCount: attrSourceCount,
+          mincePropCount: mincePropCount,
+          formData: formData
         }));
       }), fields.length < item.max && /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-add"),
@@ -271,7 +308,7 @@ var SearchPanel = function SearchPanel(props) {
     },
     onChange: function onChange(e) {
       setWindowType(e);
-      e === 1 ? setWindowCnt(0) : setWindowCnt(1);
+      e === 1 ? setWindowCnt(-1) : setWindowCnt(1);
     },
     options: [{
       value: 1,
@@ -286,8 +323,11 @@ var SearchPanel = function SearchPanel(props) {
       width: 80
     },
     value: windowCnt,
+    min: 1,
+    max: 365,
+    precision: 0,
     onChange: function onChange(e) {
-      return setWindowCnt(e);
+      setWindowCnt(Number(e));
     }
   }), /*#__PURE__*/React.createElement(Select, {
     value: windowTypeUnit,
@@ -310,10 +350,12 @@ var SearchPanel = function SearchPanel(props) {
     type: "primary",
     onClick: onReset
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    className: "".concat(buttonDisable ? 'disable' : ''),
-    disabled: buttonDisable,
+    className: "".concat(searching || buttonDisable ? 'disable' : ''),
+    disabled: searching || buttonDisable,
     type: "primary",
-    onClick: onFinish
+    onClick: function onClick() {
+      return onFinish(true);
+    }
   }, "\u63D0\u4EA4")))));
-};
+});
 export default SearchPanel;

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

@@ -1,7 +1,9 @@
+import { SearchValueProps, FiltersProps } from '../../types';
 export declare namespace SearchPanelTypes {
     interface Props {
-        defaultValue?: any;
-        onChange: (values: any) => void;
+        defaultValue?: SearchValueProps;
+        onChange: (values: SearchValueProps, isFetchRequest: boolean) => void;
+        resetTime?: Function;
     }
     interface FieldProp {
         key: string;
@@ -10,25 +12,37 @@ 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;
-        onDelete?: () => void;
-        attrChange?: (data: any) => void;
+        onChange?: (data: FiltersProps) => void;
+        onDelete: () => void;
+        formData: SearchValueProps;
         setAttrTargetCount: Function;
         setAttrSourceCount: Function;
+        attrSourceCount: {
+            [x: number]: number;
+        };
+        setMincePropCount: Function;
+        mincePropCount: {
+            [x: number]: number;
+        };
     }
     interface bizAttributeSelectorValueProp {
         id?: number;
         propCategory?: string;
+        name?: string;
+        category?: string;
+    }
+    interface targetDataProp {
+        event?: {
+            id: number;
+            name: string;
+            alias?: string;
+        };
     }
 }

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

@@ -1,5 +1,8 @@
-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: number, attrTargetCount: number): boolean;
+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 operableOrNotHandle(data: SearchValueProps, attrSourceCount: {
+    [x: number]: number;
+}, attrTargetCount: number, mincePropCount: {
+    [x: number]: number;
+}, attrGlobalCount: number): boolean;

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) {
+  if (eList.length <= 0) {
     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,34 +21,6 @@ export function targetChangeCallback(data, eList, eventGroupList) {
   }
   return data;
 }
-var buttonDisable = function buttonDisable(data, type, count) {
-  var flag = false;
-  data[type].map(function (item) {
-    item === undefined ? flag = true : null;
-    if (item !== undefined) {
-      var _item$filters;
-      (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flag = true : null;
-      item.filters === undefined && count != 0 ? flag = 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) {
-        var _item$filters2, _item$filters3;
-        (_item$filters2 = item.filters) === null || _item$filters2 === void 0 ? void 0 : _item$filters2.conditions.map(function (_item) {
-          var _item$values;
-          _item.values && ((_item$values = _item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 ? flag = true : null;
-        });
-        ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
-      }
-    }
-  });
-  return flag;
-};
-export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount) {
-  var flag = false;
-  data.attributionType === undefined ? flag = true : null;
-  buttonDisable(data, 'sourceFilters', attrSourceCount) ? flag = true : null;
-  buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
-  console.log('判断提交按钮是否可点击', attrSourceCount, flag, data);
-  return flag;
-}
 var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
   var flag = false;
   if (!eventGroupList) return false;
@@ -136,4 +37,52 @@ 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 subsetHandle = function subsetHandle(data, type, count, mincePropCount) {
+  var flag = false;
+  data[type].map(function (item) {
+    item === undefined ? flag = true : null;
+    if (item !== undefined) {
+      var _item$filters;
+      (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flag = true : null;
+      if (type === 'targetFilters') {
+        item.filters === undefined && count != 0 ? flag = true : null;
+      } else {
+        item.filters === undefined && Object.keys(count).length > 0 && count[item.eventId] !== undefined ? flag = true : null;
+        if (mincePropCount != undefined) {
+          item.attributionSubdivision === undefined && Object.keys(mincePropCount).length > 0 && mincePropCount[item.eventId] !== undefined ? flag = 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);
+      }
+    }
+  });
+  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;
+    }
+  });
+  if (type === 'targetFilters' || type === 'globalFilters') {
+    data.conditions.length != count ? flag = true : null;
+  } else {
+    data.conditions.length != count[eventId] ? flag = true : null;
+  }
+  return flag;
 };