@zgfe/business-lib 1.0.0-beta.5 → 1.0.0-beta.6

package/es/eventSelector/index.js

@@ -45,6 +45,8 @@ var BizEventSelector = function BizEventSelector(props) {
       options = _props$options === void 0 ? [] : _props$options,
       defaultValue = props.defaultValue,
       value = props.value,
+      _props$showAll = props.showAll,
+      showAll = _props$showAll === void 0 ? true : _props$showAll,
       _props$fieldNames = props.fieldNames,
       fieldNames = _props$fieldNames === void 0 ? {
     label: 'name',
@@ -119,10 +121,15 @@ var BizEventSelector = function BizEventSelector(props) {
       eventOptions = _useState18[0],
       setEventOptions = _useState18[1];
 
-  var _useState19 = useState(aliasName),
+  var _useState19 = useState(true),
       _useState20 = _slicedToArray(_useState19, 2),
-      alias = _useState20[0],
-      setAlias = _useState20[1];
+      showOverview = _useState20[0],
+      setShowOverview = _useState20[1];
+
+  var _useState21 = useState(aliasName),
+      _useState22 = _slicedToArray(_useState21, 2),
+      alias = _useState22[0],
+      setAlias = _useState22[1];
 
   useEffect(function () {
     setAlias(function () {
@@ -134,8 +141,9 @@ var BizEventSelector = function BizEventSelector(props) {
     var initValue = function initValue() {
       // 所有的option
       var firstGroup = {};
-      firstGroup[fieldNames.groupLabel] = '整体概览';
-      firstGroup[fieldNames.groupValue] = 'all';
+      firstGroup[fieldNames.groupLabel] = '所有分组'; // firstGroup[fieldNames.groupLabel] = '整体概览';
+
+      firstGroup[fieldNames.groupValue] = -2;
       firstGroup[fieldNames.children] = [];
 
       var _iterator = _createForOfIteratorHelper(options),
@@ -166,11 +174,24 @@ var BizEventSelector = function BizEventSelector(props) {
         _iterator.f();
       }
 
-      setEventOptions(function (option) {
-        return [firstGroup].concat(_toConsumableArray(option));
+      var result = JSON.parse(JSON.stringify(eventOptions));
+
+      if (result.length > 1) {
+        result = [firstGroup].concat(_toConsumableArray(result));
+      } // // 丢弃事件分组不显示
+
+
+      var index = result.findIndex(function (group) {
+        return group.groupName === '丢弃事件';
       });
-      setGroup(firstGroup);
-      setGroup2(firstGroup);
+      if (index > -1) result.splice(index, 1);
+      setEventOptions(function (option) {
+        return _toConsumableArray(result); // return [firstGroup, ...option];
+      }); // setGroup(firstGroup);
+      // setGroup2(firstGroup);
+
+      setGroup(result[0]);
+      setGroup2(result[0]);
     };
 
     if (options && options.length > 0) {
@@ -195,42 +216,87 @@ var BizEventSelector = function BizEventSelector(props) {
     if (!inValue || inValue === {}) return;
     var id = _typeof(inValue) === 'object' ? inValue[fieldNames.value] : inValue;
     if (event && event[fieldNames.value] === id) return;
+    var eid = id.split(',');
 
-    var _iterator3 = _createForOfIteratorHelper(options),
-        _step3;
+    if (parseFloat(eid[0]) < 0) {
+      // 事件概览
+      if (eid[1] < 0) {
+        setEvent(function () {
+          var _ref;
 
-    try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var option = _step3.value;
-        var children = option[fieldNames.children] || [];
+          return _ref = {}, _defineProperty(_ref, fieldNames.value, id), _defineProperty(_ref, fieldNames.label, '事件概览'), _ref;
+        });
+        setGroup(function () {
+          var _ref2;
 
-        var _iterator4 = _createForOfIteratorHelper(children),
-            _step4;
+          return _ref2 = {}, _defineProperty(_ref2, fieldNames.groupLabel, '所有分组'), _defineProperty(_ref2, fieldNames.groupValue, -2), _ref2;
+        });
+      } else {
+        var _iterator3 = _createForOfIteratorHelper(eventOptions),
+            _step3;
 
         try {
           var _loop = function _loop() {
-            var event = _step4.value;
+            var option = _step3.value;
 
-            if (event[fieldNames.value] == id) {
-              setEvent(function () {
-                return _objectSpread({}, event);
+            if (option[fieldNames.groupValue] === eid[1]) {
+              setGroup(function () {
+                var _ref3;
+
+                return _ref3 = {}, _defineProperty(_ref3, fieldNames.groupLabel, option[fieldNames.groupLabel]), _defineProperty(_ref3, fieldNames.groupValue, option[fieldNames.groupValue]), _ref3;
               });
+              return "break";
             }
           };
 
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            _loop();
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var _ret = _loop();
+
+            if (_ret === "break") break;
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator4.f();
+          _iterator3.f();
         }
       }
-    } catch (err) {
-      _iterator3.e(err);
-    } finally {
-      _iterator3.f();
+    } else {
+      var _iterator4 = _createForOfIteratorHelper(options),
+          _step4;
+
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var option = _step4.value;
+          var children = option[fieldNames.children] || [];
+
+          var _iterator5 = _createForOfIteratorHelper(children),
+              _step5;
+
+          try {
+            var _loop2 = function _loop2() {
+              var event = _step5.value;
+
+              if (event[fieldNames.value] == id) {
+                setEvent(function () {
+                  return _objectSpread({}, event);
+                });
+              }
+            };
+
+            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+              _loop2();
+            }
+          } catch (err) {
+            _iterator5.e(err);
+          } finally {
+            _iterator5.f();
+          }
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
     }
   }, [defaultValue, value]); // 更改group后，事件列表响应
 
@@ -245,9 +311,20 @@ var BizEventSelector = function BizEventSelector(props) {
       size = group[fieldNames.children].length;
     }
 
+    if (showOverview) {
+      var _arr$unshift;
+
+      arr.unshift((_arr$unshift = {}, _defineProperty(_arr$unshift, fieldNames.value, "-2,".concat(group[fieldNames.groupValue])), _defineProperty(_arr$unshift, fieldNames.label, '事件概览'), _arr$unshift));
+    }
+
     setEventData(arr);
     setEventCount(size);
-  }, [group]); // 初始化搜索框
+  }, [group]);
+  useEffect(function () {
+    setShowOverview(function () {
+      return showAll;
+    });
+  }, [showAll]); // 初始化搜索框
 
   useEffect(function () {
     setSearchValue(function () {
@@ -285,7 +362,7 @@ var BizEventSelector = function BizEventSelector(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "biz-input"
-  }, event[fieldNames.label] ? event[fieldNames.label] : /*#__PURE__*/React.createElement("span", {
+  }, event[fieldNames.label] ? event[fieldNames.label] === '事件概览' ? "".concat(group[fieldNames.groupLabel], "/").concat(event[fieldNames.label]) : event[fieldNames.label] : /*#__PURE__*/React.createElement("span", {
     className: "biz-placeholder"
   }, placeholder), /*#__PURE__*/React.createElement("span", null, alias && alias !== '' && "(".concat(alias, ")"))), /*#__PURE__*/React.createElement(IconFont, {
     className: "biz-select-zhankai",
@@ -299,7 +376,7 @@ var BizEventSelector = function BizEventSelector(props) {
 
     return /*#__PURE__*/React.createElement("div", {
       className: "biz-dropdown-item ".concat(menu[fieldNames.groupValue] === group[fieldNames.groupValue] && 'box-hover'),
-      key: menu[fieldNames.groupValue],
+      key: menu[fieldNames.groupValue] || 'key' + index,
       onMouseEnter: function onMouseEnter(e) {
         e.stopPropagation();
         setGroup(function () {
@@ -359,6 +436,8 @@ var BizEventSelector = function BizEventSelector(props) {
           setShowDropdown(false);
 
           if (onChange) {
+            item.groupId = group[fieldNames.groupValue];
+
             if (responseType === 'id') {
               onChange(item[fieldNames.value], item);
             } else {

package/es/globalAttributes/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { AttrGroup } from '../targetConditionGroup/type';
 interface AttrType {
     attrId?: string;
     [props: string]: any;
@@ -12,12 +13,12 @@ interface GlobalAttributeProps {
      * @description   默认值
      * @default           {}
      */
-    defaultValue?: ValueType;
+    defaultValue?: AttrGroup;
     /**
      * @description   默认值
      * @default           {}
      */
-    value?: ValueType;
+    value?: AttrGroup;
     /**
      * @description       数据化配置选项内容
      * @description.zh-CN

package/es/globalAttributes/index.js

@@ -35,7 +35,7 @@ var BizGlobalAttributes = function BizGlobalAttributes(props) {
       value = _props$value === void 0 ? {} : _props$value,
       options = props.options,
       _props$max = props.max,
-      max = _props$max === void 0 ? 5 : _props$max,
+      max = _props$max === void 0 ? 10 : _props$max,
       eventIds = props.eventIds,
       _onChange = props.onChange;
 
@@ -47,43 +47,38 @@ var BizGlobalAttributes = function BizGlobalAttributes(props) {
   useEffect(function () {
     var defaultAttrs = Object.keys(defaultValue).length > 0 ? defaultValue : value;
     var arr = [];
-    var operate = defaultAttrs.operate,
-        attrs = defaultAttrs.attrs;
+    var relation = defaultAttrs.relation,
+        conditions = defaultAttrs.conditions;
 
-    if (attrs) {
-      arr = attrs.map(function (item) {
+    if (conditions) {
+      arr = conditions.map(function (item) {
         var data = _objectSpread({}, item);
 
         var attrId = Math.random().toString();
-        return {
-          attrId: attrId,
-          data: data
-        };
+        return _objectSpread({
+          key: attrId
+        }, item); // return { attrId, data };
       });
-    } else {
-      arr = [{
-        attrId: Math.random().toString()
-      }];
     }
 
     setAttrsData(function (data) {
       return {
-        operate: operate,
-        attrs: _toConsumableArray(arr)
+        relation: relation,
+        conditions: _toConsumableArray(arr)
       };
     });
   }, []);
 
   var _addAttribute = function _addAttribute() {
     setAttrsData(function (data) {
-      var arr = [{
-        attrId: Math.random().toString()
-      }];
+      var item = {
+        key: Math.random().toString()
+      };
 
-      if (!data.attrs) {
-        data.attrs = arr;
+      if (!data.conditions) {
+        data.conditions = [item];
       } else {
-        data.attrs = data.attrs.concat(arr);
+        data.conditions.push(item);
       }
 
       return _objectSpread({}, data);
@@ -93,14 +88,14 @@ var BizGlobalAttributes = function BizGlobalAttributes(props) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizConditionGroup, {
     defaultValue: attrsData,
     options: options,
-    eventIds: eventIds,
+    eventId: eventIds,
     onChange: function onChange(data) {
       setAttrsData(function () {
         return _objectSpread({}, data);
       });
       _onChange && _onChange(_objectSpread({}, data));
     }
-  }), attrsData.attrs && attrsData.attrs.length < max && /*#__PURE__*/React.createElement("div", {
+  }), attrsData.conditions && attrsData.conditions.length < max && /*#__PURE__*/React.createElement("div", {
     className: "biz-icon-add",
     style: {
       marginTop: '16px'

package/es/index.d.ts

@@ -9,6 +9,7 @@ import BizAttributeSelector from './attributeSelector';
 import BizGroupSelect from './attributeSelector/group';
 import BizMultipleSelector from './multipleSelector';
 import BizTargetCondition from './targetConditionGroup';
+import BizTargetConditionGroup from './targetConditionGroup/group';
 import BizConditionGroup from './targetConditionGroup/components/conditionGroup';
 import BizDatePicker from './datePicker';
 import BizGlobalAttributes from './globalAttributes';
@@ -20,4 +21,4 @@ import IconFont from './components/iconFont';
 import { util, ajax } from './utils';
 import { GlobalContextProps } from './utils/type';
 declare const BizGlobalDataContext: import("react").Context<GlobalContextProps>;
-export { BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, BizUserCluster, IconFont, BizTargetSelector, BizEventSelector, BizGroupSelect, BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector, BizTargetCondition, BizDatePicker, BizConditionGroup, BizGlobalAttributes, ajax, util, };
+export { BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, BizUserCluster, IconFont, BizTargetSelector, BizEventSelector, BizGroupSelect, BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector, BizTargetCondition, BizTargetConditionGroup, BizDatePicker, BizConditionGroup, BizGlobalAttributes, ajax, util, };

package/es/index.js

@@ -9,6 +9,7 @@ import { createContext } from 'react';
 import BizGroupSelect from './attributeSelector/group';
 import BizMultipleSelector from './multipleSelector';
 import BizTargetCondition from './targetConditionGroup';
+import BizTargetConditionGroup from './targetConditionGroup/group';
 import BizConditionGroup from './targetConditionGroup/components/conditionGroup';
 import BizDatePicker from './datePicker';
 import BizGlobalAttributes from './globalAttributes';
@@ -19,4 +20,4 @@ import BizTable from './table';
 import IconFont from './components/iconFont';
 import { util, ajax } from './utils';
 var BizGlobalDataContext = /*#__PURE__*/createContext({});
-export { BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, BizUserCluster, IconFont, BizTargetSelector, BizEventSelector, BizGroupSelect, BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector, BizTargetCondition, BizDatePicker, BizConditionGroup, BizGlobalAttributes, ajax, util };
+export { BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, BizUserCluster, IconFont, BizTargetSelector, BizEventSelector, BizGroupSelect, BizAttributeSelector, BizGlobalDataContext, BizMultipleSelector, BizTargetCondition, BizTargetConditionGroup, BizDatePicker, BizConditionGroup, BizGlobalAttributes, ajax, util };

package/es/multipleSelector/index.js

@@ -10,6 +10,14 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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."); }
@@ -22,7 +30,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Select } from 'antd';
 import IconFont from '../components/iconFont';
 import './index.less';
@@ -36,13 +44,28 @@ var BizMultipleSelector = function BizMultipleSelector(props) {
       options = props.options,
       _props$placeholder = props.placeholder,
       placeholder = _props$placeholder === void 0 ? '请选择' : _props$placeholder,
-      onChange = props.onChange; // 是否是聚焦状态
+      _onChange = props.onChange; // 是否是聚焦状态
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       focused = _useState2[0],
       setFocused = _useState2[1];
 
+  var _useState3 = useState([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      multiValue = _useState4[0],
+      setMultiValue = _useState4[1];
+
+  useEffect(function () {
+    var data = defaultValue || value || [];
+
+    if (JSON.stringify(data) !== JSON.stringify(multiValue)) {
+      setMultiValue(function () {
+        return _toConsumableArray(data);
+      });
+    }
+  }, [defaultValue, value]);
+
   var tagRender = function tagRender(props) {
     var label = props.label,
         res = _objectWithoutProperties(props, _excluded);
@@ -69,10 +92,15 @@ var BizMultipleSelector = function BizMultipleSelector(props) {
       width: '100%'
     },
     placeholder: placeholder,
-    defaultValue: defaultValue,
+    value: multiValue,
     menuItemSelectedIcon: null,
     listHeight: 400,
-    onChange: onChange,
+    onChange: function onChange(data) {
+      setMultiValue(function () {
+        return _toConsumableArray(data);
+      });
+      _onChange && _onChange(data);
+    },
     optionLabelProp: "label",
     tagRender: tagRender,
     onFocus: function onFocus() {

package/es/targetConditionGroup/components/conditionGroup.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ValueType } from '../type';
+import { AttrGroup } from '../type';
 import './style/group.less';
 interface ConditionGroupProps {
     /**
@@ -7,7 +7,7 @@ interface ConditionGroupProps {
      * @description.zh-CN
      * @default
      */
-    defaultValue?: ValueType;
+    defaultValue?: AttrGroup;
     /**
      * @description   属性配置项
      * @description.zh-CN
@@ -18,13 +18,13 @@ interface ConditionGroupProps {
      * @description     如果是事件属性，则传事件id,多个用逗号隔开
      * @default           -
      */
-    eventIds?: string | number;
+    eventId?: string | number;
     /**
      * @description       参数改变回调
      * @description.zh-CN
      * @default
      */
-    onChange?: (data: ValueType) => void;
+    onChange?: (data: AttrGroup) => void;
 }
 declare const BizConditionGroup: React.FC<ConditionGroupProps>;
 export default BizConditionGroup;

package/es/targetConditionGroup/components/conditionGroup.js

@@ -32,44 +32,45 @@ import util from '../../utils/util';
 var BizConditionGroup = function BizConditionGroup(props) {
   var _props$defaultValue = props.defaultValue,
       defaultValue = _props$defaultValue === void 0 ? {
-    operator: 'and',
-    attrs: []
+    relation: 'and',
+    conditions: []
   } : _props$defaultValue,
       options = props.options,
-      eventIds = props.eventIds,
+      eventId = props.eventId,
       _onChange = props.onChange;
 
-  var _useState = useState(defaultValue.attrs || []),
+  var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
-      attrs = _useState2[0],
-      setAttrs = _useState2[1];
+      conditions = _useState2[0],
+      setConditions = _useState2[1];
 
-  var _useState3 = useState(defaultValue.operator || 'and'),
+  var _useState3 = useState('and'),
       _useState4 = _slicedToArray(_useState3, 2),
       operate = _useState4[0],
       setOperate = _useState4[1];
 
   useEffect(function () {
-    if (util.equal(attrs, defaultValue.attrs)) return;
-    setAttrs(function () {
-      return defaultValue.attrs ? _toConsumableArray(defaultValue.attrs) : [];
+    if (util.equal(conditions, defaultValue.conditions)) return;
+    setConditions(function () {
+      return defaultValue.conditions ? _toConsumableArray(defaultValue.conditions) : [];
     });
+    setOperate(defaultValue.relation || 'and');
   }, [defaultValue]);
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-attr-group-container"
   }, /*#__PURE__*/React.createElement("div", {
     className: "biz-attr-group-operate"
-  }, attrs.length > 1 && /*#__PURE__*/React.createElement("div", {
+  }, conditions.length > 1 && /*#__PURE__*/React.createElement("div", {
     className: "biz-attr-operate",
     onClick: function onClick(e) {
       e.stopPropagation();
-      var value = e.target.innerText === '且' ? 'and' : 'or';
+      var relation = e.target.innerText === '且' ? 'and' : 'or';
       setOperate(function () {
-        return value;
+        return relation;
       });
       _onChange && _onChange({
-        operator: value,
-        attrs: attrs
+        relation: relation,
+        conditions: conditions
       });
     }
   }, /*#__PURE__*/React.createElement("div", {
@@ -78,28 +79,28 @@ var BizConditionGroup = function BizConditionGroup(props) {
     className: operate === 'or' ? 'active' : ''
   }, "\u6216"))), /*#__PURE__*/React.createElement("div", {
     className: "biz-attr-group-content"
-  }, attrs.map(function (item, index) {
+  }, conditions.map(function (item, index) {
     return /*#__PURE__*/React.createElement(BizConditionItem, {
-      key: item.attrId || index,
+      key: item.key || index,
       options: options,
-      eventIds: eventIds,
-      defaultValue: item.data,
+      eventId: eventId,
+      defaultValue: item,
       onDelete: function onDelete() {
-        setAttrs(function (data) {
+        setConditions(function (data) {
           data.splice(index, 1);
           _onChange && _onChange({
-            operator: operate,
-            attrs: _toConsumableArray(data)
+            relation: operate,
+            conditions: _toConsumableArray(data)
           });
           return _toConsumableArray(data);
         });
       },
       onChange: function onChange(data) {
-        setAttrs(function (attr) {
-          attr[index].data = _objectSpread({}, data);
+        setConditions(function (attr) {
+          attr[index] = _objectSpread({}, data);
           _onChange && _onChange({
-            operator: operate,
-            attrs: _toConsumableArray(attr)
+            relation: operate,
+            conditions: _toConsumableArray(attr)
           });
           return _toConsumableArray(attr);
         });

package/es/targetConditionGroup/components/conditionItem.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import './style/index.less';
-import { AttrItemType } from '../type';
+import { AttrItem } from '../type';
 import { EventMetaProps } from '../../utils/type';
 interface ConditionItemProps {
     /**
@@ -8,7 +8,7 @@ interface ConditionItemProps {
      * @description.zh-CN
      * @default           -
      */
-    defaultValue?: AttrItemType;
+    defaultValue?: AttrItem;
     /**
      * @description      属性的配置项
      * @description.zh-CN
@@ -19,7 +19,7 @@ interface ConditionItemProps {
      * @description     如果是事件属性，则传事件id,多个用逗号隔开
      * @default           -
      */
-    eventIds?: string | number;
+    eventId?: string | number;
     /**
      * @description     软件id
      * @default           -
@@ -35,7 +35,7 @@ interface ConditionItemProps {
      * @description.zh-CN
      * @default
      */
-    onChange?: (data: object) => void;
+    onChange?: (data: AttrItem) => void;
     /**
      * @description       删除属性
      * @description.zh-CN