@zgfe/business-lib 1.0.27-adanalysis.0 → 1.0.27-adanalysis.2

package/es/select/handle.js

@@ -11,15 +11,19 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Input, Tag, Tooltip } from 'antd';
-import React, { useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { FormItemInputContext } from 'antd/es/form/context';
+import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import IconFont from '../icon/iconFont';
 import './styles/handle.less';
 var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _props$value;
+
   var placeholder = props.placeholder,
       labelField = props.labelField,
       keyField = props.keyField,
-      _props$border = props.border,
-      border = _props$border === void 0 ? true : _props$border;
+      border = props.border,
+      showSelectIcon = props.showSelectIcon,
+      disable = props.disable;
   var classPrefix = 'biz-select-handle';
 
   var _useState = useState(false),
@@ -36,22 +40,38 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       searchValue = _useState4[0],
       setSearchValue = _useState4[1];
 
+  var _useContext = useContext(FormItemInputContext),
+      contextStatus = _useContext.status;
+
+  var mergedStatus = props.status || contextStatus;
   useImperativeHandle(ref, function () {
     return {
-      create: function create(flag) {
+      create: function create(flag, overlayClicked) {
         if (props.disable) return;
         setFocus(flag);
         if (!props.multiple) return;
 
         if (flag) {
           inputRef.current.focus();
+        } else {
+          if (overlayClicked) {
+            setSearchValue('');
+          } else {
+            if (searchValue && props.onCreate) {
+              props.onCreate(searchValue);
+              setSearchValue('');
+            }
+          }
         }
-
-        setSearchValue('');
       },
       width: handleRef.current.clientWidth
     };
   });
+  useEffect(function () {
+    if (focus) {
+      props.onVisible && props.onVisible();
+    }
+  }, [focus]);
   var searchInputWidth = useMemo(function () {
     return textRef.current && searchValue ? textRef.current.offsetWidth : 3;
   }, [searchValue]);
@@ -66,6 +86,19 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (props.onSearch) props.onSearch(value);
   };
 
+  var onKeyDown = function onKeyDown(e) {
+    if (e.keyCode === 13 && props.multiple) {
+      var value = e.target.value.trim();
+
+      if (value && props.onCreate) {
+        props.onCreate(value);
+      }
+
+      setFocus(false);
+      setSearchValue('');
+    }
+  };
+
   if (props.multiple) {
     return /*#__PURE__*/React.createElement("div", {
       ref: handleRef,
@@ -78,9 +111,9 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
         color: "#fff"
       }, /*#__PURE__*/React.createElement(Tag, {
         closable: true,
-        id: "".concat(classPrefix, "-tag"),
+        className: "".concat(classPrefix, "-tag ").concat(disable ? 'disable' : ''),
         onClose: function onClose() {
-          onDelete(item);
+          !disable && onDelete(item);
         }
       }, /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-tag-label")
@@ -96,7 +129,8 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
         width: "".concat(searchInputWidth, "px")
       },
       value: searchValue,
-      onChange: onSearch
+      onChange: onSearch,
+      onKeyDown: onKeyDown
     }), /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-temp"),
       ref: textRef
@@ -105,11 +139,13 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   return /*#__PURE__*/React.createElement("div", {
     ref: handleRef,
-    className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
+    className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
     title: props.label || props.value && props.value[labelField]
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-content")
-  }, props.label || props.value && props.value[labelField] || /*#__PURE__*/React.createElement("span", {
+  }, showSelectIcon && ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.icon) && /*#__PURE__*/React.createElement("span", {
+    className: "".concat(classPrefix, "-icon")
+  }, props.value.icon), props.label || props.value && props.value[labelField] || /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-holder")
   }, placeholder || '请选择')), /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-expand-icon"),
@@ -118,6 +154,8 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 });
 SelectHandle.defaultProps = {
   labelField: 'label',
-  keyField: 'id'
+  keyField: 'id',
+  border: true,
+  showSelectIcon: true
 };
 export default SelectHandle;

package/es/select/index.js

@@ -31,6 +31,8 @@ import _ from 'lodash';
 export var classPrefix = 'biz-select';
 
 var BizSelect = function BizSelect(props) {
+  var _boxRef$current3;
+
   var overlayWidth = props.overlayWidth,
       minDropdownWidth = props.minDropdownWidth,
       labelField = props.labelField,
@@ -53,6 +55,7 @@ var BizSelect = function BizSelect(props) {
       setVisible = _useState6[1];
 
   var selectRef = useRef(null);
+  var overlayRef = useRef(null);
   var boxRef = useRef(null);
   var selectId = Math.random().toString();
 
@@ -62,21 +65,18 @@ var BizSelect = function BizSelect(props) {
       setWidth = _useState8[1];
 
   useEffect(function () {
-    var _boxRef$current;
-
-    setWidth((boxRef === null || boxRef === void 0 ? void 0 : (_boxRef$current = boxRef.current) === null || _boxRef$current === void 0 ? void 0 : _boxRef$current.width) || 200);
-
     if (props.defaultValue) {
       setCurrent(getValue(props.defaultValue));
     }
 
     var handleClick = function handleClick(e) {
-      var _selectRef$current, _boxRef$current2;
+      var _selectRef$current, _overlayRef$current, _boxRef$current;
 
       var clicked = (_selectRef$current = selectRef.current) === null || _selectRef$current === void 0 ? void 0 : _selectRef$current.contains(e.target);
-      (_boxRef$current2 = boxRef.current) === null || _boxRef$current2 === void 0 ? void 0 : _boxRef$current2.create(clicked);
+      var overlayClicked = (_overlayRef$current = overlayRef.current) === null || _overlayRef$current === void 0 ? void 0 : _overlayRef$current.contains(e.target);
+      (_boxRef$current = boxRef.current) === null || _boxRef$current === void 0 ? void 0 : _boxRef$current.create(clicked, overlayClicked);
 
-      if (!clicked && !props.enableCreate) {
+      if (!clicked && !props.enableCreate || overlayClicked) {
         setSearchValue('');
       }
     };
@@ -86,6 +86,11 @@ var BizSelect = function BizSelect(props) {
       window.removeEventListener('click', handleClick);
     };
   }, []);
+  useEffect(function () {
+    var _boxRef$current2;
+
+    setWidth((boxRef === null || boxRef === void 0 ? void 0 : (_boxRef$current2 = boxRef.current) === null || _boxRef$current2 === void 0 ? void 0 : _boxRef$current2.width) || 200);
+  }, [boxRef === null || boxRef === void 0 ? void 0 : (_boxRef$current3 = boxRef.current) === null || _boxRef$current3 === void 0 ? void 0 : _boxRef$current3.width]);
   useEffect(function () {
     if (!props.value) return;
     setCurrent(getValue(props.value));
@@ -149,13 +154,39 @@ var BizSelect = function BizSelect(props) {
     props.onVisibleChange && props.onVisibleChange(flag);
   };
 
+  var onCreate = function onCreate(val) {
+    var _data;
+
+    if (current) {
+      var flag = true;
+      current.forEach(function (item) {
+        if (item[labelField] === val) {
+          flag = false;
+        }
+      });
+      if (!flag) return;
+    }
+
+    var data = (_data = {}, _defineProperty(_data, keyField, val), _defineProperty(_data, labelField, val), _data);
+    var originData = current || [];
+    originData.push(data);
+    setCurrent(originData);
+    setSearchValue('');
+    if (props.onChange) props.onChange(originData);
+  };
+
+  var onVisible = function onVisible() {
+    setVisible(true);
+  };
+
   return /*#__PURE__*/React.createElement(Dropdown, {
     overlay: /*#__PURE__*/React.createElement(SelectOverlay, _objectSpread(_objectSpread({}, res), {}, {
       value: current,
       labelField: labelField,
       keyField: keyField,
       searchValue: searchValue,
-      onChange: onChange
+      onChange: onChange,
+      ref: overlayRef
     })),
     disabled: props.disable,
     destroyPopupOnHide: props.destroyPopupOnHide,
@@ -184,11 +215,15 @@ var BizSelect = function BizSelect(props) {
     theme: props.theme,
     size: props.size || 'middle',
     border: props.border,
+    showSelectIcon: props.showSelectIcon,
+    status: props.status,
     onDelete: onDelete,
     onSearch: function onSearch(v) {
       setSearchValue(v);
       if (props.onSearch) props.onSearch(v);
-    }
+    },
+    onCreate: onCreate,
+    onVisible: onVisible
   })));
 };
 

package/es/select/overlay.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { BizSelectTypes } from './types';
-declare const SelectOverlay: React.FC<BizSelectTypes.Props>;
+declare const SelectOverlay: React.ForwardRefExoticComponent<BizSelectTypes.Props & React.RefAttributes<any>>;
 export default SelectOverlay;

package/es/select/overlay.js

@@ -18,8 +18,7 @@ import BizSearchInput from '../searchInput';
 import { classPrefix } from './index';
 import SelectOption from './option';
 import _ from 'lodash';
-
-var SelectOverlay = function SelectOverlay(props) {
+var SelectOverlay = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var labelField = props.labelField,
       keyField = props.keyField,
       options = props.options,
@@ -199,13 +198,13 @@ var SelectOverlay = function SelectOverlay(props) {
   }
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-overlay ").concat(overlayClassName)
+    className: "".concat(classPrefix, "-overlay ").concat(overlayClassName),
+    ref: ref
   }, props.enableSearch && !props.multiple && /*#__PURE__*/React.createElement(BizSearchInput, {
     className: "".concat(classPrefix, "-search"),
     onChange: onSearch
   }), dropdownExtra, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list-panel")
   }, render()));
