@zgfe/business-lib 1.2.70-hxd.11 → 1.2.70-hxd.19

package/es/targetSelector/index.js

@@ -76,7 +76,8 @@ var BizTargetSelector = function BizTargetSelector(props) {
     defaultValue: alias,
     disabled: targetData === null || targetData === void 0 ? void 0 : (_targetData$event = targetData.event) === null || _targetData$event === void 0 ? void 0 : _targetData$event.name,
     onCancel: onCancelEdit,
-    onChange: onChangeAlias
+    onChange: onChangeAlias,
+    isFunnelEvent: props.isFunnelEvent
   }));
 };
 export default BizTargetSelector;

package/es/targetSelector/optionIcon.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
-declare const BizTargetOptionIcon: React.FC<{
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizTargetOptionIcon: FCWithDefaultProps<{
     enabled?: boolean;
     title?: string;
     name: string;

package/es/targetSelector/optionIcon.js

@@ -13,6 +13,9 @@ var BizTargetOptionIcon = function BizTargetOptionIcon(props) {
     key: props.name
   }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-option-icon ").concat(enabled ? '' : 'disabled', " ").concat(props.name === 'delete' ? classPrefix + '-del-icon' : ''),
+    style: {
+      backgroundColor: '#E8EFFF'
+    },
     type: props.icon,
     onClick: onClick
   }));

package/es/targetSelector/styles/index.less

