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

package/es/assets/styles/resetAntd.less

@@ -144,6 +144,14 @@
   .ant-picker-active-bar {
     display: none !important;
   }
+
+  &.ant-picker-range {
+    background-color: @background-color-base;
+    border: none;
+    &.ant-picker-large {
+      height: 40px;
+    }
+  }
 }
 
 /*日历下拉框*/
@@ -298,14 +306,14 @@
 
   .ant-modal-body {
     max-height: 400px;
-    // &:not(:last-child) {
-    //   padding-bottom: 0;
-    // }
     max-height: 400px !important;
     padding-top: @padding-xs !important;
-    padding-bottom: 0 !important;
+    // padding-bottom: 0 !important;
     overflow: auto;
     overflow: auto !important;
+    &:not(:last-child) {
+      padding-bottom: 0 !important;
+    }
   }
 }
 
@@ -375,10 +383,6 @@
       &::before {
         width: 0 !important;
       }
-
-      &.ant-table-cell-fix-left-last {
-        border-right: 1px solid @border-color-base!important;
-      }
     }
 
     .ant-table-tbody {
@@ -476,3 +480,10 @@
 .ant-dropdown {
   z-index: 6666 !important;
 }
+//message
+.ant-message {
+  z-index: 99999 !important;
+}
+
+.ant-picker {
+}

package/es/assets/theme.js

@@ -1,14 +1,24 @@
-export default {
-  'primary-color': '#165dff',
-  'border-color-base': '#ECEDF0',
-  'background-color-base': '#fafafb',
-  'text-color': '#021429',
-  'text-color-secondary': '#5f6085',
-  'tooltip-bg': '#242541',
-  'error-color': '#fb5547',
-  'shadow-color': 'rgba(0, 0, 0, 0.1)',
-  'box-shadow-base': '0px 4px 10px rgba(0, 0, 0, 0.1)',
-  'btn-text-hover-bg': '#cacdd4',
-  'warning-color': '#FD9F41',
-  'border-color-split': '#E8EFFF'
-};
+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',
+    'border-color-base': '#ECEDF0',
+    'background-color-base': '#fafafb',
+    'text-color': '#021429',
+    // 正文
+    'text-color-secondary': '#5f6085',
+    // 次要
+    'tooltip-bg': '#242541',
+    'error-color': '#fb5547',
+    'shadow-color': 'rgba(0, 0, 0, 0.1)',
+    'box-shadow-base': '0px 4px 10px rgba(0, 0, 0, 0.1)',
+    'btn-text-hover-bg': '#cacdd4',
+    'warning-color': '#FD9F41',
+    'border-color-split': '#E8EFFF'
+  };
+});

package/es/attrConditions/demo/index.js

@@ -23,13 +23,15 @@ export default (function () {
 
   var _useState = useState({
     condition: {
-      attrId: 30183431,
-      propCategory: 'eventProp',
-      type: 1,
-      operator: 'equal',
-      values: ['Microsoft Edge', 'Safari', 'Apple WebKit'],
-      dimensionSub: 'event_attr',
-      attrName: '用户open_id'
+      attrId: 0,
+      propCategory: 'userProp',
+      type: 2,
+      operator: 'gt',
+      values: ['72000', '1'],
+      dimensionSub: 'duration',
+      attrName: 'duration',
+      category: 'fixed',
+      subtype: 2
     }
   }),
       _useState2 = _slicedToArray(_useState, 2),

package/es/attrConditions/styles/index.less

@@ -61,15 +61,15 @@
   }
 
   &-input {
+    flex: 1;
     .ant-input-group-addon {
-      background-color: @background-color-gray !important;
+      // background-color: @background-color-gray !important;
       border: none;
     }
 
     &-select {
       width: 60px;
       border: none;
-      border-left: 1px solid @border-color-split;
     }
   }
 

package/es/eventSelector/listPanel.js

@@ -133,6 +133,8 @@ var EventListPanel = function EventListPanel(props) {
   }
 
   function onClickGroup(g) {
+    setCurrentGroup(g);
+
     if (defaultSelectAble) {
       var resVal = _.cloneDeep(currentValue) || {};
       resVal.group = g;
@@ -145,14 +147,6 @@ var EventListPanel = function EventListPanel(props) {
     }
   }
 
-  function onHoverGroup(g) {
-    setCurrentGroup(g);
-  }
-
-  function onMouseLeaveGroup() {
-    setCurrentGroup(currentSelectGroup);
-  }
-
   if (!groupList || !groupList.length || !groupList[0].eventList || !groupList[0].eventList.length) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-nodata-panel")
@@ -174,9 +168,7 @@ var EventListPanel = function EventListPanel(props) {
       key: group.id || 'overview',
       checked: (currentSelectGroup === null || currentSelectGroup === void 0 ? void 0 : currentSelectGroup.id) === group.id,
       data: group,
-      onClick: onClickGroup,
-      onMouseOver: onHoverGroup,
-      onMouseLeave: onMouseLeaveGroup
+      onClick: onClickGroup
     });
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right")

package/es/eventSelector/option.d.ts

@@ -11,7 +11,5 @@ declare const EventListOption: React.FC<{
     };
     data?: any;
     onClick?: (data: any) => void;
-    onMouseOver?: (data: any) => void;
-    onMouseLeave?: (data: any) => void;
 }>;
 export default EventListOption;

