@zgfe/business-lib 1.2.70-hxd.23 → 1.2.70-hxd.25

package/es/addToScene/index.js

@@ -14,6 +14,7 @@ import BizGlobalDataContext from '../context';
 import Apis from '../constants/apis';
 import request from '../utils/ajax';
 import IconFont from '../icon/iconFont';
+import { eventApi } from '../utils';
 export var classPrefix = 'biz-addtoscene';
 var BizAddToScene = function BizAddToScene(props) {
   var params = props.params;
@@ -84,13 +85,7 @@ var BizAddToScene = function BizAddToScene(props) {
     });
   }
   function queryGroups() {
-    request(Apis.querySceneGroup, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: 0
-      }
-    }).then(function (res) {
+    eventApi.fetchAllEvents(currentApp === null || currentApp === void 0 ? void 0 : currentApp.id, 0, false).then(function (res) {
       if (!res) {
         notification.error({
           message: '获取常用场景分类列表失败'

package/es/attributeSelector/index.d.ts

@@ -1,8 +1,5 @@
 import React from 'react';
 import { AttributeSelect } from './types';
 import './styles/index.less';
-type FCWithDefaultProps<P> = React.FC<P> & {
-    defaultProps?: Partial<P>;
-};
-declare const BizAttributeSelector: FCWithDefaultProps<AttributeSelect.Props>;
+declare const BizAttributeSelector: React.FC<AttributeSelect.Props>;
 export default BizAttributeSelector;

package/es/attributeSelector/index.js

@@ -43,7 +43,6 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     _useState6 = _slicedToArray(_useState5, 1),
     id = _useState6[0];
   var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList,
     userPropList = _useContext.userPropList,
     eventEnvList = _useContext.eventEnvList;
   var boxRef = useRef(null);
@@ -57,7 +56,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     setCurrentAttr(getValue(props.defaultValue));
   }, []);
   useEffect(function () {
-    setCurrentAttr(getValue(props.value));
+    if (getValue(props.value)) setCurrentAttr(getValue(props.value));
   }, [props.value, props.extra]);
   function getValue(param) {
     var res = undefined;
@@ -66,14 +65,12 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         if (attr.id === param.id && attr.name === (param.name || param.value)) res = attr;
       });
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'eventProp') {
-      eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
-        group.eventList.forEach(function (event) {
-          event.attrList.forEach(function (attr) {
-            if (attr.id === param.id) res = _.cloneDeep(attr);
-          });
-        });
-      });
-      if (res && param.step !== undefined) res.step = param.step;
+      if (param.id && (param.label || param.alias)) {
+        res = _.cloneDeep(param);
+      }
+      if (res && param.step !== undefined) {
+        res.step = param.step;
+      }
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {
       var _concat;
       (_concat = (extraUser ? extraUser : []).concat(userPropList ? userPropList : [])) === null || _concat === void 0 ? void 0 : _concat.forEach(function (attr) {

package/es/attributeSelector/types.d.ts

@@ -40,6 +40,7 @@ export interface EventGroup {
 export interface BasicProp {
     id?: number;
     label?: string;
+    encryptionType: number;
     alias?: string;
     type?: PropType;
     realTime?: boolean;

package/es/attributeSelector/util.js

@@ -31,6 +31,7 @@ export default function convertAttributeData(store) {
             propCategory: 'eventProp',
             type: item.prop_type,
             realTime: true,
+            encryptionType: item.encryption_type,
             dimensionSub: item.dimension_sub || 'event_attr'
           };
         }),
@@ -66,6 +67,7 @@ export default function convertAttributeData(store) {
       propCategory: 'envProp',
       type: prop.type,
       realTime: true,
+      encryptionType: prop.encryption_type,
       dimensionSub: prop.dimension_sub || prop.name
     };
   });
@@ -77,6 +79,7 @@ export default function convertAttributeData(store) {
       category: prop.category,
       key: "userProp-".concat(prop.name, "-").concat(prop.id || 0),
       label: prop.text || prop.name,
+      encryptionType: prop.encryption_type,
       name: prop.name,
       propCategory: 'userProp',
       type: prop.type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.70-hxd.23",
+  "version": "1.2.70-hxd.25",
   "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": "cc9496a355a99597907c89ebc807c7f3aa2da762",
+  "gitHead": "72853755f749b8edf7fe2ffa9aecbbc1656fd11c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }