@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.5

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

@@ -1,47 +1,47 @@
-@import '../../../assets/styles/variable.less';
-
-.biz-user-condition-cdp-csh {
-  display: flex;
-
-  &-content,
-  &-condition-group {
-    display: flex;
-  }
-
-  &-condition-group-sub {
-    display: flex;
-    margin-top: @margin-xs;
-  }
-
-  &-label {
-    width: 56px;
-    margin-right: @margin-xs;
-    line-height: 32px;
-  }
-
-  &-item {
-    display: flex;
-    margin-left: @margin-xs;
-  }
-
-  &-select-dataset {
-    width: 150px;
-  }
-  &-select-tips {
-    height: 32px;
-    margin-left: 8px;
-    color: #9aa1a9;
-    line-height: 32px;
-  }
-  &-select-field {
-    width: 129px;
-  }
-  &-select-condition {
-    width: 96px;
-    margin-left: @margin-xs;
-  }
-  &-value {
-    width: 150px !important;
-    margin-left: @margin-xs !important;
-  }
-}
+@import '../../../assets/styles/variable.less';
+
+.biz-user-condition-cdp-csh {
+  display: flex;
+
+  &-content,
+  &-condition-group {
+    display: flex;
+  }
+
+  &-condition-group-sub {
+    display: flex;
+    margin-top: @margin-xs;
+  }
+
+  &-label {
+    width: 56px;
+    margin-right: @margin-xs;
+    line-height: 32px;
+  }
+
+  &-item {
+    display: flex;
+    margin-left: @margin-xs;
+  }
+
+  &-select-dataset {
+    width: 150px;
+  }
+  &-select-tips {
+    height: 32px;
+    margin-left: 8px;
+    color: #9aa1a9;
+    line-height: 32px;
+  }
+  &-select-field {
+    width: 129px;
+  }
+  &-select-condition {
+    width: 96px;
+    margin-left: @margin-xs;
+  }
+  &-value {
+    width: 150px !important;
+    margin-left: @margin-xs !important;
+  }
+}

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