package/es/eventSelector/option.js

@@ -16,14 +16,6 @@ var EventListOption = function EventListOption(props) {
     if (onClick) onClick(data);
   };
 
-  function onMouseOver() {
-    if (props.onMouseOver) props.onMouseOver(data);
-  }
-
-  function onMouseLeave() {
-    if (props.onMouseLeave) props.onMouseLeave(data);
-  }
-
   function getLabel(label) {
     if (!highlight || !highlight.enable || !highlight.text) return label;
     var text = highlight.text;
@@ -40,9 +32,7 @@ var EventListOption = function EventListOption(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option ").concat(checked ? 'active' : ''),
-    onClick: _onClick,
-    onMouseOver: onMouseOver,
-    onMouseLeave: onMouseLeave
+    onClick: _onClick
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option-label"),
     title: label

package/es/index.d.ts

@@ -14,7 +14,7 @@ import BizChart from './chart';
 import BizTable from './table';
 import IconFont from './icon/iconFont';
 import { util, ajax } from './utils';
-import theme from './assets/theme';
+import theme from './assets/theme.js';
 import convertAttributeData from './attributeSelector/util';
 import BizGlobalDataContext from './context';
 import BizUserCondition from './userCondition';

package/es/index.js

@@ -13,7 +13,7 @@ import BizChart from './chart';
 import BizTable from './table';
 import IconFont from './icon/iconFont';
 import { util, ajax } from './utils';
-import theme from './assets/theme';
+import theme from './assets/theme.js';
 import convertAttributeData from './attributeSelector/util';
 import BizGlobalDataContext from './context';
 import BizUserCondition from './userCondition';

package/es/select/demo/customLabel.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/es/select/demo/customLabel.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { BizSelect } from '@zgfe/business-lib';
+import userData from '../../mock/user';
+import convertAttributeData from '../../attributeSelector/util';
+export default (function () {
+  var store = convertAttributeData({
+    userPropList: userData
+  });
+
+  function renderLabel(node, option) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, node, option.realTime ? '*' : null);
+  }
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizSelect, {
+    options: store.userPropList,
+    customLabel: renderLabel,
+    labelField: "name",
+    keyField: "name",
+    theme: "secondary",
+    popupContainer: true,
+    enableSearch: true
+  }));
+});

package/es/select/option.js

@@ -8,7 +8,8 @@ var SelectOption = function SelectOption(props) {
       group = props.group,
       checked = props.checked,
       disabled = props.disabled,
-      multiple = props.multiple;
+      multiple = props.multiple,
+      customLabel = props.customLabel;
 
   function onClick() {
     if (disabled) return;
@@ -29,6 +30,11 @@ var SelectOption = function SelectOption(props) {
     });
   }
 
+  function renderLabel(option) {
+    var dom = getLabel(option[props.labelField]);
+    return customLabel ? customLabel(dom, option) : dom;
+  }
+
   if (group) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-group")
@@ -51,7 +57,7 @@ var SelectOption = function SelectOption(props) {
     className: "".concat(classPrefix, "-option-icon")
   }, option === null || option === void 0 ? void 0 : option.icon), /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-option-label")
-  }, getLabel(option[props.labelField])), !disabled && /*#__PURE__*/React.createElement("span", {
+  }, renderLabel(option)), !disabled && /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-option-btn")
   }, props.extra && props.extra(option)));
 };

