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

package/es/userCondition/conditions/cdpCondition.js

@@ -1,32 +1,35 @@
-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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _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, { useContext, useEffect, useState } from 'react';
 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), {}, {
@@ -52,17 +55,17 @@ var CdpConditionItem = function CdpConditionItem(props) {
     operator = _useState8[0],
     setOperator = _useState8[1];
   var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
-    fieldValue = _useState10[0],
-    setFieldValue = _useState10[1];
-  var _useState11 = useState([]),
+    _useState0 = _slicedToArray(_useState9, 2),
+    fieldValue = _useState0[0],
+    setFieldValue = _useState0[1];
+  var _useState1 = useState([]),
+    _useState10 = _slicedToArray(_useState1, 2),
+    fieldList = _useState10[0],
+    setFieldList = _useState10[1];
+  var _useState11 = useState(true),
     _useState12 = _slicedToArray(_useState11, 2),
-    fieldList = _useState12[0],
-    setFieldList = _useState12[1];
-  var _useState13 = useState(true),
-    _useState14 = _slicedToArray(_useState13, 2),
-    isFirst = _useState14[0],
-    setIsFirst = _useState14[1];
+    isFirst = _useState12[0],
+    setIsFirst = _useState12[1];
   useEffect(function () {
     if (!props.value) {
       setIsFirst(false);
@@ -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 () {
@@ -270,7 +273,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "bangzhu",
     className: "".concat(classPrefix, "-select-tips")
-  })), dataset ? /*#__PURE__*/React.createElement("div", {
+  })), dataset ? (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-field"),
@@ -281,16 +284,16 @@ var CdpConditionItem = function CdpConditionItem(props) {
     value: field,
     loading: loading,
     onChange: onFieldChange
-  }), renderByType()) : null);
+  }), renderByType())) : null);
 };
 var CdpCondition = function CdpCondition(props) {
   var dataId = props.dataId,
     defaultValue = props.defaultValue,
     onChange = props.onChange;
-  var _useState15 = useState([undefined]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    cdpConditions = _useState16[0],
-    setCdpConditions = _useState16[1];
+  var _useState13 = useState([undefined]),
+    _useState14 = _slicedToArray(_useState13, 2),
+    cdpConditions = _useState14[0],
+    setCdpConditions = _useState14[1];
   useEffect(function () {
     if (defaultValue && defaultValue.dataset) {
       setCdpConditions(defaultValue.dataset);

package/es/userCondition/conditions/cdpCshCondition.js

@@ -1,32 +1,35 @@
-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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _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, { useContext, useEffect, useState } from 'react';
 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), {}, {
@@ -52,41 +55,41 @@ var CdpConditionItem = function CdpConditionItem(props) {
     field = _useState8[0],
     setField = _useState8[1];
   var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
-    subField = _useState10[0],
-    setSubField = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    subField = _useState0[0],
+    setSubField = _useState0[1];
+  var _useState1 = useState(),
+    _useState10 = _slicedToArray(_useState1, 2),
+    operator = _useState10[0],
+    setOperator = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    operator = _useState12[0],
-    setOperator = _useState12[1];
+    subOperator = _useState12[0],
+    setSubOperator = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    subOperator = _useState14[0],
-    setSubOperator = _useState14[1];
+    calculate = _useState14[0],
+    setCalculate = _useState14[1];
   var _useState15 = useState(),
     _useState16 = _slicedToArray(_useState15, 2),
-    calculate = _useState16[0],
-    setCalculate = _useState16[1];
+    subcalculate = _useState16[0],
+    setSubCalculate = _useState16[1];
   var _useState17 = useState(),
     _useState18 = _slicedToArray(_useState17, 2),
-    subcalculate = _useState18[0],
-    setSubCalculate = _useState18[1];
-  var _useState19 = useState(),
+    fieldValue = _useState18[0],
+    setFieldValue = _useState18[1];
+  var _useState19 = useState([]),
     _useState20 = _slicedToArray(_useState19, 2),
-    fieldValue = _useState20[0],
-    setFieldValue = _useState20[1];
+    fieldList = _useState20[0],
+    setFieldList = _useState20[1];
   var _useState21 = useState([]),
     _useState22 = _slicedToArray(_useState21, 2),
-    fieldList = _useState22[0],
-    setFieldList = _useState22[1];
-  var _useState23 = useState([]),
+    subFieldList = _useState22[0],
+    setSubFieldList = _useState22[1];
+  var _useState23 = useState(true),
     _useState24 = _slicedToArray(_useState23, 2),
-    subFieldList = _useState24[0],
-    setSubFieldList = _useState24[1];
-  var _useState25 = useState(true),
-    _useState26 = _slicedToArray(_useState25, 2),
-    isFirst = _useState26[0],
-    setIsFirst = _useState26[1];
+    isFirst = _useState24[0],
+    setIsFirst = _useState24[1];
   useEffect(function () {
     if (!props.value) {
       setIsFirst(false);
@@ -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 = [];
@@ -301,7 +304,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     var optionList = getOptions(field.webType);
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-condition-group")
-    }, field.webType === PropType.NUMBER2 && /*#__PURE__*/React.createElement(BizSelect, {
+    }, field.webType === PropType.NUMBER2 && (/*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-select-condition"),
       options: numberTypeCsh,
       labelField: "name",
@@ -309,12 +312,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
       overlayWidth: 96,
       value: calculate,
       onChange: onCalculateChange
-    }), /*#__PURE__*/React.createElement(BizSelect, {
+    })), /*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-select-condition"),
       options: optionList,
       labelField: "name",
       keyField: "value",
-      overlayWidth: 96,
+      overlayWidth: 120,
       value: operator,
       onChange: onOperateChange
     }), function () {
@@ -450,7 +453,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
         e.persist();
         setFieldValue([e.target.value, fieldValue && fieldValue[1] || '']);
       }
-    }), (subOperator === null || subOperator === void 0 ? void 0 : subOperator.value) === 'between' && /*#__PURE__*/React.createElement(Input, {
+    }), (subOperator === null || subOperator === void 0 ? void 0 : subOperator.value) === 'between' && (/*#__PURE__*/React.createElement(Input, {
       type: "number",
       className: "".concat(classPrefix, "-value"),
       value: fieldValue && fieldValue[1],
@@ -459,7 +462,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
         e.persist();
         setFieldValue([fieldValue && fieldValue[0] || '', e.target.value]);
       }
-    }))));
+    })))));
   }
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
@@ -477,7 +480,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "bangzhu",
     className: "".concat(classPrefix, "-select-tips")