-};
-
+});
 export default SelectOverlay;

package/es/select/styles/handle.less

@@ -56,6 +56,42 @@
       height: auto;
       min-height: @height-base;
     }
+    .biz-select-handle-tag {
+      display: flex;
+      align-items: center;
+      margin: 2px 4px 2px 0;
+      padding: 0 4px;
+      padding-top: 1px;
+      padding-bottom: 1px;
+      background: none;
+      border-color: #cacdd4;
+      border-radius: @border-radius-small;
+      &-label {
+        min-width: 0;
+        max-width: 100px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      &:not(.disable) {
+        &:hover {
+          .__default-hover();
+          .anticon {
+            color: @primary-color;
+          }
+        }
+      }
+      &.disable {
+        &:hover {
+          cursor: not-allowed;
+          .anticon-close {
+            cursor: not-allowed;
+          }
+        }
+        .biz-select-handle-tag-label {
+          color: @disabled-color !important;
+        }
+      }
+    }
   }
 
   &-search.ant-input {
@@ -67,7 +103,7 @@
 
     &:focus,
     &.active {
-      box-shadow: none;
+      box-shadow: none !important;
     }
   }
   &-temp {
@@ -81,40 +117,15 @@
     color: @input-placeholder-color;
   }
   &-content {
+    display: flex;
     flex: 1;
+    align-items: center;
     .__default-overflow();
   }
   &-expand-icon {
     width: 14px;
     margin-left: 5px;
   }
-  &-input {
-    display: flex;
-    #biz-select-handle-tag {
-      display: flex;
-      align-items: center;
-      margin: 2px 4px 2px 0;
-      padding: 0 4px;
-      padding-top: 1px;
-      padding-bottom: 1px;
-      background: none;
-      border-color: #cacdd4;
-      border-radius: @border-radius-small;
-      &-label {
-        min-width: 0;
-        max-width: 100px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-      &:hover {
-        .__default-hover();
-
-        .anticon {
-          color: @primary-color;
-        }
-      }
-    }
-  }
 
   &-tooltip {
     .ant-tooltip-inner {
@@ -122,4 +133,15 @@
       background-color: @white;
     }
   }
+
+  &-icon {
+    margin-right: @margin-xss;
+  }
+
+  &-status-error {
+    border-color: @error-color;
+    &.biz-select-handle-input:hover {
+      border-color: @error-color;
+    }
+  }
 }

package/es/select/types.d.ts

@@ -34,7 +34,9 @@ export declare namespace BizSelectTypes {
         disableItemList?: Option[];
         searchValue?: string;
         notFound?: string | ReactNode;
+        showSelectIcon?: boolean;
         loading?: boolean;
+        status?: string;
         onChange?: (val: Option) => void;
         onVisibleChange?: (visible: boolean) => void;
         destroyPopupOnHide?: boolean;
@@ -69,6 +71,10 @@ export interface HandlerTypes {
     theme?: string;
     size?: SizeType;
     border?: boolean;
+    showSelectIcon?: boolean;
+    status?: string;
     onDelete?: (data: BizSelectTypes.Option) => void;
     onSearch?: (val: string) => void;
+    onCreate?: (val: string) => void;
+    onVisible?: () => void;
 }

package/es/targetConditionGroup/index.js

@@ -211,7 +211,8 @@ var BizTargetCondition = function BizTargetCondition(props) {
         eventName: ((_target$value$event5 = target.value.event) === null || _target$value$event5 === void 0 ? void 0 : _target$value$event5.alias) || ((_target$value$event6 = target.value.event) === null || _target$value$event6 === void 0 ? void 0 : _target$value$event6.name),
         eventGroupId: (_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id,
         analysisDimension: analysisDimension,
-        filters: filterDatas
+        filters: filterDatas,
+        marked: target.value.event.marked
       };
       props.onChange(data);
     }
@@ -252,6 +253,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
   })), (filters || isAdd) && /*#__PURE__*/React.createElement(BizConditionGroup, {
     ref: conditionRef,
     value: filters,
+    onlyAnd: props.onlyAnd,
     enableEventProp: true,
     enableDelete: true,
     eventIdList: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value4 = targetData.value) === null || _targetData$value4 === void 0 ? void 0 : (_targetData$value4$ev = _targetData$value4.event) === null || _targetData$value4$ev === void 0 ? void 0 : _targetData$value4$ev.id) ? [targetData === null || targetData === void 0 ? void 0 : (_targetData$value5 = targetData.value) === null || _targetData$value5 === void 0 ? void 0 : (_targetData$value5$ev = _targetData$value5.event) === null || _targetData$value5$ev === void 0 ? void 0 : _targetData$value5$ev.id] : undefined,