package/es/select/overlay.js

@@ -25,7 +25,8 @@ var SelectOverlay = function SelectOverlay(props) {
       multiple = props.multiple,
       disableItemList = props.disableItemList,
       dropdownExtra = props.dropdownExtra,
-      loading = props.loading;
+      loading = props.loading,
+      customLabel = props.customLabel;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -116,7 +117,8 @@ var SelectOverlay = function SelectOverlay(props) {
         multiple: multiple,
         onClick: onClick,
         disabled: disabled,
-        key: option[keyField] || String(Math.random())
+        key: option[keyField] || String(Math.random()),
+        customLabel: customLabel
       });
       optionsDom.push(dom);
     });

package/es/select/styles/handle.less

@@ -92,6 +92,7 @@
       display: flex;
       align-items: center;
       margin: 2px 4px 2px 0;
+      padding: 0 4px;
       padding-top: 1px;
       padding-bottom: 1px;
       background: none;

package/es/select/types.d.ts

@@ -36,6 +36,7 @@ export declare namespace BizSelectTypes {
         onChange?: (val: Option) => void;
         onVisibleChange?: (visible: boolean) => void;
         destroyPopupOnHide?: boolean;
+        customLabel?: (node: ReactNode, option: Option) => ReactNode;
     }
     interface OverlayProps {
         option?: Option;
@@ -51,6 +52,7 @@ export declare namespace BizSelectTypes {
         labelField?: string;
         extra?: (option: Option) => ReactNode;
         onClick?: (option: Option) => void;
+        customLabel?: (node: ReactNode, option: Option) => ReactNode;
     }
 }
 export interface HandlerTypes {

package/es/userCondition/conditionTypeList.js

@@ -22,25 +22,37 @@ var ConditionTypeList = function ConditionTypeList(props) {
     className: "biz-user-condition-type-container"
   }, /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "event",
     onClick: function onClick() {
       return onAdd('event');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u505A\u8FC7\uFF08\u6CA1\u505A\u8FC7\uFF09\u2026"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "event"
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u505A\u8FC7\uFF08\u6CA1\u505A\u8FC7\uFF09\u2026"))), /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "add",
     onClick: function onClick() {
       return onAdd('add');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u65B0\u589E\u4E8E"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "add"
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u65B0\u589E\u4E8E"))), /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "active",
     onClick: function onClick() {
       return onAdd('active');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u6D3B\u8DC3\u4E8E"))), /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "active"
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u6D3B\u8DC3\u4E8E"))), /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
+    key: "prop",
     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"))), openTagCondition ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    key: "prop"
+  }, /*#__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');

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

@@ -19,3 +19,6 @@ export declare const operatorMap: {
     '>=': string;
     '<=': string;
 };
+export declare const durationHandler: {
+    [key: string]: any;
+};

package/es/userCondition/conditions/constants.js

@@ -13,9 +13,29 @@ export var operatorMap = {
   'not begin with': '开头不是',
   'end with': '结尾是',
   'not end with': '结尾不是',
-  '=': '',
-  '<': '',
-  '>': '',
-  '>=': '',
-  '<=': ''
+  '=': '=',
+  '<': '<',
+  '>': '>',
+  '>=': '≥',
+  '<=': '≤'
+};
+export var durationHandler = {
+  1: {
+    unit: '时',
+    format: function format(s) {
+      return Number(s) / 3600;
+    }
+  },
+  2: {
+    unit: '分',
+    format: function format(s) {
+      return Number(s) / 60;
+    }
+  },
+  3: {
+    unit: '秒',
+    format: function format(s) {
+      return s;
+    }
+  }
 };

package/es/userCondition/conditions/periodCondition.js

@@ -118,6 +118,7 @@ var PeriodCondition = function PeriodCondition(props) {
 
     if (operator === 'absolute') {
       return /*#__PURE__*/React.createElement(RangePicker, {
+        size: "large",
         defaultValue: [moment(values[0]), moment(values[1])],
         onChange: onDateChange,
         allowClear: false

package/es/userCondition/conditions/propCondition.js

@@ -24,7 +24,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import BizConditionItem from '../../attrConditions';
 import './styles/propCondition.less';
@@ -32,7 +32,6 @@ 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',
@@ -45,8 +44,9 @@ var attrNumTypeMap = {
 };
 
 var PropCondition = function PropCondition(props) {
-  var _useContext = useContext(BizGlobalDataContext),
-      eventEnvList = _useContext.eventEnvList;
+  var _useContext = useContext(BizUserConditionContext),
+      envNameList = _useContext.envNameList,
+      userPropsMap = _useContext.userPropsMap;
 
   var _useContext2 = useContext(BizUserConditionContext),
       eventAttrNum = _useContext2.eventAttrNum;
@@ -62,11 +62,6 @@ var PropCondition = function PropCondition(props) {
       showList = _useState2[0],
       setShowList = _useState2[1];
 
-  var envNames = useMemo(function () {
-    return eventEnvList ? eventEnvList.map(function (env) {
-      return env.name;
-    }) : [];
-  }, [eventEnvList]);
   useEffect(function () {
     buildDefault();
   }, []);
@@ -142,7 +137,7 @@ var PropCondition = function PropCondition(props) {
   function getPropCategory(attrName) {
     if (!isEvent) return 'userProp';
     if (attrName === undefined) return 'eventProp';
-    if (envNames.includes(attrName)) return 'envProp';
+    if (envNameList.includes(attrName)) return 'envProp';
     return 'eventProp';
   }
 
@@ -167,6 +162,10 @@ var PropCondition = function PropCondition(props) {
         type: attrNumTypeMap[attrType]
       };
       attrId && (props.defaultValue.attrId = attrId);
+
+      if (userPropsMap[attrName] && userPropsMap[attrName].subtype) {
+        props.defaultValue.subtype = userPropsMap[attrName].subtype;
+      }
     }
 
     if (isEvent) {

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

@@ -8,7 +8,7 @@
     flex: 1;
   }
   .biz-user-condition-event {
-    width: 355px;
+    width: 200px;
     .biz-event-select-handle {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
@@ -24,7 +24,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 30px;
+    width: 38px;
     height: 40px;
     margin-right: @margin-xs;
     margin-left: @border-radius-small;

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

@@ -7,8 +7,19 @@
   &-values,
   &-unit {
     margin-right: @margin-xs;
+    > input {
+      border: none !important;
+    }
   }
   &-operator {
     width: 129px;
   }
+  &-values {
+    .ant-picker-range.ant-picker-larg {
+      min-width: 255px;
+    }
+  }
+  &-today {
+    white-space: nowrap;
+  }
 }

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

@@ -33,4 +33,12 @@
       cursor: pointer;
     }
   }
+  .biz-condition-item-panel {
+    .biz-condition-item-input {
+      .ant-input {
+        height: 40px;
+        border: none;
+      }
+    }
+  }
 }

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

@@ -9,6 +9,9 @@
   &-value {
     width: 58px;
     margin-right: @margin-xs;
+    > input {
+      border: none !important;
+    }
   }
   .biz-user-condition-runtimes-tip {
     color: @primary-color;

package/es/userCondition/conditions/textDesc.js

@@ -1,21 +1,30 @@
+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; }
+
 import React, { useContext, useMemo } from 'react';
 import { BizUserConditionContext, classPrefix } from '..';
 import BizGlobalDataContext from '../../context';
 import { findEvent, findPropAndEnv, findTagFactory } from '../util';
-import { operatorMap } from './constants';
+import { durationHandler, operatorMap } from './constants';
 import './styles/textDesc.less';
 
 var Text = function Text(props) {
+  var _useContext = useContext(BizUserConditionContext),
+      userPropsMap = _useContext.userPropsMap;
+
   var condition = props.condition,
       showOrDesc = props.showOrDesc;
 
-  var _useContext = useContext(BizGlobalDataContext),
-      eventGroupList = _useContext.eventGroupList,
-      userPropList = _useContext.userPropList,
-      eventEnvList = _useContext.eventEnvList;
+  var _useContext2 = useContext(BizGlobalDataContext),
+      eventGroupList = _useContext2.eventGroupList,
+      userPropList = _useContext2.userPropList,
+      eventEnvList = _useContext2.eventEnvList;
 
-  var _useContext2 = useContext(BizUserConditionContext),
-      userTagsData = _useContext2.userTagsData;
+  var _useContext3 = useContext(BizUserConditionContext),
+      userTagsData = _useContext3.userTagsData;
 
   function render() {
     if (condition.labels) {
@@ -67,7 +76,7 @@ var Text = function Text(props) {
       } : {}
     }, /*#__PURE__*/React.createElement("span", {
       className: "label"
-    }, label.before), /*#__PURE__*/React.createElement("span", null, operatorMap[period.operator]), valuesDom);
+    }, label.before), period.operator === 'relative' ? /*#__PURE__*/React.createElement("span", null, "\u6700\u8FD1") : null, valuesDom);
   }
 
   function renderProps(attr, type) {
@@ -84,13 +93,7 @@ var Text = function Text(props) {
         }
       }, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-text-desc-label")
-      }, (_data = data) === null || _data === void 0 ? void 0 : _data.label), /*#__PURE__*/React.createElement("span", {
-        className: "".concat(classPrefix, "-text-desc-operator")
-      }, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", {
-        className: "".concat(classPrefix, "-text-desc-value")
-      }, attr.params.map(function (param, i) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, i > 0 ? /*#__PURE__*/React.createElement("span", null, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, param));
-      })));
+      }, (_data = data) === null || _data === void 0 ? void 0 : _data.label), renderPropValues(attr));
     }
   }
 
