@zgfe/business-lib 1.1.3-user.0 → 1.1.3-user.10

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

@@ -198,6 +198,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
 
   var onOperateChange = function onOperateChange(operate) {
     setOperator(operate);
+    setFieldValue([]);
   };
 
   function getOptions(type) {
@@ -260,7 +261,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
             defaultValue: fieldValue && fieldValue[0],
             onChange: function onChange(e) {
               e.persist();
-              setFieldValue([e.target.value]);
+              setFieldValue([e.target.value, '1']);
             },
             suffix: "\u5929"
           });
@@ -346,7 +347,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/demo/index.js

@@ -50,7 +50,7 @@ export default (function () {
   }, [conditions]);
 
   function onChange(value) {
-    console.log('change:', JSON.stringify(value));
+    console.log('change:', JSON.parse(JSON.stringify(value)));
   }
 
   var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {

package/es/userCondition/index.js

@@ -1,3 +1,5 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
 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."); }
@@ -24,7 +26,6 @@ import RelationLabel from './relationLabel';
 import OrConditions from './orConditions';
 import './styles/index.less';
 import { buildCondition } from './util';
-import _ from 'lodash';
 import BizGlobalDataContext from '../context';
 import IconFont from '../icon/iconFont';
 import request from '../utils/ajax';
@@ -54,7 +55,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),
@@ -67,11 +69,35 @@ var BizUserCondition = function BizUserCondition(props) {
       setDataList = _useState4[1];
 
   var _useState5 = useState(function () {
+    var list = [];
+
     if (defaultValue) {
-      return _.cloneDeep(defaultValue);
+      var showTag = openTagCondition && (!menuNameMap || menuNameMap['userTags']);
+      var showCdp = openCdpCondition && (!menuNameMap || menuNameMap['dataset']);
+      var flag = false;
+      defaultValue.forEach(function (item) {
+        var showItem = _toConsumableArray(item);
+
+        if (!(showTag && showCdp)) {
+          item.forEach(function (data, index) {
+            if (data.dataset && !showCdp || data.labels && !showTag) {
+              showItem.splice(index, 1);
+              flag = true;
+            }
+          });
+        }
+
+        if (showItem.length > 0) {
+          list.push(showItem);
+        }
+      });
+
+      if (flag) {
+        props.onChange(list);
+      }
     }
 
-    return [];
+    return list;
   }),
       _useState6 = _slicedToArray(_useState5, 2),
       value = _useState6[0],
@@ -108,6 +134,42 @@ var BizUserCondition = function BizUserCondition(props) {
       setLoading(false);
     }
   }, []);
+  var haveCdpValues = useMemo(function () {
+    var flag = false;
+
+    var _iterator = _createForOfIteratorHelper(value),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var condition = _step.value;
+
+        var _iterator2 = _createForOfIteratorHelper(condition),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var item = _step2.value;
+
+            if (item.dataset) {
+              flag = true;
+              break;
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+
+    return flag;
+  }, [value]);
 
   function initShowList() {
     var showList = [];
@@ -193,6 +255,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,
@@ -220,11 +283,11 @@ var BizUserCondition = function BizUserCondition(props) {
     show: value.length < andConditionNum,
     label: "\u4E14",
     onAdd: onAdd
-  }), openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("div", {
+  }), openCdpCondition && (!menuNameMap || menuNameMap['dataset']) && !props.textMode && haveCdpValues ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-tip")
   }, ' ', /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  }), "\u660E\u7EC6\u8868\u4E2D\u9700\u5B58\u5728\u300Cuser_id\u300D\u6761\u4EF6\u65B9\u53EF\u751F\u6548\u3002") : null));
+  }), "\u660E\u7EC6\u8868\u4E2D\u9700\u5B58\u5728\u300Capp_user_id\u300D\u6761\u4EF6\u65B9\u53EF\u751F\u6548\u3002") : null));
 };
 
 BizUserCondition.defaultProps = {

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.0",
+  "version": "1.1.3-user.10",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "26e6afc8e7d87d53736066f6380b8090b1016b9b"
+  "gitHead": "f9e277f36d5ac472fd9fb5cf5a840b82d8eb9cf8"
 }