package/es/targetConditionGroup/types.d.ts

@@ -26,6 +26,7 @@ export declare namespace TargetConditionTypes {
         value?: Value;
         max?: number;
         children: ReactNode;
+        onlyAnd?: boolean;
         onChange?: (value: Value) => void;
         onDelete?: (value?: Value) => void;
     }

package/es/targetSelector/index.js

@@ -39,6 +39,11 @@ var BizTargetSelector = function BizTargetSelector(props) {
       showEditModal = _useState6[0],
       setShowEditModal = _useState6[1];
 
+  var _useState7 = useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      visible = _useState8[0],
+      setVisible = _useState8[1];
+
   useEffect(function () {
     if (!props.defaultValue) return;
     setAlias(props.defaultValue.alias || '');
@@ -51,6 +56,8 @@ var BizTargetSelector = function BizTargetSelector(props) {
   }, [props.value]);
 
   var onClickIcon = function onClickIcon(name) {
+    setVisible(false);
+
     if (name === 'edit') {
       setShowEditModal(true);
     } else if (name === 'add') {
@@ -91,6 +98,10 @@ var BizTargetSelector = function BizTargetSelector(props) {
     });
   };
 
+  var onVisibleChange = function onVisibleChange(flag) {
+    setVisible(flag);
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.cloneElement(props.children, {
@@ -112,6 +123,8 @@ var BizTargetSelector = function BizTargetSelector(props) {
     enabled: enableDelete,
     onClick: onClickIcon
   }), targetData && /*#__PURE__*/React.createElement(Dropdown, {
+    visible: visible,
+    onVisibleChange: onVisibleChange,
     overlay: /*#__PURE__*/React.createElement(BizTargetOptionMenu, {
       onClick: onClickIcon,
       enableAdd: enableAdd,

package/es/targetSelector/styles/index.less

@@ -61,6 +61,7 @@
   }
   &-divider {
     height: 0;
+    margin: 8px;
     border-bottom: 1px solid @border-color-base;
   }
 

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

@@ -42,7 +42,7 @@
     display: flex;
     align-items: center;
     min-width: 28px;
-    height: 42px;
+    height: 34px;
     margin-right: @margin-xs;
   }
   &-runtimes {

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

@@ -8,7 +8,7 @@
     margin-left: @margin-xs;
   }
   &-label {
-    line-height: 40px;
+    line-height: 32px;
   }
   &-value {
     flex: 1;

package/es/userCondition/conditions/tagsCondition.js

@@ -16,13 +16,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useContext, useState } from 'react';
+import React, { useContext, useMemo, useState } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import BizSelect from '../../select';
 import { operatorMap } from './constants';
 import BizUserTagsSelect from '../../userTagsSelector';
 import './styles/tagsCondition.less';
-import { findTagFactory } from '../util';
+import { buildSelectLayer, buildTagsGroup } from '../util';
+import _ from 'lodash';
 var options = [{
   value: 'equal',
   text: '是'
@@ -45,6 +46,10 @@ var TagsCondition = function TagsCondition(props) {
       _useState2 = _slicedToArray(_useState, 1),
       defaultValues = _useState2[0];
 
+  var tagGroupList = useMemo(function () {
+    return buildTagsGroup(userTagsData || []);
+  }, [userTagsData]);
+
   function onOperatorChange(operator) {
     onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
       operator: operator.value
@@ -53,7 +58,7 @@ var TagsCondition = function TagsCondition(props) {
 
   function onTagsChange(data) {
     var values = data.map(function (item) {
-      return item[1].labelId;
+      return "".concat(item[1].id, ":").concat(item[2].layerLabelId);
     });
     onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
       values: values
@@ -62,12 +67,20 @@ var TagsCondition = function TagsCondition(props) {
 
   function buildDefaultValues() {
     var values = [];
-    var findTag = findTagFactory(userTagsData);
-    labels.values.forEach(function (id) {
-      var tag = findTag(id);
+    var findTag = buildSelectLayer(userTagsData);
+    labels.values.forEach(function (value) {
+      if (_.isNumber(value)) {
+        return;
+      }
+
+      var _value$split = value.split(':'),
+          _value$split2 = _slicedToArray(_value$split, 2),
+          layerId = _value$split2[1];
+
+      var selectValue = findTag(Number(layerId));
 
-      if (tag) {
-        values.push([tag.labelGroup, tag]);
+      if (selectValue) {
+        values.push(selectValue);
       }
     });
     return values;
@@ -92,11 +105,11 @@ var TagsCondition = function TagsCondition(props) {
     className: "".concat(classPrefix, "-tags-condition-value")
   }, /*#__PURE__*/React.createElement(BizUserTagsSelect, {
     defaultValue: defaultValues,
-    data: userTagsData,
-    childFields: ['children'],
-    keyFields: ['labelGroup', 'labelId'],
-    labelFields: ['labelGroup', 'labelName'],
-    valueFields: ['labelGroup', 'labelId'],
+    data: tagGroupList,
+    childFields: ['children', 'layers'],
+    keyFields: ['labelGroup', 'id', 'layerLabelId'],
+    labelFields: ['labelGroup', 'labelName', 'layerLabelName'],
+    valueFields: ['labelGroup', 'id', 'layerLabelId'],
     onChange: onTagsChange,
     destroyPopupOnHide: true
   })), /*#__PURE__*/React.createElement("div", {

package/es/userCondition/conditions/textDesc.js

@@ -4,10 +4,23 @@ 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 _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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import _ from 'lodash';
 import React, { useContext, useMemo } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import BizGlobalDataContext from '../../context';
-import { findEvent, findPropAndEnv, findTagFactory } from '../util';
+import { findEvent, findPropAndEnv, buildSelectLayer } from '../util';
 import { durationHandler, operatorMap } from './constants';
 import './styles/textDesc.less';
 
@@ -57,12 +70,12 @@ var Text = function Text(props) {
   function renderPeriod(label, period, isEvent) {
     var _label$after;
 
-    var valuesDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, period.values[0]), /*#__PURE__*/React.createElement("span", null, (_label$after = label.after) !== null && _label$after !== void 0 ? _label$after : '天'));
-
     if (period.operator === 'unlimited_time') {
       return /*#__PURE__*/React.createElement("span", null, "\u5728\u4EFB\u610F\u65F6\u95F4\u5185");
     }
 
+    var valuesDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, period.values[0]), /*#__PURE__*/React.createElement("span", null, (_label$after = label.after) !== null && _label$after !== void 0 ? _label$after : '天'));
+
     if (period.operator === 'absolute') {
       valuesDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-text-desc-value")
@@ -173,15 +186,23 @@ var Text = function Text(props) {
       className: "label"
     }, /*#__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 (id, index) {
-      var tag = findTag(id);
+    }, /*#__PURE__*/React.createElement("span", null, "("), labels.values.map(function (value, index) {
+      if (_.isNumber(value)) {
+        return null;
+      }
+
+      var _value$split = value.split(':'),
+          _value$split2 = _slicedToArray(_value$split, 2),
+          layerId = _value$split2[1];
+
+      var tag = findTag(Number(layerId));
       return /*#__PURE__*/React.createElement("span", {
-        key: id
+        key: layerId
       }, index >= 1 ? /*#__PURE__*/React.createElement("span", {
         style: {
           margin: '0 4px'
         }
-      }, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, tag && tag.labelName));
+      }, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName + '：' + tag[2].layerLabelName));
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
 
@@ -231,7 +252,7 @@ var Text = function Text(props) {
   }
 
   var findTag = useMemo(function () {
-    return findTagFactory(userTagsData);
+    return buildSelectLayer(userTagsData);
   }, [userTagsData]);
   return /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-text-desc")