@zgfe/business-lib 1.0.14 → 1.0.15-user.1

package/es/select/styles/handle.less

@@ -45,7 +45,7 @@
     height: auto;
     min-height: @height-lg;
     overflow: visible;
-
+    line-height: 1;
     &.sm {
       height: auto;
       min-height: @height-sm;
@@ -87,19 +87,28 @@
     font-size: @font-size-lg;
     transform: translateY(-50%);
   }
+  &-input {
+    #biz-select-handle-tag {
+      display: flex;
+      align-items: center;
+      margin: 2px 4px 2px 0;
+      padding-top: 1px;
+      padding-bottom: 1px;
+      background: none;
+      border-color: #cacdd4;
+      border-radius: @border-radius-small;
+      &-label {
+        min-width: 0;
+        max-width: 100px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      &:hover {
+        .__default-hover();
 
-  &-tag {
-    display: flex;
-    align-items: center;
-    margin: 2px 4px 2px 0;
-    background: none;
-    border-color: #cacdd4;
-
-    &:hover {
-      .__default-hover();
-
-      .anticon {
-        color: @primary-color;
+        .anticon {
+          color: @primary-color;
+        }
       }
     }
   }

package/es/select/types.d.ts

@@ -6,7 +6,7 @@ export declare namespace BizSelectTypes {
     }
     interface Option {
         icon?: ReactNode;
-        [otherProp: string]: any;
+        [otherProp: string | symbol | number]: any;
     }
     interface Props {
         disable?: boolean;
@@ -34,6 +34,8 @@ export declare namespace BizSelectTypes {
         notFound?: string | ReactNode;
         loading?: boolean;
         onChange?: (val: Option) => void;
+        onVisibleChange?: (visible: boolean) => void;
+        destroyPopupOnHide?: boolean;
     }
     interface OverlayProps {
         option?: Option;

package/es/userCondition/conditionTypeList.js

@@ -1,13 +1,19 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { Space } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import './styles/conditionTypeList.less';
+import { BizUserConditionContext } from '.';
 
 var ConditionTypeList = function ConditionTypeList(props) {
   var onAdd = props.onAdd,
       label = props.label,
       show = props.show;
-  if (!show) return null;
+
+  var _useContext = useContext(BizUserConditionContext),
+      textMode = _useContext.textMode,
+      openTagCondition = _useContext.openTagCondition;
+
+  if (!show || textMode) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-type-list"
   }, label ? /*#__PURE__*/React.createElement("div", {
@@ -34,7 +40,12 @@ var ConditionTypeList = function ConditionTypeList(props) {
     onClick: function onClick() {
       return onAdd('prop');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3")))));
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))), openTagCondition ? /*#__PURE__*/React.createElement("li", {
+    className: "condition-type",
+    onClick: function onClick() {
+      return onAdd('tag');
+    }
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u6807\u7B7E"))) : null));
 };
 
 ConditionTypeList.defaultProps = {

package/es/userCondition/conditionWrap.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CloseOutlined } from '@ant-design/icons';
+import IconFont from '../icon/iconFont';
 import './styles/conditionWrap.less';
 
 var ConditionWrap = function ConditionWrap(props) {
@@ -12,7 +12,9 @@ var ConditionWrap = function ConditionWrap(props) {
     onClick: function onClick() {
       return props.onDelte();
     }
-  }, /*#__PURE__*/React.createElement(CloseOutlined, null)));
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "qingchu"
+  })));
 };
 
 export default ConditionWrap;

package/es/userCondition/conditions/constants.d.ts

@@ -0,0 +1,21 @@
+export declare const operatorMap: {
+    relative: string;
+    absolute: string;
+    unlimited_time: string;
+    join_time: string;
+    'is not null': string;
+    'is null': string;
+    'not contains': string;
+    contains: string;
+    equal: string;
+    'not equal': string;
+    'begin with': string;
+    'not begin with': string;
+    'end with': string;
+    'not end with': string;
+    '=': string;
+    '<': string;
+    '>': string;
+    '>=': string;
+    '<=': string;
+};

package/es/userCondition/conditions/constants.js

@@ -0,0 +1,21 @@
+export var operatorMap = {
+  relative: '最近',
+  absolute: '固定时段',
+  unlimited_time: '任意时间',
+  join_time: '新增后',
+  'is not null': '不是空值',
+  'is null': '是空值',
+  'not contains': '不包含',
+  contains: '包含',
+  equal: '是',
+  'not equal': '不是',
+  'begin with': '开头是',
+  'not begin with': '开头不是',
+  'end with': '结尾是',
+  'not end with': '结尾不是',
+  '=': '',
+  '<': '',
+  '>': '',
+  '>=': '',
+  '<=': ''
+};

package/es/userCondition/conditions/eventCondition.js

@@ -4,16 +4,19 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React from 'react';
+import React, { useContext } from 'react';
 import { RightOutlined } from '@ant-design/icons';
 import BizEventSelector from '../../eventSelector';
 import RunTimesCondition from './runTimesCondition';
 import PeriodCondition from './periodCondition';
 import PropCondition from './propCondition';
 import './styles/eventCondition.less';
-import { classPrefix } from '..';
+import { BizUserConditionContext, classPrefix } from '..';
 
 var EventCondition = function EventCondition(props) {
+  var _useContext = useContext(BizUserConditionContext),
+      isRealTime = _useContext.isRealTime;
+
   var condition = props.condition,
       dataId = props.dataId;
 
@@ -70,7 +73,12 @@ var EventCondition = function EventCondition(props) {
         id: condition.eventId
       }
     },
-    onChange: onEventChange
+    onChange: onEventChange,
+    border: false,
+    theme: "normal",
+    placeholder: "\u9009\u62E9\u4E00\u4E2A\u4E8B\u4EF6",
+    destroyPopupOnHide: true,
+    defaultSelectAble: false
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition-expand-attr"),
     onClick: onAddAttr
@@ -97,7 +105,8 @@ var EventCondition = function EventCondition(props) {
     dataId: dataId,
     runPeriod: condition.runPeriod,
     onChange: onPeriodChange,
-    isEvent: true
+    isEvent: true,
+    isRealTime: isRealTime
   })))));
 };
 

