@zgfe/business-lib 1.1.12 → 1.1.13-y.0

package/es/attrConditions/demo/index.js

@@ -47,6 +47,8 @@ export default (function () {
     name: "condition"
   }, /*#__PURE__*/React.createElement(BizConditionItem, {
     enableEventProp: true,
+    showCommonAttr: true,
+    eventIdList: [3767, 3768],
     disableItemList: [{
       name: 'is_anonymous',
       propCategory: 'userProp'

package/es/attrConditions/index.js

@@ -30,7 +30,8 @@ var BizConditionItem = function BizConditionItem(props) {
       enableEnvProp = props.enableEnvProp,
       disableItemList = props.disableItemList,
       border = props.border,
-      theme = props.theme;
+      theme = props.theme,
+      showCommonAttr = props.showCommonAttr;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -145,6 +146,7 @@ var BizConditionItem = function BizConditionItem(props) {
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     value: attr,
     eventIdList: eventIdList,
+    showCommonAttr: showCommonAttr,
     enableDelete: enableDelete,
     enableEventProp: enableEventProp,
     enableUserProp: enableUserProp,

package/es/attrConditions/types.d.ts

@@ -11,7 +11,7 @@ interface BasicAttrTypes {
 export declare namespace AttrConditionTypes {
     interface ItemValue {
         subtype?: number;
-        attrId?: number;
+        attrId?: number | string;
         attrName?: string;
         label?: string;
         type?: PropType;
@@ -32,6 +32,7 @@ export declare namespace AttrConditionTypes {
         onDelete?: (value?: ItemValue) => void;
         border?: boolean;
         destroyPopupOnHide?: boolean;
+        showCommonAttr?: boolean;
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;

package/es/attributeSelector/demo/index.js

@@ -19,7 +19,7 @@ import userData from './userData.js';
 import convertAttributeData from '../util';
 export default (function () {
   var _useState = useState({
-    id: 30183426,
+    id: '30183431,30183428',
     propCategory: 'eventProp'
   }),
       _useState2 = _slicedToArray(_useState, 2),
@@ -45,7 +45,8 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: true,
-    eventIdList: [24143016],
+    showCommonAttr: true,
+    eventIdList: [24143016, 24143017],
     value: attribute,
     onChange: onChange,
     enableDelete: true,

package/es/attributeSelector/index.js

@@ -4,6 +4,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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."); }
@@ -16,18 +24,20 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import './styles/index.less';
 import { Dropdown, Tooltip } from 'antd';
 import AttrListPanel from './listPanel';
 import IconFont from '../icon/iconFont';
 import { BizGlobalDataContext } from '..';
 import SelectHandle from '../select/handle';
+import _ from 'lodash';
 
 var BizAttributeSelector = function BizAttributeSelector(props) {
   var enableDelete = props.enableDelete,
       placeholder = props.placeholder,
-      theme = props.theme;
+      theme = props.theme,
+      eventIdList = props.eventIdList;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -57,6 +67,17 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       width = _useState8[0],
       setWidth = _useState8[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]);
   useEffect(function () {
     setWidth(boxRef.current.width || 284);
     if (!props.defaultValue) return;
@@ -74,11 +95,21 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         if (attr.name === param.name) 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 = attr;
-          });
+      eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.forEach(function (id) {
+        var event = eventIdMap[id];
+        if (!event) return;
+        event.attrList.forEach(function (attr) {
+          if (typeof param.id == 'string' && param.id.split(',').length > 1 && param.id.includes(attr.id.toString())) {
+            if (res) {
+              res.id += ",".concat(attr.id);
+              res.key += ",".concat(attr.key);
+              res.eventId += ",".concat(attr.eventId);
+            } else {
+              res = _.cloneDeep(attr);
+            }
+          } else if (attr.id === param.id) {
+            res = attr;
+          }
         });
       });
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {

package/es/attributeSelector/listPanel.js

@@ -1,3 +1,9 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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."); }
@@ -33,7 +39,8 @@ var AttrListPanel = function AttrListPanel(props) {
       enableEnvProp = props.enableEnvProp,
       enableEventProp = props.enableEventProp,
       enableUserProp = props.enableUserProp,
-      eventIdList = props.eventIdList;
+      eventIdList = props.eventIdList,
+      showCommonAttr = props.showCommonAttr;
 
   var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -89,9 +96,34 @@ var AttrListPanel = function AttrListPanel(props) {
 
     if (enableEventProp) {
       var hasAnchor = false;
+      var eventShareAttrObj = {};
+      var eventShareAttrList = [];
       eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.forEach(function (id) {
         var event = eventIdMap[id];
         if (!event) return;
+        event.attrList.forEach(function (item) {
+          if (eventShareAttrObj[item.label]) {
+            var itemData = eventShareAttrObj[item.label];
+            itemData.frequency = itemData.frequency + 1;
+            itemData.id += ",".concat(item.id);
+            itemData.eventId += ",".concat(item.eventId);
+            itemData.key += ",".concat(item.key);
+          } else {
+            eventShareAttrObj[item.label] = _objectSpread(_objectSpread({}, item), {}, {
+              frequency: 1
+            });
+          }
+        });
+
+        if (Object.keys(eventShareAttrObj).length > 0) {
+          for (var key in eventShareAttrObj) {
+            if (eventShareAttrObj[key].frequency > 1) {
+              delete eventShareAttrObj[key].frequency;
+              eventShareAttrList.push(eventShareAttrObj[key]);
+            }
+          }
+        }
+
         var group = {
           isEvent: true,
           groupName: event.alias || event.name,
@@ -101,6 +133,15 @@ var AttrListPanel = function AttrListPanel(props) {
         };
         list.push(group);
       });
+
+      if (eventShareAttrList.length > 0 && showCommonAttr) {
+        list.unshift({
+          groupName: '事件共有属性',
+          anchor: hasAnchor ? String(Math.random()) : anchor.event,
+          key: "event-".concat(Math.random()),
+          children: eventShareAttrList.slice()
+        });
+      }
     }
 
     if (enableUserProp) {

package/es/attributeSelector/types.d.ts

@@ -31,7 +31,7 @@ export interface EventGroup {
     eventList: AnalysisEvent[];
 }
 export interface BasicProp {
-    id: number;
+    id: number | string;
     label?: string;
     alias?: string;
     type?: PropType;
@@ -53,9 +53,9 @@ export interface EnvProp extends BasicProp {
     key?: string;
 }
 export interface EventProp extends BasicProp {
-    eventId?: number;
+    eventId?: number | string;
     propCategory: 'eventProp';
-    key?: number;
+    key?: number | string;
 }
 export interface PropGroups {
     eventGroupList?: EventGroup[];
@@ -82,10 +82,11 @@ export declare namespace AttributeSelect {
         theme?: string;
         destroyPopupOnHide?: boolean;
         size?: SizeType;
+        showCommonAttr?: boolean;
     }
     interface Option {
         groupName: string;
-        isEvent: boolean;
+        isEvent?: boolean;
         key: string;
         anchor: string;
         children: Value[];

package/es/userCondition/types.d.ts

@@ -63,7 +63,7 @@ export declare namespace BizUserConditionT {
         }[];
     }
     interface AttrCondition {
-        attrId: number;
+        attrId: number | string;
         attrName: string;
         operator: 'is not null' | 'is null' | 'not contains' | 'contains' | 'equal' | 'not equal' | 'begin with' | 'not begin with' | 'end with' | 'not end with' | Unpacked<RunTimesI, 'operator'>;
         params: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.12",
+  "version": "1.1.13-y.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5b2d20352f9fbb9919f21397c60a21aa55b9bd7f"
+  "gitHead": "0b36177aafd37255bd885d2958c92bf3138afed5"
 }