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

package/es/eventSelector/styles/index.less

@@ -1,123 +1,127 @@
-@import '../../assets/styles/inner.less';
-
-.biz-event-select {
-  position: relative;
-  border-radius: 4px;
-  .__select-handle();
-
-  &:hover {
-    .biz-target-select-option-icon {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      float: right;
-      margin-top: 4px;
-    }
-  }
-
-  .biz-event-select-handle {
-    border: none !important;
-  }
-
-  &.border {
-    .biz-event-select-handle {
-      .__select-handle();
-    }
-  }
-  &-list-panel {
-    display: flex;
-    flex-direction: row;
-    width: 477px;
-    height: 320px;
-    padding: 0;
-    .__select-panel();
-  }
-
-  &-left {
-    flex: none;
-    width: 192px;
-    padding: @padding-xs;
-    overflow-y: auto;
-    border-right: 1px solid @border-color-base;
-  }
-
-  &-right {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    padding: @padding-xs;
-  }
-
-  &-search {
-    flex: none;
-    margin-bottom: @margin-sm;
-  }
-
-  &-list {
-    flex: 1;
-    overflow-y: auto;
-  }
-  &-nodata-panel {
-    width: 284px;
-    .__select-panel();
-  }
-
-  &-nodata {
-    .__select-nodata();
-  }
-
-  &-like {
-    display: inline-block;
-    width: @font-size-base;
-    margin-right: @margin-xss;
-    color: @warning-color;
-  }
-  &-event-item-wrap {
-    .biz-event-select-option {
-      padding: 0 @padding-xs;
-    }
-  }
-  &-option {
-    .__select-option();
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-    &:hover,
-    &.active {
-      .ant-badge-count {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-    &.disable,
-    &.disable:hover {
-      color: #ccd0d4;
-      background: #fff;
-      cursor: not-allowed;
-    }
-
-    &-label {
-      flex: 1;
-      max-width: 220px;
-      .__default-overflow();
-    }
-
-    .ant-badge {
-      flex: none;
-    }
-
-    .ant-badge-count {
-      color: @text-color;
-      background: none;
-    }
-
-    &:not(.active, :hover) .biz-event-select-highlight {
-      color: @primary-color;
-    }
-  }
-
-  .biz-select-handle-input.active {
-    box-shadow: none;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-event-select {
+  position: relative;
+  border-radius: 4px;
+  .__select-handle();
+
+  &:hover {
+    .biz-target-select-option-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      float: right;
+      margin-top: 4px;
+    }
+  }
+
+  .biz-event-select-handle {
+    border: none !important;
+  }
+
+  &.border {
+    .biz-event-select-handle {
+      .__select-handle();
+    }
+  }
+  &-list-panel {
+    display: flex;
+    flex-direction: row;
+    width: 477px;
+    height: 320px;
+    padding: 0;
+    .__select-panel();
+  }
+
+  &-left {
+    flex: none;
+    width: 192px;
+    padding: @padding-xs;
+    overflow-y: auto;
+    border-right: 1px solid @border-color-base;
+  }
+
+  &-right {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    padding: @padding-xs;
+  }
+
+  &-search {
+    flex: none;
+    margin-bottom: @margin-sm;
+  }
+
+  &-list {
+    flex: 1;
+    overflow-y: auto;
+  }
+  &-nodata-panel {
+    width: 284px;
+    .__select-panel();
+  }
+
+  &-nodata {
+    .__select-nodata();
+  }
+
+  &-like {
+    display: inline-block;
+    width: @font-size-base;
+    margin-right: @margin-xss;
+    color: @warning-color;
+  }
+  &-event-item-wrap {
+    .biz-event-select-option {
+      padding: 0 @padding-xs;
+    }
+  }
+  &-option {
+    .__select-option();
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    &:hover,
+    &.active {
+      .ant-badge-count {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+    &.disable,
+    &.disable:hover {
+      color: #ccd0d4;
+      background: #fff;
+      cursor: not-allowed;
+    }
+
+    &-label {
+      flex: 1;
+      max-width: 220px;
+      .__default-overflow();
+    }
+
+    .ant-badge {
+      flex: none;
+    }
+
+    .ant-badge-count {
+      color: @text-color;
+      background: none;
+    }
+
+    &:not(.active, :hover) .biz-event-select-highlight {
+      color: @primary-color;
+    }
+  }
+
+  .biz-select-handle-input.active {
+    box-shadow: none;
+  }
+
+  &-tip {
+    float: right;
+  }
+}

package/es/eventSelector/types.d.ts

@@ -19,6 +19,7 @@ export declare namespace EventSelectTypes {
         multiple?: boolean;
         maxEventCount?: number;
         showBuiltInTarget?: boolean;
+        showRetentionTarget?: number;
         defaultSelectAble?: boolean;
         selectList?: number[];
         disableList?: number[];

package/es/formulaTarget/components/formula/index.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 React, { useEffect, useImperativeHandle, useState } from 'react';
 import { formatTarget, getBrackets, targetsFormat } from './util';
 import './index.less';
@@ -115,15 +115,16 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       },
       onDelete: function onDelete() {
         return _onDelete(target.id);
-      }
+      },
+      onlyAnd: props.onlyAnd
     });
-  }), targetList.length < 9 ? (/*#__PURE__*/React.createElement(Tooltip, {
+  }), targetList.length < 9 ? /*#__PURE__*/React.createElement(Tooltip, {
     title: "\u6DFB\u52A0\u6307\u6807\u8FD0\u7B97"
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tianjia",
     className: "".concat(classPrefix, "-add"),
     onClick: onAdd
-  }))) : null, /*#__PURE__*/React.createElement("div", {
+  })) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-format")
   }, /*#__PURE__*/React.createElement("span", null, "\u8BA1\u7B97\u7ED3\u679C"), /*#__PURE__*/React.createElement(BizSelect, {
     value: resultFormat,

package/es/formulaTarget/components/formula/index.less

@@ -1,76 +1,76 @@
-@import '../../../assets/styles/inner.less';
-
-.formula-container {
-  display: flex;
-  align-items: center;
-  &-target {
-    display: flex;
-    &:hover {
-      .formula-container-option:not(.active) {
-        display: flex;
-        color: #b9ceff;
-        &.disabled {
-          color: #ccd0d4;
-        }
-      }
-    }
-    &-handle {
-      min-width: 88px;
-      &.focus {
-        .biz-select-handle-input {
-          border-color: @primary-color;
-        }
-      }
-      &-icon {
-        margin-left: 4px;
-        color: @text-color-middle;
-      }
-      &-name {
-        margin-left: 4px;
-      }
-    }
-  }
-
-  &-format {
-    display: flex;
-    align-items: center;
-    margin-left: 40px;
-    & > span {
-      margin-right: 12px;
-    }
-
-    .biz-select-handle {
-      min-width: 136px;
-    }
-  }
-  &-add {
-    margin-left: 8px;
-    color: @primary-color;
-    font-size: 18px !important;
-    cursor: pointer;
-  }
-  &-option {
-    display: flex;
-    align-items: center;
-    color: transparent;
-    cursor: pointer;
-    &.active {
-      display: flex;
-      color: #354354;
-    }
-    &.disabled {
-      cursor: not-allowed;
-    }
-
-    &:first-child {
-      margin-right: 4px;
-    }
-    &:last-child {
-      margin-left: 4px;
-    }
-  }
-
-  &-symbol {
-    margin: 0 12px;
-  }
-}
+@import '../../../assets/styles/inner.less';
+
+.formula-container {
+  display: flex;
+  align-items: center;
+  &-target {
+    display: flex;
+    &:hover {
+      .formula-container-option:not(.active) {
+        display: flex;
+        color: #b9ceff;
+        &.disabled {
+          color: #ccd0d4;
+        }
+      }
+    }
+    &-handle {
+      min-width: 88px;
+      &.focus {
+        .biz-select-handle-input {
+          border-color: @primary-color;
+        }
+      }
+      &-icon {
+        margin-left: 4px;
+        color: @text-color-middle;
+      }
+      &-name {
+        margin-left: 4px;
+      }
+    }
+  }
+
+  &-format {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+    & > span {
+      margin-right: 12px;
+    }
+
+    .biz-select-handle {
+      min-width: 136px;
+    }
+  }
+  &-add {
+    margin-left: 8px;
+    color: @primary-color;
+    font-size: 18px !important;
+    cursor: pointer;
+  }
+  &-option {
+    display: flex;
+    align-items: center;
+    color: transparent;
+    cursor: pointer;
+    &.active {
+      display: flex;
+      color: #354354;
+    }
+    &.disabled {
+      cursor: not-allowed;
+    }
+
+    &:first-child {
+      margin-right: 4px;
+    }
+    &:last-child {
+      margin-left: 4px;
+    }
+  }
+
+  &-symbol {
+    margin: 0 12px;
+  }
+}

package/es/formulaTarget/components/formula/types.d.ts

@@ -5,6 +5,7 @@ export declare namespace FormulaContainerTypes {
         formula?: string;
         resultFormat?: string;
         onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, result?: string) => void;
+        onlyAnd?: boolean;
     }
     type Value = null | string | TargetConditionTypes.Value;
     interface FormulaItemValue {

package/es/formulaTarget/components/formula/util.js

@@ -1,9 +1,9 @@
-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 _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); }
 import _ from 'lodash';
 import { attrOptions, normalOptions } from '../../../targetConditionGroup/data/operates';
 import { util } from '../../../utils';

