@zgfe/modules-attribution 1.0.1-alpha.19 → 1.0.1-alpha.21

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

@@ -63,7 +63,7 @@ var defaultValue = {
           "attrName": "商品单价"
         }]
       },
-      "propfilters": {
+      "attributionSubdivision": {
         "propCategory": "eventProp",
         "type": 1,
         "attrId": 139499
@@ -93,7 +93,7 @@ var defaultValue = {
           "attrName": "商品单价"
         }]
       },
-      "propfilters": {
+      "attributionSubdivision": {
         "propCategory": "eventProp",
         "type": 1,
         "attrId": 139490

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

@@ -17,6 +17,7 @@ var AttributableEvents = function AttributableEvents(props) {
     setAttrSourceCount = props.setAttrSourceCount,
     formData = props.formData,
     eventIdList = props.eventIdList,
+    selectList = props.selectList,
     onDelete = props.onDelete;
   var _useContext = useContext(AttributableContext),
     setButtonDisable = _useContext.setButtonDisable;
@@ -72,14 +73,14 @@ var AttributableEvents = function AttributableEvents(props) {
         }
       });
       setFilters(value.filters);
-      setMinceAttr(value.propfilters);
+      setMinceAttr(value.attributionSubdivision);
       if (eventIdList && eventIdList.length >= 0) {
         setEventId(eventIdList[0]);
       }
-      if (value.propfilters) {
+      if (value.attributionSubdivision) {
         setBizAttributeSelectorValue({
-          id: value.propfilters.attrId,
-          propCategory: value.propfilters.propCategory
+          id: value.attributionSubdivision.attrId,
+          propCategory: value.attributionSubdivision.propCategory
         });
         setAttrSelectShow(true);
       }
@@ -180,7 +181,7 @@ 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: minceAttr
+        attributionSubdivision: minceAttr
       };
       props.onChange(data);
     }
@@ -190,11 +191,13 @@ var AttributableEvents = function AttributableEvents(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "select-and-attr"
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showBuiltInTarget: true,
+    showAllEvent: false,
+    showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
     onChange: onChangeReason,
-    defaultValue: bizEventSelectorDefaultValue
+    defaultValue: bizEventSelectorDefaultValue,
+    selectList: selectList
   }), attrSelectShow && /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: true,

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

@@ -44,7 +44,7 @@ var GlobalAttribute = function GlobalAttribute(props) {
     onChange: onChange,
     onConditionsCount: setCount
   }), count < max && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-add ").concat(props.eventIdList[0] === -100 ? 'disabled' : ''),
+    className: "".concat(classPrefix, "-add ").concat(props.eventIdList && props.eventIdList.length <= 0 ? 'disabled' : ''),
     onClick: onAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-add-icon"),

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