package/es/userCondition/conditions/periodCondition.js

@@ -4,19 +4,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import BizSelect from '../../select';
 import { Input, DatePicker, Checkbox } from 'antd';
 import moment from 'moment';
 import './styles/periodCondition.less';
 import { classPrefix } from '..';
+import { operatorMap } from './constants';
 var RangePicker = DatePicker.RangePicker;
-var operatorMap = {
-  relative: '最近',
-  absolute: '固定时段',
-  unlimited_time: '任意时间',
-  join_time: '新增后'
-};
 
 var PeriodCondition = function PeriodCondition(props) {
   var dataId = props.dataId,
@@ -36,11 +31,21 @@ var PeriodCondition = function PeriodCondition(props) {
       text: '任意时间',
       value: 'unlimited_time'
     }, {
-      text: '新增后',
+      text: '新增后*',
       value: 'join_time'
     }]);
   }
 
+  var unit = useMemo(function () {
+    if (runPeriod.operator === 'absolute' || runPeriod.operator === 'unlimited_time') {
+      return '';
+    } else if (runPeriod.operator === 'relative') {
+      return '天';
+    } else if (runPeriod.operator === 'join_time') {
+      return '天内';
+    }
+  }, [runPeriod.operator]);
+
   function onChange(data) {
     props.onChange(dataId, data);
   }
@@ -127,7 +132,12 @@ var PeriodCondition = function PeriodCondition(props) {
   }, label) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
-    overlayWidth: 129,
+    dropdownExtra: isEvent ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        lineHeight: '29px'
+      }
+    }, "*\u7528\u6237\u65B0\u589E\u6570\u636E\u4E3A\u6BCF\u65E5\u51CC\u6668\u751F\u6210") : null,
+    overlayWidth: isEvent ? 210 : 114,
     options: options,
     labelField: "text",
     keyField: "value",
@@ -140,7 +150,7 @@ var PeriodCondition = function PeriodCondition(props) {
     className: "".concat(classPrefix, "-period-condition-values")
   }, renderValues()), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-unit")
