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

package/es/analysisLayout/index.js

@@ -108,7 +108,9 @@ var BizAnalysisLayout = function BizAnalysisLayout(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "biz-layout-panel"
-  }, leftPanel), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "biz-left-content"
+  }, leftPanel)), /*#__PURE__*/React.createElement("div", {
     className: "biz-layout-bottom"
   }, leftHandle)), showLeft ? /*#__PURE__*/React.createElement(Tooltip, {
     title: function title() {

package/es/analysisLayout/index.less

@@ -5,8 +5,7 @@
   display: flex;
   width: 100%;
   height: 100%;
-  min-height: 900px;
-  overflow-y: auto;
+  overflow: hidden;
 
   .biz-layout-left {
     position: relative;
@@ -35,6 +34,9 @@
       height: calc(100% - 30px);
       padding: @searchPadding;
       overflow: auto;
+      .biz-left-content {
+        min-height: 600px;
+      }
     }
 
     .biz-layout-bottom {
@@ -64,13 +66,13 @@
   .biz-layout-right {
     box-sizing: border-box;
     padding: @contentPadding;
-    overflow-x: auto;
-    overflow-y: hidden;
+    overflow: auto;
     background-color: #fff;
 
     .biz-right-content {
       min-width: 600px;
       height: 100%;
+      min-height: 600px;
     }
   }
 }

package/es/dialog/components/selectToInput.d.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import { SelectProps } from 'antd';
 import '../style/index.less';
+interface ValueType {
+    [prop: string]: any;
+}
 interface fieldNamesProps {
     label: string;
     value: string;
@@ -12,6 +15,11 @@ interface SelectInputProps extends SelectProps {
      * @default       false
      */
     name?: string;
+    /**
+     * @description   扩展名称
+     * @default       -
+     */
+    extendName?: string;
     /**
      * @description   创建option回调
      * @default       false
@@ -31,13 +39,12 @@ interface SelectInputProps extends SelectProps {
      * @description  默认值
      * @default       false
      */
-    value?: string | number;
+    value?: ValueType;
     /**
      * @description   值改变回调
      * @default       -
      */
-    onChange?: (value?: string | number) => void;
-    onChangeType?: (type: boolean) => void;
+    onChange?: (value?: ValueType) => void;
 }
 declare const BizSelectToInput: React.FC<SelectInputProps>;
 export default BizSelectToInput;

package/es/dialog/components/selectToInput.js

@@ -1,4 +1,4 @@
-var _excluded = ["options", "search", "create", "name", "value", "onChange", "onChangeType"];
+var _excluded = ["options", "search", "create", "name", "extendName", "fieldNames", "value", "onChange"];
 
 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; }
 
@@ -25,8 +25,19 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useState } from 'react';
 import { BizSelect } from '../..';
 import IconFont from '../../components/iconFont';
-import { Input } from 'antd';
+import { Input, Radio, Space, Tooltip } from 'antd';
 import '../style/index.less';
+var inputOptions = [{
+  label: '公开',
+  value: 1
+}, {
+  label: '指定人员明显',
+  value: 2,
+  title: '通过看板的共享功能指定可见成员'
+}, {
+  label: '仅自己可见',
+  value: 3
+}];
 
 var BizSelectToInput = function BizSelectToInput(props) {
   var options = props.options,
@@ -36,9 +47,14 @@ var BizSelectToInput = function BizSelectToInput(props) {
       create = _props$create === void 0 ? true : _props$create,
       _props$name = props.name,
       name = _props$name === void 0 ? '' : _props$name,
+      extendName = props.extendName,
+      _props$fieldNames = props.fieldNames,
+      fieldNames = _props$fieldNames === void 0 ? {
+    label: 'label',
+    value: 'value'
+  } : _props$fieldNames,
       value = props.value,
       _onChange = props.onChange,
-      onChangeType = props.onChangeType,
       res = _objectWithoutProperties(props, _excluded);
 
   var _useState = useState(true),
@@ -56,26 +72,53 @@ var BizSelectToInput = function BizSelectToInput(props) {
       isFirst = _useState6[0],
       setIsFirst = _useState6[1];
 
+  var _useState7 = useState(3),
+      _useState8 = _slicedToArray(_useState7, 2),
+      radioData = _useState8[0],
+      setRadioData = _useState8[1];
+
+  var _useState9 = useState(''),
+      _useState10 = _slicedToArray(_useState9, 2),
+      inputData = _useState10[0],
+      setInputData = _useState10[1];
+
   useEffect(function () {
     if (isFirst) {
       setIsFirst(false);
       return;
     }
 
-    onChangeType && onChangeType(isSelect);
-
     if (isSelect) {
       _onChange && _onChange(selectValue);
     } else {
       _onChange && _onChange();
     }
   }, [isSelect]);
+  useEffect(function () {
+    if (isFirst) return;
+    var data = null;
+
+    if (inputData) {
+      if (extendName) {
+        var _data;
+
+        data = (_data = {}, _defineProperty(_data, fieldNames.value, 0), _defineProperty(_data, fieldNames.label, inputData), _defineProperty(_data, extendName, radioData), _data);
+      } else {
+        var _data2;
+
+        data = (_data2 = {}, _defineProperty(_data2, fieldNames.value, 0), _defineProperty(_data2, fieldNames.label, value), _data2);
+      }
+    }
+
+    _onChange && _onChange(data);
+  }, [radioData, inputData]);
   return /*#__PURE__*/React.createElement("div", null, isSelect ? /*#__PURE__*/React.createElement(BizSelect, _objectSpread(_objectSpread({
     options: options,
     search: search,
     create: create,
     size: "middle",
-    value: selectValue,
+    fieldNames: fieldNames,
+    value: selectValue && selectValue[fieldNames.value],
     name: name
   }, res), {}, {
     createOption: function createOption() {
@@ -83,13 +126,13 @@ var BizSelectToInput = function BizSelectToInput(props) {
         return false;
       });
     },
-    onChange: function onChange(value) {
-      _onChange && _onChange(value);
+    onChange: function onChange(value, data) {
+      _onChange && _onChange(data);
       setSelectValue(function () {
-        return value;
+        return data;
       });
     }
-  })) : /*#__PURE__*/React.createElement("div", {
+  })) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "biz-flex"
   }, /*#__PURE__*/React.createElement(Input, {
     className: "biz-input",
@@ -102,7 +145,9 @@ var BizSelectToInput = function BizSelectToInput(props) {
       })
     },
     onBlur: function onBlur(e) {
-      _onChange && _onChange(e.target.value);
+      setInputData(function () {
+        return e.target.value;
+      });
     }
   }), /*#__PURE__*/React.createElement(IconFont, {
     className: "biz-icon biz-icon-switch",
@@ -112,7 +157,25 @@ var BizSelectToInput = function BizSelectToInput(props) {
         return true;
       });
     }
-  })));
+  })), extendName && /*#__PURE__*/React.createElement("div", {
+    className: "biz-form-radio"
+  }, /*#__PURE__*/React.createElement(Radio.Group, {
+    value: radioData,
+    onChange: function onChange(e) {
+      setRadioData(function () {
+        return e.target.value;
+      });
+    }
+  }, /*#__PURE__*/React.createElement(Space, {
+    direction: "horizontal"
+  }, inputOptions.map(function (item) {
+    return /*#__PURE__*/React.createElement(Radio, {
+      key: item.value,
+      value: item.value
+    }, item.title ? /*#__PURE__*/React.createElement(Tooltip, {
+      title: item.title
+    }, item.label) : item.label);
+  }))))));
 };
 
 export default BizSelectToInput;

