@zgfe/modules-attribution 1.0.2-alpha.1 → 1.0.2-alpha.3

package/es/modules/content/index.js

@@ -106,6 +106,8 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-top-content")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-content-box")
   }, /*#__PURE__*/React.createElement(SearchPanel, {
@@ -113,7 +115,7 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     defaultValue: searchData,
     onChange: onChangeSearch,
     resetTime: resetTime
-  })), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-bottom-content-box")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-bottom-content-box-times")

package/es/modules/home/styles/index.less

@@ -14,20 +14,24 @@
     font-weight: 500;
     font-size: 16px;
     line-height: 48px;
-    border-bottom: 1px solid #f2f3f4;
   }
   &-content {
     width: 100%;
     height: 100%;
     // overflow: auto;
     overflow-x: hidden;
-    background: #fafafb;
+    background: #fff;
     border-top: 1px solid #eaeaea;
     .attribution-content {
-      &-top-content-box {
-        margin: 16px 24px;
-        padding: 24px;
-        background: #fff;
+      &-top-content {
+        background: #fafafb;
+        padding: 16px 24px;
+        &-box{
+          padding: 24px;
+          background: #fff;
+          border: 1px solid #ECEDF0;
+          border-radius: 8px;
+        }
       }
       &-bottom-content-box {
         min-height: 382px;

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

@@ -102,6 +102,10 @@ var AttributableEvents = function AttributableEvents(props) {
   var onEventDelete = function onEventDelete() {
     if (formData && formData.sourceFilters.length <= 1) {
       setReasonData(undefined);
+      setAttrSelectShow(false);
+      setFilters(undefined);
+      setIsAdd(false);
+      setBizAttributeSelectorValue(undefined);
       onChangeHandle(undefined, undefined, undefined);
       return;
     }
@@ -264,7 +268,9 @@ var AttributableEvents = function AttributableEvents(props) {
     onClick: function onClick() {
       return onAdd();
     }
-  })))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
+  })))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(count > 0 ? 'attr-box-show' : '')
+  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filters,
     onlyAnd: true,
@@ -273,6 +279,6 @@ var AttributableEvents = function AttributableEvents(props) {
     eventIdList: [eventId],
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  })));
+  }))));
 };
 export default AttributableEvents;

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

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizAttrConditionGroup, IconFont } from '@zgfe/business-lib';
 import React, { useEffect, useRef, useState } from 'react';
 var GlobalAttribute = function GlobalAttribute(props) {
-  var classPrefix = 'mi-left-form';
+  var classPrefix = 'form-box';
   var max = props.max,
     onChange = props.onChange,
     setAttrGlobalCount = props.setAttrGlobalCount;
@@ -33,13 +33,15 @@ var GlobalAttribute = function GlobalAttribute(props) {
     }
   }, [props.eventIdList, props.value]);
   var onAdd = function onAdd() {
-    if (props.eventIdList[0] === -100) return;
+    if (props.eventIdList && props.eventIdList.length <= 0 || 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, {
+  return /*#__PURE__*/React.createElement("div", null, props.eventIdList && props.eventIdList[0] === -100 ? '' : /*#__PURE__*/React.createElement("div", {
+    className: "".concat(count > 0 ? 'attr-box-show' : '')
+  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: props.value,
     onlyAnd: true,
@@ -48,7 +50,7 @@ var GlobalAttribute = function GlobalAttribute(props) {
     eventIdList: props.eventIdList,
     onChange: onChange,
     onConditionsCount: setCount
-  }), count < max && /*#__PURE__*/React.createElement("div", {
+  })), count < max && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-add ").concat(props.eventIdList && props.eventIdList.length <= 0 ? 'disabled' : ''),
     onClick: onAdd
   }, /*#__PURE__*/React.createElement(IconFont, {

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

@@ -147,7 +147,9 @@ var TargetEvent = function TargetEvent(props) {
     onClick: function onClick() {
       return onAdd();
     }
-  }))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
+  }))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(count > 0 ? 'attr-box-show' : '')
+  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: undefined,
     onlyAnd: true,
@@ -156,6 +158,6 @@ var TargetEvent = function TargetEvent(props) {
     eventIdList: [eventId],
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  })));
+  }))));
 };
 export default TargetEvent;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { SearchPanelTypes } from './types';
 import './styles/index.less';
-export declare const classPrefix = "mi-left-form";
+export declare const classPrefix = "form-box";
 declare const SearchPanel: React.ForwardRefExoticComponent<SearchPanelTypes.Props & React.RefAttributes<any>>;
 export default SearchPanel;

package/es/modules/searchPanel/index.js

@@ -18,7 +18,7 @@ import _ from 'lodash';
 import { targetChangeCallback, operableOrNotHandle } from './utils';
 import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
-export var classPrefix = 'mi-left-form';
+export var classPrefix = 'form-box';
 var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue,
     resetTime = props.resetTime;
