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

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

@@ -1,11 +1,11 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 (function (global, factory) {
   (typeof exports === "undefined" ? "undefined" : _typeof(exports)) === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'], factory) : (global = global || self, factory(global.acorn = {}));
 })(this, function (exports) {
   '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,
@@ -32,16 +35,16 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     paragraph: {
       rows: 2
     }
-  }, showHandle ? (/*#__PURE__*/React.createElement("div", {
+  }, showHandle ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle")
-  }, conditions.length > 1 && (/*#__PURE__*/React.createElement("div", {
+  }, conditions.length > 1 && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-operate"),
     onClick: onClickRelation
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-operate-text ").concat(relation === 'and' || props.onlyAnd ? 'active' : '', " ").concat(props.onlyAnd ? 'only-and' : '')
-  }, /*#__PURE__*/React.createElement("span", null, "\u4E14")), !props.onlyAnd && (/*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u4E14")), !props.onlyAnd && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-operate-text ").concat(relation === 'or' ? 'active' : '')
-  }, /*#__PURE__*/React.createElement("span", null, "\u6216"))))))) : null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u6216")))) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-container")
   }, conditions.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
@@ -57,14 +60,19 @@ 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
     }));
   }))));
 });

package/es/attrCondition/index.js

@@ -1,12 +1,12 @@
 var _excluded = ["border"];
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+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';
@@ -31,7 +31,8 @@ var BizAttrCondition = function BizAttrCondition(_ref) {
     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,
@@ -61,7 +62,7 @@ var BizAttrCondition = function BizAttrCondition(_ref) {
   }, [isValidate, attr, operate, values]);
   return /*#__PURE__*/React.createElement(Space, {
     className: classPrefix
-  }, !loading ? (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }, !loading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-column")
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     value: attr,
@@ -76,7 +77,8 @@ var BizAttrCondition = function BizAttrCondition(_ref) {
     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, {
@@ -98,16 +100,16 @@ var BizAttrCondition = function BizAttrCondition(_ref) {
     relationConfig: relationConfig
   }), isValueError ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
-  }, "\u5C5E\u6027\u503C\u4E0D\u53EF\u4E3A\u7A7A") : null), enableDelete && (/*#__PURE__*/React.createElement(IconFont, {
+  }, "\u5C5E\u6027\u503C\u4E0D\u53EF\u4E3A\u7A7A") : null), enableDelete && /*#__PURE__*/React.createElement(IconFont, {
     type: "qingchu",
     className: "".concat(classPrefix, "-btn-del"),
     onClick: onDelete
-  })))) : (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Skeleton.Input, {
+  })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Skeleton.Input, {
     active: true
   }), /*#__PURE__*/React.createElement(Skeleton.Input, {
     active: true
   }), /*#__PURE__*/React.createElement(Skeleton.Input, {
     active: true
-  }))));
+  })));
 };
 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

@@ -1,9 +1,9 @@
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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; }
 import { useEffect, useState } from 'react';
 import { PropCategory } from '../attributeSelector/types';
 import { getCondition } from '../attrConditions';
@@ -26,8 +26,8 @@ var useAttrCondition = function useAttrCondition(props) {
     loading = _useState8[0],
     setLoading = _useState8[1];
   var _useState9 = useState(((_props$defaultValue3 = props.defaultValue) === null || _props$defaultValue3 === void 0 ? void 0 : _props$defaultValue3.placeholder) || ((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.placeholder)),
-    _useState0 = _slicedToArray(_useState9, 1),
-    placeholder = _useState0[0];
+    _useState10 = _slicedToArray(_useState9, 1),
+    placeholder = _useState10[0];
   useEffect(function () {
     var data = props.defaultValue || props.value;
     if (data) {
@@ -40,7 +40,7 @@ var useAttrCondition = function useAttrCondition(props) {
             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'
           };
         }
@@ -52,11 +52,10 @@ var useAttrCondition = function useAttrCondition(props) {
             name: data.attrName,
             propCategory: data.propCategory,
             type: data.type,
-            category: data.category,
-            encryptionType: data.encryptionType,
+            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
           };
         }
@@ -67,7 +66,7 @@ var useAttrCondition = function useAttrCondition(props) {
             propCategory: data.propCategory,
             type: data.type,
             key: "".concat(data.propCategory, "-").concat(data.attrId),
-            label: data.attrNameStr || data.label,
+            label: data.attrNameStr || data.label || data.attrName,
             subtype: data.subtype,
             encryptionType: data.encryptionType
           };

package/es/attrCondition/useConditionGroup.js

@@ -1,13 +1,13 @@
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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; }
 import { useState, useEffect, useImperativeHandle } from 'react';
 import _ from 'lodash';
 var useConditionGroup = function useConditionGroup(props, ref) {

package/es/attrConditions/components/operateList.js

@@ -1,22 +1,25 @@
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-import React, { useEffect, useState } from 'react';
+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; }
+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位是',
@@ -144,7 +147,7 @@ var BizOperateList = function BizOperateList(props) {
     options: options,
     size: "middle",
     onChange: onChange
-  }), [OperateTypes.NPlaceIs, OperateTypes.NPlaceNotIs].includes(current.value) ? (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "\u7B2C"), /*#__PURE__*/React.createElement(InputNumber, {
+  }), [OperateTypes.NPlaceIs, OperateTypes.NPlaceNotIs].includes(current.value) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, "\u7B2C"), /*#__PURE__*/React.createElement(InputNumber, {
     min: 1,
     maxLength: 2,
     value: nPlace,
@@ -157,6 +160,6 @@ var BizOperateList = function BizOperateList(props) {
     }
   }), /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-nplace-text")
-  }, "\u4F4D", current.value === OperateTypes.NPlaceIs ? '是' : '不是'))) : null);
+  }, "\u4F4D", current.value === OperateTypes.NPlaceIs ? '是' : '不是')) : null);
 };
 export default BizOperateList;