@zgfe/modules-attribution 1.0.1-alpha.27 → 1.0.1-alpha.30

package/es/components/searchTime/index.js

@@ -42,7 +42,8 @@ var SearchTime = function SearchTime(props) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(BizDatePicker, {
     value: time,
-    onChange: onChangeTime
+    onChange: onChangeTime,
+    selectRange: 365
   }));
 };
 export default SearchTime;

package/es/modules/content/index.js

@@ -10,14 +10,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from '../../utils/request';
 import React, { useContext, useEffect, useState, useRef } from 'react';
-import Request from 'umi-request';
 import SearchPanel from '../searchPanel';
 import './styles/index.less';
 import { Apis } from '../../constants';
 import { handleTableData } from './utils';
 import { TableList, OptionGroup, SearchTime } from '../../components';
-var CancelToken = Request.CancelToken;
-var cancel;
 var classPrefix = 'attribution-content';
 var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useState = useState(props.value),
@@ -28,59 +25,39 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useState5 = useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    timer = _useState6[0],
-    setTimer = _useState6[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  var _useState7 = useState(true),
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isFetchRequest = _useState6[0],
+    setIsFetchRequest = _useState6[1];
+  var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
-    isFetchRequest = _useState8[0],
-    setIsFetchRequest = _useState8[1];
-  var _useState9 = useState(null),
-    _useState10 = _slicedToArray(_useState9, 2),
-    time = _useState10[0],
-    setTime = _useState10[1];
+    time = _useState8[0],
+    setTime = _useState8[1];
   useEffect(function () {
     if (searchData.sourceFilters && searchData.sourceFilters[0].eventId === -100) return;
-    if (timer) clearTimeout(timer);
-    var flag = true;
-    setTimer(setTimeout(function () {
-      if (flag) {
-        fetchRequest();
-      }
-    }, 500));
-    return function () {
-      if (timer) clearTimeout(timer);
-      flag = false;
-    };
-  }, [searchData, time]);
+    fetchRequest();
+  }, [searchData]);
   useEffect(function () {
     props.onSearching && props.onSearching(loading);
   }, [loading]);
-  var _useState11 = useState(100),
-    _useState12 = _slicedToArray(_useState11, 2),
-    total = _useState12[0],
-    setTotal = _useState12[1];
+  var _useState9 = useState(100),
+    _useState10 = _slicedToArray(_useState9, 2),
+    total = _useState10[0],
+    setTotal = _useState10[1];
   var fetchRequest = function fetchRequest() {
     if (!isFetchRequest) {
       return;
     }
     setIsFetchRequest(false);
     setLoading(true);
-    if (typeof cancel === 'function') {
-      cancel();
-    }
     var _searchData = _objectSpread(_objectSpread({}, searchData), {}, {
       targetFilters: searchData.targetFilters[0]
     });
     request(Apis.getAnalyseData, {
       method: 'post',
-      data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time),
-      cancelToken: new CancelToken(function executor(c) {
-        cancel = c;
-      })
+      data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time)
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
         var _data = handleTableData(res === null || res === void 0 ? void 0 : res.data);
@@ -89,7 +66,7 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
       setTimeout(function () {
         setLoading(false);
-      }, 0);
+      }, 20);
     }).catch(function () {
       setLoading(false);
     });
@@ -108,10 +85,10 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _objectSpread(_objectSpread({}, value), data);
     });
   };
