@bit-sun/business-component 2.0.20 → 2.0.21

package/dist/components/Functional/ExportFunctions/ExportIcon/index.d.ts

@@ -1,7 +1,12 @@
 interface exportIconType {
-    url: string;
-    params: any;
-    otherParams?: any;
+    /** others选填，使用axios发请求，*/
+    request: {
+        url: string;
+        params: Function | Object;
+        others?: Object;
+    };
+    /** BsSulaQueryTable的tableRef*/
+    tableRef: any;
 }
-declare const ExportIcon: ({ params, url, otherParams }: exportIconType) => JSX.Element;
+declare const ExportIcon: ({ request, tableRef }: exportIconType) => JSX.Element;
 export default ExportIcon;

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import React, { createContext, useContext, useEffect, forwardRef, createElement,
 import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Popover } from 'antd';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
-import _ from 'lodash';
+import _, { omit } from 'lodash';
 import { useDebounceFn } from 'ahooks';
 import { stringify } from 'querystring';
 import { Resizable } from 'react-resizable';
@@ -413,6 +413,16 @@ function _regeneratorRuntime() {
   }, exports;
 }
 
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
+}
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -825,14 +835,14 @@ function _objectWithoutProperties$1(source, excluded) {
   return target;
 }
 
-function _typeof(obj) {
+function _typeof$1(obj) {
   "@babel/helpers - typeof";
 
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+  return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
     return typeof obj;
   } : function (obj) {
     return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, _typeof(obj);
+  }, _typeof$1(obj);
 }
 
 /**
@@ -1737,7 +1747,7 @@ function warning$1(valid, message) {
   warningOnce(valid, "[@ant-design/icons] ".concat(message));
 }
 function isIconDefinition(target) {
-  return _typeof(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof(target.icon) === 'object' || typeof target.icon === 'function');
+  return _typeof$1(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof$1(target.icon) === 'object' || typeof target.icon === 'function');
 }
 function normalizeAttrs() {
   var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -8983,9 +8993,11 @@ GuideWrapper.Field = Field;
 var exportlogo = "data:image/png;base64,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";
 
 var ExportIcon = function ExportIcon(_ref) {
-  var params = _ref.params,
-      url = _ref.url,
-      otherParams = _ref.otherParams;
+  var request = _ref.request,
+      tableRef = _ref.tableRef;
+  var url = request.url,
+      params = request.params,
+      others = request.others;
   return /*#__PURE__*/React.createElement("div", {
     style: {
       cursor: 'pointer'
@@ -8996,11 +9008,29 @@ var ExportIcon = function ExportIcon(_ref) {
     width: 32,
     src: exportlogo,
     onClick: function onClick() {
+      var _tableRef$current, _convertedParams$sele, _convertedParams$sele2;
+
+      var convertedParams = tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.getExportParams();
+      var requestData;
+
+      if (typeof params === 'function') {
+        requestData = _objectSpread2({}, omit(params(convertedParams), 'selectedRows'));
+      } else if (_typeof(params) === 'object') {
+        requestData = _objectSpread2({}, params);
+      }
+
+      if (!params) {
+        requestData = omit(convertedParams, 'selectedRows');
+      }
+
+      requestData['qp-id-in'] = convertedParams === null || convertedParams === void 0 ? void 0 : (_convertedParams$sele = convertedParams.selectedRows) === null || _convertedParams$sele === void 0 ? void 0 : (_convertedParams$sele2 = _convertedParams$sele.map(function (d) {
+        return d.id;
+      })) === null || _convertedParams$sele2 === void 0 ? void 0 : _convertedParams$sele2.join(',');
       axios(_objectSpread2({
         url: url,
         method: 'POST',
-        data: (params === null || params === void 0 ? void 0 : params.current) || (typeof params == 'function' ? params() : params)
-      }, otherParams)).then(function (result) {
+        data: requestData
+      }, others)).then(function (result) {
         result = result.data;
 
         if (result.code !== '000000') {

package/dist/index.js

@@ -424,6 +424,16 @@ function _regeneratorRuntime() {
   }, exports;
 }
 
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
+}
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -836,14 +846,14 @@ function _objectWithoutProperties$1(source, excluded) {
   return target;
 }
 
-function _typeof(obj) {
+function _typeof$1(obj) {
   "@babel/helpers - typeof";
 
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+  return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
     return typeof obj;
   } : function (obj) {
     return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, _typeof(obj);
+  }, _typeof$1(obj);
 }
 
 /**
@@ -1748,7 +1758,7 @@ function warning$1(valid, message) {
   warningOnce(valid, "[@ant-design/icons] ".concat(message));
 }
 function isIconDefinition(target) {
-  return _typeof(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof(target.icon) === 'object' || typeof target.icon === 'function');
+  return _typeof$1(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof$1(target.icon) === 'object' || typeof target.icon === 'function');
 }
 function normalizeAttrs() {
   var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -8994,9 +9004,11 @@ GuideWrapper.Field = Field;
 var exportlogo = "data:image/png;base64,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";
 
 var ExportIcon = function ExportIcon(_ref) {
-  var params = _ref.params,
-      url = _ref.url,
-      otherParams = _ref.otherParams;
+  var request = _ref.request,
+      tableRef = _ref.tableRef;
+  var url = request.url,
+      params = request.params,
+      others = request.others;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       cursor: 'pointer'
@@ -9007,11 +9019,29 @@ var ExportIcon = function ExportIcon(_ref) {
     width: 32,
     src: exportlogo,
     onClick: function onClick() {
+      var _tableRef$current, _convertedParams$sele, _convertedParams$sele2;
+
+      var convertedParams = tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.getExportParams();
+      var requestData;
+
+      if (typeof params === 'function') {
+        requestData = _objectSpread2({}, _.omit(params(convertedParams), 'selectedRows'));
+      } else if (_typeof(params) === 'object') {
+        requestData = _objectSpread2({}, params);
+      }
+
+      if (!params) {
+        requestData = _.omit(convertedParams, 'selectedRows');
+      }
+
+      requestData['qp-id-in'] = convertedParams === null || convertedParams === void 0 ? void 0 : (_convertedParams$sele = convertedParams.selectedRows) === null || _convertedParams$sele === void 0 ? void 0 : (_convertedParams$sele2 = _convertedParams$sele.map(function (d) {
+        return d.id;
+      })) === null || _convertedParams$sele2 === void 0 ? void 0 : _convertedParams$sele2.join(',');
       axios__default['default'](_objectSpread2({
         url: url,
         method: 'POST',
-        data: (params === null || params === void 0 ? void 0 : params.current) || (typeof params == 'function' ? params() : params)
-      }, otherParams)).then(function (result) {
+        data: requestData
+      }, others)).then(function (result) {
         result = result.data;
 
         if (result.code !== '000000') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Functional/ExportFunctions/ExportIcon/index.md

@@ -0,0 +1,37 @@
+---
+title: 导出按钮
+order: 5
+nav:
+  title: 组件
+  order: 1
+group:
+  path: /components/functional
+  order: 0
+  title: 功能组件
+---
+
+## ExportIcon
+
+导出按钮demo
+
+```tsx
+import React, { useState, useRef } from 'react';
+import {ExportIcon}  from '../../../../index';
+
+
+
+export default () => {
+	
+	const tableRef = useRef()
+
+  return (
+    <div>
+      <ExportIcon request={{url:'abc'}} tableRef={tableRef}/>
+    </div>
+  );
+};
+```
+
+<API></API>
+
+More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/components/Functional/ExportFunctions/ExportIcon/index.tsx

@@ -2,26 +2,44 @@ import React, {Ref} from 'react'
 import {message, Popconfirm, Tooltip} from "antd";
 import axios from 'axios'
 import exportlogo from '../../../../assets/exportlogo.png'
-
+import {omit} from 'lodash'
 interface exportIconType{
-	url: string,
-	params: any,
-	otherParams?: any
+	/** others选填，使用axios发请求，*/
+	request:{
+		url: string,
+		params: Function | Object,
+		others?: Object
+	},
+	/** BsSulaQueryTable的tableRef*/
+	tableRef: any,
 }
 
-const ExportIcon = ({params, url, otherParams}: exportIconType) => {
-
+const ExportIcon = ({request, tableRef}: exportIconType) => {
+	const {url, params, others} = request
 
 	return (
 		<div style={{ cursor: 'pointer' }}>
 				<Tooltip title="导出数据">
 					<img width={32} src={exportlogo} onClick={() =>{
+						const convertedParams = tableRef?.current?.getExportParams()
+						let requestData: any
+
+						if(typeof params === 'function'){
+							requestData = {...omit(params(convertedParams),'selectedRows')}
+						}else if(typeof params === 'object'){
+							requestData = {...params}
+						}
+						if(!params){
+							requestData = omit(convertedParams, 'selectedRows')
+						}
+
+						requestData['qp-id-in'] = convertedParams?.selectedRows?.map((d: any) => d.id)?.join(',')
 
 						axios({
 							url,
 							method:'POST',
-							data:params?.current || (typeof params == 'function' ? params() : params),
-							...otherParams,
+							data:requestData,
+							...others,
 						})
 							.then((result: any) => {
 								result = result.data;