@zgfe/modules-attribution 1.0.1-alpha.23 → 1.0.1-alpha.25

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/searchPanel/components/attributableEvents.js

@@ -80,7 +80,9 @@ var AttributableEvents = function AttributableEvents(props) {
       if (value.attributionSubdivision && value.attributionSubdivision.conditions) {
         setBizAttributeSelectorValue({
           id: value.attributionSubdivision.conditions.attrId,
-          propCategory: value.attributionSubdivision.conditions.propCategory
+          propCategory: value.attributionSubdivision.conditions.propCategory,
+          name: value.attributionSubdivision.conditions.attrName,
+          category: value.attributionSubdivision.conditions.category
         });
         setAttrSelectShow(true);
       }
@@ -128,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);
@@ -159,7 +161,9 @@ var AttributableEvents = function AttributableEvents(props) {
     } else {
       setBizAttributeSelectorValue({
         id: attr.id,
-        propCategory: attr.propCategory
+        propCategory: attr.propCategory,
+        name: attr.name,
+        category: attr.category
       });
     }
     var _minceAttr = attr === undefined ? undefined : {
@@ -237,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

@@ -302,9 +302,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

@@ -35,6 +35,8 @@ export declare namespace SearchPanelTypes {
     interface bizAttributeSelectorValueProp {
         id?: number;
         propCategory?: string;
+        name?: string;
+        category?: string;
     }
     interface targetDataProp {
         event?: {

package/es/types.d.ts

@@ -19,16 +19,17 @@ export interface FiltersProps {
     attributionSubdivision?: AttributionSubdivisionProps | undefined;
 }
 export interface AttributionSubdivisionProps {
-    relation: 'and' | 'or';
-    conditions: {
-        attrId: number | undefined;
-        propCategory: string | undefined;
-        type: string | undefined;
-        id?: number | undefined;
-        name?: string | undefined;
-        category?: string | undefined;
-        attrName?: string | undefined;
-    };
+    relation: string;
+    conditions: ConditionsnProps;
+}
+export interface ConditionsnProps {
+    attrId: number | undefined;
+    propCategory: string | undefined;
+    type: string | undefined;
+    id?: number | undefined;
+    name?: string | undefined;
+    category?: string | undefined;
+    attrName?: string | undefined;
 }
 export interface TableDataHandleProps {
     xAxis: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.23",
+  "version": "1.0.1-alpha.25",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "29c789967da8b0268c0d9e70e481252935120876"
+  "gitHead": "570f07d37e23c8c3152253e91955edd97f8a7cb3"
 }