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

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

@@ -64,9 +64,12 @@ var defaultValue = {
         }]
       },
       "attributionSubdivision": {
-        "propCategory": "eventProp",
-        "type": 1,
-        "attrId": 139499
+        relation: "and",
+        conditions: {
+          "propCategory": "eventProp",
+          "type": 1,
+          "attrId": 139499
+        }
       }
     }, {
       "eventId": 6088,
@@ -94,9 +97,12 @@ var defaultValue = {
         }]
       },
       "attributionSubdivision": {
-        "propCategory": "eventProp",
-        "type": 1,
-        "attrId": 139490
+        relation: "and",
+        conditions: {
+          "propCategory": "eventProp",
+          "type": 1,
+          "attrId": 139490
+        }
       }
     }],
     "globalFilters": {

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

@@ -77,10 +77,10 @@ var AttributableEvents = function AttributableEvents(props) {
       if (eventIdList && eventIdList.length >= 0) {
         setEventId(eventIdList[0]);
       }
-      if (value.attributionSubdivision) {
+      if (value.attributionSubdivision && value.attributionSubdivision.conditions) {
         setBizAttributeSelectorValue({
-          id: value.attributionSubdivision.attrId,
-          propCategory: value.attributionSubdivision.propCategory
+          id: value.attributionSubdivision.conditions.attrId,
+          propCategory: value.attributionSubdivision.conditions.propCategory
         });
         setAttrSelectShow(true);
       }
@@ -163,11 +163,14 @@ var AttributableEvents = function AttributableEvents(props) {
       });
     }
     var _minceAttr = attr === undefined ? undefined : {
-      propCategory: attr.propCategory,
-      type: attr.type,
-      attrId: attr.id,
-      attrName: attr.name,
-      category: attr.category
+      relation: "and",
+      conditions: {
+        propCategory: attr.propCategory,
+        type: attr.type,
+        attrId: attr.id,
+        attrName: attr.name,
+        category: attr.category
+      }
     };
     setMinceAttr(_minceAttr);
     onChangeHandle(ReasonData, filters, _minceAttr);

package/es/modules/searchPanel/index.js

@@ -20,7 +20,6 @@ import { AttributableContext } from '../../types';
 export var classPrefix = 'mi-left-form';
 var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue;
-  console.log('SearchPanel', defaultValue);
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
     setButtonDisable = _useContext.setButtonDisable;

package/es/types.d.ts

@@ -16,16 +16,19 @@ export interface FiltersProps {
     eventId: number;
     eventName: string;
     filters?: AttrConditionTypes.GroupValue | undefined;
-    attributionSubdivision?: PropfiltersProps | undefined;
+    attributionSubdivision?: AttributionSubdivisionProps | undefined;
 }
-export interface PropfiltersProps {
-    attrId: number | undefined;
-    propCategory: string | undefined;
-    type: string | undefined;
-    id?: number | undefined;
-    name?: string | undefined;
-    category?: string | undefined;
-    attrName?: string | 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;
+    };
 }
 export interface TableDataHandleProps {
     xAxis: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.21",
+  "version": "1.0.1-alpha.23",
   "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": "996f95a27a25d2365836ab5a3533ee33fb8a14b6"
+  "gitHead": "29c789967da8b0268c0d9e70e481252935120876"
 }