@zgfe/business-lib 1.2.57 → 1.2.66-hxd.2

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,51 +1,57 @@
-@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;
-  }
-}
+@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;
+  }
+}

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

@@ -1,26 +1,26 @@
-@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;
+    > 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;
+  }
+}

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,17 @@
-@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;
+    }
+    &-label {
+    }
+    &-operator {
+    }
+    &-value {
+      color: @text-color;
+    }
+  }
+}

package/es/userCondition/conditions/textDesc.js

@@ -54,9 +54,6 @@ var Text = function Text(props) {
     if (data.eventId === undefined) {
       return renderProps(data.attrs[0], 'user');
     }
-    if (String(data.eventId) === '-13') {
-      return renderOrder(data);
-    }
     if (String(data.eventId) === '-14') {
       return renderBusiness(data);
     }
@@ -125,26 +122,6 @@ var Text = function Text(props) {
       className: "".concat(classPrefix, "-text-desc-value")
     }, event.alias || event.name), attrs, timeDimensions, runtimes);
   }
-  function renderOrder(condition) {
-    var periodLabel = {};
-    if (condition.runPeriod.operator === 'join_time') {
-      periodLabel.before = '在新增后';
-      periodLabel.after = '天内';
-    }
-    if (condition.runPeriod.operator === 'relative' || condition.runPeriod.operator === 'absolute') {
-      periodLabel.before = '在';
-    }
-    var period = renderPeriod(periodLabel, condition.runPeriod, true);
-    var frequencyValues = renderFrequencyValues(condition.runTimes.values, condition.runTimes.operator, '次数');
-    var timeDimensions = renderTimeDimensions(condition.timeDimensions);
-    var property = renderProperty(condition.attrs, '订单属性');
-    return /*#__PURE__*/React.createElement("span", {
-      style: {
-        backgroundColor: '#fffeeb',
-        padding: '6px 7px'
-      }
-    }, "\u8BA2\u5355\u6570\u636E ", period, timeDimensions, property, frequencyValues);
-  }
   function renderBusiness(condition) {
     var periodLabel = {};
     if (condition.runPeriod.operator === 'join_time') {
@@ -393,7 +370,7 @@ var Text = function Text(props) {
         _value$between = value.between,
         between = _value$between === void 0 ? [] : _value$between;
       var numOperatorMap = _objectSpread(_objectSpread({}, operatorMap), {}, {
-        equal: '等于'
+        equal: value.webType === 'number' ? '等于' : '是'
       });
       var valuesDom = '';
       var calculateTxt = '';

package/es/userCondition/orConditions.js

@@ -218,13 +218,6 @@ var OrConditions = function OrConditions(props) {
           onChange: onChangeEvent,
           condition: condition
         });
-      } else if (String(conditionData.eventId) === eventIdType.orderData) {
-        conditionDom = /*#__PURE__*/React.createElement(BusinessCondition, {
-          label: "\u8BA2\u5355\u6570\u636E",
-          dataId: id,
-          onChange: onChangeEvent,
-          condition: condition
-        });
       } else if (util.isNumber(conditionData.eventId)) {
         conditionDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EventCondition, {
           dataId: id,

package/es/userCondition/styles/conditionTypeList.less

@@ -1,30 +1,30 @@
-@import '../../assets/styles/inner.less';
-.biz-user-condition-type-list {
-  display: flex;
-  align-items: center;
-  .biz-user-condition-type-label {
-    margin-right: 10px;
-  }
-  .biz-user-condition-type-container {
-    display: flex;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    .condition-type {
-      padding: @padding-xss 12px;
-      background-color: @background-color-base;
-      border-radius: @border-radius-large;
-      cursor: pointer;
-      &:nth-child(n + 2) {
-        margin-left: @margin-md;
-      }
-      &:hover {
-        color: @primary-color;
-        background-color: @primary-color-hover;
-      }
-      &:active {
-        border-color: @primary-color;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-user-condition-type-list {
+  display: flex;
+  align-items: center;
+  .biz-user-condition-type-label {
+    margin-right: 10px;
+  }
+  .biz-user-condition-type-container {
+    display: flex;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    .condition-type {
+      padding: @padding-xss 12px;
+      background-color: @background-color-base;
+      border-radius: @border-radius-large;
+      cursor: pointer;
+      &:nth-child(n + 2) {
+        margin-left: @margin-md;
+      }
+      &:hover {
+        color: @primary-color;
+        background-color: @primary-color-hover;
+      }
+      &:active {
+        border-color: @primary-color;
+      }
+    }
+  }
+}

package/es/userCondition/styles/conditionWrap.less

@@ -1,18 +1,18 @@
-@import '../../assets//styles/variable.less';
-.biz-user-condition-item-wrap {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  margin-bottom: @margin-xs;
-  .biz-user-condition-item {
-    flex: 1;
-  }
-  .biz-user-condition-item-delete {
-    display: flex;
-    align-items: center;
-    //对齐第一行
-    height: 32px;
-    margin-left: @margin-lg;
-    cursor: pointer;
-  }
-}
+@import '../../assets//styles/variable.less';
+.biz-user-condition-item-wrap {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  margin-bottom: @margin-xs;
+  .biz-user-condition-item {
+    flex: 1;
+  }
+  .biz-user-condition-item-delete {
+    display: flex;
+    align-items: center;
+    //对齐第一行
+    height: 32px;
+    margin-left: @margin-lg;
+    cursor: pointer;
+  }
+}