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

package/es/assets/styles/resetAntd.less

@@ -10,14 +10,18 @@
 
   .ant-input {
     background-color: @background-color-base!important;
+
+    &.ant-input-status-error {
+      border-color: #116acc00 !important;
+    }
   }
 
   > .ant-input:hover {
-    border-color: #165dff00 !important;
+    border-color: #116acc00 !important;
   }
 
   > .ant-input:focus {
-    border-color: #165dff00 !important;
+    border-color: #116acc00 !important;
   }
 
   &:hover {

package/es/assets/styles/variable.less

@@ -17,5 +17,5 @@
 @text-color-middle: #9aa1a9;
 @custom-background: #fafafb;
 @custom-focus: #f0f7ff;
-@primary-color: '#165dff';
+@primary-color: '#116ACC';
 @input-placeholder-color: #9797af;

package/es/assets/theme.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
   'use strict';
 
   exports.theme = {
-    'primary-color': '#165dff',
+    'primary-color': '#116ACC',
     'border-color-base': '#ECEDF0',
     'background-color-base': '#fafafb',
     'text-color': '#021429',

package/es/attrCondition/demo/group.js

@@ -6,7 +6,7 @@ var extraList = [{
   name: 'Session属性',
   attrList: [{
     id: 'sa_duration',
-    label: 'Session时长',
+    label: 'Session时长 ',
     propCategory: 'sessionProp',
     key: 'sessionProp-sa_duration',
     type: 2,

package/es/attrCondition/group.js

@@ -2,6 +2,7 @@ import React from 'react';
 import useConditionGroup from './useConditionGroup';
 import { Skeleton } from 'antd';
 import BizAttrCondition from '.';
+var BizAttrConditionGroupTimer = null;
 var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var showHandle = props.showHandle,
     eventIdList = props.eventIdList,
@@ -12,7 +13,9 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     disableItemList = props.disableItemList,
     overlayClassName = props.overlayClassName,
     extra = props.extra,
-    relationConfig = props.relationConfig;
+    relationConfig = props.relationConfig,
+    realTimeTags = props.realTimeTags,
+    supportNPlace = props.supportNPlace;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -57,18 +60,20 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
       enableEnvProp: enableEnvProp,
       disableItemList: disableItemList,
       extra: extra,
+      supportNPlace: supportNPlace,
       onChange: function onChange(data) {
-        return _onChange(data, index);
+        clearTimeout(BizAttrConditionGroupTimer);
+        BizAttrConditionGroupTimer = setTimeout(function () {
+          _onChange(data, index);
+        }, 20);
       },
       onDelete: function onDelete() {
         return _onDelete(index);
       },
       relationSup: index ? conditions[index - 1] : undefined,
-      relationConfig: relationConfig
+      relationConfig: relationConfig,
+      realTimeTags: realTimeTags
     }));
   }))));
 });
-BizAttrConditionGroup.defaultProps = {
-  showHandle: true
-};
 export default BizAttrConditionGroup;

package/es/attrCondition/index.js

@@ -1,9 +1,12 @@
+var _excluded = ["border"];
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Skeleton, Space } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
 import BizAttributeSelector from '../attributeSelector';
@@ -15,7 +18,10 @@ import './styles/index.less';
 import IconFont from '../icon/iconFont';
 import { BizValidatorContext } from '../context';
 var classPrefix = 'biz-attr-condition';
-var BizAttrCondition = function BizAttrCondition(props) {
+var BizAttrCondition = function BizAttrCondition(_ref) {
+  var _ref$border = _ref.border,
+    border = _ref$border === void 0 ? false : _ref$border,
+    props = _objectWithoutProperties(_ref, _excluded);
   var eventIdList = props.eventIdList,
     enableDelete = props.enableDelete,
     enableEventProp = props.enableEventProp,
@@ -25,7 +31,8 @@ var BizAttrCondition = function BizAttrCondition(props) {
     theme = props.theme,
     overlayClassName = props.overlayClassName,
     relationSup = props.relationSup,
-    relationConfig = props.relationConfig;
+    relationConfig = props.relationConfig,
+    realTimeTags = props.realTimeTags;
   var _useAttrCondition = useAttrCondition(props),
     loading = _useAttrCondition.loading,
     attr = _useAttrCondition.attr,
@@ -70,7 +77,8 @@ var BizAttrCondition = function BizAttrCondition(props) {
     destroyPopupOnHide: props.destroyPopupOnHide,
     placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
     status: isAttrError ? 'error' : '',
-    extra: props.extra
+    extra: props.extra,
+    realTimeTags: realTimeTags
   }), isAttrError ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
   }, "\u5C5E\u6027\u4E0D\u53EF\u4E3A\u7A7A") : null), /*#__PURE__*/React.createElement(BizOperateList, {
@@ -104,7 +112,4 @@ var BizAttrCondition = function BizAttrCondition(props) {
     active: true
   })));
 };
-BizAttrCondition.defaultProps = {
-  border: false
-};
 export default BizAttrCondition;

