@zgfe/business-lib 1.1.3-user.6 → 1.1.3-user.7

package/es/userCondition/conditionTypeList.js

@@ -1,9 +1,10 @@
 import React, { useContext } from 'react';
-import { Space } from 'antd';
+import { Space, Tooltip } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import './styles/conditionTypeList.less';
 import { BizUserConditionContext } from '.';
 import BizGlobalDataContext from '../context';
+import IconFont from '../icon/iconFont';
 
 var ConditionTypeList = function ConditionTypeList(props) {
   var onAdd = props.onAdd,
@@ -13,7 +14,8 @@ var ConditionTypeList = function ConditionTypeList(props) {
   var _useContext = useContext(BizUserConditionContext),
       textMode = _useContext.textMode,
       openTagCondition = _useContext.openTagCondition,
-      openCdpCondition = _useContext.openCdpCondition;
+      openCdpCondition = _useContext.openCdpCondition,
+      cdpTip = _useContext.cdpTip;
 
   var _useContext2 = useContext(BizGlobalDataContext),
       menuNameMap = _useContext2.menuNameMap;
@@ -67,7 +69,11 @@ var ConditionTypeList = function ConditionTypeList(props) {
     onClick: function onClick() {
       return onAdd('cdp');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u660E\u7EC6\u6570\u636E"))) : null));
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u660E\u7EC6\u6570\u636E"), cdpTip ? /*#__PURE__*/React.createElement(Tooltip, {
+    title: cdpTip
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "tishiicon"
+  })) : null)) : null));
 };
 
 ConditionTypeList.defaultProps = {

package/es/userCondition/conditions/cdpCondition.js

@@ -346,7 +346,7 @@ var CdpCondition = function CdpCondition(props) {
   }, "\u660E\u7EC6\u6570\u636E"), cdpConditions.map(function (item, index) {
     return /*#__PURE__*/React.createElement(CdpConditionItem, {
       value: item,
-      key: (item === null || item === void 0 ? void 0 : item.fieldName) || index,
+      key: "".concat(item === null || item === void 0 ? void 0 : item.datasetId).concat(item === null || item === void 0 ? void 0 : item.operator).concat(index),
       onChange: function onChange(data) {
         return onChangeCondition(data, index);
       }

package/es/userCondition/conditions/textDesc.js

@@ -217,9 +217,7 @@ var Text = function Text(props) {
         backgroundColor: '#effcff',
         padding: '6px 7px'
       }
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "".concat(classPrefix, "-text-desc-value")
-    }, /*#__PURE__*/React.createElement("span", null, "("), dataset.map(function (value) {
+    }, dataset.map(function (value) {
       if (!value) return null;
       var operator = value.operator,
           _value$params = value.params,
@@ -252,7 +250,7 @@ var Text = function Text(props) {
       return /*#__PURE__*/React.createElement("span", {
         key: Math.random()
       }, "".concat(value.datasetName, "\u4E2D").concat(value.fieldName).concat(valuesDom));
-    }), /*#__PURE__*/React.createElement("span", null, ")")));
+    }));
   }
 
   function renderPropValues(attr) {

package/es/userCondition/index.js

@@ -53,7 +53,8 @@ var BizUserCondition = function BizUserCondition(props) {
       defaultValue = props.defaultValue,
       openTagCondition = props.openTagCondition,
       openCdpCondition = props.openCdpCondition,
-      userTagsData = props.userTagsData;
+      userTagsData = props.userTagsData,
+      cdpTip = props.cdpTip;
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -216,6 +217,7 @@ var BizUserCondition = function BizUserCondition(props) {
       textMode: props.textMode,
       openTagCondition: openTagCondition,
       openCdpCondition: openCdpCondition,
+      cdpTip: cdpTip,
       userTagsData: userTagsData !== null && userTagsData !== void 0 ? userTagsData : [],
       isRealTime: props.isRealTime,
       envNameList: envNameList,

package/es/userCondition/types.d.ts

@@ -36,6 +36,7 @@ export declare namespace BizUserConditionT {
         userTagsData?: UserTagsDataI[];
         isRealTime?: boolean;
         openCdpCondition?: boolean;
+        cdpTip?: string;
     }
     interface UserTagsDataI {
         appId: number;
@@ -132,7 +133,7 @@ export declare namespace BizUserConditionT {
         orConditions: Conditions[number];
     }
     type ShowListT = ShowItemI[];
-    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'openCdpCondition' | 'textMode' | 'isRealTime'> & {
+    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'openCdpCondition' | 'textMode' | 'isRealTime' | 'cdpTip'> & {
         envNameList: string[];
         userPropsMap: {
             [key: string]: UserProp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.3-user.6",
+  "version": "1.1.3-user.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "003987b1574225b054c23ac7f3372ccf79bb3a47"
+  "gitHead": "2cbc14e2d80f1278719e7214b8715988c3e51709"
 }