@@ -11,7 +11,8 @@ import { Select, Tooltip, message } from 'antd';
 var TargetEvent = function TargetEvent(props) {
   var value = props.value,
     setAttrTargetCount = props.setAttrTargetCount,
-    eventIdList = props.eventIdList;
+    eventIdList = props.eventIdList,
+    selectList = props.selectList;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     targetData = _useState2[0],
@@ -111,11 +112,13 @@ var TargetEvent = function TargetEvent(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "selector-content"
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showBuiltInTarget: true,
+    showAllEvent: false,
+    showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
     defaultValue: bizEventSelectorDefaultValue,
-    onChange: onChangeTarget
+    onChange: onChangeTarget,
+    selectList: selectList
   }), /*#__PURE__*/React.createElement(Select, {
     defaultValue: 1,
     style: {

package/es/modules/searchPanel/index.js

@@ -15,7 +15,6 @@ import GlobalAttribute from './components/globalAttribute';
 import './styles/index.less';
 import _ from 'lodash';
 import { targetChangeCallback, submitButtonDisableHandle } from './utils';
-import { initTarget } from '../../constants/initData';
 import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
 export var classPrefix = 'mi-left-form';
@@ -25,6 +24,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
     setButtonDisable = _useContext.setButtonDisable;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    eventGroupList = _useContext2.eventGroupList;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -40,43 +41,62 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _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(-1),
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    windowCnt = _useState10[0],
-    setWindowCnt = _useState10[1];
-  var _useState11 = useState('day'),
+    selectList = _useState10[0],
+    setSelectList = _useState10[1];
+  useEffect(function () {
+    if (formData) {
+      var targetData = targetChangeCallback(formData, eventIdList, eventGroupList);
+      form.setFieldsValue(targetData);
+    }
+  }, [eventIdList, formData]);
+  var _useState11 = useState(-1),
     _useState12 = _slicedToArray(_useState11, 2),
-    windowTypeUnit = _useState12[0],
-    setwindowTypeUnit = _useState12[1];
-  var _useState13 = useState(0),
+    windowCnt = _useState12[0],
+    setWindowCnt = _useState12[1];
+  var _useState13 = useState('day'),
     _useState14 = _slicedToArray(_useState13, 2),
-    attrTargetCount = _useState14[0],
-    setAttrTargetCount = _useState14[1];
-  var _useState15 = useState({}),
+    windowTypeUnit = _useState14[0],
+    setwindowTypeUnit = _useState14[1];
+  var _useState15 = useState(0),
     _useState16 = _slicedToArray(_useState15, 2),
-    attrSourceCount = _useState16[0],
-    setAttrSourceCount = _useState16[1];
+    attrTargetCount = _useState16[0],
+    setAttrTargetCount = _useState16[1];
   var _useState17 = useState({}),
     _useState18 = _slicedToArray(_useState17, 2),
-    mincePropCount = _useState18[0],
-    setMincePropCount = _useState18[1];
+    attrSourceCount = _useState18[0],
+    setAttrSourceCount = _useState18[1];
+  var _useState19 = useState({}),
+    _useState20 = _slicedToArray(_useState19, 2),
+    mincePropCount = _useState20[0],
+    setMincePropCount = _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 = [];
+    var _eList = _.cloneDeep(getSelectEventIdList(data, 'targetFilters', eList));
+    getSelectEventIdList(data, 'sourceFilters', eList);
+    setEventIdList(_eList);
+    setSelectList(eList);
+  };
   useEffect(function () {
     if (defaultValue) {
       var data = defaultValue;
       setFormData(data);
-      var eList = [];
-      defaultValue.targetFilters.forEach(function (target) {
-        if (target && target.eventId) {
-          eList.push(target.eventId);
-        }
-      });
-      setEventIdList(eList);
+      setSelectEventIdList(defaultValue);
       if (defaultValue.windowType !== undefined) {
         setOtherEvent(defaultValue.otherEvent);
         setWindowCnt(defaultValue.windowCnt);
@@ -86,7 +106,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var _attrCount = {};
       var _sourceCount = {};
       data.sourceFilters.map(function (item) {
-        if (item.propfilters != undefined) {
+        if (item.attributionSubdivision != undefined) {
           _attrCount[item.eventId] = 1;
         }
         if (item.filters != undefined) {
@@ -101,23 +121,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onChange = function onChange(_changedValues, allValues) {
     console.log('筛选值发生改变', _changedValues, allValues);
     setFormData(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];
-      }
-      setEventIdList(eList);
-      var targetData = targetChangeCallback(data, eList, eventGroupList);
-      form.setFieldsValue(targetData);
-    }
+    setSelectEventIdList(_.cloneDeep(allValues));
     setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount, mincePropCount));
   };
   var onFinish = function onFinish(isFetchRequest) {
@@ -145,10 +149,10 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     form.resetFields();
     setWindowType(1);
   };
-  var _useState19 = useState(1),
-    _useState20 = _slicedToArray(_useState19, 2),
-    windowType = _useState20[0],
-    setWindowType = _useState20[1];
+  var _useState21 = useState(1),
+    _useState22 = _slicedToArray(_useState21, 2),
+    windowType = _useState22[0],
+    setWindowType = _useState22[1];
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -211,7 +215,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
           setMincePropCount: setMincePropCount,
           attrSourceCount: attrSourceCount,
           mincePropCount: mincePropCount,
-          formData: formData
+          formData: formData,
+          selectList: selectList
         }));
       }), fields.length < item.max && /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-add"),

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

@@ -30,6 +30,7 @@ export declare namespace SearchPanelTypes {
         mincePropCount: {
             [x: number]: number;
         };
+        selectList?: number[];
     }
     interface bizAttributeSelectorValueProp {
         id?: number;

package/es/modules/searchPanel/utils.js

@@ -1,5 +1,5 @@
 export function targetChangeCallback(data, eList, eventGroupList) {
-  if (eList[0] === -100) {
+  if (eList.length <= 0) {
     data.globalFilters = undefined;
   } else {
     if (data.globalFilters && data.globalFilters.conditions) {
@@ -57,14 +57,16 @@ var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
       } else {
         item.filters === undefined && Object.keys(count).length > 0 && count[item.eventId] !== undefined ? flag = true : null;
         if (mincePropCount != undefined) {
-          item.propfilters === 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 ? 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$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;
+          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') {
           var _item$filters3;

package/es/types.d.ts

@@ -16,7 +16,7 @@ export interface FiltersProps {
     eventId: number;
     eventName: string;
     filters?: AttrConditionTypes.GroupValue | undefined;
-    propfilters?: PropfiltersProps | undefined;
+    attributionSubdivision?: PropfiltersProps | undefined;
 }
 export interface PropfiltersProps {
     attrId: number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.19",
+  "version": "1.0.1-alpha.21",
   "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.2",
+    "@zgfe/business-lib": "1.1.41-attribution.4",
     "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": "672e6e4544e74848eb0be22362dfcde65dc2e559"
+  "gitHead": "996f95a27a25d2365836ab5a3533ee33fb8a14b6"
 }