@zgfe/modules-attribution 1.0.1-alpha.24 → 1.0.1-alpha.26

package/es/components/searchTime/index.js

@@ -5,10 +5,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { BizDatePicker } from '@zgfe/business-lib';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useState, useEffect } from 'react';
 import { getInitDate } from '../../constants';
 import { AttributableContext } from '../../types';
 import './styles/index.less';
+import _ from 'lodash';
 var classPrefix = 'search-panel';
 var SearchTime = function SearchTime(props) {
   var _useContext = useContext(AttributableContext),
@@ -21,7 +22,14 @@ var SearchTime = function SearchTime(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     timer = _useState4[0],
     setTimer = _useState4[1];
+  useEffect(function () {
+    if (props.time === undefined) {
+      var _time = props.time || getInitDate(includeToday);
+      setTime(_.cloneDeep(_time));
+    }
+  }, [props.time]);
   var onChangeTime = function onChangeTime(val) {
+    setTime(val);
     if (timer) clearTimeout(timer);
     setTimer(setTimeout(function () {
       setTime(val);
@@ -33,7 +41,7 @@ var SearchTime = function SearchTime(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(BizDatePicker, {
-    defaultValue: time,
+    value: time,
     onChange: onChangeTime
   }));
 };

package/es/components/tableList/index.js

@@ -2,6 +2,7 @@ import React, { useContext } from 'react';
 import { Table } from 'antd';
 import './styles/index.less';
 import { AttributableContext } from '../../types';
+import empty from '../../images/empty.png';
 var TableList = function TableList(props) {
   var classPrefix = 'table-list';
   var tableDataList = props.tableDataList,
@@ -10,9 +11,11 @@ var TableList = function TableList(props) {
     searching = _useContext.searching;
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, !tableDataList.dataSource && !searching && /*#__PURE__*/React.createElement("p", {
+  }, !tableDataList.dataSource && !searching && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-empty-tips")
-  }, "\u8BF7\u9009\u62E9\u6761\u4EF6\u8FDB\u884C\u67E5\u8BE2"), (tableDataList.dataSource || searching) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Table, {
+  }, /*#__PURE__*/React.createElement("img", {
+    src: empty
+  }), /*#__PURE__*/React.createElement("p", null, "\u8BF7\u9009\u62E9\u6761\u4EF6\u8FDB\u884C\u67E5\u8BE2")), (tableDataList.dataSource || searching) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Table, {
     dataSource: tableDataList.dataSource,
     columns: tableDataList.columns,
     rowKey: "key",

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

@@ -1,7 +1,15 @@
 .table-list {
   margin-top: 25px;
   &-empty-tips {
-    margin-top: 150px;
+    margin-top: 112px;
     text-align: center;
+    img{
+      width: 88px;
+      height: 88px;
+    }
+    p{
+      color: #354354;
+      line-height: 20px;
+    }
   }
 }

package/es/modules/content/index.js

@@ -67,6 +67,7 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (!isFetchRequest) {
       return;
     }
+    setIsFetchRequest(false);
     setLoading(true);
     if (typeof cancel === 'function') {
       cancel();
@@ -117,6 +118,13 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       SearchPanelRef.current.onGetSearchData();
     }
   };
+  var resetTime = function resetTime() {
+    setSearchData(function (value) {
+      return _objectSpread(_objectSpread({}, value), {}, {
+        time: undefined
+      });
+    });
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -124,7 +132,8 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(SearchPanel, {
     ref: SearchPanelRef,
     defaultValue: searchData,
-    onChange: onChangeSearch
+    onChange: onChangeSearch,
+    resetTime: resetTime
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-bottom-content-box")
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -15,7 +15,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 21
+    defaultApp: 328
   }, /*#__PURE__*/React.createElement(AttributionHome, {
     defaultValue: defaultValue,
     afterEditTarget: afterEditTarget

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

@@ -12,7 +12,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 21
+    defaultApp: 328
   }, /*#__PURE__*/React.createElement(AttributionHome, {
     afterEditTarget: afterEditTarget
   }));

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

@@ -130,8 +130,8 @@ var AttributableEvents = function AttributableEvents(props) {
       message.error('请先选择待归因事件');
       return;
     }
-    if (count >= 10) {
-      message.error('最多可添加10条属性筛选');
+    if (count >= 5) {
+      message.error('最多可添加5条属性筛选');
       return;
     }
     setIsAdd(true);
@@ -241,6 +241,7 @@ var AttributableEvents = function AttributableEvents(props) {
   })))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filters,
+    onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
     eventIdList: [eventId],

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

@@ -146,6 +146,7 @@ var TargetEvent = function TargetEvent(props) {
   }))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filters,
+    onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
     eventIdList: [eventId],

package/es/modules/searchPanel/index.js

@@ -10,6 +10,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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';
@@ -19,7 +20,8 @@ import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
 export var classPrefix = 'mi-left-form';
 var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var defaultValue = props.defaultValue;
+  var defaultValue = props.defaultValue,
+    resetTime = props.resetTime;
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
     setButtonDisable = _useContext.setButtonDisable;
@@ -91,9 +93,20 @@ 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];
   useEffect(function () {
-    if (defaultValue) {
+    if (defaultValue && reset !== null) {
       var data = defaultValue;
+      if (reset) {
+        data = {
+          targetFilters: initTarget,
+          sourceFilters: initTarget
+        };
+        setReset(null);
+      }
       setFormData(data);
       setSelectEventIdList(defaultValue);
       if (defaultValue.windowType !== undefined) {
@@ -116,9 +129,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setAttrSourceCount(_sourceCount);
     }
     setLoading(false);
-  }, []);
+  }, [reset]);
   var onChange = function onChange(_changedValues, allValues) {
-    console.log('筛选值发生改变', _changedValues, allValues);
     setFormData(allValues);
     setSelectEventIdList(_.cloneDeep(allValues));
     setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount, mincePropCount));
@@ -145,13 +157,18 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   var onReset = function onReset() {
     setButtonDisable(true);
-    form.resetFields();
+    setReset(true);
+    setTimeout(function () {
+      form.resetFields();
+      resetTime && resetTime();
+    }, 20);
     setWindowType(1);
+    setOtherEvent(false);
   };
-  var _useState21 = useState(1),
-    _useState22 = _slicedToArray(_useState21, 2),
-    windowType = _useState22[0],
-    setWindowType = _useState22[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, {
@@ -302,9 +319,10 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       width: 80
     },
     value: windowCnt,
+    min: 1,
+    max: 365,
     onChange: function onChange(e) {
-      if (e !== null && e <= 0) return;
-      setWindowCnt(e);
+      setWindowCnt(Number(e));
     }
   }), /*#__PURE__*/React.createElement(Select, {
     value: windowTypeUnit,

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

@@ -3,6 +3,7 @@ export declare namespace SearchPanelTypes {
     interface Props {
         defaultValue?: SearchValueProps;
         onChange: (values: SearchValueProps, isFetchRequest: boolean) => void;
+        resetTime?: Function;
     }
     interface FieldProp {
         key: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.24",
+  "version": "1.0.1-alpha.26",
   "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.4",
+    "@zgfe/business-lib": "1.1.41-attribution.7",
     "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": "2d3ab096fd12d162ccc7b0b9128ed188b2086cfd"
+  "gitHead": "2ea8da6f86d57e0a2d303d750a3172f253d0d8c3"
 }