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

package/es/assets/styles/variable.less

@@ -1,21 +1,21 @@
-@import '~antd/es/style/themes/default.less';
-
-@border-radius-sx: 2px;
-@border-radius-small: 4px;
-@border-radius-normal: 8px;
-@border-radius-large: 20px;
-@option-height: @height-base;
-@background-color-gray: #f6f6f6;
-@background-color-table: #f2f3f4;
-
-@icon-width: 24px;
-
-@shadow-color-light: rgba(0, 0, 0, 0.1);
-@box-shadow-small: 0px 1px 2px @shadow-color-light;
-@primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
-@box-shadow-form: 0 0 0 4px @primary-color-hover;
-@text-color-middle: #9aa1a9;
-@custom-background: #fafafb;
-@custom-focus: #f0f7ff;
-@primary-color: '#165dff';
-@input-placeholder-color: #9797af;
+@import '~antd/es/style/themes/default.less';
+
+@border-radius-sx: 2px;
+@border-radius-small: 4px;
+@border-radius-normal: 8px;
+@border-radius-large: 20px;
+@option-height: @height-base;
+@background-color-gray: #f6f6f6;
+@background-color-table: #f2f3f4;
+
+@icon-width: 24px;
+
+@shadow-color-light: rgba(0, 0, 0, 0.1);
+@box-shadow-small: 0px 1px 2px @shadow-color-light;
+@primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
+@box-shadow-form: 0 0 0 4px @primary-color-hover;
+@text-color-middle: #9aa1a9;
+@custom-background: #fafafb;
+@custom-focus: #f0f7ff;
+@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

@@ -1,101 +1,101 @@
-@import '../../assets/styles/inner.less';
-.biz-attr-condition {
-  gap: 16px !important;
-  align-items: flex-start !important;
-  width: 100%;
-  &-btn-del {
-    color: #9aa1a9;
-    font-size: 16px !important;
-    line-height: 32px;
-    &:hover {
-      color: @error-color;
-      cursor: pointer;
-    }
-  }
-  .biz-attr-select-handle {
-    width: 184px;
-    padding: 0;
-  }
-  .ant-space-item:nth-of-type(3) {
-    min-width: 184px;
-    max-width: calc(100% - 320px);
-  }
-  &-group {
-    display: flex;
-    flex-direction: row;
-    .ant-space-item:nth-of-type(3) {
-      min-width: 184px;
-      max-width: calc(100% - 380px);
-    }
-    &-container {
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      gap: 4px;
-      width: 100%;
-      max-width: calc(100% + 33px);
-      margin-left: -33px;
-      &-item {
-        padding: 4px 0 4px 48px;
-        &:hover {
-          background: #e8efff;
-        }
-      }
-    }
-    &-handle {
-      position: relative;
-      width: 1px;
-      margin-right: 0;
-      margin-left: 32px;
-      background: @border-color-base;
-    }
-    &-operate {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      width: 16px;
-      transform: translate(-50%, -50%);
-    }
-    &-operate-text {
-      width: 16px;
-      height: 16px;
-      span {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-        height: 100%;
-        font-size: 12px;
-        *font-size: 10px;
-        transform: scale(0.83, 0.83);
-      }
-
-      .__default-hover();
-
-      &:first-child {
-        border-top-left-radius: 3px;
-        border-top-right-radius: 3px;
-      }
-
-      &:last-child {
-        border-bottom-right-radius: 3px;
-        border-bottom-left-radius: 3px;
-      }
-
-      &.active {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-  }
-
-  &-column {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-  }
-  &-error {
-    padding-left: 4px;
-    color: @error-color;
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-attr-condition {
+  gap: 16px !important;
+  align-items: flex-start !important;
+  width: 100%;
+  &-btn-del {
+    color: #9aa1a9;
+    font-size: 16px !important;
+    line-height: 32px;
+    &:hover {
+      color: @error-color;
+      cursor: pointer;
+    }
+  }
+  .biz-attr-select-handle {
+    width: 184px;
+    padding: 0;
+  }
+  .ant-space-item:nth-of-type(3) {
+    min-width: 184px;
+    max-width: calc(100% - 320px);
+  }
+  &-group {
+    display: flex;
+    flex-direction: row;
+    .ant-space-item:nth-of-type(3) {
+      min-width: 184px;
+      max-width: calc(100% - 380px);
+    }
+    &-container {
+      display: flex;
+      flex: 1;
+      flex-direction: column;
+      gap: 4px;
+      width: 100%;
+      max-width: calc(100% + 33px);
+      margin-left: -33px;
+      &-item {
+        padding: 4px 0 4px 48px;
+        &:hover {
+          background: #e7f3fe;
+        }
+      }
+    }
+    &-handle {
+      position: relative;
+      width: 1px;
+      margin-right: 0;
+      margin-left: 32px;
+      background: @border-color-base;
+    }
+    &-operate {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 16px;
+      transform: translate(-50%, -50%);
+    }
+    &-operate-text {
+      width: 16px;
+      height: 16px;
+      span {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        font-size: 12px;
+        *font-size: 10px;
+        transform: scale(0.83, 0.83);
+      }
+
+      .__default-hover();
+
+      &:first-child {
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+      }
+
+      &:last-child {
+        border-bottom-right-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      &.active {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+  }
+
+  &-column {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+  }
+  &-error {
+    padding-left: 4px;
+    color: @error-color;
+  }
+}

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/styles/group.less

@@ -1,49 +1,49 @@
-@import '../../assets/styles/inner.less';
-
-.biz-condition {
-  display: flex;
-
-  /* 是筛选条件组 */
-  &-group-handle {
-    position: relative;
-    width: 1px;
-    margin-right: 16px;
-    margin-left: 8px;
-    background: @border-color-base;
-  }
-
-  &-group-operate {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 16px;
-    transform: translate(-50%, -50%);
-
-    &-text {
-      width: 16px;
-      height: 16px;
-      font-size: 12px;
-      line-height: 16px;
-      text-align: center;
-
-      .__default-hover();
-
-      &:first-child {
-        border-radius: @border-radius-sx @border-radius-sx 0px 0px;
-      }
-
-      &:last-child {
-        border-radius: 0px 0px @border-radius-sx @border-radius-sx;
-      }
-
-      &.active {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-  }
-
-  &-item-container {
-    flex: 1;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-condition {
+  display: flex;
+
+  /* 是筛选条件组 */
+  &-group-handle {
+    position: relative;
+    width: 1px;
+    margin-right: 16px;
+    margin-left: 8px;
+    background: @border-color-base;
+  }
+
+  &-group-operate {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 16px;
+    transform: translate(-50%, -50%);
+
+    &-text {
+      width: 16px;
+      height: 16px;
+      font-size: 12px;
+      line-height: 16px;
+      text-align: center;
+
+      .__default-hover();
+
+      &:first-child {
+        border-radius: @border-radius-sx @border-radius-sx 0px 0px;
+      }
+
+      &:last-child {
+        border-radius: 0px 0px @border-radius-sx @border-radius-sx;
+      }
+
+      &.active {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+  }
+
+  &-item-container {
+    flex: 1;
+  }
+}