package/es/attrCondition/styles/index.less

@@ -38,7 +38,7 @@
       &-item {
         padding: 4px 0 4px 48px;
         &:hover {
-          background: #e8efff;
+          background: #e7f3fe;
         }
       }
     }

package/es/attrCondition/useAttrCondition.js

@@ -37,9 +37,10 @@ var useAttrCondition = function useAttrCondition(props) {
           attrData = {
             id: data.attrId,
             propCategory: data.propCategory,
+            encryptionType: data.encryptionType,
             type: data.type,
             key: "".concat(data.propCategory, "-").concat(data.attrId),
-            label: data.attrNameStr || data.label,
+            label: data.attrNameStr || data.label || data.attrName,
             dimensionSub: data.dimensionSub || 'event_attr'
           };
         }
@@ -51,10 +52,10 @@ var useAttrCondition = function useAttrCondition(props) {
             name: data.attrName,
             propCategory: data.propCategory,
             type: data.type,
-            category: data.category,
+            category: data.category || (data.propCategory === PropCategory.UserProp ? 'fixed' : undefined),
             key: "".concat(data.propCategory, "-").concat(data.attrName, "-").concat(aId),
             subtype: data.subtype,
-            label: data.attrNameStr || data.label,
+            label: data.attrNameStr || data.label || data.attrName,
             dimensionSub: data.dimensionSub || data.attrName
           };
         }
@@ -65,8 +66,9 @@ var useAttrCondition = function useAttrCondition(props) {
             propCategory: data.propCategory,
             type: data.type,
             key: "".concat(data.propCategory, "-").concat(data.attrId),
-            label: data.attrNameStr || data.label,
-            subtype: data.subtype
+            label: data.attrNameStr || data.label || data.attrName,
+            subtype: data.subtype,
+            encryptionType: data.encryptionType
           };
         }
       }

package/es/attrConditions/components/operateList.js

@@ -8,15 +8,18 @@ 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, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { InputNumber, Space, message } from 'antd';
 import { classPrefix } from '..';
 import { PropType } from '../../attributeSelector/types';
 import BizSelect from '../../select';
-import { dateOperate, numberOperate, stringOperate, specialOperate, stringBusinessOperate } from '../utils/operates';
+import { dateOperate, numberOperate, stringOperate, specialOperate, stringBusinessOperate, stringOperate1 } from '../utils/operates';
 import { OperateTypes } from '../types';