@@ -1,110 +1,142 @@
-@import '../../assets/styles/inner.less';
-
-.biz-target-select {
-  position: relative;
-  display: flex;
-  align-items: center;
-  height: 32px;
-  padding: 0;
-  line-height: 32px;
-  background-color: @background-color-base;
-  border-color: @background-color-base;
-  .__select-handle();
-
-  &:hover {
-    border-color: @primary-color;
-    .biz-target-select-option-icon {
-      display: inline-block;
-    }
-  }
-  &:focus {
-    background-color: #fff;
-    .biz-select-handle-input {
-      background-color: #fff;
-    }
-  }
-
-  .biz-select-handle-input.middle {
-    height: 30px;
-    line-height: 30px;
-  }
-  .biz-event-select {
-    flex: 1;
-  }
-
-  .biz-event-select-handle {
-    flex: none;
-    padding: 0;
-    border: none;
-  }
-
-  &-option-icon {
-    display: none;
-    flex: none;
-    width: 16px;
-    height: @height-sm;
-    margin-right: 4px;
-    color: @text-color-secondary;
-    line-height: @height-sm;
-    text-align: center;
-    border-radius: @border-radius-small;
-
-    &:hover:not(.disabled) {
-      .__default-hover;
-    }
-
-    &.disabled {
-      .__default-disabled;
-    }
-  }
-
-  &-del-icon:hover:not(.disabled) {
-    .__error-hover();
-  }
-
-  &-menu {
-    width: 200px;
-    .__select-panel();
-
-    &-item {
-      .__select-option();
-      span:first-child {
-        margin-right: 15px;
-      }
-    }
-  }
-  &-divider {
-    height: 0;
-    margin: 8px;
-    border-bottom: 1px solid @border-color-base;
-  }
-
-  &-modal {
-    position: absolute;
-    top: 45px;
-    left: 0;
-    z-index: 1000;
-    width: 100%;
-    min-width: 280px;
-    .__select-panel();
-  }
-
-  &-tip {
-    margin-top: 2px;
-    margin-bottom: 12px;
-    margin-left: 2px;
-    font-size: 12px;
-  }
-
-  &-error {
-    color: @error-color;
-  }
-
-  &-footer {
-    text-align: right;
-  }
-
-  &-mr8 {
-    margin-right: @margin-xs;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-target-select {
+  position: relative;
+  display: flex;
+  align-items: center;
+  height: 32px;
+  padding: 0;
+  line-height: 32px;
+  background-color: @background-color-base;
+  border-color: @background-color-base;
+  .__select-handle();
+
+  .biz-event-select {
+    border: none !important;
+  }
+  &.focus {
+    border: 1px solid rgba(255, 0, 0, 0);
+    box-shadow: 0 0 0 4px @custom-focus;
+    .biz-event-select {
+      // border: 1px solid #116acc !important;
+    }
+  }
+
+  &:hover {
+    .biz-event-select {
+      border-color: @primary-color;
+    }
+
+    border-color: @primary-color;
+    .biz-target-select-option-icon {
+      display: inline-block;
+    }
+  }
+  &:focus {
+    background-color: #fff;
+    .biz-select-handle-input {
+      background-color: #fff;
+    }
+  }
+
+  .biz-select-handle-input.middle {
+    height: 30px;
+    line-height: 30px;
+  }
+  .biz-event-select {
+    flex: 1;
+  }
+
+  .biz-event-select-handle {
+    flex: none;
+    padding: 0;
+    border: none;
+    &.focus {
+      box-shadow: none !important;
+    }
+  }
+
+  &-option-icon {
+    display: none;
+    flex: none;
+    width: 16px;
+    height: @height-sm;
+    margin-right: 4px;
+    color: @text-color-secondary;
+    line-height: @height-sm;
+    text-align: center;
+    border-radius: @border-radius-small;
+
+    &:hover:not(.disabled) {
+      .__default-hover;
+    }
+
+    &.disabled {
+      .__default-disabled;
+    }
+  }
+
+  &-del-icon:hover:not(.disabled) {
+    .__error-hover();
+  }
+
+  &-menu {
+    width: 200px;
+    .__select-panel();
+
+    &-item {
+      .__select-option();
+      span:first-child {
+        margin-right: 15px;
+      }
+    }
+  }
+  &-divider {
+    height: 0;
+    margin: 8px;
+    border-bottom: 1px solid @border-color-base;
+  }
+
+  &-modal {
+    position: absolute;
+    top: 45px;
+    left: 0;
+    z-index: 1000;
+    width: 100%;
+    min-width: 280px;
+    .__select-panel();
+  }
+
+  &-tip {
+    margin-left: 2px;
+    color: #9aa1a9;
+    font-size: 12px;
+  }
+
+  &-error {
+    color: @error-color;
+  }
+
+  &-footer {
+    display: flex;
+    justify-content: end;
+    &-left {
+      margin-right: auto;
+      margin-left: 2px;
+      color: #116acc;
+      font-weight: 400;
+      font-size: 12px;
+      cursor: pointer;
+    }
+    .ant-btn {
+    }
+    :nth-child(2) {
+      color: #021429;
+      background-color: #f2f3f4;
+    }
+  }
+
+  &-mr8 {
+    margin-right: @margin-xs;
+  }
+}

package/es/userCondition/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/userCondition/conditionTypeList.js

@@ -15,7 +15,8 @@ var ConditionTypeList = function ConditionTypeList(props) {
     openCdpCondition = _useContext.openCdpCondition,
     openBusinessDataCondition = _useContext.openBusinessDataCondition,
     openCondition = _useContext.openCondition,
-    cdpTip = _useContext.cdpTip;
+    cdpTip = _useContext.cdpTip,
+    realTimeTags = _useContext.realTimeTags;
   var _useContext2 = useContext(BizGlobalDataContext),
     currentUser = _useContext2.currentUser,
     currentApp = _useContext2.currentApp,
@@ -65,7 +66,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     onClick: function onClick() {
       return onAdd('tag');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u6807\u7B7E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u6807\u7B7E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 && !realTimeTags ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('cdp_csh');
@@ -74,7 +75,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     title: cdpTip
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) !== 2 && openCdpCondition && authority[1006] ? /*#__PURE__*/React.createElement("li", {
+  })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) !== 2 && openCdpCondition && authority[1006] && !realTimeTags ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('cdp');
@@ -83,7 +84,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     title: cdpTip
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"
-  })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' && (openBusinessDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("li", {
+  })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' && !realTimeTags && (openBusinessDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     key: "business",
     onClick: function onClick() {

package/es/userCondition/conditions/cdpCondition.js

@@ -15,18 +15,21 @@ import BizSelect from '../../select';
 import { PropType } from '../types';
 import './styles/cdpCondition.less';
 import _ from 'lodash';
-import { dateOperate, numberOperate, stringOperate } from '../../attrConditions/utils/operates';
+import { dateOperate, numberOperate, stringOperate, 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 IconFont from '../../icon/iconFont';
+import BizGlobalDataContext from '../../context';
 var classPrefix = 'biz-user-condition-cdp';
 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), {}, {
@@ -181,7 +184,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
         list = numberOperate;
         break;
       case PropType.STRING2:
-        list = stringOperate;
+        list = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
         break;
       default:
         list = [];
@@ -198,7 +201,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       options: optionList,
       labelField: "name",
       keyField: "value",
-      overlayWidth: 96,
+      overlayWidth: 120,
       value: operator,
       onChange: onOperateChange
     }), function () {

package/es/userCondition/conditions/cdpCshCondition.js

@@ -15,18 +15,21 @@ 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 IconFont from '../../icon/iconFont';
+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), {}, {
@@ -289,7 +292,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: onOperateChange
     }), function () {

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

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

package/es/userCondition/conditions/dataAttribute.js

@@ -14,7 +14,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import BizSelect from '../../select';
 import './styles/runTimesCondition.less';
 import { classPrefix } from '..';
-import { stringOperate, orderTypeList, typeList, computeTypeList } from '../../attrConditions/utils/operates';
+import { stringOperate, orderTypeList, typeList, computeTypeList, stringOperate1 } from '../../attrConditions/utils/operates';
 import moment from 'moment';
 import request from '../../utils/ajax';
 import BizGlobalDataContext from '../../context';
@@ -22,6 +22,8 @@ import ParamsCondition from './business/paramsCondition';
 import OperatorCondition from './business/operatorCondition';
 import Apis from '../../constants/apis';
 var DataAttribute = function DataAttribute(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+    basicConfig = _useContext.basicConfig;
   var condition = props.condition,
     index = props.index,
     onChange = props.onChange;
@@ -29,8 +31,8 @@ var DataAttribute = function DataAttribute(props) {
   var operateList = [];
   switch (condition.attrs[index].attrType) {
     case 'cont-string':
-      list = typeList['cont-string'];
-      operateList = stringOperate;
+      list = basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string'];
+      operateList = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
       break;
     case 'cont-num':
       list = computeTypeList;
@@ -57,8 +59,8 @@ var DataAttribute = function DataAttribute(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     bizDataAttrList = _useState8[0],
     setBizDataAttrList = _useState8[1];
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    currentApp = _useContext2.currentApp;
   useEffect(function () {
     if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
       queryBizDataAttrList(condition === null || condition === void 0 ? void 0 : condition.typeId);
@@ -123,7 +125,7 @@ var DataAttribute = function DataAttribute(props) {
       });
       switch (operate.propType) {
         case 1:
-          setMasterList(typeList['cont-string']);
+          setMasterList(basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string']);
           condition.attrs[index].attrType = 'cont-string';
           setQueryValueObj({
             keyword: '',
@@ -152,7 +154,7 @@ var DataAttribute = function DataAttribute(props) {
     if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
       switch (operate.propType) {
         case 1:
-          setStringOperateList(typeList['cont-string']);
+          setStringOperateList(basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string']);
           condition.attrs[index].attrType = 'cont-string';
           setQueryValueObj({
             keyword: '',
@@ -228,8 +230,10 @@ var DataAttribute = function DataAttribute(props) {
     },
     labelField: "name",
     keyField: "value",
+    overlayWidth: 120,
     onChange: onMasterListChange
   })), /*#__PURE__*/React.createElement(OperatorCondition, {
+    key: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrId,
     queryValueObj: queryValueObj,
     stringOperateList: stringOperateList,
     index: index,

package/es/userCondition/conditions/eventCondition.js

@@ -15,10 +15,9 @@ import BizEventSelector from '../../eventSelector';
 import RunTimesCondition from './runTimesCondition';
 import PeriodCondition from './periodCondition';
 import PropCondition from './propCondition';
-import { DownOutlined } from '@ant-design/icons';
 import './styles/eventCondition.less';
 import { BizUserConditionContext, classPrefix } from '..';
-import { Dropdown, notification, Space } from 'antd';
+import { Button, notification } from 'antd';
 import TimeDimension from './timeDimension';
 import { Tooltip } from 'antd';
 import IconFont from '../../icon/iconFont';
@@ -28,7 +27,8 @@ import Apis from '../../constants/apis';
 var EventCondition = function EventCondition(props) {
   var _condition$timeDimens2, _condition$timeDimens3;
   var _useContext = useContext(BizUserConditionContext),
-    isRealTime = _useContext.isRealTime;
+    isRealTime = _useContext.isRealTime,
+    realTimeTags = _useContext.realTimeTags;
   var _useContext2 = useContext(BizGlobalDataContext),
     currentUser = _useContext2.currentUser,
     currentApp = _useContext2.currentApp;
@@ -66,7 +66,7 @@ var EventCondition = function EventCondition(props) {
       }]
     }));
   }
-  var onClick = function onClick(_ref) {
+  var _onClick = function onClick(_ref) {
     var key = _ref.key;
     if (key === 'time dimension') {
       var _condition$timeDimens;
@@ -87,10 +87,6 @@ var EventCondition = function EventCondition(props) {
     }
     onChange(_objectSpread({}, condition));
   };
-  var items = [{
-    label: '时间维度',
-    key: 'time dimension'
-  }];
   function onTimeDimensionChange(condition) {
     onChange(_objectSpread({}, condition));
   }
@@ -202,21 +198,17 @@ var EventCondition = function EventCondition(props) {
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu"
     }))));
-  }), condition && !(eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(condition.eventId)) && ((_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.length) < 3 && ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      margin: '2px 0 0 38px',
-      color: '#4075fd',
-      fontSize: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    menu: {
-      items: items,
-      onClick: onClick
-    }
-  }, /*#__PURE__*/React.createElement("a", {
-    onClick: function onClick(e) {
-      return e.preventDefault();
-    }
-  }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
+  }), condition && !(eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(condition.eventId)) && ((_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.length) < 3 && ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) && realTimeTags !== true ? /*#__PURE__*/React.createElement(Button, {
+    className: "".concat(classPrefix, "-event-condition-time"),
+    type: "dashed",
+    onClick: function onClick() {
+      return _onClick({
+        key: 'time dimension'
+      });
+    },
+    icon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "tianjia1"
+    })
+  }, "\u65F6\u95F4\u7EF4\u5EA6") : null);
 };
 export default EventCondition;

package/es/userCondition/conditions/order/runPeriodCondition.d.ts

@@ -7,5 +7,8 @@ export interface RunPeriodConditionPropsI extends AllConditionBasePropsI<any> {
     dataId: number;
     condition: BizUserConditionT.BusinessCondition;
 }
-declare const RunPeriodCondition: React.FC<RunPeriodConditionPropsI>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const RunPeriodCondition: FCWithDefaultProps<RunPeriodConditionPropsI>;
 export default RunPeriodCondition;

package/es/userCondition/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;