-  })), dataset ? /*#__PURE__*/React.createElement("div", {
+  })), dataset ? (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-field"),
@@ -488,18 +491,18 @@ var CdpConditionItem = function CdpConditionItem(props) {
     value: field,
     loading: loading,
     onChange: onFieldChange
-  }), renderByType()) : null), ['add', 'subtraction', 'multiplication', 'division'].includes((operator === null || operator === void 0 ? void 0 : operator.value) || '') && /*#__PURE__*/React.createElement("div", {
+  }), renderByType())) : null), ['add', 'subtraction', 'multiplication', 'division'].includes((operator === null || operator === void 0 ? void 0 : operator.value) || '') && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
-  }, renderSubCondition()));
+  }, renderSubCondition())));
 };
 var CdpCondition = function CdpCondition(props) {
   var dataId = props.dataId,
     defaultValue = props.defaultValue,
     onChange = props.onChange;
-  var _useState27 = useState([undefined]),
-    _useState28 = _slicedToArray(_useState27, 2),
-    cdpConditions = _useState28[0],
-    setCdpConditions = _useState28[1];
+  var _useState25 = useState([undefined]),
+    _useState26 = _slicedToArray(_useState25, 2),
+    cdpConditions = _useState26[0],
+    setCdpConditions = _useState26[1];
   useEffect(function () {
     if (defaultValue && defaultValue.data_set_csh) {
       setCdpConditions(defaultValue.data_set_csh);

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

@@ -1,20 +1,20 @@
-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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _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, { 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,