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

package/es/loading/styles/index.less

@@ -1,20 +1,20 @@
-@import '../../assets/styles/inner.less';
-
-.biz-loading {
-  &-container.loading {
-    display: flex !important;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-    .ant-spin-text {
-      margin-top: 12px;
-      color: #67727f;
-      font-size: 14px;
-    }
-  }
-  &-wrapper.loading {
-    height: 100%;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-loading {
+  &-container.loading {
+    display: flex !important;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    .ant-spin-text {
+      margin-top: 12px;
+      color: #67727f;
+      font-size: 14px;
+    }
+  }
+  &-wrapper.loading {
+    height: 100%;
+  }
+}

package/es/loginForm/index.less

@@ -1,7 +1,7 @@
-@import '../assets/styles/inner.less';
-.biz-login {
-  width: 374px;
-  .btn-login {
-    width: 100%;
-  }
-}
+@import '../assets/styles/inner.less';
+.biz-login {
+  width: 374px;
+  .btn-login {
+    width: 100%;
+  }
+}

package/es/platformSelector/styles/index.less

@@ -1,26 +1,26 @@
-@import '../../assets/styles/inner.less';
-.biz-platform-selector {
-  width: 134px;
-  box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
-  .biz-platform-selector-select .biz-select-handle-input {
-    background-color: #fff;
-    border: 1px solid #ecedf0;
-    .biz-select-handle-content .biz-select-handle-icon .bsicon {
-      color: #9aa1a9;
-    }
-    .biz-select-handle-content-label {
-      display: flex;
-      align-items: center;
-    }
-  }
-}
-.biz-platform-selector-select-overlay .biz-select-list-panel .biz-select-option {
-  .biz-select-option-icon .bsicon {
-    color: #9aa1a9;
-  }
-  &:hover {
-    .biz-select-option-icon .bsicon {
-      color: #165dff;
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-platform-selector {
+  width: 134px;
+  box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
+  .biz-platform-selector-select .biz-select-handle-input {
+    background-color: #fff;
+    border: 1px solid #ecedf0;
+    .biz-select-handle-content .biz-select-handle-icon .bsicon {
+      color: #9aa1a9;
+    }
+    .biz-select-handle-content-label {
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+.biz-platform-selector-select-overlay .biz-select-list-panel .biz-select-option {
+  .biz-select-option-icon .bsicon {
+    color: #9aa1a9;
+  }
+  &:hover {
+    .biz-select-option-icon .bsicon {
+      color: #116acc;
+    }
+  }
+}

package/es/productCondition/conditionTypeList.d.ts

@@ -6,5 +6,8 @@ export interface ConditionTypeListPropsI {
     label?: string | React.ReactNode;
     show?: boolean;
 }
-declare const ConditionTypeList: React.FC<ConditionTypeListPropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const ConditionTypeList: FCWithDefaultProps<ConditionTypeListPropsI>;
 export default ConditionTypeList;

package/es/productCondition/conditions/cdpCshCondition.js

@@ -15,17 +15,20 @@ 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 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), {}, {
@@ -287,7 +290,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: function onChange(v) {
         onOperateChange(v);

package/es/productCondition/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/productCondition/conditions/constants.js

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

package/es/productCondition/conditions/order/runPeriodCondition.js

@@ -16,7 +16,8 @@ var RangePicker = DatePicker.RangePicker;
 var RunPeriodCondition = function RunPeriodCondition(props) {
   var onChange = props.onChange,
     condition = props.condition,
-    isEvent = props.isEvent;
+    _props$isEvent = props.isEvent,
+    isEvent = _props$isEvent === void 0 ? false : _props$isEvent;
   var options = [{
     text: '最近',
     value: 'relative'
@@ -126,7 +127,4 @@ var RunPeriodCondition = function RunPeriodCondition(props) {
     onChange: onChange
   }))));
 };
-RunPeriodCondition.defaultProps = {
-  isEvent: false
-};
 export default RunPeriodCondition;

package/es/productCondition/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/productCondition/conditions/propCondition.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import { PropConditionType } from '../types';
 import './styles/propCondition.less';
-declare const PropCondition: React.FC<PropConditionType.PropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const PropCondition: FCWithDefaultProps<PropConditionType.PropsI>;
 export default PropCondition;

package/es/productCondition/conditions/styles/cdpCondition.less

@@ -1,31 +1,31 @@
-@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-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-field {
+    width: 129px;
+  }
+  &-select-condition {
+    width: 96px;
+    margin: 0 @margin-xs;
+  }
+}

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

@@ -1,41 +1,41 @@
-@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-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-field {
+    width: 129px;
+  }
+  &-select-condition {
+    width: 96px;
+    margin-left: @margin-xs;
+  }
+  &-value {
+    width: 150px !important;
+    margin-left: @margin-xs !important;
+  }
+}

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

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

package/es/productCondition/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: 100px;
+  }
+  &-values {
+    .ant-picker-range.ant-picker-larg {
+      min-width: 255px;
+    }
+  }
+  &-today {
+    margin-left: @margin-xs;
+    white-space: nowrap;
+  }
+}

package/es/productCondition/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/productCondition/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;
+  }
+}