+import BizGlobalDataContext from '../../context';
 var BizOperateList = function BizOperateList(props) {
   var _props$attr4;
+  var _useContext = useContext(BizGlobalDataContext),
+    basicConfig = _useContext.basicConfig;
   var _useState = useState({
       value: ''
     }),
@@ -66,7 +69,7 @@ var BizOperateList = function BizOperateList(props) {
       } else if (specialOperateHandle((_props$attr3 = props.attr) === null || _props$attr3 === void 0 ? void 0 : _props$attr3.name)) {
         optionData = specialOperate;
       } else {
-        optionData = stringOperate;
+        optionData = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
         if (props === null || props === void 0 ? void 0 : props.supportNPlace) {
           optionData = [].concat(_toConsumableArray(optionData), [{
             name: '第N位是',

package/es/attrConditions/components/stringList.js

@@ -15,7 +15,6 @@ import BizGlobalDataContext from '../../context';
 import BizSelect from '../../select';
 import request from '../../utils/ajax';
 import { OperateTypes } from '../types';
-import { util } from '../../utils';
 import _ from 'lodash';
 var StringList = function StringList(props) {
   var _props$attr;
@@ -116,23 +115,20 @@ var StringList = function StringList(props) {
                 });
               } else {
                 var requestData = {
-                  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                  appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
                   platform: 0,
                   limit: 20,
                   attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
-                  dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
+                  dimensionsub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
                   v: searchValue || ''
                 };
-                var formData = util.transformRequest(requestData);
                 request(Apis.esQuery, {
                   method: 'post',
-                  data: formData,
-                  headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                  }
+                  data: requestData
                 }).then(function (result) {
+                  var data = result === null || result === void 0 ? void 0 : result.data;
                   setOptions(function () {
-                    return result && result.sources ? result.sources.map(function (item) {
+                    return data && data.sources ? data.sources.map(function (item) {
                       return {
                         name: item,
                         value: item

package/es/attrConditions/index.d.ts

@@ -4,5 +4,8 @@ import './styles/index.less';
 import { AttrConditionTypes, OperateTypes } from './types';
 export declare const classPrefix = "biz-condition-item";
 export declare function getCondition(attr: AttributeSelect.Value, operate: OperateTypes, values: string[]): AttrConditionTypes.ItemValue | undefined;
-declare const BizConditionItem: React.FC<AttrConditionTypes.ItemProp>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizConditionItem: FCWithDefaultProps<AttrConditionTypes.ItemProp>;
 export default BizConditionItem;

package/es/attrConditions/index.js

@@ -48,7 +48,8 @@ var BizConditionItem = function BizConditionItem(props) {
     enableEnvProp = props.enableEnvProp,
     disableItemList = props.disableItemList,
     border = props.border,
-    theme = props.theme;
+    theme = props.theme,
+    realTimeTags = props.realTimeTags;
   var _useAttrCondition = useAttrCondition(props),
     loading = _useAttrCondition.loading,
     attr = _useAttrCondition.attr,
@@ -82,7 +83,8 @@ var BizConditionItem = function BizConditionItem(props) {
     },
     theme: theme,
     destroyPopupOnHide: props.destroyPopupOnHide,
-    extra: props.extra
+    extra: props.extra,
+    realTimeTags: realTimeTags
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizOperateList, {

package/es/attrConditions/types.d.ts

@@ -19,6 +19,7 @@ export declare namespace AttrConditionTypes {
         attrNameStr?: string;
         type?: PropType;
         propCategory?: 'userProp' | 'eventProp' | 'envProp' | string;
+        encryptionType?: number;
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
         operator?: OperateTypes;
@@ -47,6 +48,7 @@ export declare namespace AttrConditionTypes {
             eventAttrIdSub: number;
             eventAttrNameSub: string;
         }[];
+        realTimeTags?: Boolean;
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;
@@ -64,6 +66,8 @@ export declare namespace AttrConditionTypes {
             eventAttrIdSub: number;
             eventAttrNameSub: string;
         }[];
+        realTimeTags?: Boolean;
+        supportNPlace?: boolean;
     }
     interface Option {
         name: string;

package/es/attrConditions/utils/operates.d.ts

@@ -10,6 +10,10 @@ export declare const stringOperate: {
     name: string;
     value: string;
 }[];
+export declare const stringOperate1: {
+    name: string;
+    value: string;
+}[];
 export declare const numberAUMOperate: {
     name: string;
     value: string;

package/es/attrConditions/utils/operates.js

@@ -44,6 +44,43 @@ export var stringOperate = [{
   name: '不是空值',
   value: 'is not null'
 }];
+export var stringOperate1 = [{
+  name: '是',
+  value: 'equal'
+}, {
+  name: '包含',
+  value: 'contains'
+}, {
+  name: '不是',
+  value: 'not equal'
+}, {
+  name: '不包含',
+  value: 'not contains'
+}, {
+  name: '开头是',
+  value: 'begin with'
+}, {
+  name: '结尾是',
+  value: 'end with'
+}, {
+  name: '开头不是',
+  value: 'not begin with'
+}, {
+  name: '结尾不是',
+  value: 'not end with'
+}, {
+  name: '是空值',
+  value: 'is null'
+}, {
+  name: '不是空值',
+  value: 'is not null'
+}, {
+  name: '正则匹配',
+  value: 'regexp'
+}, {
+  name: '正则不匹配',
+  value: 'not regexp'
+}];
 export var numberAUMOperate = [{
   name: '>',
   value: 'gt'

package/es/attributeSelector/index.js

@@ -28,7 +28,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     overlayClassName = props.overlayClassName,
     isStrNum = props.isStrNum,
     isString = props.isString,
-    isHideYeWu = props.isHideYeWu;
+    isHideYeWu = props.isHideYeWu,
+    realTimeTags = props.realTimeTags;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     currentAttr = _useState2[0],
@@ -42,7 +43,6 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     _useState6 = _slicedToArray(_useState5, 1),
     id = _useState6[0];
   var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList,
     userPropList = _useContext.userPropList,
     eventEnvList = _useContext.eventEnvList;
   var boxRef = useRef(null);
@@ -56,6 +56,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     setCurrentAttr(getValue(props.defaultValue));
   }, []);
   useEffect(function () {
+    if (props.value && !getValue(props.value)) return;
     setCurrentAttr(getValue(props.value));
   }, [props.value, props.extra]);
   function getValue(param) {
@@ -65,14 +66,12 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         if (attr.id === param.id && attr.name === (param.name || param.value)) res = attr;
       });
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'eventProp') {
-      eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
-        group.eventList.forEach(function (event) {
-          event.attrList.forEach(function (attr) {
-            if (attr.id === param.id) res = _.cloneDeep(attr);
-          });
-        });
-      });
-      if (res && param.step !== undefined) res.step = param.step;
+      if (param.id && (param.label || param.alias)) {
+        res = _.cloneDeep(param);
+      }
+      if (res && param.step !== undefined) {
+        res.step = param.step;
+      }
     } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {
       var _concat;
       (_concat = (extraUser ? extraUser : []).concat(userPropList ? userPropList : [])) === null || _concat === void 0 ? void 0 : _concat.forEach(function (attr) {
@@ -113,7 +112,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         isNumber: isNumber,
         isStrNum: isStrNum,
         isString: isString,
-        isHideYeWu: isHideYeWu
+        isHideYeWu: isHideYeWu,
+        realTimeTags: realTimeTags
       }));
     },
     trigger: ['click'],