@zgfe/business-lib 1.2.10-session.2 → 1.2.10-session.3

package/es/attrCondition/demo/group.js

@@ -7,15 +7,15 @@ var extraList = [{
   attrList: [{
     id: 'sa_duration',
     label: 'Session时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-sa_duration',
+    propCategory: 'sessionProp',
+    key: 'sessionProp-sa_duration',
     type: 2,
     subtype: 2
   }, {
     id: 'se_duration',
     label: '事件使用时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-se_duration',
+    propCategory: 'sessionProp',
+    key: 'sessionProp-se_duration',
     type: 2,
     subtype: 2
   }]
@@ -35,7 +35,7 @@ export default (function () {
       attrName: 'is_anonymous'
     }, {
       attrId: 'sa_duration',
-      propCategory: 'extraProp',
+      propCategory: 'sessionProp',
       type: 2,
       operator: 'gt',
       values: ['158400', '1'],

package/es/attrCondition/demo/index.js

@@ -6,15 +6,15 @@ var extraList = [{
   attrList: [{
     id: 'sa_duration',
     label: 'Session时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-sa_duration',
+    propCategory: 'sessionProp',
+    key: 'sessionProp-sa_duration',
     type: 2,
     subtype: 2
   }, {
     id: 'se_duration',
     label: '事件使用时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-se_duration',
+    propCategory: 'sessionProp',
+    key: 'sessionProp-se_duration',
     type: 2,
     subtype: 2
   }]

package/es/attrCondition/useAttrCondition.js

@@ -55,8 +55,8 @@ var useAttrCondition = function useAttrCondition(props) {
             dimensionSub: data.dimensionSub || data.attrName
           };
         }
-      } else if (data.propCategory === PropCategory.ExtraProp) {
-        if (data.attrId) {
+      } else {
+        if (data.attrId && data.propCategory) {
           attrData = {
             id: data.attrId,
             propCategory: data.propCategory,

package/es/attrConditions/components/valuesList.js

@@ -37,7 +37,7 @@ var ValuesList = function ValuesList(props) {
     setIsFirst = _useState6[1];
   useEffect(function () {
     if (defaultValue) {
-      if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.ExtraProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
+      if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.SessionProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
         var num = String(parseFloat(defaultValue[0]) / getUnitCount(defaultValue[1]));
         setCurrent([num, defaultValue[1]]);
       } else {
@@ -72,7 +72,7 @@ var ValuesList = function ValuesList(props) {
   };
   var onChangeNumber = function onChangeNumber(e) {
     var data = [e.target.value];
-    if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.ExtraProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
+    if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.SessionProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
       var num = String(parseFloat(e.target.value) * getUnitCount(unit));
       data = [num, unit];
       setCurrent([e.target.value, unit]);
@@ -144,7 +144,7 @@ var ValuesList = function ValuesList(props) {
       status: status,
       onChange: onChangeNumber,
       suffix: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : null
-    }), (attr.propCategory === PropCategory.UserProp || attr.propCategory === PropCategory.ExtraProp) && attr.subtype === 2 && numberAfter);
+    }), (attr.propCategory === PropCategory.UserProp || attr.propCategory === PropCategory.SessionProp) && attr.subtype === 2 && numberAfter);
   } else {
     if (operate === OperateTypes.Absolute) {
       return /*#__PURE__*/React.createElement(RangePicker, {

package/es/attrConditions/index.js

@@ -20,17 +20,17 @@ export function getCondition(attr, operate, values) {
   };
   if (attr.propCategory === PropCategory.EventProp) {
     responseData.attrName = attr.label;
-  } else if (attr.propCategory === PropCategory.ExtraProp) {
-    responseData.attrName = attr.label;
-    if (attr.propCategory === PropCategory.ExtraProp && attr.subtype) {
-      responseData.subtype = attr.subtype;
-    }
-  } else {
+  } else if (attr.propCategory === PropCategory.UserProp || attr.propCategory === PropCategory.EnvProp) {
     responseData.attrName = attr.name;
     responseData.category = attr.category;
     if (attr.propCategory === PropCategory.UserProp && attr.subtype) {
       responseData.subtype = attr.subtype;
     }
+  } else {
+    responseData.attrName = attr.label;
+    if (attr.propCategory === PropCategory.SessionProp && attr.subtype) {
+      responseData.subtype = attr.subtype;
+    }
   }
   return responseData;
 }

package/es/attrConditions/types.d.ts

@@ -18,7 +18,7 @@ export declare namespace AttrConditionTypes {
         label?: string;
         attrNameStr?: string;
         type?: PropType;
-        propCategory?: 'userProp' | 'eventProp' | 'envProp' | 'extraProp';
+        propCategory?: 'userProp' | 'eventProp' | 'envProp' | string;
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
         operator?: OperateTypes;

package/es/attributeSelector/demo/extra.js

@@ -17,8 +17,8 @@ var extraList = [{
   attrList: [{
     id: 'sa_duration',
     label: 'Session时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-sa_duration',
+    propCategory: 'sessionProp',
+    key: 'sessionProp-sa_duration',
     type: 2,
     subtype: 2
   }]
@@ -28,21 +28,21 @@ var extraList = [{
   attrList: [{
     id: 'page_duration',
     label: '页面访问时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-page_duration'
+    propCategory: 'pageProp',
+    key: 'pageProp-page_duration'
   }, {
     id: 'click',
     label: '页面点击次数',
-    propCategory: 'extraProp',
-    key: 'extraProp-click'
+    propCategory: 'pageProp',
+    key: 'pageProp-click'
   }]
 }];
 export default (function () {
   var _useState = useState({
       id: 'sa_duration',
       label: 'Session时长',
-      propCategory: 'extraProp',
-      key: 'extraProp-sa_duration',
+      propCategory: 'sessionProp',
+      key: 'sessionProp-sa_duration',
       type: 2,
       subtype: 2
     }),
@@ -83,7 +83,7 @@ export default (function () {
     extra: list,
     disableItemList: [{
       id: 'click',
-      propCategory: 'extraProp'
+      propCategory: 'sessionProp'
     }]
   })));
 });

package/es/attributeSelector/index.js

@@ -85,13 +85,13 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
           if (attr.name === param.name && attr.category === param.category) res = attr;
         }
       });
-    } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'extraProp') {
+    } else {
       extra === null || extra === void 0 ? void 0 : extra.forEach(function (item) {
         item.attrList.forEach(function (attr) {
           if (hasKey) {
-            if (attr.key === param.key) res = _.cloneDeep(attr);
+            if (attr.key === (param === null || param === void 0 ? void 0 : param.key)) res = _.cloneDeep(attr);
           } else {
-            if (attr.id === param.id) res = _.cloneDeep(attr);
+            if (attr.id === (param === null || param === void 0 ? void 0 : param.id)) res = _.cloneDeep(attr);
           }
         });
       });

package/es/attributeSelector/listPanel.js

@@ -59,8 +59,8 @@ var AttrListPanel = function AttrListPanel(props) {
       item.key = "eventProp-".concat(item.id);
     } else if (item.propCategory === 'userProp') {
       item.key = "userProp-".concat(item.name);
-    } else if (item.propCategory === 'extraProp') {
-      item.key = "extraProp-".concat(item.id);
+    } else {
+      item.key = "".concat(item.propCategory, "-").concat(item.id || (item === null || item === void 0 ? void 0 : item.name));
     }
     return item;
   });

package/es/attributeSelector/types.d.ts

@@ -9,7 +9,7 @@ export declare enum PropCategory {
     EventProp = "eventProp",
     UserProp = "userProp",
     EnvProp = "envProp",
-    ExtraProp = "extraProp"
+    SessionProp = "sessionProp"
 }
 export declare enum ShowStatus {
     show = 0,
@@ -103,10 +103,11 @@ export declare namespace AttributeSelect {
         attrList: ExtraProp[];
     }
     interface ExtraProp extends BasicProp {
-        propCategory: 'extraProp';
+        propCategory: string;
         key?: number | string;
         name?: string;
         subtype?: number;
+        [key: string]: any;
     }
     interface Option {
         groupName: string;

package/es/attributeSelector/types.js

@@ -9,7 +9,7 @@ export var PropCategory;
   PropCategory["EventProp"] = "eventProp";
   PropCategory["UserProp"] = "userProp";
   PropCategory["EnvProp"] = "envProp";
-  PropCategory["ExtraProp"] = "extraProp";
+  PropCategory["SessionProp"] = "sessionProp";
 })(PropCategory || (PropCategory = {}));
 export var ShowStatus;
 (function (ShowStatus) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.10-session.2",
+  "version": "1.2.10-session.3",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "dd0fcae68835a8dfbc1bacd80ed6a06c7f7a7e4c",
+  "gitHead": "a4619711126c3b1efd8a5fbfa2abf56e9da6fb96",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }