@zgfe/business-lib 1.1.13-attr.0 → 1.1.13-attr.1

package/es/attrConditions/demo/group.js

@@ -65,6 +65,9 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(BizConditionGroup, {
     ref: conditionRef,
     value: data,
+    showCommonAttr: true,
+    eventIdList: [3767, 3768],
+    enableEventProp: true,
     onChange: onChange,
     onConditionsCount: setCount
   }), /*#__PURE__*/React.createElement("br", null), count < 3 && /*#__PURE__*/React.createElement(Button, {

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/group.js

@@ -31,7 +31,8 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
       enableUserProp = props.enableUserProp,
       enableEnvProp = props.enableEnvProp,
       disableItemList = props.disableItemList,
-      onConditionsCount = props.onConditionsCount;
+      onConditionsCount = props.onConditionsCount,
+      showCommonAttr = props.showCommonAttr;
 
   var _useState = useState('and'),
       _useState2 = _slicedToArray(_useState, 2),
@@ -179,6 +180,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
       key: item.key,
       value: item.data,
       eventIdList: eventIdList,
+      showCommonAttr: showCommonAttr,
       enableDelete: enableDelete,
       enableEventProp: enableEventProp,
       enableUserProp: enableUserProp,

package/es/attrConditions/index.js

@@ -14,7 +14,6 @@ import React, { useEffect, useState } from 'react';
 import BizAttributeSelector from '../attributeSelector';
 import { PropCategory } from '../attributeSelector/types';
 import './styles/index.less';
-import _ from 'lodash';
 import BizOperateList from './components/operateList';
 import ValuesList from './components/valuesList';
 import { Skeleton } from 'antd';
@@ -31,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),
@@ -99,7 +99,7 @@ var BizConditionItem = function BizConditionItem(props) {
     if (props.onChange) {
       if (!attr) return;
       var responseData = {
-        attrId: _.isNumber(attr.id) ? attr.id : parseInt(attr.id),
+        attrId: attr.id,
         propCategory: attr.propCategory,
         type: attr.type,
         operator: operate,
@@ -146,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,11 +32,13 @@ export declare namespace AttrConditionTypes {
         onDelete?: (value?: ItemValue) => void;
         border?: boolean;
         destroyPopupOnHide?: boolean;
+        showCommonAttr?: boolean;
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;
         value?: GroupValue;
         onlyAnd?: boolean;
+        showCommonAttr?: boolean;
         onChange?: (value: GroupValue) => void;
         onConditionsCount?: (value: number) => void;
     }

package/es/attributeSelector/index.js

@@ -89,7 +89,6 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
 
   function getValue(param) {
     var res = undefined;
-    var resEvent = undefined;
 
     if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'envProp') {
       eventEnvList === null || eventEnvList === void 0 ? void 0 : eventEnvList.forEach(function (attr) {
@@ -100,13 +99,13 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         var event = eventIdMap[id];
         if (!event) return;
         event.attrList.forEach(function (attr) {
-          if (typeof param.id == 'string' && param.id.includes(attr.id.toString())) {
-            if (resEvent) {
-              resEvent.id += ",".concat(attr.id);
-              resEvent.key += ",".concat(attr.key);
-              resEvent.eventId += ",".concat(attr.eventId);
+          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 {
-              resEvent = _.cloneDeep(attr);
+              res = _.cloneDeep(attr);
             }
           } else if (attr.id === param.id) {
             res = attr;
@@ -119,7 +118,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       });
     }
 
-    return resEvent || res;
+    return res;
   }
 
   function onDelete() {
@@ -184,7 +183,6 @@ BizAttributeSelector.defaultProps = {
   size: 'middle',
   propSymbol: '*',
   optionsHeaderTip: '带＊的属性每日凌晨更新',
-  destroyPopupOnHide: false,
-  showCommonAttr: false
+  destroyPopupOnHide: false
 };
 export default BizAttributeSelector;

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.13-attr.0",
+  "version": "1.1.13-attr.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "60cbc94769458e0fc58942abc834d80c8ed2f113"
+  "gitHead": "0b36177aafd37255bd885d2958c92bf3138afed5"
 }