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

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/cdpCondition.less

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

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

@@ -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;