package/es/formulaTarget/components/formulaItem/index.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 React, { useContext, useEffect, useRef, useState } from 'react';
 import { classPrefix } from '../formula';
 import { getDimension, getFilters, isDisable, judgeHaveFilter, validator } from '../formula/util';
@@ -33,24 +33,24 @@ var FormulaItem = function FormulaItem(props) {
     label = _useState8[0],
     setLabel = _useState8[1];
   var _useState9 = useState(false),
-    _useState0 = _slicedToArray(_useState9, 2),
-    haveFilter = _useState0[0],
-    setHaveFilter = _useState0[1];
-  var _useState1 = useState(''),
-    _useState10 = _slicedToArray(_useState1, 2),
-    dimension = _useState10[0],
-    setDimension = _useState10[1];
-  var _useState11 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    haveFilter = _useState10[0],
+    setHaveFilter = _useState10[1];
+  var _useState11 = useState(''),
     _useState12 = _slicedToArray(_useState11, 2),
-    isValidate = _useState12[0],
-    setIsValidate = _useState12[1];
+    dimension = _useState12[0],
+    setDimension = _useState12[1];
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    isValidate = _useState14[0],
+    setIsValidate = _useState14[1];
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     currentApp = _useContext.currentApp;
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    open = _useState14[0],
-    setOpen = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    open = _useState16[0],
+    setOpen = _useState16[1];
   var panelRef = useRef(null);
   var handleRef = useRef(null);
   useEffect(function () {
@@ -166,7 +166,8 @@ var FormulaItem = function FormulaItem(props) {
         onDelete: props.onDelete,
         onSubmit: function onSubmit() {
           return setOpen(false);
-        }
+        },
+        onlyAnd: props.onlyAnd
       });
     },
     trigger: ['click'],
@@ -179,10 +180,14 @@ var FormulaItem = function FormulaItem(props) {
   }, /*#__PURE__*/React.createElement(SelectHandle, {
     label: label,
     open: open
-  }, /*#__PURE__*/React.createElement("span", null, label), haveFilter ? (/*#__PURE__*/React.createElement(IconFont, {
+  }, !label && /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: '#9797AE'
+    }
+  }, label ? label : '请选择'), /*#__PURE__*/React.createElement("span", null, label), haveFilter ? /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-target-handle-icon"),
     type: "a-shaixuan2"
-  })) : null, /*#__PURE__*/React.createElement("span", {
+  }) : null, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-target-handle-name")
   }, dimension)))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option ").concat((formulaValue === null || formulaValue === void 0 ? void 0 : formulaValue.right) ? 'active' : '').concat(disableRight ? ' disabled' : ''),

package/es/formulaTarget/components/formulaItem/types.d.ts

@@ -7,4 +7,5 @@ export interface FormulaItemProps {
     onChange?: (data: FormulaContainerTypes.Item) => void;
     onDelete?: () => void;
     onSubmit?: () => void;
+    onlyAnd?: boolean;
 }