@@ -139,11 +142,7 @@ var Text = function Text(props) {
       if (label) {
         var dom = /*#__PURE__*/React.createElement("span", {
           key: i
-        }, /*#__PURE__*/React.createElement("span", null, label), /*#__PURE__*/React.createElement("span", null, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", null, attr.params.map(function (param, i) {
-          return /*#__PURE__*/React.createElement("span", {
-            key: i
-          }, i > 0 ? '或' : '', param);
-        })), /*#__PURE__*/React.createElement("span", null, i !== attrs.length - 1 ? '，' : ''));
+        }, /*#__PURE__*/React.createElement("span", null, label), /*#__PURE__*/React.createElement("span", null, renderPropValues(attr)), i !== attrs.length - 1 ? '，' : '');
         attrsDom.push(dom);
       }
     });
@@ -184,6 +183,51 @@ var Text = function Text(props) {
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
 
+  function renderPropValues(attr) {
+    if (attr.attrType === 'cont-date') {
+      return renderDateValues(attr.operator, attr.params);
+    } else if (attr.attrType === 'cont-num') {
+      return renderNumValues(attr);
+    } else if (attr.attrType === 'cont-string') {
+      return renderStringValues(attr);
+    }
+  }
+
+  function renderStringValues(attr) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-operator")
+    }, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-value")
+    }, attr.params.map(function (param, i) {
+      return /*#__PURE__*/React.createElement(React.Fragment, {
+        key: param
+      }, i > 0 ? /*#__PURE__*/React.createElement("span", null, "\u6216") : null, /*#__PURE__*/React.createElement("span", null, param));
+    })));
+  }
+
+  function renderNumValues(attr) {
+    var numOperatorMap = _objectSpread(_objectSpread({}, operatorMap), {}, {
+      'not equal': '≠'
+    });
+
+    if (userPropsMap[attr.attrName] && userPropsMap[attr.attrName].subtype === 2) {
+      var handler = durationHandler[attr.params[1]];
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, numOperatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", null, handler.format(attr.params[0])), /*#__PURE__*/React.createElement("span", null, handler.unit));
+    }
+
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, operatorMap[attr.operator]), /*#__PURE__*/React.createElement("span", null, attr.params[0]));
+  }
+
+  function renderDateValues(operator, params) {
+    if (operator === 'relative') {
+      return /*#__PURE__*/React.createElement("span", null, "\u4E3A\u6700\u8FD1".concat(params[0], "\u5929"));
+    }
+
+    if (operator === 'absolute') {
+      return /*#__PURE__*/React.createElement("span", null, "\u4E3A".concat(params[0], "\u5230").concat(params[1]));
+    }
+  }
+
   var findTag = useMemo(function () {
     return findTagFactory(userTagsData);
   }, [userTagsData]);

