@zgfe/business-lib 1.2.71-hxd.30 → 1.2.71-hxd.33

package/es/addToPanel/index.js

@@ -98,7 +98,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     form.extendTarget ? searchParam.extendTarget = form.extendTarget : null;
     var resData = {
       data: searchParam,
-      chosen_data: form.showList && form.showList === 'dynamic' ? [] : props.showList
+      chosen_data: form.showList && form.showList === 'dynamic' ? [] : props.params.showList
     };
     if (searchParam === null || searchParam === void 0 ? void 0 : searchParam.overall) {
       resData.module = 'overall';

package/es/attributeSelector/index.js

@@ -29,7 +29,7 @@ var BizAttributeSelector = function BizAttributeSelector(_ref) {
     _ref$optionsHeaderTip = _ref.optionsHeaderTip,
     optionsHeaderTip = _ref$optionsHeaderTip === void 0 ? '带＊的属性每日凌晨更新' : _ref$optionsHeaderTip,
     _ref$destroyPopupOnHi = _ref.destroyPopupOnHide,
-    destroyPopupOnHide = _ref$destroyPopupOnHi === void 0 ? false : _ref$destroyPopupOnHi,
+    destroyPopupOnHide = _ref$destroyPopupOnHi === void 0 ? true : _ref$destroyPopupOnHi,
     props = _objectWithoutProperties(_ref, _excluded);
   var _props$enableDelete = props.enableDelete,
     enableDelete = _props$enableDelete === void 0 ? false : _props$enableDelete,

package/es/attributeSelector/listPanel.js

@@ -1,7 +1,14 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorValues(e) { if (null != e) { var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"], r = 0; if (t) return t.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) return { next: function next() { return e && r >= e.length && (e = void 0), { value: e && e[r++], done: !e }; } }; } throw new TypeError(_typeof(e) + " is not iterable"); }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -9,11 +16,12 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { Anchor, Button } from 'antd';
-import React, { useContext, useEffect, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { BizGlobalDataContext } from '..';
 import BizSearchInput from '../searchInput';
 import Option from './option';
 import _ from 'lodash';
+import { eventApi } from '../utils';
 var Link = Anchor.Link;
 var AttrListPanel = function AttrListPanel(props) {
   var _props$disableItemLis;
@@ -51,17 +59,6 @@ var AttrListPanel = function AttrListPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     currentAttr = _useState6[0],
     setCurrentAttr = _useState6[1];
-  var eventIdMap = useMemo(function () {
-    var eventIdMap = {};
-    var eventList = (eventGroupList || []).reduce(function (pre, group) {
-      return [].concat(_toConsumableArray(pre), _toConsumableArray(group.eventList));
-    }, []);
-    eventList.forEach(function (event) {
-      if (eventIdMap[event.id]) return;
-      eventIdMap[event.id] = event;
-    });
-    return eventIdMap;
-  }, [eventGroupList]);
   var disableItemlist = (_props$disableItemLis = props.disableItemList) === null || _props$disableItemLis === void 0 ? void 0 : _props$disableItemLis.map(function (item) {
     if (item.propCategory === 'envProp') {
       item.key = "envProp-".concat(item.dimensionSub || item.name, "-").concat(item.id || 0);
@@ -84,6 +81,10 @@ var AttrListPanel = function AttrListPanel(props) {
     _useState0 = _slicedToArray(_useState9, 2),
     anchorList = _useState0[0],
     setAnchorList = _useState0[1];
+  var _useState1 = useState([]),
+    _useState10 = _slicedToArray(_useState1, 2),
+    eventAttrsList = _useState10[0],
+    setEventAttrsList = _useState10[1];
   useEffect(function () {
     var data = {
       container: "container-".concat(id),
@@ -99,7 +100,9 @@ var AttrListPanel = function AttrListPanel(props) {
         name: item.name
       });
     });
-    stAnchor(data);
+    stAnchor(function () {
+      return data;
+    });
     if (enableEventProp) {
       list.push({
         id: data.event,
@@ -118,105 +121,312 @@ var AttrListPanel = function AttrListPanel(props) {
         name: '触发环境'
       });
     }
-    setAnchorList(list);
+    setAnchorList(function () {
+      return list;
+    });
   }, [id]);
   var classPrefix = 'biz-attr-select';
   useEffect(function () {
-    var list = [];
-    if (extra) {
-      extra.forEach(function (item) {
-        list.push({
-          isEvent: false,
-          groupName: item.name,
-          key: item.type,
-          anchor: anchor[item.type],
-          children: item.attrList
-        });
+    var allEventIds = new Set();
+    if (eventIdList && eventIdList.length > 0) {
+      eventIdList.forEach(function (id) {
+        return allEventIds.add(id);
       });
     }
-    if (enableEventProp) {
-      if (props.showCommonProp) {
-        var group = {
-          isEvent: true,
-          groupName: '共有属性',
-          key: "event-common",
-          children: [],
-          anchor: anchor.event
-        };
-        var propMap = {};
-        eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.forEach(function (id) {
-          var event = eventIdMap[id];
-          if (!event) return;
-          event.attrList.forEach(function (attr) {
-            var name = attr.alias || attr.label;
-            if (!propMap[name]) {
-              propMap[name] = _.cloneDeep(attr);
-            } else {
-              group.children.push(propMap[name]);
-            }
-          });
-        });
-        if (group.children.length) list.push(group);
-      } else {
-        var hasAnchor = false;
-        eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.forEach(function (id) {
-          var event = eventIdMap[id];
-          if (!event) return;
-          var group = {
-            isEvent: true,
-            groupName: event.alias || event.name,
-            anchor: hasAnchor ? String(Math.random()) : anchor.event,
-            key: "event-".concat(event.id),
-            children: event.attrList.slice().filter(function (item) {
-              return isHideYeWu || realTimeTags ? item.id != 31415926 : true;
-            }).filter(function (item) {
-              return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : isString ? item.type === 1 : true;
-            })
-          };
-          list.push(group);
-        });
-        funnelEventIdList === null || funnelEventIdList === void 0 ? void 0 : funnelEventIdList.forEach(function (idList, step) {
-          idList.forEach(function (id) {
-            var event = eventIdMap[id];
-            if (!event) return;
-            var group = {
-              isEvent: true,
-              groupName: event.alias || event.name,
-              anchor: hasAnchor ? String(Math.random()) : anchor.event,
-              key: "event-".concat(event.id, "-").concat(step),
-              children: event.attrList.map(function (attr) {
-                var res = _.cloneDeep(attr);
-                res.step = step;
-                return res;
-              })
-            };
-            list.push(group);
-          });
+    if (funnelEventIdList && funnelEventIdList.length > 0) {
+      funnelEventIdList.forEach(function (stepList) {
+        stepList.forEach(function (id) {
+          return allEventIds.add(id);
         });
-      }
-    }
-    if (enableUserProp) {
-      list.push({
-        isEvent: false,
-        groupName: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027"),
-        key: 'userProps',
-        anchor: anchor.user,
-        children: (extraUser ? extraUser : []).concat(userPropList.filter(function (item) {
-          return realTimeTags ? item.category === 'custom' : true;
-        }))
       });
     }
-    if (enableEnvProp) {
-      list.push({
-        isEvent: false,
-        groupName: '触发环境',
-        key: 'eventEnvProps',
-        anchor: anchor.env,
-        children: eventEnvList
-      });
+    if (allEventIds.size === 0) {
+      setEventAttrsList([]);
+      return;
     }
-    setOptionList(list);
-  }, [anchor, eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
+    var prefetchEventAttrs = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+        var allAttrs, _i, _Array$from, eventId, attrs, _t;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
+            case 0:
+              allAttrs = [];
+              _i = 0, _Array$from = Array.from(allEventIds);
+            case 1:
+              if (!(_i < _Array$from.length)) {
+                _context.n = 6;
+                break;
+              }
+              eventId = _Array$from[_i];
+              _context.p = 2;
+              _context.n = 3;
+              return eventApi.fetchEventAttrs(eventId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+            case 3:
+              attrs = _context.v;
+              allAttrs.push.apply(allAttrs, _toConsumableArray(attrs));
+              _context.n = 5;
+              break;
+            case 4:
+              _context.p = 4;
+              _t = _context.v;
+              console.error("\u9884\u53D6\u4E8B\u4EF6 ".concat(eventId, " \u7684\u5C5E\u6027\u5931\u8D25"), _t);
+            case 5:
+              _i++;
+              _context.n = 1;
+              break;
+            case 6:
+              setEventAttrsList(allAttrs);
+            case 7:
+              return _context.a(2);
+          }
+        }, _callee, null, [[2, 4]]);
+      }));
+      return function prefetchEventAttrs() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    prefetchEventAttrs();
+  }, [eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.join(','), JSON.stringify(funnelEventIdList)]);
+  useEffect(function () {
+    var initOptionList = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+        var list, group, propMap, hasAnchor, eventAttrsMap, _iterator, _step, _loop3, _loop, step, _t3;
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
+            case 0:
+              list = [];
+              if (extra) {
+                extra.forEach(function (item) {
+                  list.push({
+                    isEvent: false,
+                    groupName: item.name,
+                    key: item.type,
+                    anchor: anchor[item.type],
+                    children: item.attrList
+                  });
+                });
+              }
+              if (!enableEventProp) {
+                _context5.n = 11;
+                break;
+              }
+              if (!props.showCommonProp) {
+                _context5.n = 1;
+                break;
+              }
+              group = {
+                isEvent: true,
+                groupName: '共有属性',
+                key: "event-common",
+                children: [],
+                anchor: anchor.event
+              };
+              propMap = {};
+              eventAttrsList.forEach(function (attr) {
+                var name = attr.alias || attr.label;
+                if (!propMap[name]) {
+                  propMap[name] = _.cloneDeep(attr);
+                } else {
+                  group.children.push(propMap[name]);
+                }
+              });
+              if (group.children.length) list.push(group);
+              _context5.n = 11;
+              break;
+            case 1:
+              hasAnchor = false;
+              eventAttrsMap = {};
+              eventAttrsList.forEach(function (attr) {
+                if (!eventAttrsMap[attr.eventId]) {
+                  eventAttrsMap[attr.eventId] = [];
+                }
+                eventAttrsMap[attr.eventId].push(attr);
+              });
+              _iterator = _createForOfIteratorHelper(eventIdList || []);
+              _context5.p = 2;
+              _loop3 = /*#__PURE__*/_regenerator().m(function _loop3() {
+                var eventId, eventName, eventAttrs, filteredAttrs, _group2;
+                return _regenerator().w(function (_context4) {
+                  while (1) switch (_context4.n) {
+                    case 0:
+                      eventId = _step.value;
+                      try {
+                        eventName = function () {
+                          var eventList = (eventGroupList || []).reduce(function (pre, group) {
+                            return [].concat(_toConsumableArray(pre), _toConsumableArray(group.eventList));
+                          }, []);
+                          var event = eventList.find(function (e) {
+                            return e.id === eventId;
+                          });
+                          return event ? event.alias || event.name : "\u4E8B\u4EF6".concat(eventId);
+                        }();
+                        eventAttrs = eventAttrsMap[eventId] || [];
+                        filteredAttrs = eventAttrs.filter(function (item) {
+                          return isHideYeWu || realTimeTags ? item.id !== 31415926 : true;
+                        }).filter(function (item) {
+                          return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : isString ? item.type === 1 : true;
+                        });
+                        if (filteredAttrs.length > 0) {
+                          _group2 = {
+                            isEvent: true,
+                            groupName: eventName,
+                            anchor: hasAnchor ? String(Math.random()) : anchor.event,
+                            key: "event-".concat(id),
+                            children: filteredAttrs
+                          };
+                          list.push(_group2);
+                          hasAnchor = true;
+                        }
+                      } catch (error) {
+                        console.error("\u83B7\u53D6\u4E8B\u4EF6 ".concat(id, " \u7684\u5C5E\u6027\u5931\u8D25"), error);
+                      }
+                    case 1:
+                      return _context4.a(2);
+                  }
+                }, _loop3);
+              });
+              _iterator.s();
+            case 3:
+              if ((_step = _iterator.n()).done) {
+                _context5.n = 5;
+                break;
+              }
+              return _context5.d(_regeneratorValues(_loop3()), 4);
+            case 4:
+              _context5.n = 3;
+              break;
+            case 5:
+              _context5.n = 7;
+              break;
+            case 6:
+              _context5.p = 6;
+              _t3 = _context5.v;
+              _iterator.e(_t3);
+            case 7:
+              _context5.p = 7;
+              _iterator.f();
+              return _context5.f(7);
+            case 8:
+              if (!funnelEventIdList) {
+                _context5.n = 11;
+                break;
+              }
+              _loop = /*#__PURE__*/_regenerator().m(function _loop(step) {
+                var idList, _iterator2, _step2, _loop2, _t2;
+                return _regenerator().w(function (_context3) {
+                  while (1) switch (_context3.n) {
+                    case 0:
+                      idList = funnelEventIdList[step];
+                      _iterator2 = _createForOfIteratorHelper(idList);
+                      _context3.p = 1;
+                      _loop2 = /*#__PURE__*/_regenerator().m(function _loop2() {
+                        var eventId, eventName, eventAttrs, _group;
+                        return _regenerator().w(function (_context2) {
+                          while (1) switch (_context2.n) {
+                            case 0:
+                              eventId = _step2.value;
+                              try {
+                                eventName = function () {
+                                  var eventList = (eventGroupList || []).reduce(function (pre, group) {
+                                    return [].concat(_toConsumableArray(pre), _toConsumableArray(group.eventList));
+                                  }, []);
+                                  var event = eventList.find(function (e) {
+                                    return e.id === eventId;
+                                  });
+                                  return event ? event.alias || event.name : "\u4E8B\u4EF6".concat(eventId);
+                                }();
+                                eventAttrs = eventAttrsMap[eventId] || [];
+                                _group = {
+                                  isEvent: true,
+                                  groupName: eventName,
+                                  anchor: hasAnchor ? String(Math.random()) : anchor.event,
+                                  key: "event-".concat(eventId, "-").concat(step),
+                                  children: eventAttrs.map(function (attr) {
+                                    var res = _.cloneDeep(attr);
+                                    res.step = step;
+                                    return res;
+                                  })
+                                };
+                                list.push(_group);
+                                hasAnchor = true;
+                              } catch (error) {
+                                console.error("\u83B7\u53D6\u6F0F\u6597\u4E8B\u4EF6 ".concat(id, " \u7684\u5C5E\u6027\u5931\u8D25"), error);
+                              }
+                            case 1:
+                              return _context2.a(2);
+                          }
+                        }, _loop2);
+                      });
+                      _iterator2.s();
+                    case 2:
+                      if ((_step2 = _iterator2.n()).done) {
+                        _context3.n = 4;
+                        break;
+                      }
+                      return _context3.d(_regeneratorValues(_loop2()), 3);
+                    case 3:
+                      _context3.n = 2;
+                      break;
+                    case 4:
+                      _context3.n = 6;
+                      break;
+                    case 5:
+                      _context3.p = 5;
+                      _t2 = _context3.v;
+                      _iterator2.e(_t2);
+                    case 6:
+                      _context3.p = 6;
+                      _iterator2.f();
+                      return _context3.f(6);
+                    case 7:
+                      return _context3.a(2);
+                  }
+                }, _loop, null, [[1, 5, 6, 7]]);
+              });
+              step = 0;
+            case 9:
+              if (!(step < funnelEventIdList.length)) {
+                _context5.n = 11;
+                break;
+              }
+              return _context5.d(_regeneratorValues(_loop(step)), 10);
+            case 10:
+              step++;
+              _context5.n = 9;
+              break;
+            case 11:
+              if (enableUserProp) {
+                list.push({
+                  isEvent: false,
+                  groupName: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027"),
+                  key: 'userProps',
+                  anchor: anchor.user,
+                  children: (extraUser ? extraUser : []).concat(userPropList.filter(function (item) {
+                    return realTimeTags ? item.category === 'custom' : true;
+                  }))
+                });
+              }
+              if (enableEnvProp) {
+                list.push({
+                  isEvent: false,
+                  groupName: '触发环境',
+                  key: 'eventEnvProps',
+                  anchor: anchor.env,
+                  children: eventEnvList
+                });
+              }
+              setOptionList(list);
+            case 12:
+              return _context5.a(2);
+          }
+        }, _callee2, null, [[2, 6, 7, 8]]);
+      }));
+      return function initOptionList() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    initOptionList();
+  }, [anchor, eventGroupList, userPropList, eventEnvList, props.showCommonProp, enableEventProp, enableUserProp, enableEnvProp, extra, extraUser, isHideYeWu, realTimeTags, isNumber, isStrNum, isString, eventAttrsList]);
   useEffect(function () {
     setCurrentAttr(props.value);
   }, [props.value]);
@@ -235,7 +445,7 @@ var AttrListPanel = function AttrListPanel(props) {
       });
       var childList = [];
       group.children.forEach(function (option) {
-        if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test((option === null || option === void 0 ? void 0 : option.alias) || (option === null || option === void 0 ? void 0 : option.label))) return;
+        if (searchValue && !(new RegExp(_.escapeRegExp(searchValue), 'i').test(option === null || option === void 0 ? void 0 : option.alias) || new RegExp(_.escapeRegExp(searchValue), 'i').test(option === null || option === void 0 ? void 0 : option.label))) return;
         var disabled = false;
         disableItemlist === null || disableItemlist === void 0 ? void 0 : disableItemlist.forEach(function (item) {
           if (item.key === option.key) disabled = true;
@@ -260,6 +470,7 @@ var AttrListPanel = function AttrListPanel(props) {
         list = list.concat(childList);
       }
     });
+    console.log(optionList, list, anchor, anchorList, 'anchorListanchorListanchorList');
     return list;
   }();
   if (!showList.length && !searchValue) return /*#__PURE__*/React.createElement("div", {
@@ -272,7 +483,7 @@ var AttrListPanel = function AttrListPanel(props) {
       return setSearchValue(val);
     },
     placeholder: "\u641C\u7D22\u5C5E\u6027"
-  }), showList.length ? (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Anchor, {
+  }), /*#__PURE__*/React.createElement("div", null, anchor.container), showList.length ? (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Anchor, {
     className: "".concat(classPrefix, "-anchor-panel"),
     affix: false,
     onClick: function onClick(e) {

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
     };
   });
@@ -82,6 +84,7 @@ export default function convertAttributeData(store) {
       type: prop.type,
       subtype: prop.subtype,
       realTime: prop.category === 'custom',
+      encryptionType: prop.encryption_type,
       dimensionSub: prop.dimension_sub || prop.name
     };
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.71-hxd.30",
+  "version": "1.2.71-hxd.33",
   "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": "f619d8e9acb810bf34cdfb16220eb76f0979325d",
+  "gitHead": "2ce79f5e8a302f8537678057aec9fc452a5a3210",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }