@zgfe/business-lib 1.2.70-hxd.7 → 1.2.71-hxd.1

package/es/userCondition/conditions/cdpCshCondition.js

@@ -15,18 +15,21 @@ import BizSelect from '../../select';
 import { PropType } from '../types';
 import './styles/cdpCshCondition.less';
 import _ from 'lodash';
-import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2 } from '../../attrConditions/utils/operates';
+import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2, stringOperate1 } from '../../attrConditions/utils/operates';
 import { DatePicker, Input } from 'antd';
 import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
 import IconFont from '../../icon/iconFont';
+import BizGlobalDataContext from '../../context';
 var classPrefix = 'biz-user-condition-cdp-csh';
 var CdpConditionItem = function CdpConditionItem(props) {
-  var _useContext = useContext(BizUserConditionContext),
-    _useContext$datasetLi = _useContext.datasetList,
-    datasetList = _useContext$datasetLi === void 0 ? [] : _useContext$datasetLi;
+  var _useContext = useContext(BizGlobalDataContext),
+    basicConfig = _useContext.basicConfig;
+  var _useContext2 = useContext(BizUserConditionContext),
+    _useContext2$datasetL = _useContext2.datasetList,
+    datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
   var _useState = useState(function () {
       if (props.value) {
         return _objectSpread(_objectSpread({}, props.value), {}, {
@@ -289,7 +292,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
         list = numberOperateCsh;
         break;
       case PropType.STRING2:
-        list = stringOperate;
+        list = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
         break;
       default:
         list = [];
@@ -314,7 +317,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       options: optionList,
       labelField: "name",
       keyField: "value",
-      overlayWidth: 96,
+      overlayWidth: 120,
       value: operator,
       onChange: onOperateChange
     }), function () {

package/es/userCondition/conditions/constants.d.ts

@@ -13,6 +13,8 @@ export declare const operatorMap: {
     'not begin with': string;
     'end with': string;
     'not end with': string;
+    regexp: string;
+    'not regexp': string;
     '=': string;
     '<': string;
     '>': string;

package/es/userCondition/conditions/constants.js

@@ -13,6 +13,8 @@ export var operatorMap = {
   'not begin with': '开头不是',
   'end with': '结尾是',
   'not end with': '结尾不是',
+  regexp: '正则匹配',
+  'not regexp': '正则不匹配',
   '=': '=',
   '<': '<',
   '>': '>',

package/es/userCondition/conditions/dataAttribute.js

@@ -14,7 +14,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import BizSelect from '../../select';
 import './styles/runTimesCondition.less';
 import { classPrefix } from '..';
-import { stringOperate, orderTypeList, typeList, computeTypeList } from '../../attrConditions/utils/operates';
+import { stringOperate, orderTypeList, typeList, computeTypeList, stringOperate1 } from '../../attrConditions/utils/operates';
 import moment from 'moment';
 import request from '../../utils/ajax';
 import BizGlobalDataContext from '../../context';
@@ -22,6 +22,8 @@ import ParamsCondition from './business/paramsCondition';
 import OperatorCondition from './business/operatorCondition';
 import Apis from '../../constants/apis';
 var DataAttribute = function DataAttribute(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+    basicConfig = _useContext.basicConfig;
   var condition = props.condition,
     index = props.index,
     onChange = props.onChange;
@@ -29,8 +31,8 @@ var DataAttribute = function DataAttribute(props) {
   var operateList = [];
   switch (condition.attrs[index].attrType) {
     case 'cont-string':
-      list = typeList['cont-string'];
-      operateList = stringOperate;
+      list = basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string'];
+      operateList = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
       break;
     case 'cont-num':
       list = computeTypeList;
@@ -57,8 +59,8 @@ var DataAttribute = function DataAttribute(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     bizDataAttrList = _useState8[0],
     setBizDataAttrList = _useState8[1];
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    currentApp = _useContext2.currentApp;
   useEffect(function () {
     if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
       queryBizDataAttrList(condition === null || condition === void 0 ? void 0 : condition.typeId);
@@ -123,7 +125,7 @@ var DataAttribute = function DataAttribute(props) {
       });
       switch (operate.propType) {
         case 1:
-          setMasterList(typeList['cont-string']);
+          setMasterList(basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string']);
           condition.attrs[index].attrType = 'cont-string';
           setQueryValueObj({
             keyword: '',
@@ -152,7 +154,7 @@ var DataAttribute = function DataAttribute(props) {
     if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
       switch (operate.propType) {
         case 1:
-          setStringOperateList(typeList['cont-string']);
+          setStringOperateList(basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string']);
           condition.attrs[index].attrType = 'cont-string';
           setQueryValueObj({
             keyword: '',
@@ -228,8 +230,10 @@ var DataAttribute = function DataAttribute(props) {
     },
     labelField: "name",
     keyField: "value",
+    overlayWidth: 120,
     onChange: onMasterListChange
   })), /*#__PURE__*/React.createElement(OperatorCondition, {
+    key: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrId,
     queryValueObj: queryValueObj,
     stringOperateList: stringOperateList,
     index: index,

package/es/userCondition/conditions/eventCondition.js

@@ -15,10 +15,9 @@ import BizEventSelector from '../../eventSelector';
 import RunTimesCondition from './runTimesCondition';
 import PeriodCondition from './periodCondition';
 import PropCondition from './propCondition';
-import { DownOutlined } from '@ant-design/icons';
 import './styles/eventCondition.less';
 import { BizUserConditionContext, classPrefix } from '..';
-import { Dropdown, notification, Space } from 'antd';
+import { Button, notification } from 'antd';
 import TimeDimension from './timeDimension';
 import { Tooltip } from 'antd';
 import IconFont from '../../icon/iconFont';
@@ -28,7 +27,8 @@ import Apis from '../../constants/apis';
 var EventCondition = function EventCondition(props) {
   var _condition$timeDimens2, _condition$timeDimens3;
   var _useContext = useContext(BizUserConditionContext),
-    isRealTime = _useContext.isRealTime;
+    isRealTime = _useContext.isRealTime,
+    realTimeTags = _useContext.realTimeTags;
   var _useContext2 = useContext(BizGlobalDataContext),
     currentUser = _useContext2.currentUser,
     currentApp = _useContext2.currentApp;
@@ -66,7 +66,7 @@ var EventCondition = function EventCondition(props) {
       }]
     }));
   }
-  var onClick = function onClick(_ref) {
+  var _onClick = function onClick(_ref) {
     var key = _ref.key;
     if (key === 'time dimension') {
       var _condition$timeDimens;
@@ -87,10 +87,6 @@ var EventCondition = function EventCondition(props) {
     }
     onChange(_objectSpread({}, condition));
   };
-  var items = [{
-    label: '时间维度',
-    key: 'time dimension'
-  }];
   function onTimeDimensionChange(condition) {
     onChange(_objectSpread({}, condition));
   }
@@ -202,21 +198,17 @@ var EventCondition = function EventCondition(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
     }))));
-  }), condition && !(eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(condition.eventId)) && ((_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.length) < 3 && ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      margin: '2px 0 0 38px',
-      color: '#4075fd',
-      fontSize: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    menu: {
-      items: items,
-      onClick: onClick
-    }
-  }, /*#__PURE__*/React.createElement("a", {
-    onClick: function onClick(e) {
-      return e.preventDefault();
-    }
-  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
+  }), condition && !(eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(condition.eventId)) && ((_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.length) < 3 && ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) && realTimeTags !== true ? /*#__PURE__*/React.createElement(Button, {
+    className: "".concat(classPrefix, "-event-condition-time"),
+    type: "dashed",
+    onClick: function onClick() {
+      return _onClick({
+        key: 'time dimension'
+      });
+    },
+    icon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "tianjia1"
+    })
+  }, "\u65F6\u95F4\u7EF4\u5EA6") : null);
 };
 export default EventCondition;

package/es/userCondition/conditions/order/runPeriodCondition.d.ts

@@ -7,5 +7,8 @@ export interface RunPeriodConditionPropsI extends AllConditionBasePropsI<any> {
     dataId: number;
     condition: BizUserConditionT.BusinessCondition;
 }
-declare const RunPeriodCondition: React.FC<RunPeriodConditionPropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const RunPeriodCondition: FCWithDefaultProps<RunPeriodConditionPropsI>;
 export default RunPeriodCondition;

package/es/userCondition/conditions/periodCondition.d.ts

@@ -7,5 +7,8 @@ export interface PeriodConditionPropsI extends AllConditionBasePropsI<RunPeriodI
     runPeriod: RunPeriodI;
     isRealTime?: boolean;
 }
-declare const PeriodCondition: React.FC<PeriodConditionPropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const PeriodCondition: FCWithDefaultProps<PeriodConditionPropsI>;
 export default PeriodCondition;

package/es/userCondition/conditions/periodCondition.js

@@ -4,12 +4,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React, { useMemo } from 'react';
+import React, { useMemo, useContext } from 'react';
 import BizSelect from '../../select';
-import { Input, DatePicker, Checkbox } from 'antd';
+import { DatePicker, Checkbox, InputNumber } from 'antd';
 import moment from 'moment';
 import './styles/periodCondition.less';
-import { classPrefix } from '..';
+import { BizUserConditionContext, classPrefix } from '..';
 import { operatorMap } from './constants';
 var RangePicker = DatePicker.RangePicker;
 var PeriodCondition = function PeriodCondition(props) {
@@ -17,6 +17,8 @@ var PeriodCondition = function PeriodCondition(props) {
     label = props.label,
     isEvent = props.isEvent,
     runPeriod = props.runPeriod;
+  var _useContext = useContext(BizUserConditionContext),
+    realTimeTags = _useContext.realTimeTags;
   var options = [{
     text: '最近',
     value: 'relative'
@@ -33,6 +35,12 @@ var PeriodCondition = function PeriodCondition(props) {
       value: 'join_time'
     }]);
   }
+  if (realTimeTags) {
+    options = [{
+      text: '最近',
+      value: 'relative'
+    }];
+  }
   var unit = useMemo(function () {
     if (runPeriod.operator === 'absolute' || runPeriod.operator === 'unlimited_time') {
       return '';
@@ -72,9 +80,8 @@ var PeriodCondition = function PeriodCondition(props) {
         values: newValues
       }));
     } else if (runPeriod.operator === 'relative' || runPeriod.operator === 'join_time') {
-      var newValue = newData.target.value;
       onChange(_objectSpread(_objectSpread({}, runPeriod), {}, {
-        values: [newValue, runPeriod.values[1]]
+        values: [newData, runPeriod.values[1]]
       }));
     }
   }
@@ -91,9 +98,10 @@ var PeriodCondition = function PeriodCondition(props) {
     var operator = runPeriod.operator,
       values = runPeriod.values;
     if (operator === 'relative' || operator === 'join_time') {
-      return /*#__PURE__*/React.createElement(Input, {
-        size: "middle",
-        value: values[0],
+      return /*#__PURE__*/React.createElement(InputNumber, {
+        max: realTimeTags ? 30 : undefined,
+        min: 1,
+        value: Number(values[0]),
         onChange: onDateChange,
         style: {
           width: 58
@@ -116,7 +124,7 @@ var PeriodCondition = function PeriodCondition(props) {
   }, label) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
-    dropdownExtra: isEvent ? /*#__PURE__*/React.createElement("div", {
+    dropdownExtra: isEvent && !realTimeTags ? /*#__PURE__*/React.createElement("div", {
       style: {
         lineHeight: '29px'
       }
@@ -135,12 +143,12 @@ var PeriodCondition = function PeriodCondition(props) {
     className: "".concat(classPrefix, "-period-condition-values")
   }, renderValues()), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-unit")
-  }, unit), props.isRealTime && runPeriod.operator === 'relative' ? /*#__PURE__*/React.createElement("div", {
+  }, unit), props.isRealTime && runPeriod.operator === 'relative' && !realTimeTags ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-today")
   }, /*#__PURE__*/React.createElement(Checkbox, {
     checked: runPeriod.values[1] === '1',
     onChange: onChangeToday
-  }, "\u4E0D\u5305\u542B\u4ECA\u5929")) : null);
+  }, "\u4E0D\u5305\u542B\u4ECA\u5929")) : null, realTimeTags && /*#__PURE__*/React.createElement("div", null, "\uFF0C\u5305\u542B\u4ECA\u5929"));
 };
 PeriodCondition.defaultProps = {
   isEvent: false,

package/es/userCondition/conditions/propCondition.js

@@ -35,7 +35,8 @@ var attrNumTypeMap = {
 var PropCondition = function PropCondition(props) {
   var _useContext = useContext(BizUserConditionContext),
     envNameList = _useContext.envNameList,
-    userPropsMap = _useContext.userPropsMap;
+    userPropsMap = _useContext.userPropsMap,
+    realTimeTags = _useContext.realTimeTags;
   var _useContext2 = useContext(BizUserConditionContext),
     eventAttrNum = _useContext2.eventAttrNum;
   var isEvent = props.isEvent,
@@ -160,14 +161,15 @@ var PropCondition = function PropCondition(props) {
         return _onChange(data, i);
       },
       enableUserProp: !isEvent,
-      enableEnvProp: isEvent,
+      enableEnvProp: isEvent && !realTimeTags,
       enableEventProp: isEvent,
       onDelete: function onDelete() {
         return onRemoveAttr(i);
       },
       enableDelete: isEvent,
       border: false,
-      destroyPopupOnHide: true
+      destroyPopupOnHide: true,
+      realTimeTags: realTimeTags
     }, props))));
   }
   return /*#__PURE__*/React.createElement("div", {

package/es/userCondition/conditions/styles/eventCondition.less

@@ -54,4 +54,18 @@
     font-weight: 400;
     font-size: 14px;
   }
+
+  &-time {
+    display: flex !important;
+    gap: 4px;
+    margin: 13px 0px 0px 38px;
+    padding: 4px 16px !important;
+    color: #116acc !important;
+    font-weight: 400;
+    font-size: 14px !important;
+    line-height: 14px;
+    background: #fff !important;
+    border: 1px dashed #116acc !important;
+    border-radius: 4px !important;
+  }
 }

package/es/userCondition/conditions/styles/periodCondition.less

@@ -7,12 +7,13 @@
   &-values,
   &-unit {
     margin-right: @margin-xs;
+    text-wrap-mode: nowrap;
     > input {
       border: none !important;
     }
   }
   &-operator {
-    width: 129px;
+    width: 100px;
   }
   &-values {
     .ant-picker-range.ant-picker-larg {
@@ -23,4 +24,9 @@
     margin-left: @margin-xs;
     white-space: nowrap;
   }
+  .ant-input-number {
+    background-color: #fafafb;
+    border: 1px solid #fafafb;
+    border-radius: 4px;
+  }
 }

package/es/userCondition/conditions/styles/textDesc.less

@@ -6,12 +6,11 @@
     &-or {
       margin: 0 @margin-xs;
     }
-    &-label {
-    }
-    &-operator {
-    }
     &-value {
       color: @text-color;
     }
+    &-error {
+      color: #fb5547;
+    }
   }
 }

package/es/userCondition/conditions/tagsCondition.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext, useState } from 'react';
+import React, { useContext, useState, useEffect } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import BizSelect from '../../select';
 import { operatorMap } from './constants';
@@ -28,7 +28,8 @@ var options = [{
 }];
 var TagsCondition = function TagsCondition(props) {
   var _useContext = useContext(BizUserConditionContext),
-    userTagsData = _useContext.userTagsData;
+    userTagsData = _useContext.userTagsData,
+    searchUserTagsData = _useContext.searchUserTagsData;
   var _useContext2 = useContext(BizGlobalDataContext),
     currentApp = _useContext2.currentApp;
   var labels = props.labels,
@@ -37,8 +38,14 @@ var TagsCondition = function TagsCondition(props) {
   var _useState = useState(function () {
       return buildDefaultValues();
     }),
-    _useState2 = _slicedToArray(_useState, 1),
-    defaultValue = _useState2[0];
+    _useState2 = _slicedToArray(_useState, 2),
+    defaultValue = _useState2[0],
+    setDefaultValue = _useState2[1];
+  useEffect(function () {
+    setDefaultValue(function () {
+      return buildDefaultValues();
+    });
+  }, [userTagsData]);
   function onOperatorChange(operator) {
     onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
       operator: operator.value
@@ -54,7 +61,7 @@ var TagsCondition = function TagsCondition(props) {
   }
   function buildDefaultValues() {
     var values = [];
-    var findTag = buildSelectLayer(userTagsData);
+    var findTag = buildSelectLayer(userTagsData.concat(searchUserTagsData || []));
     labels.values.forEach(function (value) {
       if (_.isNumber(value)) {
         return;

package/es/userCondition/conditions/textDesc.js

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import _ from 'lodash';
 import React, { useContext, useMemo } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
-import { monthTimeOperatorType, monthValuesType, skyTimeOperatorType, timeDimensionType, timeValuesType, typeList, weekTimeOperatorType, weekValuesType, orderTypeList, computeTypeList, stringOperate } from '../../attrConditions/utils/operates';
+import { monthTimeOperatorType, monthValuesType, skyTimeOperatorType, timeDimensionType, timeValuesType, typeList, weekTimeOperatorType, weekValuesType, orderTypeList, computeTypeList, stringOperate1 } from '../../attrConditions/utils/operates';
 import BizGlobalDataContext from '../../context';
 import { findEvent, findPropAndEnv, buildSelectLayer } from '../util';
 import { durationHandler, operatorMap } from './constants';
@@ -149,8 +149,8 @@ var Text = function Text(props) {
       var operateList = [];
       switch (item.attrType) {
         case 'cont-string':
-          attrTypeList = typeList['cont-string'];
-          operateList = stringOperate;
+          attrTypeList = stringOperate1;
+          operateList = stringOperate1;
           break;
         case 'cont-num':
           attrTypeList = computeTypeList;
@@ -299,7 +299,7 @@ var Text = function Text(props) {
     }, /*#__PURE__*/React.createElement("b", null, "\u7528\u6237\u6807\u7B7E")), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, operatorMap[labels.operator])), /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-text-desc-value")
     }, /*#__PURE__*/React.createElement("span", null, "("), labels.values.map(function (value, index) {
-      var _tag$;
+      var _tag$, _tag$2, _tag$3, _tag$4, _tag$5, _tag$6;
       if (_.isNumber(value)) {
         return null;
       }
@@ -313,7 +313,11 @@ var Text = function Text(props) {
         style: {
           margin: '0 4px'
         }
-      }, "\u6216") : null, tag && (tag[1].labelCreateType === LabelCreateType.firstAndLastUpdate || tag[1].labelCreateType === LabelCreateType.fundingSource || tag[1].labelCreateType === LabelCreateType.eventPreference || tag[1].labelCreateType === LabelCreateType.sqlCreateTable) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName), tag && (tag[1].labelCreateType === LabelCreateType.autoUpdate || tag[1].labelCreateType === LabelCreateType.manualUpdate || tag[1].labelCreateType === LabelCreateType.recencyFrequencyMonetaryUpdate || tag[1].labelCreateType === LabelCreateType.labelOpenApi || tag[1].labelCreateType === LabelCreateType.lostUser || tag[1].labelCreateType === LabelCreateType.riskLevel || tag[1].labelCreateType === LabelCreateType.financeValue || tag[1].labelCreateType === LabelCreateType.financingRange || tag[1].labelCreateType === LabelCreateType.transferScale || tag[1].labelCreateType === LabelCreateType.assetLevel || tag[1].labelCreateType === LabelCreateType.aum) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName + '：' + ((_tag$ = tag[2]) === null || _tag$ === void 0 ? void 0 : _tag$.layerLabelName)));
+      }, "\u6216") : null, tag && (tag[1].labelCreateType === LabelCreateType.firstAndLastUpdate || tag[1].labelCreateType === LabelCreateType.fundingSource || tag[1].labelCreateType === LabelCreateType.eventPreference || tag[1].labelCreateType === LabelCreateType.sqlCreateTable) && /*#__PURE__*/React.createElement("span", {
+        className: "".concat(((_tag$ = tag[2]) === null || _tag$ === void 0 ? void 0 : _tag$.ancestryState) != 1 && ((_tag$2 = tag[2]) === null || _tag$2 === void 0 ? void 0 : _tag$2.ancestryState) !== null ? "".concat(classPrefix, "-text-desc-error") : '')
+      }, tag && tag[1].labelName), tag && (tag[1].labelCreateType === LabelCreateType.autoUpdate || tag[1].labelCreateType === LabelCreateType.manualUpdate || tag[1].labelCreateType === LabelCreateType.recencyFrequencyMonetaryUpdate || tag[1].labelCreateType === LabelCreateType.labelOpenApi || tag[1].labelCreateType === LabelCreateType.lostUser || tag[1].labelCreateType === LabelCreateType.riskLevel || tag[1].labelCreateType === LabelCreateType.financeValue || tag[1].labelCreateType === LabelCreateType.financingRange || tag[1].labelCreateType === LabelCreateType.transferScale || tag[1].labelCreateType === LabelCreateType.assetLevel || tag[1].labelCreateType === LabelCreateType.aum) && /*#__PURE__*/React.createElement("span", {
+        className: "".concat(((_tag$3 = tag[2]) === null || _tag$3 === void 0 ? void 0 : _tag$3.ancestryState) != 1 && ((_tag$4 = tag[2]) === null || _tag$4 === void 0 ? void 0 : _tag$4.ancestryState) !== null ? "".concat(classPrefix, "-text-desc-error") : '')
+      }, tag && (tag[1].id !== ((_tag$5 = tag[2]) === null || _tag$5 === void 0 ? void 0 : _tag$5.layerLabelId) ? tag[1].labelName + '：' + ((_tag$6 = tag[2]) === null || _tag$6 === void 0 ? void 0 : _tag$6.layerLabelName) : tag[1].labelName)));
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
   function renderCdp(condition) {

package/es/userCondition/demo/index.js

@@ -19,9 +19,15 @@ export default (function () {
     }),
     _useState2 = _slicedToArray(_useState, 2),
     setStore = _useState2[1];
-  var _useState3 = useState(tagList),
-    _useState4 = _slicedToArray(_useState3, 1),
-    userTagsData = _useState4[0];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    userTagsData = _useState4[0],
+    setUserTagsData = _useState4[1];
+  useEffect(function () {
+    setTimeout(function () {
+      setUserTagsData(tagList);
+    }, 2000);
+  }, []);
   var newStore = convertAttributeData({
     eventList: eventData,
     userPropList: userData,
@@ -36,21 +42,21 @@ export default (function () {
   function onChange(value) {
     console.log('change:', JSON.parse(JSON.stringify(value)));
   }
-  var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
-    defaultValue: defaultValue,
-    onChange: onChange,
-    eventAttrNum: 3,
-    openTagCondition: true,
-    openCdpCondition: true,
-    userTagsData: userTagsData,
-    isRealTime: true
-  });
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 86284
+    defaultApp: 155
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'inline-block'
     }
-  }, descDom));
+  }, /*#__PURE__*/React.createElement(BizUserCondition, {
+    defaultValue: defaultValue,
+    onChange: onChange,
+    eventAttrNum: 3,
+    openTagCondition: true,
+    openCdpCondition: true,
+    userTagsData: userTagsData,
+    isRealTime: true,
+    realTimeTags: true
+  })));
 });