-  }, "\u5929"), props.isRealTime && runPeriod.operator === 'relative' ? /*#__PURE__*/React.createElement("div", {
+  }, unit), props.isRealTime && runPeriod.operator === 'relative' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-today")
   }, /*#__PURE__*/React.createElement(Checkbox, {
     checked: runPeriod.values[1] === '1',

package/es/userCondition/conditions/propCondition.js

@@ -24,13 +24,15 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import BizConditionItem from '../../attrConditions';
 import './styles/propCondition.less';
 import { useContext } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import { transformNumberOperate } from '../util';
+import { PropType } from '../../attributeSelector/types';
+import BizGlobalDataContext from '../../context';
 var numAttrTypeMap = {
   1: 'cont-string',
   2: 'cont-num',
@@ -43,19 +45,28 @@ var attrNumTypeMap = {
 };
 
 var PropCondition = function PropCondition(props) {
-  var _useContext = useContext(BizUserConditionContext),
-      eventAttrNum = _useContext.eventAttrNum;
+  var _useContext = useContext(BizGlobalDataContext),
+      eventEnvList = _useContext.eventEnvList;
+
+  var _useContext2 = useContext(BizUserConditionContext),
+      eventAttrNum = _useContext2.eventAttrNum;
 
   var isEvent = props.isEvent,
       label = props.label,
       attrs = props.attrs,
-      dataId = props.dataId;
+      dataId = props.dataId,
+      eventId = props.eventId;
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       showList = _useState2[0],
       setShowList = _useState2[1];
 
+  var envNames = useMemo(function () {
+    return eventEnvList ? eventEnvList.map(function (env) {
+      return env.name;
+    }) : [];
+  }, [eventEnvList]);
   useEffect(function () {
     buildDefault();
   }, []);
@@ -97,8 +108,8 @@ var PropCondition = function PropCondition(props) {
     var newAttr = {
       attrName: attrName,
       attrId: attrId,
-      category: category,
-      operator: transformNumberOperate(operator),
+      category: category || 'custom',
+      operator: type === PropType.NUMBER ? transformNumberOperate(operator) : operator,
       params: values,
       attrType: numAttrTypeMap[type]
     };
@@ -130,7 +141,9 @@ var PropCondition = function PropCondition(props) {
 
   function getPropCategory(attrName) {
     if (!isEvent) return 'userProp';
-    return attrName === undefined ? 'eventProp' : 'envProp';
+    if (attrName === undefined) return 'eventProp';
+    if (envNames.includes(attrName)) return 'envProp';
+    return 'eventProp';
   }
 
   function renderAttr(item, i) {
@@ -156,6 +169,10 @@ var PropCondition = function PropCondition(props) {
       attrId && (props.defaultValue.attrId = attrId);
     }
 
+    if (isEvent) {
+      props.eventIdList = [eventId];
+    }
+
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-prop-condition-attr"),
       key: id
@@ -171,7 +188,10 @@ var PropCondition = function PropCondition(props) {
       onDelete: function onDelete() {
         return onRemoveAttr(i);
       },
-      enableDelete: isEvent
+      enableDelete: isEvent,
+      border: false,
+      destroyPopupOnHide: true,
+      theme: "normal"
     }, props))));
   }
 

package/es/userCondition/conditions/runTimesCondition.js

@@ -21,10 +21,10 @@ var options = [{
   text: '<'
 }, {
   value: '>=',
-  text: '>='
+  text: '≥'
 }, {
   value: '<=',
-  text: '<='
+  text: '≤'
 }, {
   value: 'not equal',
   text: '≠'

package/es/userCondition/conditions/styles/eventCondition.less

@@ -12,6 +12,9 @@
     .biz-event-select-handle {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
+      .biz-select-handle-input {
+        background-color: @background-color-gray;
+      }
     }
   }
   &-times-period-wrap {
@@ -22,13 +25,11 @@
     align-items: center;
     justify-content: center;
     width: 30px;
-    height: 42px;
+    height: 40px;
     margin-right: @margin-xs;
-    border: 1px solid @border-color-base;
-    border-left: none;
+    margin-left: @border-radius-small;
+    background-color: @background-color-gray;
     border-radius: @border-radius-small;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
     cursor: pointer;
   }
   &-attrs {
@@ -40,6 +41,7 @@
   &-label {
     display: flex;
     align-items: center;
+    min-width: 28px;
     height: 42px;
     margin-right: @margin-xs;
   }

package/es/userCondition/conditions/styles/propCondition.less

@@ -26,9 +26,9 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 30px;
-      height: 30px;
-      border: 1px solid @border-color-base;
+      width: 40px;
+      height: 40px;
+      background-color: @background-color-gray;
       border-radius: @border-radius-sx;
       cursor: pointer;
     }

package/es/userCondition/conditions/styles/tagsCondition.less

@@ -0,0 +1,18 @@
+@import '../../../assets/styles/variable.less';
+.biz-user-condition-tags-condition {
+  display: flex;
+  &-label,
+  &-value {
+    margin-right: @margin-xs;
+  }
+  &-label {
+    line-height: 40px;
+  }
+  &-value {
+    flex: 1;
+    min-width: 0;
+  }
+  &-operator {
+    width: 96px;
+  }
+}

package/es/userCondition/conditions/styles/textDesc.less

@@ -0,0 +1,17 @@
+@import '../../../assets/styles/variable.less';
+.biz-user-condition {
+  &-text-desc {
+    color: @text-color-secondary;
+    font-size: 14px;
+    &-or {
+      margin: 0 @margin-xs;
+    }
+    &-label {
+    }
+    &-operator {
+    }
+    &-value {
+      color: @text-color;
+    }
+  }
+}

package/es/userCondition/conditions/tagsCondition.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { AllConditionBasePropsI, BizUserConditionT } from '../types';
+import './styles/tagsCondition.less';
+declare type Labels = BizUserConditionT.Labels;
+export interface TagsConditionPropI extends AllConditionBasePropsI<Labels> {
+    labels: Labels;
+}
+declare const TagsCondition: React.FC<TagsConditionPropI>;
+export default TagsCondition;

package/es/userCondition/conditions/tagsCondition.js

@@ -0,0 +1,107 @@
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useContext, useState } from 'react';
+import { BizUserConditionContext, classPrefix } from '..';
+import BizSelect from '../../select';
+import { operatorMap } from './constants';
+import BizUserTagsSelect from '../../userTagsSelector';
+import './styles/tagsCondition.less';
+import { findTagFactory } from '../util';
+var options = [{
+  value: 'equal',
+  text: '是'
+}, {
+  value: 'not equal',
+  text: '不是'
+}];
+
+var TagsCondition = function TagsCondition(props) {
+  var _useContext = useContext(BizUserConditionContext),
+      userTagsData = _useContext.userTagsData;
+
+  var labels = props.labels,
+      dataId = props.dataId,
+      onChange = props.onChange;
+
+  var _useState = useState(function () {
+    return buildDefaultValues();
+  }),
+      _useState2 = _slicedToArray(_useState, 1),
+      defaultValues = _useState2[0];
+
+  function onOperatorChange(operator) {
+    onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
+      operator: operator.value
+    }));
+  }
+
+  function onTagsChange(data) {
+    var values = data.map(function (item) {
+      return item[1].labelId;
+    });
+    onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
+      values: values
+    }));
+  }
+
+  function buildDefaultValues() {
+    var values = [];
+    var findTag = findTagFactory(userTagsData);
+    labels.values.forEach(function (id) {
+      var tag = findTag(id);
+
+      if (tag) {
+        values.push([tag.labelGroup, tag]);
+      }
+    });
+    return values;
+  }
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-tags-condition")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-tags-condition-label")
+  }, "\u7528\u6237\u6807\u7B7E"), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-tags-condition-value")
+  }, /*#__PURE__*/React.createElement(BizUserTagsSelect, {
+    defaultValue: defaultValues,
+    data: userTagsData,
+    childFields: ['children'],
+    keyFields: ['labelGroup', 'labelId'],
+    labelFields: ['labelGroup', 'labelName'],
+    valueFields: ['labelGroup', 'labelId'],
+    onChange: onTagsChange,
+    destroyPopupOnHide: true
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-tags-condition-operator")
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    options: options,
+    labelField: "text",
+    keyField: "value",
+    value: {
+      value: labels.operator,
+      text: operatorMap[labels.operator]
+    },
+    onChange: onOperatorChange
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-tags-condition-unit")
+  }));
+};
+
+export default TagsCondition;

package/es/userCondition/conditions/textDesc.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { BizUserConditionT } from '../types';
+import './styles/textDesc.less';
+export interface TextProps {
+    condition: BizUserConditionT.ActiveCondition | BizUserConditionT.AddCondition | BizUserConditionT.PropCondition | BizUserConditionT.EventCondition | BizUserConditionT.TagsCondition;
+    showOrDesc: boolean;
+}
+declare const Text: React.FC<TextProps>;
+export default Text;