@@ -1,57 +1,71 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition-event-condition {
-  display: flex;
-  &-left {
-    display: flex;
-  }
-  &-right {
-    flex: 1;
-  }
-  .biz-user-condition-event {
-    width: 200px;
-    .biz-event-select-handle {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-      .biz-select-handle-input {
-        background-color: @background-color-base;
-      }
-    }
-  }
-  &-times-period-wrap {
-    display: flex;
-  }
-  &-expand-attr {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 38px;
-    height: @height-base;
-    margin-right: @margin-xs;
-    margin-left: @border-radius-small;
-    background-color: @background-color-base;
-    border-radius: @border-radius-small;
-    cursor: pointer;
-  }
-  &-attrs {
-    flex: 1;
-    width: 100%;
-    // margin-right: @margin-xs;
-    margin-bottom: @margin-xs;
-  }
-  &-label {
-    display: flex;
-    align-items: center;
-    min-width: 28px;
-    height: 34px;
-    margin-right: @margin-xs;
-  }
-  &-runtimes {
-    margin-right: @margin-xs;
-  }
-  .del-log {
-    margin-top: 4px;
-    color: #fb5547;
-    font-weight: 400;
-    font-size: 14px;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-condition-event-condition {
+  display: flex;
+  &-left {
+    display: flex;
+  }
+  &-right {
+    flex: 1;
+  }
+  .biz-user-condition-event {
+    width: 200px;
+    .biz-event-select-handle {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+      .biz-select-handle-input {
+        background-color: @background-color-base;
+      }
+    }
+  }
+  &-times-period-wrap {
+    display: flex;
+  }
+  &-expand-attr {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 38px;
+    height: @height-base;
+    margin-right: @margin-xs;
+    margin-left: @border-radius-small;
+    background-color: @background-color-base;
+    border-radius: @border-radius-small;
+    cursor: pointer;
+  }
+  &-attrs {
+    flex: 1;
+    width: 100%;
+    // margin-right: @margin-xs;
+    margin-bottom: @margin-xs;
+  }
+  &-label {
+    display: flex;
+    align-items: center;
+    min-width: 28px;
+    height: 34px;
+    margin-right: @margin-xs;
+  }
+  &-runtimes {
+    margin-right: @margin-xs;
+  }
+  .del-log {
+    margin-top: 4px;
+    color: #fb5547;
+    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

@@ -1,26 +1,32 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition-period-condition {
-  display: flex;
-  align-items: center;
-  &-label,
-  &-operator,
-  &-values,
-  &-unit {
-    margin-right: @margin-xs;
-    > input {
-      border: none !important;
-    }
-  }
-  &-operator {
-    width: 129px;
-  }
-  &-values {
-    .ant-picker-range.ant-picker-larg {
-      min-width: 255px;
-    }
-  }
-  &-today {
-    margin-left: @margin-xs;
-    white-space: nowrap;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-condition-period-condition {
+  display: flex;
+  align-items: center;
+  &-label,
+  &-operator,
+  &-values,
+  &-unit {
+    margin-right: @margin-xs;
+    text-wrap-mode: nowrap;
+    > input {
+      border: none !important;
+    }
+  }
+  &-operator {
+    width: 100px;
+  }
+  &-values {
+    .ant-picker-range.ant-picker-larg {
+      min-width: 255px;
+    }
+  }
+  &-today {
+    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/propCondition.less

@@ -1,43 +1,43 @@
-@import '../../../assets//styles/variable.less';
-.biz-user-condition-prop-condition {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  &-label {
-    margin-right: @margin-xs;
-  }
-  &-attrs {
-    flex: 1;
-    .biz-user-condition-prop-condition-attr {
-      display: flex;
-      align-items: center;
-      &:nth-child(n + 2) {
-        margin-top: @margin-xs;
-      }
-      .biz-user-condition-prop-condition-item-wrap {
-        flex: 1;
-      }
-    }
-  }
-  &-add {
-    width: 100%;
-    margin-top: @margin-xss;
-    .biz-user-condition-prop-add-btn {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: @height-base;
-      height: @height-base;
-      background-color: @background-color-base;
-      border-radius: @border-radius-sx;
-      cursor: pointer;
-    }
-  }
-  .biz-condition-item-panel {
-    .biz-condition-item-input {
-      .ant-input {
-        border: none;
-      }
-    }
-  }
-}
+@import '../../../assets//styles/variable.less';
+.biz-user-condition-prop-condition {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  &-label {
+    margin-right: @margin-xs;
+  }
+  &-attrs {
+    flex: 1;
+    .biz-user-condition-prop-condition-attr {
+      display: flex;
+      align-items: center;
+      &:nth-child(n + 2) {
+        margin-top: @margin-xs;
+      }
+      .biz-user-condition-prop-condition-item-wrap {
+        flex: 1;
+      }
+    }
+  }
+  &-add {
+    width: 100%;
+    margin-top: @margin-xss;
+    .biz-user-condition-prop-add-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: @height-base;
+      height: @height-base;
+      background-color: @background-color-base;
+      border-radius: @border-radius-sx;
+      cursor: pointer;
+    }
+  }
+  .biz-condition-item-panel {
+    .biz-condition-item-input {
+      .ant-input {
+        border: none;
+      }
+    }
+  }
+}

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

@@ -1,19 +1,19 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition-runtimes-condition {
-  display: flex;
-  align-items: center;
-  &-label {
-    margin-right: @margin-xs;
-  }
-  &-operator,
-  &-value {
-    width: 58px;
-    margin-right: @margin-xs;
-    > input {
-      border: none !important;
-    }
-  }
-  .biz-user-condition-runtimes-tip {
-    color: @primary-color;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-condition-runtimes-condition {
+  display: flex;
+  align-items: center;
+  &-label {
+    margin-right: @margin-xs;
+  }
+  &-operator,
+  &-value {
+    width: 58px;
+    margin-right: @margin-xs;
+    > input {
+      border: none !important;
+    }
+  }
+  .biz-user-condition-runtimes-tip {
+    color: @primary-color;
+  }
+}

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

@@ -1,20 +1,20 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition-tags-condition {
-  display: flex;
-  &-label {
-    margin-right: @margin-xs;
-  }
-  &-value {
-    margin-left: @margin-xs;
-  }
-  &-label {
-    line-height: 32px;
-  }
-  &-value {
-    flex: 1;
-    min-width: 0;
-  }
-  &-operator {
-    width: 96px;
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-condition-tags-condition {
+  display: flex;
+  &-label {
+    margin-right: @margin-xs;
+  }
+  &-value {
+    margin-left: @margin-xs;
+  }
+  &-label {
+    line-height: 32px;
+  }
+  &-value {
+    flex: 1;
+    min-width: 0;
+  }
+  &-operator {
+    width: 96px;
+  }
+}

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

@@ -1,17 +1,16 @@
-@import '../../../assets/styles/variable.less';
-.biz-user-condition {
-  &-text-desc {
-    color: @text-color-secondary;
-    font-size: 14px;
-    &-or {
-      margin: 0 @margin-xs;
-    }
-    &-label {
-    }
-    &-operator {
-    }
-    &-value {
-      color: @text-color;
-    }
-  }
-}
+@import '../../../assets/styles/variable.less';
+.biz-user-condition {
+  &-text-desc {
+    color: @text-color-secondary;
+    font-size: 14px;
+    &-or {
+      margin: 0 @margin-xs;
+    }
+    &-value {
+      color: @text-color;
+    }
+    &-error {
+      color: #fb5547;
+    }
+  }
+}

package/es/userCondition/conditions/tagsCondition.js

@@ -1,16 +1,16 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 = 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';
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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

@@ -1,19 +1,19 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 = 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; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 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) {