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

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

@@ -21,7 +21,8 @@ var options = [{
   value: 'test2'
 }, {
   label: 'test3',
-  value: 'test3'
+  value: 'test3',
+  disabled: true
 }];
 export default (function () {
   var _useState = useState('test2'),

package/es/select/index.d.ts

@@ -6,11 +6,19 @@ interface fieldNamesProps {
     value: string;
 }
 interface BizSelectProps {
+    /**
+     * @description   自定义节点
+     * @default       { label: 'label', value: 'value' }
+     */
     fieldNames?: fieldNamesProps;
+    /**
+     * @description   默认值
+     * @default       -
+     */
     defaultValue?: string | number;
     /**
      * @description   下拉名称
-     * @default       false
+     * @default       '''
      */
     name?: string;
     /**

package/es/select/index.js

@@ -141,12 +141,14 @@ var BizSelect = function BizSelect(props) {
       setSelectValue(function () {
         return value;
       });
-      _onChange && _onChange(value, option);
+      _onChange && _onChange(value, option.data);
     }
   }), currentOption.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item[fieldNames.value] || item,
-      key: item[fieldNames.value] || item
+      key: item[fieldNames.value] || item,
+      disabled: item.disabled,
+      data: item
     }, item.icon && /*#__PURE__*/React.createElement(IconFont, {
       style: {
         marginRight: '7px',

package/es/table/demo/index2.js

@@ -1,9 +1,51 @@
-import React from 'react';
+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, { useEffect, useState } from 'react';
 import { BizTable } from '@zgfe/business-lib';
-import tableData, { columns } from './data/table';
+import { columns } from './data/table';
 export default (function () {
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      tableData = _useState2[0],
+      setTableData = _useState2[1];
+
+  var getData = function getData(pagination) {
+    var current = pagination && pagination.current || 0;
+    var data = [];
+
+    for (var i = 0; i < 10; i++) {
+      data.push({
+        key: current * 10 + i,
+        name: "Edrward ".concat(current * 10 + i),
+        age: 32,
+        address: "London Park no. ".concat(current * 10 + i)
+      });
+    }
+
+    setTableData(function () {
+      return data;
+    });
+  };
+
+  useEffect(function () {
+    getData();
+  }, []);
   return /*#__PURE__*/React.createElement(BizTable, {
     columns: columns,
-    dataSource: tableData
+    dataSource: tableData,
+    total: 1000,
+    onChange: function onChange(pagination) {
+      return getData(pagination);
+    }
   });
 });

package/es/table/demo/index3.d.ts

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

package/es/table/demo/index3.js

@@ -0,0 +1,227 @@
+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."); }
+
+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, { useEffect, useState } from 'react';
+import { BizTable } from '@zgfe/business-lib';
+var dataSource2 = [{
+  key: 1,
+  attr1: 10,
+  attr2: 100,
+  attr3: 42,
+  name: '指标1',
+  val1: 22,
+  val2: 21
+}, {
+  key: 2,
+  attr1: 10,
+  attr2: 300,
+  attr3: 42,
+  name: '指标2',
+  val1: 22,
+  val2: 21
+}, {
+  key: 3,
+  attr1: 10,
+  attr2: 100,
+  attr3: 40,
+  name: '指标3',
+  val1: 22,
+  val2: 21
+}, {
+  key: 4,
+  attr1: 20,
+  attr2: 200,
+  attr3: 40,
+  name: '指标4',
+  val1: 22,
+  val2: 21
+}, {
+  key: 5,
+  attr1: 20,
+  attr2: 200,
+  attr3: 40,
+  name: '指标5',
+  val1: 22,
+  val2: 21
+}, {
+  key: 6,
+  attr1: 30,
+  attr2: 220,
+  attr3: 40,
+  name: '指标6',
+  val1: 22,
+  val2: 21
+}, {
+  key: 7,
+  attr1: 40,
+  attr2: 220,
+  attr3: 40,
+  name: '指标7',
+  val1: 22,
+  val2: 21
+}, {
+  key: 8,
+  attr1: 50,
+  attr2: 300,
+  attr3: 40,
+  name: '指标8',
+  val1: 22,
+  val2: 21
+}, {
+  key: 9,
+  attr1: 50,
+  attr2: 300,
+  attr3: 40,
+  name: '指标9',
+  val1: 22,
+  val2: 21
+}, {
+  key: 10,
+  attr1: 50,
+  attr2: 20,
+  attr3: 40,
+  name: '指标10',
+  val1: 22,
+  val2: 21
+}];
+var column2 = [{
+  title: '属性一',
+  dataIndex: 'attr1',
+  onCell: function onCell(row) {
+    return {
+      rowSpan: row.attr1RowSpan
+    };
+  }
+}, {
+  title: '属性二',
+  dataIndex: 'attr2',
+  onCell: function onCell(row) {
+    return {
+      rowSpan: row.attr2RowSpan
+    };
+  }
+}, {
+  title: '属性三',
+  dataIndex: 'attr3',
+  onCell: function onCell(row) {
+    return {
+      rowSpan: row.attr3RowSpan
+    };
+  }
+}, {
+  title: '名称',
+  dataIndex: 'name'
+}, {
+  title: '值1',
+  dataIndex: 'val1'
+}, {
+  title: '值2',
+  dataIndex: 'val2'
+}];
+export default (function () {
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      tableData = _useState2[0],
+      setTableData = _useState2[1]; // 排序
+
+
+  var sortData = function sortData(data) {
+    var compare = function compare(a, b) {
+      if (a.attr1 !== b.attr1) {
+        return a.attr1 - b.attr1;
+      } else if (a.attr2 !== b.attr2) {
+        return a.attr2 - b.attr2;
+      } else {
+        return a.attr3 - b.attr3;
+      }
+    };
+
+    data.sort(compare);
+    console.log('sort after>>', data);
+    return data;
+  }; // 获取合并行数
+
+
+  var mergeRow = function mergeRow(source, field, field2, field3) {
+    var count = 0,
+        scount = 0,
+        tcount = 0; //重复项的第一项,第二项,第三项
+
+    var indexCount = 1; //下一项
+
+    var data = JSON.parse(JSON.stringify(source));
+
+    while (indexCount < data.length) {
+      var item = data.slice(count, count + 1)[0]; //获取没有比较的第一个对象
+
+      if (!item["".concat(field, "RowSpan")]) {
+        item["".concat(field, "RowSpan")] = 1; //初始化为1
+
+        item["".concat(field2, "RowSpan")] = 1; //初始化为1
+
+        item["".concat(field3, "RowSpan")] = 1; //初始化为1
+      }
+
+      if (item[field] === data[indexCount][field]) {
+        //第一个对象与后面的对象相比，有相同项就累加，并且后面相同项设置为0
+        item["".concat(field, "RowSpan")]++;
+        data[indexCount]["".concat(field, "RowSpan")] = 0; // 第二项比较
+
+        if (data[scount][field2] === data[indexCount][field2]) {
+          data[scount]["".concat(field2, "RowSpan")]++;
+          data[indexCount]["".concat(field2, "RowSpan")] = 0;
+
+          if (data[tcount][field3] === data[indexCount][field3]) {
+            data[tcount]["".concat(field3, "RowSpan")]++;
+            data[indexCount]["".concat(field3, "RowSpan")] = 0;
+          } else {
+            data[indexCount]["".concat(field3, "RowSpan")] = 1;
+            tcount = indexCount;
+          }
+        } else {
+          data[indexCount]["".concat(field2, "RowSpan")] = 1;
+          data[indexCount]["".concat(field3, "RowSpan")] = 1;
+          scount = indexCount;
+          tcount = indexCount;
+        }
+      } else {
+        count = indexCount;
+        scount = indexCount;
+        tcount = indexCount;
+      }
+
+      indexCount++;
+    }
+
+    console.log('for>>', data);
+    return data;
+  };
+
+  useEffect(function () {
+    var data = mergeRow(sortData(dataSource2), 'attr1', 'attr2', 'attr3');
+    setTableData(function () {
+      return _toConsumableArray(data);
+    });
+  }, []);
+  return /*#__PURE__*/React.createElement(BizTable, {
+    dataSource: tableData,
+    columns: column2
+  });
+});

package/es/table/index.d.ts

@@ -11,7 +11,7 @@ interface BizTableProps {
      * @description     表头
      * @default         line
      */
-    columns?: (ColumnGroupType<object> | ColumnType<object>)[];
+    columns: (ColumnGroupType<object> | ColumnType<object>)[];
     /**
      * @description     数据总数
      * @default         dataSource.length

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);
         });