@zgfe/business-lib 1.0.18 → 1.0.19

package/es/attributeSelector/util.js

@@ -15,7 +15,7 @@ export default function convertAttributeData(store) {
       eventList: []
     };
     group_.eventList.forEach(function (e) {
-      if (e.is_delete || e.is_stop) return;
+      if (e.is_delete) return;
       var event = {
         alias: e.alias_name,
         attrList: e.event_attrs.map(function (item) {
@@ -35,7 +35,8 @@ export default function convertAttributeData(store) {
         id: e.event_id,
         isDelete: e.is_delete,
         isStop: e.is_stop,
-        name: e.event_name
+        name: e.event_name,
+        eventHidden: e.event_hidden
       };
       group.eventList.push(event);
     });

package/es/eventSelector/index.js

@@ -22,6 +22,8 @@ var BizEventSelector = function BizEventSelector(props) {
   var alias = props.alias,
       placeholder = props.placeholder,
       showAllEvent = props.showAllEvent,
+      border = props.border,
+      theme = props.theme,
       defaultSelectAble = props.defaultSelectAble;
 
   var _useState = useState(),
@@ -123,7 +125,7 @@ var BizEventSelector = function BizEventSelector(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: [classPrefix, border ? 'border' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Dropdown, {
     overlay: /*#__PURE__*/React.createElement(EventListPanel, {
       value: currentValue,
@@ -140,12 +142,13 @@ var BizEventSelector = function BizEventSelector(props) {
     onVisibleChange: onVisibleChange,
     getPopupContainer: props.popupContainer ? function () {
       return document.getElementById(selectId);
-    } : undefined
+    } : undefined,
+    destroyPopupOnHide: props.defaultSelectAble
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle"),
     id: selectId
   }, /*#__PURE__*/React.createElement(SelectHandle, {
-    theme: "secondary",
+    theme: theme,
     border: false,
     label: getLabel(),
     placeholder: placeholder
@@ -155,6 +158,9 @@ var BizEventSelector = function BizEventSelector(props) {
 BizEventSelector.defaultProps = {
   showAllEvent: true,
   defaultSelectAble: true,
-  popupContainer: true
+  popupContainer: true,
+  border: true,
+  theme: 'secondary',
+  destroyPopupOnHide: false
 };
 export default BizEventSelector;

package/es/eventSelector/listPanel.js

@@ -24,6 +24,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import { classPrefix } from '.';
 import { BizGlobalDataContext } from '..';
+import { ShowStatus } from '../attributeSelector/types';
 import BizSearchInput from '../searchInput';
 import EventListOption from './option';
 
@@ -49,25 +50,20 @@ var EventListPanel = function EventListPanel(props) {
       currentGroup = _useState6[0],
       setCurrentGroup = _useState6[1];
 
-  var _useState7 = useState(),
+  var _useState7 = useState([]),
       _useState8 = _slicedToArray(_useState7, 2),
-      currentSelectGroup = _useState8[0],
-      setCurrentSelectGroup = _useState8[1];
+      searchEventList = _useState8[0],
+      setSearchEventList = _useState8[1];
 
   var _useState9 = useState([]),
       _useState10 = _slicedToArray(_useState9, 2),
-      searchEventList = _useState10[0],
-      setSearchEventList = _useState10[1];
+      showList = _useState10[0],
+      setShowList = _useState10[1];
 
-  var _useState11 = useState([]),
+  var _useState11 = useState(),
       _useState12 = _slicedToArray(_useState11, 2),
-      showList = _useState12[0],
-      setShowList = _useState12[1];
-
-  var _useState13 = useState(),
-      _useState14 = _slicedToArray(_useState13, 2),
-      currentValue = _useState14[0],
-      setCurrentValue = _useState14[1];
+      currentValue = _useState12[0],
+      setCurrentValue = _useState12[1];
 
   var overviewData = {
     id: -100,
@@ -97,7 +93,6 @@ var EventListPanel = function EventListPanel(props) {
       return [group].concat(_toConsumableArray(list));
     });
     setCurrentGroup(group);
-    setCurrentSelectGroup(group);
   }, []);
   useEffect(function () {
     setCurrentValue(props.value);
@@ -139,10 +134,7 @@ var EventListPanel = function EventListPanel(props) {
       resVal.group = g;
       resVal.event = searchEventList[0];
       setCurrentValue(resVal);
-      setCurrentSelectGroup(g);
       if (props.onChange) props.onChange(resVal);
-    } else {
-      setCurrentSelectGroup(g);
     }
   }
 
@@ -165,7 +157,7 @@ var EventListPanel = function EventListPanel(props) {
       count: group.eventList.length,
       label: group.name || '未分组',
       key: group.id || 'overview',
-      checked: (currentSelectGroup === null || currentSelectGroup === void 0 ? void 0 : currentSelectGroup.id) === group.id,
+      checked: (currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id) === group.id,
       data: group,
       onClick: onClickGroup
     });
@@ -178,21 +170,24 @@ var EventListPanel = function EventListPanel(props) {
     },
     placeholder: "\u641C\u7D22\u57CB\u70B9\u4E8B\u4EF6"
   }), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-list")
+    className: "".concat(classPrefix, "-list"),
+    id: "scrollableDiv"
   }, /*#__PURE__*/React.createElement(InfiniteScroll, {
-    dataLength: (showList === null || showList === void 0 ? void 0 : showList.length) || 0,
-    next: loadMoreData,
-    hasMore: (showList === null || showList === void 0 ? void 0 : showList.length) < searchEventList.length,
+    dataLength: showList.length,
+    hasMore: showList.length < searchEventList.length,
     loader: /*#__PURE__*/React.createElement(Skeleton, {
       paragraph: {
         rows: 1
       },
       active: true
     }),
-    scrollableTarget: "scrollableDiv"
+    next: loadMoreData,
+    scrollableTarget: "scrollableDiv",
+    key: Math.random()
   }, showList === null || showList === void 0 ? void 0 : showList.map(function (e) {
     var _currentValue$event;
 
+    if (e.eventHidden === ShowStatus.hidden) return null;
     return /*#__PURE__*/React.createElement(EventListOption, {
       label: e.alias || e.name,
       key: "".concat(currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id, "-").concat(e.id),

package/es/eventSelector/styles/index.less

@@ -1,12 +1,12 @@
 @import '../../assets/styles/inner.less';
 
 .biz-event-select {
-  position: relative;
-
-  &-handle {
-    .__select-handle();
+  &.border {
+    .biz-event-select-handle {
+      .__select-handle();
+    }
   }
-
+  position: relative;
   &-list-panel {
     display: flex;
     flex-direction: row;

package/es/eventSelector/types.d.ts

@@ -22,6 +22,10 @@ export declare namespace EventSelectTypes {
         showAllEvent?: boolean;
         defaultSelectAble?: boolean;
         popupContainer?: boolean;
+        onVisibleChange?: (visible: boolean) => void;
+        border?: boolean;
+        theme?: string;
+        destroyPopupOnHide?: boolean;
         onChange?: (val: Value) => void;
     }
     interface DropdownProps {

package/es/index.d.ts

@@ -19,10 +19,11 @@ import convertAttributeData from './attributeSelector/util';
 import BizGlobalDataContext from './context';
 import BizUserCondition from './userCondition';
 import BizSearchInput from './searchInput';
+import BizUserTagsSelect from './userTagsSelector';
 import BizAddToScene from './addToScene';
 import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, setGlobalConfig, };
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizSelectTypes } from './select/types';
 export type { AttributeSelect } from './attributeSelector/types';

package/es/index.js

@@ -18,7 +18,8 @@ import convertAttributeData from './attributeSelector/util';
 import BizGlobalDataContext from './context';
 import BizUserCondition from './userCondition';
 import BizSearchInput from './searchInput';
+import BizUserTagsSelect from './userTagsSelector';
 import BizAddToScene from './addToScene';
 import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, setGlobalConfig };
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };

package/es/mock/event.js

@@ -131,6 +131,139 @@ 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: '注册',
@@ -221,6 +354,87 @@ 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/children.d.ts

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

package/es/select/demo/children.js

@@ -0,0 +1,81 @@
+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, { useState } from 'react';
+import { BizSelect } from '@zgfe/business-lib';
+import { Button } from 'antd';
+var stringOperate = [{
+  name: '是',
+  value: 'equal'
+}, {
+  name: '包含',
+  value: 'contains'
+}, {
+  name: '不是',
+  value: 'not equal'
+}, {
+  name: '不包含',
+  value: 'not contains'
+}, {
+  name: '开头是',
+  value: 'begin with'
+}, {
+  name: '结尾是',
+  value: 'end with'
+}, {
+  name: '开头不是',
+  value: 'not begin with'
+}, {
+  name: '结尾不是',
+  value: 'not end with'
+}, {
+  name: '是空值',
+  value: 'is null'
+}, {
+  name: '不是空值',
+  value: 'is not null'
+}];
+var disabledList = [{
+  value: 'not equal'
+}, {
+  value: 'not begin with'
+}];
+export default (function () {
+  var _useState = useState([{
+    name: '不是',
+    value: 'not equal'
+  }]),
+      _useState2 = _slicedToArray(_useState, 2),
+      data = _useState2[0],
+      setData = _useState2[1];
+
+  var onChange = function onChange(value) {
+    console.log(value);
+    setData(function () {
+      return value;
+    });
+  };
+
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizSelect, {
+    options: stringOperate,
+    value: data,
+    labelField: "name",
+    keyField: "value",
+    theme: "secondary",
+    popupContainer: true,
+    onChange: onChange,
+    disableItemList: disabledList,
+    multiple: true
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "primary"
+  }, "\u70B9\u51FB\u6253\u5F00\u4E0B\u62C9")));
+});

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/demo/index.js

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

package/es/select/demo/multiple.js

@@ -40,10 +40,13 @@ var stringOperate = [{
   name: '是空值',
   value: 'is null'
 }, {
-  name: '不是空值',
+  name: '不是空值aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
   value: 'is not null'
 }];
 var disabledList = [{
+  name: '是',
+  value: 'equal'
+}, {
   name: '不包含',
   value: 'not contains'
 }, {
@@ -51,7 +54,10 @@ var disabledList = [{
   value: 'not begin with'
 }];
 export default (function () {
-  var _useState = useState(),
+  var _useState = useState([].concat(disabledList, [{
+    name: '包含',
+    value: 'contains'
+  }])),
       _useState2 = _slicedToArray(_useState, 2),
       data = _useState2[0],
       setData = _useState2[1];
@@ -73,6 +79,7 @@ export default (function () {
     onChange: onChange,
     disableItemList: disabledList,
     multiple: true,
-    enableCreate: true
+    enableCreate: true,
+    value: data
   }), /*#__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

@@ -78,11 +78,13 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
         color: "#fff"
       }, /*#__PURE__*/React.createElement(Tag, {
         closable: true,
-        className: "".concat(classPrefix, "-tag"),
+        id: "".concat(classPrefix, "-tag"),
         onClose: function onClose() {
           onDelete(item);
         }
-      }, item[labelField]));
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-tag-label")
+      }, 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 from 'react';
+import React, { PropsWithChildren } from 'react';
 import './styles/index.less';
 import { BizSelectTypes } from './types';
 export declare const classPrefix = "biz-select";
-declare const BizSelect: React.FC<BizSelectTypes.Props>;
+declare const BizSelect: React.FC<PropsWithChildren<BizSelectTypes.Props>>;
 export default BizSelect;