package/es/userCondition/demo/index.js

@@ -150,20 +150,79 @@ var getTagList = Promise.resolve([{
 }]);
 var data = {
   json: [[{
+    eventId: '-4',
     attrs: [],
-    labels: {
-      operator: 'equal',
-      values: [77388914425856, 77383474429952, 77384417755136]
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '1']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    }
+  }, {
+    eventId: '-3',
+    attrs: [],
+    runPeriod: {
+      operator: 'absolute',
+      values: ['2022-07-13', '2022-07-19']
+    },
+    runTimes: {
+      operator: '>=',
+      values: ['1']
     }
   }], [{
     attrs: [{
-      attrId: 114,
-      attrName: 'name',
+      attrId: 0,
+      attrName: 'zg_id',
+      operator: '>',
+      params: ['20'],
+      attrType: 'cont-num',
+      category: 'fixed'
+    }]
+  }, {
+    attrs: [{
+      attrId: 0,
+      attrName: 'app_user_id',
+      operator: 'equal',
+      params: ['20'],
+      attrType: 'cont-string',
+      category: 'fixed'
+    }]
+  }], [{
+    attrs: [{
+      attrId: 0,
+      attrName: 'duration',
+      operator: 'not equal',
+      params: [1198800, '1'],
+      attrType: 'cont-num',
+      category: 'fixed'
+    }]
+  }, {
+    eventId: 24143017,
+    runTimes: {
+      operator: '>=',
+      values: ['1']
+    },
+    attrs: [{
+      attrId: 0,
+      attrName: 'resolution_l',
+      category: 'fixed',
+      operator: '>',
+      params: ['10'],
+      attrType: 'cont-num'
+    }, {
+      attrId: 30183430,
+      attrName: '扫码场景描述',
       category: 'custom',
       operator: 'equal',
-      params: ['Safari', 'Microsoft Edge'],
+      params: ['Microsoft Edge', 'Safari', 'Apple WebKit'],
       attrType: 'cont-string'
-    }]
+    }],
+    runPeriod: {
+      operator: 'relative',
+      values: ['30', '0']
+    }
   }]]
 };
 export default (function () {
@@ -217,6 +276,7 @@ export default (function () {
   }
 
   var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
+    textMode: true,
     defaultValue: defaultValue,
     onChange: onChange,
     eventAttrNum: 3,

package/es/userCondition/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BizUserConditionT } from './types';
 import './styles/index.less';
-export declare const BizUserConditionContext: React.Context<Pick<BizUserConditionT.PropsI, "textMode" | "openTagCondition" | "orConditionNum" | "eventAttrNum" | "userTagsData" | "isRealTime">>;
+export declare const BizUserConditionContext: React.Context<BizUserConditionT.GlobalContext>;
 export declare const classPrefix = "biz-user-condition";
 declare const BizUserCondition: React.FC<BizUserConditionT.PropsI>;
 export default BizUserCondition;

package/es/userCondition/index.js

@@ -18,23 +18,30 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { createContext, useEffect, useState } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import ConditionTypeList from './conditionTypeList';
 import RelationLabel from './relationLabel';
 import OrConditions from './orConditions';
 import './styles/index.less';
 import { buildCondition } from './util';
 import _ from 'lodash';
+import BizGlobalDataContext from '../context';
 export var BizUserConditionContext = /*#__PURE__*/createContext({
   orConditionNum: 2,
   eventAttrNum: 1,
   textMode: false,
   openTagCondition: false,
-  userTagsData: []
+  userTagsData: [],
+  envNameList: [],
+  userPropsMap: {}
 });
 export var classPrefix = 'biz-user-condition';
 
 var BizUserCondition = function BizUserCondition(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+      eventEnvList = _useContext.eventEnvList,
+      userPropList = _useContext.userPropList;
+
   var andConditionNum = props.andConditionNum,
       defaultValue = props.defaultValue,
       openTagCondition = props.openTagCondition,
@@ -61,6 +68,18 @@ var BizUserCondition = function BizUserCondition(props) {
       value = _useState6[0],
       setValue = _useState6[1];
 
+  var envNameList = useMemo(function () {
+    return eventEnvList ? eventEnvList.map(function (env) {
+      return env.name;
+    }) : [];
+  }, [eventEnvList]);
+  var userPropsMap = useMemo(function () {
+    if (!userPropList) return {};
+    return userPropList.reduce(function (pre, curr) {
+      pre[curr.name] = curr;
+      return pre;
+    }, {});
+  }, [userPropList]);
   useEffect(function () {
     initShowList();
   }, []);
@@ -118,7 +137,7 @@ var BizUserCondition = function BizUserCondition(props) {
 
     setValue(newValue);
     setDataList(newDataList);
-    props.onChange(newValue);
+    props.onChange && props.onChange(newValue);
   }
 
   return /*#__PURE__*/React.createElement(BizUserConditionContext.Provider, {
@@ -128,7 +147,9 @@ var BizUserCondition = function BizUserCondition(props) {
       textMode: props.textMode,
       openTagCondition: openTagCondition,
       userTagsData: userTagsData !== null && userTagsData !== void 0 ? userTagsData : [],
-      isRealTime: props.isRealTime
+      isRealTime: props.isRealTime,
+      envNameList: envNameList,
+      userPropsMap: userPropsMap
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
@@ -139,14 +160,14 @@ var BizUserCondition = function BizUserCondition(props) {
   }, "\u4E14"), showList.length ? /*#__PURE__*/React.createElement("div", {
     className: ["".concat(classPrefix, "-and-conditions-wrap"), props.textMode ? 'text-mode' : ''].join(' ')
   }, showList.map(function (item, i) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OrConditions, {
+    return /*#__PURE__*/React.createElement(OrConditions, {
       showAndDesc: i > 0,
       orConditions: item.orConditions,
       key: item.id,
       onChange: function onChange(data) {
         _onChange(item.id, data);
       }
-    }));
+    });
   })) : null), /*#__PURE__*/React.createElement(ConditionTypeList, {
     show: value.length < andConditionNum,
     label: "\u4E14",

package/es/userCondition/orConditions.js

@@ -47,14 +47,8 @@ var OrConditions = function OrConditions(props) {
       showList = _useState2[0],
       setShowList = _useState2[1];
 
-  var _useState3 = useState(orConditions),
-      _useState4 = _slicedToArray(_useState3, 2),
-      value = _useState4[0],
-      setValue = _useState4[1];
-
   useEffect(function () {
     if (orConditions) {
-      setValue(orConditions);
       initShowList();
     }
   }, [orConditions]);
@@ -77,8 +71,9 @@ var OrConditions = function OrConditions(props) {
       id: Math.random(),
       condition: condition
     };
-    var newValue = [].concat(_toConsumableArray(value), [condition]);
-    setValue(newValue);
+    var newValue = showList.map(function (item) {
+      return item.condition;
+    }).concat([condition]);
     setShowList([].concat(_toConsumableArray(showList), [newData]));
     props.onChange(newValue);
   }
@@ -159,7 +154,6 @@ var OrConditions = function OrConditions(props) {
     var newValue = newList.map(function (item) {
       return item.condition;
     });
-    setValue(newValue);
     props.onChange(newValue);
   }
 
@@ -179,7 +173,7 @@ var OrConditions = function OrConditions(props) {
     if (textMode) {
       return /*#__PURE__*/React.createElement(Text, {
         showOrDesc: i > 0,
-        key: i,
+        key: id,
         condition: condition
       });
     }
@@ -214,11 +208,11 @@ var OrConditions = function OrConditions(props) {
         runPeriod: condition.runPeriod
       });
     } else if (util.isNumber(condition.eventId)) {
-      conditionDom = /*#__PURE__*/React.createElement(EventCondition, {
+      conditionDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EventCondition, {
         dataId: id,
         onChange: onChangeEvent,
         condition: condition
-      });
+      }));
     }
 
     return /*#__PURE__*/React.createElement(ConditionWrap, {

package/es/userCondition/styles/index.less

@@ -6,7 +6,7 @@
     display: flex;
     .biz-user-condition-and-conditions-wrap {
       flex: 1;
-      margin-bottom: @margin-md;
+      margin-bottom: @margin-lg;
       &.text-mode {
         display: flex;
         flex-wrap: wrap;

package/es/userCondition/styles/orConditions.less

@@ -1,6 +1,8 @@
 @import '../../assets/styles/variable.less';
 .biz-user-condition-or {
-  margin-bottom: @margin-md;
+  &:not(:last-child) {
+    margin-bottom: @margin-lg;
+  }
   &.text-mode {
     display: flex;
     min-width: 0;
@@ -17,10 +19,13 @@
   &-content {
     display: flex;
     width: 100%;
-    margin-bottom: @margin-md;
+
     background: #ffffff;
     border: 1px solid @border-color-base;
     border-radius: @border-radius-small;
+    &:not(:last-child) {
+      margin-bottom: @margin-md;
+    }
     .biz-user-condition-conditions {
       flex: 1;
       padding: @padding-xs @padding-md 0 0;

package/es/userCondition/styles/relationLabel.less

@@ -1,9 +1,9 @@
-@import '../../commonStyle/variable.less';
+@import '../../assets/styles/inner.less';
 .biz-user-condition-relation {
   position: relative;
   width: 2px;
-  margin-right: 30px;
-  background-color: @hoverBgColor;
+  margin-right: @margin-lg;
+  background-color: @border-color-split;
   &-label {
     position: absolute;
     top: 50%;
@@ -12,7 +12,8 @@
     height: 24px;
     line-height: 24px;
     text-align: center;
-    background-color: @hoverBgColor;
+    background-color: @border-color-split;
+    border-radius: @border-radius-small;
     transform: translate(-50%, -50%);
   }
 }

package/es/userCondition/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { UserProp } from '../attributeSelector/types';
 import { TagI } from './../userTagsSelector/types';
 export declare type Unpacked<T, U extends keyof T> = Required<T> extends {
     [key in U]: infer R;
@@ -79,6 +80,12 @@ export declare namespace BizUserConditionT {
         orConditions: Conditions[number];
     }
     type ShowListT = ShowItemI[];
+    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'textMode' | 'isRealTime'> & {
+        envNameList: string[];
+        userPropsMap: {
+            [key: string]: UserProp;
+        };
+    };
 }
 export declare namespace OrConditionsT {
     interface PropI {

package/es/userTagsSelector/demo/index.js

@@ -22,7 +22,7 @@ data.forEach(function (item) {
     var id = Math.random();
     var tag = {
       id: id,
-      labelName: '标签' + id
+      labelName: '标签' + id + id + id + id
     };
 
     if (id < 0.6 && defaultValue.length < 20) {

package/es/userTagsSelector/groups/groupOption.js

@@ -1,7 +1,7 @@
 import React, { forwardRef } from 'react';
 import { Badge } from 'antd';
 import { classPrefix } from '..';
-import theme from '../../assets/theme';
+import theme from '../../assets/theme.js';
 import './styles/option.less';
 import { util } from '../../utils';
 var GroupOption = /*#__PURE__*/forwardRef(function (props, ref) {

package/es/userTagsSelector/multipleCheckPanel/checkOption.js

@@ -2,7 +2,7 @@ import React, { forwardRef } from 'react';
 import { Checkbox } from 'antd';
 import { classPrefix } from '..';
 import { util } from '../../utils';
-import theme from '../../assets/theme';
+import theme from '../../assets/theme.js';
 import './styles/option.less';
 var CheckOption = /*#__PURE__*/forwardRef(function (props, ref) {
   var highlightText = props.highlightText,

package/es/userTagsSelector/multipleCheckPanel/styles/option.less

@@ -20,6 +20,7 @@
       .__default-disabled();
     }
     .ant-checkbox-wrapper {
+      width: 100%;
       min-width: 0;
       > span {
         &:not(.ant-checkbox) {

package/es/userTagsSelector/styles/cascaderOverlay.less

@@ -17,11 +17,11 @@
       min-width: 0;
       padding: @padding-xs;
     }
-    .rc-virtual-list-scrollbar {
-      display: block !important;
-    }
-    .rc-virtual-list-scrollbar-thumb {
-      background-color: #cacdd4 !important;
-    }
+    // .rc-virtual-list-scrollbar {
+    //   display: block !important;
+    // }
+    // .rc-virtual-list-scrollbar-thumb {
+    //   background-color: #cacdd4 !important;
+    // }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.15-user.1",
+  "version": "1.0.15-user.10",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -53,6 +53,7 @@
     "@types/qs": "^6.9.7",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
+    "@zgfe/business-lib": "^1.0.15-user.10",
     "antd": "^4.19.2",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -61,5 +62,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "508ba3614c7cbbdefb822255f4c0233cc855a50e"
+  "gitHead": "2ab0769309e533bb40620be5c21f6cfa682a3f6b"
 }

package/es/assets/theme.d.ts

@@ -1,15 +0,0 @@
-declare const _default: {
-    'primary-color': string;
-    'border-color-base': string;
-    'background-color-base': string;
-    'text-color': string;
-    'text-color-secondary': string;
-    'tooltip-bg': string;
-    'error-color': string;
-    'shadow-color': string;
-    'box-shadow-base': string;
-    'btn-text-hover-bg': string;
-    'warning-color': string;
-    'border-color-split': string;
-};
-export default _default;