@zgfe/business-lib 1.0.15-user.2 → 1.0.15

package/es/mock/event.js

@@ -131,139 +131,6 @@ export default [{
     insert_time: '2018-11-26 14:46:48',
     owner: 'zg'
   }]
-}, {
-  groupId: 6666,
-  groupName: '微信2',
-  eventList: [{
-    plats: [3],
-    click_analysis: false,
-    mark_type: null,
-    event_id: 24143017,
-    event_name: '微信-关注公众号',
-    event_hidden: 0,
-    event_type: 0,
-    is_stop: 0,
-    is_delete: 0,
-    alias_name: null,
-    event_attrs: [{
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183430,
-      attr_name: '扫码场景描述',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183425,
-      attr_name: '二维码ticket',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183429,
-      attr_name: '公众号app_id',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: true,
-      attr_id: 30183423,
-      attr_name: '关注来源',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183428,
-      attr_name: '用户open_id',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183427,
-      attr_name: '公众号名称',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }],
-    stop_date_time: null,
-    insert_time: '2018-11-26 14:46:48',
-    owner: 'zg'
-  }, {
-    plats: [3],
-    click_analysis: false,
-    mark_type: null,
-    event_id: 24143016,
-    event_name: '微信-取消关注公众号',
-    event_hidden: 0,
-    event_type: 0,
-    is_stop: 0,
-    is_delete: 0,
-    alias_name: null,
-    event_attrs: [{
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183431,
-      attr_name: '用户open_id',
-      event_id: 24143016,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183426,
-      attr_name: '公众号名称',
-      event_id: 24143016,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183424,
-      attr_name: '公众号app_id',
-      event_id: 24143016,
-      prop_type: 1,
-      is_stop: 0
-    }],
-    stop_date_time: null,
-    insert_time: '2018-11-26 14:46:48',
-    owner: 'zg'
-  }]
 }, {
   groupId: 4200,
   groupName: '注册',
@@ -354,87 +221,6 @@ export default [{
   groupId: 4199,
   groupName: '官网',
   eventList: [{
-    plats: [3],
-    click_analysis: false,
-    mark_type: null,
-    event_id: 24143017,
-    event_name: '微信-关注公众号',
-    event_hidden: 0,
-    event_type: 0,
-    is_stop: 0,
-    is_delete: 0,
-    alias_name: null,
-    event_attrs: [{
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183430,
-      attr_name: '扫码场景描述',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183425,
-      attr_name: '二维码ticket',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183429,
-      attr_name: '公众号app_id',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: true,
-      attr_id: 30183423,
-      attr_name: '关注来源',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183428,
-      attr_name: '用户open_id',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }, {
-      hidden: 0,
-      dimension_sub: 'event_attr',
-      encryption_type: 0,
-      alias_name: '',
-      value_dict: false,
-      attr_id: 30183427,
-      attr_name: '公众号名称',
-      event_id: 24143017,
-      prop_type: 1,
-      is_stop: 0
-    }],
-    stop_date_time: null,
-    insert_time: '2018-11-26 14:46:48',
-    owner: 'zg'
-  }, {
     plats: [3],
     click_analysis: false,
     mark_type: null,

package/es/select/demo/index.js

@@ -48,18 +48,12 @@ var disabledList = [{
   value: 'not equal'
 }, {
   value: 'not begin with'
-}, {
-  name: '不是',
-  value: 'not equal'
 }];
 export default (function () {
-  var _useState = useState([].concat(disabledList, [{
-    name: '不是空值',
-    value: 'is not null'
-  }, {
-    name: '是',
-    value: 'equal'
-  }])),
+  var _useState = useState({
+    name: '不是',
+    value: 'not equal'
+  }),
       _useState2 = _slicedToArray(_useState, 2),
       data = _useState2[0],
       setData = _useState2[1];

package/es/select/demo/multiple.js

@@ -40,13 +40,10 @@ var stringOperate = [{
   name: '是空值',
   value: 'is null'
 }, {
-  name: '不是空值aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+  name: '不是空值',
   value: 'is not null'
 }];
 var disabledList = [{
-  name: '是',
-  value: 'equal'
-}, {
   name: '不包含',
   value: 'not contains'
 }, {
@@ -54,10 +51,7 @@ var disabledList = [{
   value: 'not begin with'
 }];
 export default (function () {
-  var _useState = useState([].concat(disabledList, [{
-    name: '包含',
-    value: 'contains'
-  }])),
+  var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
       data = _useState2[0],
       setData = _useState2[1];
@@ -79,7 +73,6 @@ export default (function () {
     onChange: onChange,
     disableItemList: disabledList,
     multiple: true,
-    enableCreate: true,
-    value: data
+    enableCreate: true
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u503C\u662F\uFF1A", JSON.stringify(data)));
 });

package/es/select/handle.js

@@ -81,13 +81,11 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
         color: "#fff"
       }, /*#__PURE__*/React.createElement(Tag, {
         closable: true,
-        id: "".concat(classPrefix, "-tag"),
+        className: "".concat(classPrefix, "-tag"),
         onClose: function onClose() {
           onDelete(item);
         }
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "".concat(classPrefix, "-tag-label")
-      }, item[labelField])));
+      }, item[labelField]));
     }) : !focus ? /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-holder")
     }, placeholder || '请选择') : '', /*#__PURE__*/React.createElement(Input, {

package/es/select/index.d.ts

@@ -1,6 +1,6 @@
-import React, { PropsWithChildren } from 'react';
+import React from 'react';
 import './styles/index.less';
 import { BizSelectTypes } from './types';
 export declare const classPrefix = "biz-select";
-declare const BizSelect: React.FC<PropsWithChildren<BizSelectTypes.Props>>;
+declare const BizSelect: React.FC<BizSelectTypes.Props>;
 export default BizSelect;

package/es/select/index.js

@@ -64,7 +64,7 @@ var BizSelect = function BizSelect(props) {
   useEffect(function () {
     var _boxRef$current;
 
-    setWidth((boxRef === null || boxRef === void 0 ? void 0 : (_boxRef$current = boxRef.current) === null || _boxRef$current === void 0 ? void 0 : _boxRef$current.width) || 200);
+    setWidth(((_boxRef$current = boxRef.current) === null || _boxRef$current === void 0 ? void 0 : _boxRef$current.width) || 200);
 
     if (props.defaultValue) {
       setCurrent(getValue(props.defaultValue));
@@ -159,7 +159,7 @@ var BizSelect = function BizSelect(props) {
     setSearchValue('');
 
     if (!props.multiple) {
-      onVisibleChange(false);
+      setVisible(false);
     }
 
     if (props.onChange) props.onChange(option);
@@ -167,7 +167,6 @@ var BizSelect = function BizSelect(props) {
 
   var onVisibleChange = function onVisibleChange(flag) {
     setVisible(flag);
-    props.onVisibleChange && props.onVisibleChange(flag);
   };
 
   return /*#__PURE__*/React.createElement(Dropdown, {
@@ -179,7 +178,7 @@ var BizSelect = function BizSelect(props) {
       onChange: onChange
     })),
     disabled: props.disable,
-    destroyPopupOnHide: props.destroyPopupOnHide,
+    destroyPopupOnHide: true,
     overlayStyle: {
       minWidth: minDropdownWidth || 0,
       width: overlayWidth || width
@@ -194,7 +193,7 @@ var BizSelect = function BizSelect(props) {
     className: "".concat(classPrefix, "-handle ").concat(props.className ? props.className : ''),
     ref: selectRef,
     id: selectId
-  }, props.children ? props.children : /*#__PURE__*/React.createElement(SelectHandle, {
+  }, /*#__PURE__*/React.createElement(SelectHandle, {
     ref: boxRef,
     value: current,
     labelField: labelField,
@@ -215,7 +214,6 @@ var BizSelect = function BizSelect(props) {
 BizSelect.defaultProps = {
   labelField: 'label',
   keyField: 'id',
-  popupContainer: true,
-  destroyPopupOnHide: true
+  popupContainer: true
 };
 export default BizSelect;

package/es/select/overlay.js

@@ -100,7 +100,7 @@ var SelectOverlay = function SelectOverlay(props) {
       if (searchValue && !new RegExp(searchValue, 'i').test(option[labelField])) return;
       var disabled = false;
       disableItemList === null || disableItemList === void 0 ? void 0 : disableItemList.forEach(function (item) {
-        if (item[keyField] === option[keyField]) {
+        if (item[keyField] === option[keyField] && (!current || current && ids.indexOf(option[keyField]) < 0)) {
           disabled = true;
         }
       });

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,29 +87,19 @@
     font-size: @font-size-lg;
     transform: translateY(-50%);
   }
-  &-input {
-    #biz-select-handle-tag {
-      display: flex;
-      align-items: center;
-      margin: 2px 4px 2px 0;
-      padding: 0 4px;
-      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();
 
-        .anticon {
-          color: @primary-color;
-        }
+  &-tag {
+    display: flex;
+    align-items: center;
+    margin: 2px 4px 2px 0;
+    background: none;
+    border-color: #cacdd4;
+
+    &:hover {
+      .__default-hover();
+
+      .anticon {
+        color: @primary-color;
       }
     }
   }

package/es/select/types.d.ts

@@ -6,7 +6,7 @@ export declare namespace BizSelectTypes {
     }
     interface Option {
         icon?: ReactNode;
-        [otherProp: string | symbol | number]: any;
+        [otherProp: string]: any;
     }
     interface Props {
         disable?: boolean;
@@ -34,8 +34,6 @@ 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,19 +1,13 @@
-import React, { useContext } from 'react';
+import React 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;
-
-  var _useContext = useContext(BizUserConditionContext),
-      textMode = _useContext.textMode,
-      openTagCondition = _useContext.openTagCondition;
-
-  if (!show || textMode) return null;
+  if (!show) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-type-list"
   }, label ? /*#__PURE__*/React.createElement("div", {
@@ -40,12 +34,7 @@ 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"))), 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));
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3")))));
 };
 
 ConditionTypeList.defaultProps = {

package/es/userCondition/conditionWrap.js

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

package/es/userCondition/conditions/eventCondition.js

@@ -4,19 +4,16 @@ 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, { useContext } from 'react';
+import React 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 { BizUserConditionContext, classPrefix } from '..';
+import { classPrefix } from '..';
 
 var EventCondition = function EventCondition(props) {
-  var _useContext = useContext(BizUserConditionContext),
-      isRealTime = _useContext.isRealTime;
-
   var condition = props.condition,
       dataId = props.dataId;
 
@@ -26,7 +23,6 @@ var EventCondition = function EventCondition(props) {
 
   function onEventChange(data) {
     var event = data.event;
-    console.log(condition);
     onChange(_objectSpread(_objectSpread({}, condition), {}, {
       eventId: event.id
     }));
@@ -74,12 +70,7 @@ var EventCondition = function EventCondition(props) {
         id: condition.eventId
       }
     },
-    onChange: onEventChange,
-    border: false,
-    theme: "normal",
-    placeholder: "\u9009\u62E9\u4E00\u4E2A\u4E8B\u4EF6",
-    destroyPopupOnHide: true,
-    defaultSelectAble: false
+    onChange: onEventChange
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition-expand-attr"),
     onClick: onAddAttr
@@ -106,8 +97,7 @@ var EventCondition = function EventCondition(props) {
     dataId: dataId,
     runPeriod: condition.runPeriod,
     onChange: onPeriodChange,
-    isEvent: true,
-    isRealTime: isRealTime
+    isEvent: true
   })))));
 };
 

package/es/userCondition/conditions/periodCondition.js

@@ -4,14 +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, { useMemo } from 'react';
+import React 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,
@@ -31,21 +36,11 @@ 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);
   }
@@ -132,12 +127,7 @@ var PeriodCondition = function PeriodCondition(props) {
   }, label) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-operator")
   }, /*#__PURE__*/React.createElement(BizSelect, {
-    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,
+    overlayWidth: 129,
     options: options,
     labelField: "text",
     keyField: "value",
@@ -150,7 +140,7 @@ var PeriodCondition = function PeriodCondition(props) {
     className: "".concat(classPrefix, "-period-condition-values")
   }, renderValues()), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-unit")
-  }, unit), props.isRealTime && runPeriod.operator === 'relative' ? /*#__PURE__*/React.createElement("div", {
+  }, "\u5929"), props.isRealTime && runPeriod.operator === 'relative' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition-today")
   }, /*#__PURE__*/React.createElement(Checkbox, {
     checked: runPeriod.values[1] === '1',