package/es/dialog/demo/index.js

@@ -19,34 +19,35 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import { BizDialog } from '@zgfe/business-lib';
 import { Button } from 'antd';
-var options = ['分类一', '分类二', '分类三'];
+var options = [{
+  id: 11,
+  name: '分类一'
+}, {
+  id: 22,
+  name: '分类二'
+}, {
+  id: 33,
+  name: '分分类三一'
+}];
 var chartTypes = ['趋势图', '汇总图', '地图'];
 var fields = [{
   label: '分类',
   name: 'class',
+  extendName: 'range',
   type: 'selectToInput',
   options: options,
   children: ['range'],
+  fieldNames: {
+    label: 'name',
+    value: 'id'
+  },
   rules: [{
     required: true,
     message: '请选择分类'
-  }]
-}, {
-  label: '',
-  name: 'range',
-  type: 'radio',
-  dependencies: 'class',
-  hidden: true,
-  options: [{
-    label: '公开',
-    value: 'public'
-  }, {
-    label: '指定人员明显',
-    value: 'appoint'
-  }, {
-    label: '仅自己可见',
-    value: 'own'
-  }]
+  }],
+  onChange: function onChange(val) {
+    console.log('select>>>', val);
+  }
 }, {
   label: '名称',
   name: 'name',
@@ -69,8 +70,11 @@ var fields = [{
   name: 'show',
   type: 'radio',
   direction: 'vertical',
+  dependenceFields: {
+    chart: 'line'
+  },
   options: [{
-    label: '动态显示数据最多的5个分组',
+    label: '动态显示数据最多的10个分组',
     value: 'dynamic'
   }, {
     label: '固定显示当前选择的分组',
@@ -82,7 +86,10 @@ var fields = [{
   }]
 }];
 var formData = {
-  class: '分类一',
+  class: {
+    id: 11,
+    name: '分类一'
+  },
   range: 'public',
   show: 'dynamic'
 };

package/es/dialog/index.d.ts

@@ -1,6 +1,18 @@
 import { FormItemProps, ModalProps } from 'antd';
 import React from 'react';
+interface BizObjectDefaultProps {
+    [key: string]: any;
+}
+interface fieldNamesProps {
+    label: string;
+    value: string;
+}
 interface FieldProps {
+    /**
+     * @description       form.item名称
+     * @default           -
+     */
+    label?: string;
     /**
      * @description       form.item类型
      * @default           input
@@ -11,13 +23,18 @@ interface FieldProps {
      * @default           -
      */
     value?: string | number;
+    /**
+     * @description       form.item 依赖项及其值 {age:20}
+     * @default           -
+     */
+    dependenceFields?: BizObjectDefaultProps;
     /**
      * @description       提示
      * @default           -
      */
     placeholder?: string;
     /**
-     * @description       form.item p排列方向
+     * @description       form.item 排列方向 'horizontal' | 'vertical'
      * @default           horizontal
      */
     direction?: 'horizontal' | 'vertical';
@@ -26,11 +43,26 @@ interface FieldProps {
      * @default           -
      */
     options?: Array<any>;
+    /**
+     * @description   扩展名称
+     * @default       -
+     */
+    extendName?: string;
+    /**
+     * @description   下拉框的自定义节点 label、value
+     * @default      { label: 'label', value: 'value' }
+     */
+    fieldNames?: fieldNamesProps;
     /**
      * @description       影响的表单项
      * @default           -
      */
     children?: Array<string>;
+    /**
+     * @description   值发生改变
+     * @default         -
+     */
+    onChange?: () => void;
 }
 interface BizDialogProps {
     /**
@@ -64,5 +96,5 @@ interface BizDialogProps {
      */
     onCancel?: () => void;
 }
-declare const BizDialog: React.FC<ModalProps & BizDialogProps>;
+declare const BizDialog: React.FC<ModalProps & BizDialogProps & FormItemProps>;
 export default BizDialog;

package/es/dialog/index.js

@@ -1,8 +1,6 @@
-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; }
+var _excluded = ["width", "title", "initialValues", "fields", "visible", "showMark", "layout", "onOk", "onCancel"];
 
-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; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -24,6 +22,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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; }
+
 import { Form, Input, Modal, Radio, Space } from 'antd';
 import React, { useEffect, useState } from 'react';
 import BizSelectToInput from './components/selectToInput';
@@ -45,7 +47,8 @@ var BizDialog = function BizDialog(props) {
       _props$layout = props.layout,
       layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
       _onOk = props.onOk,
-      _onCancel = props.onCancel;
+      _onCancel = props.onCancel,
+      res = _objectWithoutProperties(props, _excluded);
 
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -56,74 +59,74 @@ var BizDialog = function BizDialog(props) {
       formFields = _useState2[0],
       setFormFields = _useState2[1];
 
-  var getFormItem = function getFormItem(data) {
-    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'input';
-    var name = arguments.length > 2 ? arguments[2] : undefined;
-    var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var getFormItem = function getFormItem(_ref) {
+    var type = _ref.type,
+        label = _ref.label,
+        options = _ref.options,
+        placeholder = _ref.placeholder,
+        _ref$fieldNames = _ref.fieldNames,
+        fieldNames = _ref$fieldNames === void 0 ? {
+      label: 'label',
+      value: 'value'
+    } : _ref$fieldNames,
+        extendName = _ref.extendName,
+        direction = _ref.direction,
+        onChange = _ref.onChange;
 
     if (type === 'selectToInput') {
       return /*#__PURE__*/React.createElement(BizSelectToInput, {
-        name: name,
+        name: label,
         options: options,
-        onChangeType: function onChangeType(isSelect) {
-          if (data.children && data.children.length > 0) {
-            var children = _toConsumableArray(data.children);
-
-            var arr = [];
-            fields.forEach(function (item) {
-              var field = _objectSpread({}, item);
-
-              if (children.indexOf(item.name) > -1) {
-                field.hidden = isSelect;
-              }
-
-              arr.push(field);
-            });
-            setFormFields(function () {
-              return [].concat(arr);
-            });
-          }
-        }
+        fieldNames: fieldNames,
+        extendName: extendName,
+        onChange: onChange
       });
     } else if (type === 'select') {
       return /*#__PURE__*/React.createElement(BizSelect, {
         options: options,
-        name: name,
-        size: "middle"
+        name: label,
+        size: "middle",
+        onChange: onChange
       });
     } else if (type === 'input') {
       return /*#__PURE__*/React.createElement(Input, {
         className: "biz-input",
-        placeholder: data.placeholder || "\u8BF7\u8F93\u5165".concat(name),
+        placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label),
         autoComplete: "off",
         allowClear: {
           clearIcon: /*#__PURE__*/React.createElement(IconFont, {
             className: "biz-icon",
             type: 'icon-qingchu'
           })
-        }
+        },
+        onChange: onChange
       });
     } else if (type === 'password') {
       return /*#__PURE__*/React.createElement(Input.Password, {
         className: "biz-input",
-        placeholder: data.placeholder || "\u8BF7\u8F93\u5165".concat(name)
+        placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label),
+        onChange: onChange
       });
     } else if (type === 'tab') {
       return /*#__PURE__*/React.createElement(BizTab, {
-        options: options
+        options: options,
+        onChange: onChange
       });
     } else if (type === 'radio') {
-      return /*#__PURE__*/React.createElement(Radio.Group, null, /*#__PURE__*/React.createElement(Space, {
-        direction: data.direction || 'horizontal'
-      }, options.map(function (item) {
+      return /*#__PURE__*/React.createElement(Radio.Group, {
+        onChange: onChange
+      }, /*#__PURE__*/React.createElement(Space, {
+        direction: direction || 'horizontal'
+      }, options && options.map(function (item) {
         return /*#__PURE__*/React.createElement(Radio, {
-          key: item.value,
-          value: item.value
-        }, item.label);
+          key: item[fieldNames.value],
+          value: item[fieldNames.value]
+        }, item[fieldNames.label]);
       })));
     } else if (type === 'list') {
       return /*#__PURE__*/React.createElement(BizList, {
-        options: options.length > 0 ? options : undefined
+        options: options && options.length > 0 ? options : undefined,
+        onChange: onChange
       });
     }
   };
@@ -171,17 +174,84 @@ var BizDialog = function BizDialog(props) {
     initialValues: initialValues,
     layout: layout
   }, formFields === null || formFields === void 0 ? void 0 : formFields.map(function (item, index) {
-    return /*#__PURE__*/React.createElement(Form.Item, {
-      key: item.name,
-      label: item.label,
-      name: item.name,
-      hidden: item.hidden,
-      rules: item.rules,
-      help: item.help,
-      wrapperCol: {
-        offset: !item.label && layout === 'horizontal' ? 2 : 0
-      }
-    }, getFormItem(item, item.type, item.label, item.options));
+    // 判断是否有依赖项，如果依赖项的值符合，则展示，否则不展示
+    if (item.dependenceFields && Object.keys(item.dependenceFields).length > 0) {
+      var keys = Object.keys(item.dependenceFields);
+      var dependenceFields = item.dependenceFields;
+      return /*#__PURE__*/React.createElement(Form.Item, {
+        key: item.name,
+        noStyle: true,
+        shouldUpdate: function shouldUpdate(prevValues, curValues) {
+          var flag = false;
+
+          var _iterator = _createForOfIteratorHelper(keys),
+              _step;
+
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var key = _step.value;
+
+              if (prevValues[key] !== curValues[key]) {
+                flag = true;
+                break;
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+
+          return flag;
+        }
+      }, function (_ref2) {
+        var getFieldValue = _ref2.getFieldValue;
+        var flag = true;
+
+        var _iterator2 = _createForOfIteratorHelper(keys),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var key = _step2.value;
+
+            if (getFieldValue(key) !== dependenceFields[key]) {
+              flag = false;
+              break;
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+
+        return flag ? /*#__PURE__*/React.createElement(Form.Item, {
+          label: item.label,
+          name: item.name,
+          hidden: item.hidden,
+          rules: item.rules,
+          help: item.help,
+          wrapperCol: {
+            offset: !item.label && layout === 'horizontal' ? 2 : 0
+          },
+          shouldUpdate: true
+        }, getFormItem(item)) : null;
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(Form.Item, {
+        key: item.name,
+        label: item.label,
+        name: item.name,
+        hidden: item.hidden,
+        rules: item.rules,
+        help: item.help,
+        wrapperCol: {
+          offset: !item.label && layout === 'horizontal' ? 2 : 0
+        },
+        shouldUpdate: true
+      }, getFormItem(item));
+    }
   })));
 };
 

package/es/dialog/style/index.less

@@ -44,6 +44,7 @@
   &.ant-form-horizontal .ant-form-item-label > label {
     height: 40px;
   }
+
   &.ant-form-vertical .ant-form-item-label {
     margin-bottom: 12px;
     color: @titleColor;
@@ -74,3 +75,10 @@
   max-height: 400px;
   overflow: auto;
 }
+
+.biz-form-radio {
+  width: 100%;
+  height: 40px;
+  color: @titleColor;
+  line-height: 40px;
+}

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,13 +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,
-      disabled: item.disabled
+      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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",