@@ -175,7 +175,9 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setWindowType = _useState24[1];
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement(Skeleton, {
+  }, /*#__PURE__*/React.createElement("p", {
+    className: "".concat(classPrefix, "-bottom-form-title")
+  }, "\u9009\u62E9\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Skeleton, {
     loading: loading,
     active: true,
     paragraph: {
@@ -189,9 +191,10 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, searchFields.map(function (item) {
     if (item.type === 'globalFilters') {
       return /*#__PURE__*/React.createElement(Form.Item, {
-        key: item.key
+        key: item.key,
+        className: "".concat(classPrefix, "-form-item")
       }, /*#__PURE__*/React.createElement(Form.Item, {
-        className: "".concat(classPrefix, "-title")
+        className: "".concat(classPrefix, "-title global-attr")
       }, item.label), /*#__PURE__*/React.createElement(Form.Item, {
         className: "".concat(classPrefix, "-item"),
         name: item.name
@@ -208,6 +211,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var add = _ref.add,
         remove = _ref.remove;
       return /*#__PURE__*/React.createElement(Form.Item, {
+        className: "".concat(classPrefix, "-form-item"),
         key: "".concat(item.key, "-item-").concat(index)
       }, /*#__PURE__*/React.createElement(Form.Item, {
         className: "".concat(classPrefix, "-title")
@@ -216,7 +220,7 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
           color: 'red'
         }
       }, "* "), item.label, /*#__PURE__*/React.createElement(Tooltip, {
-        placement: "left",
+        placement: "right",
         title: item.tips
       }, /*#__PURE__*/React.createElement(IconFont, {
         type: "tishiicon"
@@ -281,6 +285,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     style: {
       width: 208
     },
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#021429'
+      }
+    }),
     options: [{
       value: 1,
       label: '首次触点归因'
@@ -307,6 +317,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     style: {
       width: 208
     },
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#021429'
+      }
+    }),
     onChange: function onChange(e) {
       setWindowType(e);
       e === 1 ? setWindowCnt(-1) : setWindowCnt(1);
@@ -338,6 +354,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onChange: function onChange(e) {
       return setwindowTypeUnit(e);
     },
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#021429'
+      }
+    }),
     options: [{
       value: 'day',
       label: '天'
@@ -357,6 +379,6 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onClick: function onClick() {
       return onFinish(true);
     }
-  }, "\u63D0\u4EA4")))));
+  }, "\u67E5\u8BE2")))));
 });
 export default SearchPanel;

package/es/modules/searchPanel/styles/index.less

@@ -1,6 +1,16 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
-.mi-left-form {
+.form-box {
+  .xiangxia{
+    font-size: 14px!important;
+  }
+  &-form-item{
+    margin-bottom: 16px;
+    .attr-box-show{
+      margin-top: 12px;
+    }
+  }
+  
   &-bottom-form-title {
     margin-top: 34px;
     margin-bottom: 16px;
@@ -71,13 +81,12 @@
   }
 
   &-item.ant-form-item {
-    margin-bottom: 12px;
+    margin-bottom: 0px;
   }
 
   &-add {
     width: fit-content;
     height: 20px;
-    margin-top: 8px;
     color: #165dff;
     font-size: 14px;
     line-height: 20px;
@@ -97,6 +106,10 @@
     }
   }
 
+  .global-attr{
+    margin-bottom: 0!important;
+  }
+
   .biz-condition-item-input {
     border-color: transparent;
   }
@@ -106,8 +119,8 @@
   }
   .attributable-events-box {
     .select-and-attr {
-      display: flex;
       margin-bottom: 12px;
+      display: flex;
       .ant-dropdown-trigger {
         width: 208px;
         margin-right: 16px;
@@ -128,18 +141,13 @@
             right: 40px;
           }
         }
-        // .biz-attr-select-handle:hover{
-        //   .xiangxia{
-        //     display: none;
-        //   }
-        // }
       }
       .button-box {
         .qingchu,
         .tianjia2,
         .shaixuan {
           margin-top: 2px;
-          margin-right: 20px;
+          margin-right: 16px;
           // color: #CCD0D4;
           color: #9aa1a9;
           font-size: 20px !important;
@@ -162,7 +170,6 @@
   .target-events-box {
     .selector-content {
       display: flex;
-      margin-bottom: 12px;
       .ant-dropdown-trigger {
         width: 208px;
         margin-right: 16px;
@@ -175,7 +182,7 @@
       }
     }
     .shaixuan {
-      margin: 2px 0 0 20px;
+      margin: 2px 0 0 16px;
       color: #9aa1a9;
       font-size: 20px !important;
       cursor: pointer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.2-alpha.1",
+  "version": "1.0.2-alpha.3",
   "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.11",
+    "@zgfe/business-lib": "1.1.41-attribution.16",
     "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": "06f899b8b276b467b3bc18082b4e8ce6d7af90b9"
+  "gitHead": "1f756584bf9a984a8017f88908113edf14ee5286"
 }