-  var _useState13 = useState({}),
-    _useState14 = _slicedToArray(_useState13, 2),
-    tableDataList = _useState14[0],
-    setTableDataList = _useState14[1];
+  var _useState11 = useState({}),
+    _useState12 = _slicedToArray(_useState11, 2),
+    tableDataList = _useState12[0],
+    setTableDataList = _useState12[1];
   var SearchPanelRef = useRef(null);
   var onGetSearchData = function onGetSearchData() {
     if (SearchPanelRef) {

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

@@ -3,119 +3,113 @@ import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import { AttributionHome } from '@zgfe/modules-attribution';
 import { requestConfig } from '../../../utils/ajaxConfig';
 var defaultValue = {
-  id: 1426,
-  name: '999',
-  type: 0,
-  enlarged: 0,
-  panelId: 438,
-  panelType: 'edit',
   data: {
-    "app_id": 21,
+    "app_id": 331,
     "module": "attribution",
     "targetFilters": [{
-      "eventId": 6078,
-      "eventName": "埋点事件-11",
+      "eventId": 4024,
+      "eventName": "收入",
       "filters": {
         "relation": "and",
         "conditions": [{
-          "attrId": 139498,
+          "attrId": 31331,
           "propCategory": "eventProp",
           "type": 2,
           "operator": "gt",
-          "values": ["99"],
+          "values": ["88"],
           "dimensionSub": "event_attr",
-          "label": "商品总价",
-          "attrName": "商品总价"
+          "label": "price",
+          "attrName": "price"
         }, {
-          "attrId": 139372,
+          "attrId": 31328,
           "propCategory": "eventProp",
-          "type": 1,
-          "operator": "equal",
-          "values": ["12"],
+          "type": 2,
+          "operator": "gt",
+          "values": ["99"],
           "dimensionSub": "event_attr",
-          "label": "机身宽度",
-          "attrName": "机身宽度"
+          "label": "total",
+          "attrName": "total"
         }]
       }
     }],
     "sourceFilters": [{
-      "eventId": 6090,
-      "eventName": "间隔事件-01",
+      "eventId": 4023,
+      "eventName": "查看商品",
       "filters": {
         "relation": "and",
         "conditions": [{
-          "attrId": 139498,
+          "attrId": 31321,
           "propCategory": "eventProp",
           "type": 2,
           "operator": "gt",
-          "values": ["11"],
+          "values": ["77"],
           "dimensionSub": "event_attr",
-          "label": "商品总价",
-          "attrName": "商品总价"
+          "label": "商品价格",
+          "attrName": "商品价格"
         }, {
-          "attrId": 139488,
+          "attrId": 31332,
           "propCategory": "eventProp",
-          "type": 2,
-          "operator": "gt",
-          "values": ["77"],
+          "type": 1,
+          "operator": "equal",
+          "values": ["移动电话"],
           "dimensionSub": "event_attr",
-          "label": "商品单价",
-          "attrName": "商品单价"
+          "label": "商品类型",
+          "attrName": "商品类型"
         }]
       },
       "attributionSubdivision": {
-        relation: "and",
-        conditions: {
+        "relation": "and",
+        "conditions": {
           "propCategory": "eventProp",
           "type": 1,
-          "attrId": 139499
+          "attrId": 31332
         }
       }
     }, {
-      "eventId": 6088,
-      "eventName": "间隔事件-02",
+      "eventId": 4026,
+      "eventName": "加购商品",
       "filters": {
         "relation": "and",
         "conditions": [{
-          "attrId": 139494,
+          "attrId": 31334,
           "propCategory": "eventProp",
           "type": 2,
           "operator": "gt",
-          "values": ["22"],
+          "values": ["66"],
           "dimensionSub": "event_attr",
-          "label": "商品总价",
-          "attrName": "商品总价"
+          "label": "商品价格",
+          "attrName": "商品价格"
         }, {
-          "attrId": 139493,
+          "attrId": 31336,
           "propCategory": "eventProp",
-          "type": 2,
-          "operator": "gt",
-          "values": ["33"],
+          "type": 1,
+          "operator": "equal",
+          "values": ["移动电话"],
           "dimensionSub": "event_attr",
-          "label": "商品单价",
-          "attrName": "商品单价"
+          "label": "商品类型",
+          "attrName": "商品类型"
         }]
       },
       "attributionSubdivision": {
-        relation: "and",
-        conditions: {
+        "relation": "and",
+        "conditions": {
           "propCategory": "eventProp",
           "type": 1,
-          "attrId": 139490
+          "attrId": 31329
         }
       }
     }],
     "globalFilters": {
       "relation": "and",
       "conditions": [{
-        "attrId": 139300,
+        "attrId": 31331,
         "propCategory": "eventProp",
         "type": 2,
         "operator": "gt",
-        "values": ["87"],
+        "values": ["55"],
         "dimensionSub": "event_attr",
-        "label": "商品价格",
-        "attrName": "商品价格"
+        "label": "price",
+        "attrName": "price"
       }]
     },
     "attributionType": 3,
@@ -125,12 +119,11 @@ var defaultValue = {
     "time": {
       "unit": "day",
       "relative": [14, 0],
-      "begin": "2023-05-17",
-      "end": "2023-05-31"
+      "begin": "2023-05-29",
+      "end": "2023-06-12"
     },
     "chartType": "grid"
-  },
-  chosen_data: []
+  }
 };
 export default (function () {
   useEffect(function () {
@@ -141,7 +134,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 21
+    defaultApp: 331
   }, /*#__PURE__*/React.createElement(AttributionHome, {
     defaultValue: defaultValue,
     afterEditTarget: afterEditTarget

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

@@ -140,6 +140,10 @@ var AttributableEvents = function AttributableEvents(props) {
     }, 0);
   };
   var onMinceProp = function onMinceProp() {
+    console.log('attrSelectShow', attrSelectShow);
+    if (attrSelectShow) {
+      return;
+    }
     if (ReasonData !== undefined || bizEventSelectorDefaultValue !== undefined) {
       setAttrSelectShow(true);
       setButtonDisable(true);

package/es/modules/searchPanel/components/globalAttribute.d.ts

@@ -4,6 +4,7 @@ declare const GlobalAttribute: React.FC<{
     value?: AttrConditionTypes.GroupValue;
     max?: number;
     eventIdList?: number[];
+    setAttrGlobalCount: Function;
     onChange?: (val: any) => void;
 }>;
 export default GlobalAttribute;

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

@@ -9,7 +9,8 @@ import React, { useEffect, useRef, useState } from 'react';
 var GlobalAttribute = function GlobalAttribute(props) {
   var classPrefix = 'mi-left-form';
   var max = props.max,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    setAttrGlobalCount = props.setAttrGlobalCount;
   var conditionRef = useRef(null);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -35,9 +36,13 @@ var GlobalAttribute = function GlobalAttribute(props) {
     if (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, {
     ref: conditionRef,
     value: props.value,
+    onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
     eventIdList: props.eventIdList,

package/es/modules/searchPanel/index.js

@@ -15,7 +15,7 @@ import SearchContent from './components/index';
 import GlobalAttribute from './components/globalAttribute';
 import './styles/index.less';
 import _ from 'lodash';
-import { targetChangeCallback, submitButtonDisableHandle } from './utils';
+import { targetChangeCallback, operableOrNotHandle } from './utils';
 import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
 export var classPrefix = 'mi-left-form';
@@ -24,7 +24,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     resetTime = props.resetTime;
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
-    setButtonDisable = _useContext.setButtonDisable;
+    setButtonDisable = _useContext.setButtonDisable,
+    searching = _useContext.searching;
   var _useContext2 = useContext(BizGlobalDataContext),
     eventGroupList = _useContext2.eventGroupList;
   var _Form$useForm = Form.useForm(),
@@ -76,6 +77,10 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState20 = _slicedToArray(_useState19, 2),
     mincePropCount = _useState20[0],
     setMincePropCount = _useState20[1];
+  var _useState21 = useState(0),
+    _useState22 = _slicedToArray(_useState21, 2),
+    attrGlobalCount = _useState22[0],
+    setAttrGlobalCount = _useState22[1];
   var getSelectEventIdList = function getSelectEventIdList(data, type, eList) {
     if (data[type]) {
       data[type].forEach(function (target) {
@@ -93,13 +98,14 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setEventIdList(_eList);
     setSelectList(eList);
   };
-  var _useState21 = useState(false),
-    _useState22 = _slicedToArray(_useState21, 2),
-    reset = _useState22[0],
-    setReset = _useState22[1];
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    reset = _useState24[0],
+    setReset = _useState24[1];
   useEffect(function () {
     if (defaultValue && reset !== null) {
       var data = defaultValue;
+      console.log('初始化', data);
       if (reset) {
         data = {
           targetFilters: initTarget,
@@ -133,8 +139,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onChange = function onChange(_changedValues, allValues) {
     setFormData(allValues);
     setSelectEventIdList(_.cloneDeep(allValues));
-    setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount, mincePropCount));
   };
+  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) {
       res.otherEvent = otherEvent;
@@ -165,10 +175,10 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setWindowType(1);
     setOtherEvent(false);
   };
-  var _useState23 = useState(1),
-    _useState24 = _slicedToArray(_useState23, 2),
-    windowType = _useState24[0],
-    setWindowType = _useState24[1];
+  var _useState25 = useState(1),
+    _useState26 = _slicedToArray(_useState25, 2),
+    windowType = _useState26[0],
+    setWindowType = _useState26[1];
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -193,7 +203,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         name: item.name
       }, /*#__PURE__*/React.createElement(GlobalAttribute, {
         max: item.max,
-        eventIdList: eventIdList
+        eventIdList: eventIdList,
+        setAttrGlobalCount: setAttrGlobalCount
       })));
     }
     return /*#__PURE__*/React.createElement(Form.List, {
@@ -321,6 +332,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     value: windowCnt,
     min: 1,
     max: 365,
+    precision: 0,
     onChange: function onChange(e) {
       setWindowCnt(Number(e));
     }
@@ -345,8 +357,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     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: function onClick() {
       return onFinish(true);

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

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

package/es/modules/searchPanel/utils.js

@@ -38,14 +38,17 @@ var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList)
   });
   return flag;
 };
-export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount, mincePropCount) {
+export function operableOrNotHandle(data, attrSourceCount, attrTargetCount, mincePropCount, attrGlobalCount) {
   var flag = false;
   data.attributionType === undefined ? flag = true : null;
-  buttonDisable(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
-  buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
+  subsetHandle(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
+  subsetHandle(data, 'targetFilters', attrTargetCount) ? flag = true : null;
+  if (data.globalFilters) {
+    conditionsHandle('globalFilters', data.globalFilters, attrGlobalCount, 0) ? flag = true : null;
+  }
   return flag;
 }
-var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
+var subsetHandle = function subsetHandle(data, type, count, mincePropCount) {
   var flag = false;
   data[type].map(function (item) {
     item === undefined ? flag = true : null;
@@ -61,22 +64,24 @@ var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
         }
       }
       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) {
-          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;
-          ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
-        } else {
-          var _item$filters4;
-          ((_item$filters4 = item.filters) === null || _item$filters4 === void 0 ? void 0 : _item$filters4.conditions.length) != count[item.eventId] ? flag = true : null;
-        }
+        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;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.27",
+  "version": "1.0.1-alpha.30",
   "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.7",
+    "@zgfe/business-lib": "1.1.41-attribution.8",
     "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": "1ac5643191315492d636ed504669a25405efeb89"
+  "gitHead": "d9314ca0a5f0d92e1e048db27d6006e23ba9271b"
 }