@bit-sun/business-component 2.0.20 → 2.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/dist/components/Functional/ExportFunctions/ExportIcon/index.d.ts +9 -4
  2. package/dist/index.esm.js +56 -13
  3. package/dist/index.js +55 -12
  4. package/dist/utils/utils.d.ts +2 -0
  5. package/package.json +3 -2
  6. package/src/assets/exportFail.svg +25 -35
  7. package/src/assets/exportProcessing.svg +19 -29
  8. package/src/assets/exportSuccess.svg +23 -33
  9. package/src/assets/upExport.svg +8 -8
  10. package/src/components/Business/AddSelectBusiness/index.tsx +2 -1
  11. package/src/components/Functional/AddSelect/index.md +1 -0
  12. package/src/components/Functional/BillEntry/index.tsx +4 -4
  13. package/src/components/Functional/ExportFunctions/ExportIcon/index.md +37 -0
  14. package/src/components/Functional/ExportFunctions/ExportIcon/index.tsx +26 -8
  15. package/src/components/Functional/SearchSelect/index.tsx +7 -1
  16. package/src/utils/utils.ts +22 -0
package/dist/components/Functional/ExportFunctions/ExportIcon/index.d.ts CHANGED
@@ -1,7 +1,12 @@
1
1
  interface exportIconType {
2
- url: string;
3
- params: any;
4
- otherParams?: any;
2
+ /** others选填，使用axios发请求，*/
3
+ request: {
4
+ url: string;
5
+ params: Function | Object;
6
+ others?: Object;
7
+ };
8
+ /** BsSulaQueryTable的tableRef*/
9
+ tableRef: any;
5
10
  }
6
- declare const ExportIcon: ({ params, url, otherParams }: exportIconType) => JSX.Element;
11
+ declare const ExportIcon: ({ request, tableRef }: exportIconType) => JSX.Element;
7
12
  export default ExportIcon;
package/dist/index.esm.js CHANGED
@@ -3,7 +3,7 @@ import React, { createContext, useContext, useEffect, forwardRef, createElement,
3
3
  import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Popover } from 'antd';
4
4
  import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
5
5
  import classNames from 'classnames';
6
- import _ from 'lodash';
6
+ import _, { omit } from 'lodash';
7
7
  import { useDebounceFn } from 'ahooks';
8
8
  import { stringify } from 'querystring';
9
9
  import { Resizable } from 'react-resizable';
@@ -413,6 +413,16 @@ function _regeneratorRuntime() {
413
413
  }, exports;
414
414
  }
415
415
 
416
+ function _typeof(obj) {
417
+ "@babel/helpers - typeof";
418
+
419
+ return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
420
+ return typeof obj;
421
+ } : function (obj) {
422
+ return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
423
+ }, _typeof(obj);
424
+ }
425
+
416
426
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
417
427
  try {
418
428
  var info = gen[key](arg);
@@ -825,14 +835,14 @@ function _objectWithoutProperties$1(source, excluded) {
825
835
  return target;
826
836
  }
827
837
 
828
- function _typeof(obj) {
838
+ function _typeof$1(obj) {
829
839
  "@babel/helpers - typeof";
830
840
 
831
- return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
841
+ return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
832
842
  return typeof obj;
833
843
  } : function (obj) {
834
844
  return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
835
- }, _typeof(obj);
845
+ }, _typeof$1(obj);
836
846
  }
837
847
 
838
848
  /**
@@ -1737,7 +1747,7 @@ function warning$1(valid, message) {
1737
1747
  warningOnce(valid, "[@ant-design/icons] ".concat(message));
1738
1748
  }
1739
1749
  function isIconDefinition(target) {
1740
- return _typeof(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof(target.icon) === 'object' || typeof target.icon === 'function');
1750
+ return _typeof$1(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof$1(target.icon) === 'object' || typeof target.icon === 'function');
1741
1751
  }
1742
1752
  function normalizeAttrs() {
1743
1753
  var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -3573,7 +3583,17 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
3573
3583
  var searchParams = {};
3574
3584
 
3575
3585
  if (typeof selectParamsKey === 'string') {
3576
- searchParams = v ? _defineProperty({}, selectParamsInitKey, initVal) : _defineProperty({}, selectParamsKey, searchValue);
3586
+ var selectParamsInitValue = initVal;
3587
+
3588
+ if (labelInValue) {
3589
+ selectParamsInitValue = Array.isArray(initVal) ? initVal.map(function (i) {
3590
+ return i.value || i.key;
3591
+ }).join(',') : initVal;
3592
+ } else {
3593
+ selectParamsInitValue = Array.isArray(initVal) ? initVal.join(',') : initVal;
3594
+ }
3595
+
3596
+ searchParams = v ? _defineProperty({}, selectParamsInitKey, selectParamsInitValue) : _defineProperty({}, selectParamsKey, searchValue);
3577
3597
  }
3578
3598
 
3579
3599
  if (Array.isArray(selectParamsKey)) {
@@ -5630,7 +5650,9 @@ var InputElement = function InputElement(_ref) {
5630
5650
  var onSerchdata = function onSerchdata(name) {
5631
5651
  axios.get("/items/sku/pager/v2?".concat(stringify({
5632
5652
  'skuCodeAndSkuName': name,
5633
- 'pageSize': 100
5653
+ 'pageSize': 100,
5654
+ 'qp-combination-eq': false,
5655
+ 'qp-approveStatus-eq': 1
5634
5656
  }))).then(function (_ref2) {
5635
5657
  var data = _ref2.data,
5636
5658
  status = _ref2.status;
@@ -8108,7 +8130,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
8108
8130
  url: "/items/sku/pager/v2",
8109
8131
  filter: 'qp-name-like',
8110
8132
  otherParams: {
8111
- 'qp-combination-eq': false
8133
+ 'qp-combination-eq': false,
8134
+ 'qp-approveStatus-eq': 1
8112
8135
  },
8113
8136
  mappingTextField: 'name',
8114
8137
  mappingValueField: 'skuCode'
@@ -8983,9 +9006,11 @@ GuideWrapper.Field = Field;
8983
9006
  var exportlogo = "data:image/png;base64,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";
8984
9007
 
8985
9008
  var ExportIcon = function ExportIcon(_ref) {
8986
- var params = _ref.params,
8987
- url = _ref.url,
8988
- otherParams = _ref.otherParams;
9009
+ var request = _ref.request,
9010
+ tableRef = _ref.tableRef;
9011
+ var url = request.url,
9012
+ params = request.params,
9013
+ others = request.others;
8989
9014
  return /*#__PURE__*/React.createElement("div", {
8990
9015
  style: {
8991
9016
  cursor: 'pointer'
@@ -8996,11 +9021,29 @@ var ExportIcon = function ExportIcon(_ref) {
8996
9021
  width: 32,
8997
9022
  src: exportlogo,
8998
9023
  onClick: function onClick() {
9024
+ var _tableRef$current, _convertedParams$sele, _convertedParams$sele2;
9025
+
9026
+ var convertedParams = tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.getExportParams();
9027
+ var requestData;
9028
+
9029
+ if (typeof params === 'function') {
9030
+ requestData = _objectSpread2({}, omit(params(convertedParams), 'selectedRows'));
9031
+ } else if (_typeof(params) === 'object') {
9032
+ requestData = _objectSpread2({}, params);
9033
+ }
9034
+
9035
+ if (!params) {
9036
+ requestData = omit(convertedParams, 'selectedRows');
9037
+ }
9038
+
9039
+ 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) {
9040
+ return d.id;
9041
+ })) === null || _convertedParams$sele2 === void 0 ? void 0 : _convertedParams$sele2.join(',');
8999
9042
  axios(_objectSpread2({
9000
9043
  url: url,
9001
9044
  method: 'POST',
9002
- data: (params === null || params === void 0 ? void 0 : params.current) || (typeof params == 'function' ? params() : params)
9003
- }, otherParams)).then(function (result) {
9045
+ data: requestData
9046
+ }, others)).then(function (result) {
9004
9047
  result = result.data;
9005
9048
 
9006
9049
  if (result.code !== '000000') {
package/dist/index.js CHANGED
@@ -424,6 +424,16 @@ function _regeneratorRuntime() {
424
424
  }, exports;
425
425
  }
426
426
 
427
+ function _typeof(obj) {
428
+ "@babel/helpers - typeof";
429
+
430
+ return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
431
+ return typeof obj;
432
+ } : function (obj) {
433
+ return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
434
+ }, _typeof(obj);
435
+ }
436
+
427
437
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
428
438
  try {
429
439
  var info = gen[key](arg);
@@ -836,14 +846,14 @@ function _objectWithoutProperties$1(source, excluded) {
836
846
  return target;
837
847
  }
838
848
 
839
- function _typeof(obj) {
849
+ function _typeof$1(obj) {
840
850
  "@babel/helpers - typeof";
841
851
 
842
- return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
852
+ return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
843
853
  return typeof obj;
844
854
  } : function (obj) {
845
855
  return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
846
- }, _typeof(obj);
856
+ }, _typeof$1(obj);
847
857
  }
848
858
 
849
859
  /**
@@ -1748,7 +1758,7 @@ function warning$1(valid, message) {
1748
1758
  warningOnce(valid, "[@ant-design/icons] ".concat(message));
1749
1759
  }
1750
1760
  function isIconDefinition(target) {
1751
- return _typeof(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof(target.icon) === 'object' || typeof target.icon === 'function');
1761
+ return _typeof$1(target) === 'object' && typeof target.name === 'string' && typeof target.theme === 'string' && (_typeof$1(target.icon) === 'object' || typeof target.icon === 'function');
1752
1762
  }
1753
1763
  function normalizeAttrs() {
1754
1764
  var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -3584,7 +3594,17 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
3584
3594
  var searchParams = {};
3585
3595
 
3586
3596
  if (typeof selectParamsKey === 'string') {
3587
- searchParams = v ? _defineProperty({}, selectParamsInitKey, initVal) : _defineProperty({}, selectParamsKey, searchValue);
3597
+ var selectParamsInitValue = initVal;
3598
+
3599
+ if (labelInValue) {
3600
+ selectParamsInitValue = Array.isArray(initVal) ? initVal.map(function (i) {
3601
+ return i.value || i.key;
3602
+ }).join(',') : initVal;
3603
+ } else {
3604
+ selectParamsInitValue = Array.isArray(initVal) ? initVal.join(',') : initVal;
3605
+ }
3606
+
3607
+ searchParams = v ? _defineProperty({}, selectParamsInitKey, selectParamsInitValue) : _defineProperty({}, selectParamsKey, searchValue);
3588
3608
  }
3589
3609
 
3590
3610
  if (Array.isArray(selectParamsKey)) {
@@ -5641,7 +5661,9 @@ var InputElement = function InputElement(_ref) {
5641
5661
  var onSerchdata = function onSerchdata(name) {
5642
5662
  axios__default['default'].get("/items/sku/pager/v2?".concat(querystring.stringify({
5643
5663
  'skuCodeAndSkuName': name,
5644
- 'pageSize': 100
5664
+ 'pageSize': 100,
5665
+ 'qp-combination-eq': false,
5666
+ 'qp-approveStatus-eq': 1
5645
5667
  }))).then(function (_ref2) {
5646
5668
  var data = _ref2.data,
5647
5669
  status = _ref2.status;
@@ -8119,7 +8141,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
8119
8141
  url: "/items/sku/pager/v2",
8120
8142
  filter: 'qp-name-like',
8121
8143
  otherParams: {
8122
- 'qp-combination-eq': false
8144
+ 'qp-combination-eq': false,
8145
+ 'qp-approveStatus-eq': 1
8123
8146
  },
8124
8147
  mappingTextField: 'name',
8125
8148
  mappingValueField: 'skuCode'
@@ -8994,9 +9017,11 @@ GuideWrapper.Field = Field;
8994
9017
  var exportlogo = "data:image/png;base64,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";
8995
9018
 
8996
9019
  var ExportIcon = function ExportIcon(_ref) {
8997
- var params = _ref.params,
8998
- url = _ref.url,
8999
- otherParams = _ref.otherParams;
9020
+ var request = _ref.request,
9021
+ tableRef = _ref.tableRef;
9022
+ var url = request.url,
9023
+ params = request.params,
9024
+ others = request.others;
9000
9025
  return /*#__PURE__*/React__default['default'].createElement("div", {
9001
9026
  style: {
9002
9027
  cursor: 'pointer'
@@ -9007,11 +9032,29 @@ var ExportIcon = function ExportIcon(_ref) {
9007
9032
  width: 32,
9008
9033
  src: exportlogo,
9009
9034
  onClick: function onClick() {
9035
+ var _tableRef$current, _convertedParams$sele, _convertedParams$sele2;
9036
+
9037
+ var convertedParams = tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.getExportParams();
9038
+ var requestData;
9039
+
9040
+ if (typeof params === 'function') {
9041
+ requestData = _objectSpread2({}, _.omit(params(convertedParams), 'selectedRows'));
9042
+ } else if (_typeof(params) === 'object') {
9043
+ requestData = _objectSpread2({}, params);
9044
+ }
9045
+
9046
+ if (!params) {
9047
+ requestData = _.omit(convertedParams, 'selectedRows');
9048
+ }
9049
+
9050
+ 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) {
9051
+ return d.id;
9052
+ })) === null || _convertedParams$sele2 === void 0 ? void 0 : _convertedParams$sele2.join(',');
9010
9053
  axios__default['default'](_objectSpread2({
9011
9054
  url: url,
9012
9055
  method: 'POST',
9013
- data: (params === null || params === void 0 ? void 0 : params.current) || (typeof params == 'function' ? params() : params)
9014
- }, otherParams)).then(function (result) {
9056
+ data: requestData
9057
+ }, others)).then(function (result) {
9015
9058
  result = result.data;
9016
9059
 
9017
9060
  if (result.code !== '000000') {
package/dist/utils/utils.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export declare function downloadExcel(data: any, fileName?: any, isResUrl?: boolean): void;
2
+ export declare function handleCommonTimeRender(text: any, format?: any): any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bit-sun/business-component",
3
- "version": "2.0.20",
3
+ "version": "2.0.23",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -31,7 +31,8 @@
31
31
  "antd": "4.17.2",
32
32
  "axios": "^0.24.0",
33
33
  "classnames": "^2.3.1",
34
- "lodash": "^4.17.21",
34
+ "dayjs": "^1.11.5",
35
+ "lodash": "^4.7.21",
35
36
  "querystring": "^0.2.1",
36
37
  "react": "^16.12.0",
37
38
  "react-beautiful-dnd": "10.0.0",
package/src/assets/exportFail.svg CHANGED
@@ -1,43 +1,33 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
- <title>下载失败-icon</title>
4
- <defs>
5
- <rect id="path-1" x="0" y="0" width="40" height="40"></rect>
6
- </defs>
2
+ <svg width="40px" height="42px" viewBox="0 0 40 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <title>编组 18</title>
7
4
  <g id="导出功能" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8
- <g id="列表数据导出功能-导出列表" transform="translate(-1584.000000, -137.000000)">
9
- <g id="编组-13" transform="translate(1570.000000, 0.000000)">
10
- <g id="编组-21备份-21" transform="translate(0.000000, 126.000000)">
11
- <g id="编组-6" transform="translate(14.000000, 11.000000)">
12
- <mask id="mask-2" fill="white">
13
- <use xlink:href="#path-1"></use>
14
- </mask>
15
- <use id="下载失败-icon" fill="#D8D8D8" opacity="0" xlink:href="#path-1"></use>
16
- <g mask="url(#mask-2)">
17
- <g transform="translate(4.000000, 3.000000)">
18
- <path d="M4.57142857,31.7142857 L4.57142857,2.28571429 C4.57142857,1.02334914 5.59477771,-1.10037491e-15 6.85714286,0 L22.974729,0 L22.974729,0 L32,8.22182322 L32,31.7142857 C32,32.9766509 30.9766509,34 29.7142857,34 L6.85714286,34 C5.59477771,34 4.57142857,32.9766509 4.57142857,31.7142857 Z" id="路径-6" fill="#1B79FF"></path>
19
- <g id="编组-2" stroke-width="1" fill="none" transform="translate(0.000000, 10.200000)">
20
- <path d="M12.5714286,0.571428571 C13.0448155,0.571428571 13.4733869,0.763306536 13.7836116,1.07353123 C14.0938363,1.38375593 14.2857143,1.81232736 14.2857143,2.28571429 L14.2857143,2.28571429 L14.2857143,12.447619 C14.2857143,12.921006 14.0938363,13.3495774 13.7836116,13.6598021 C13.4733869,13.9700268 13.0448155,14.1619048 12.5714286,14.1619048 L12.5714286,14.1619048 L2.28571429,14.1619048 C1.81232736,14.1619048 1.38375593,13.9700268 1.07353123,13.6598021 C0.763306536,13.3495774 0.571428571,12.921006 0.571428571,12.447619 L0.571428571,12.447619 L0.571428571,2.28571429 C0.571428571,1.81232736 0.763306536,1.38375593 1.07353123,1.07353123 C1.38375593,0.763306536 1.81232736,0.571428571 2.28571429,0.571428571 L2.28571429,0.571428571 Z" id="矩形" stroke="#005CFF" stroke-width="1.14285714" fill="#FFFFFF"></path>
21
- <g id="X" transform="translate(4.555429, 4.646667)" fill="#005CFF" fill-rule="nonzero">
22
- <polygon id="路径" points="4.112 5.55333333 2.952 3.8318 1.808 5.55333333 0 5.55333333 2.04 2.74493333 0.088 0 1.872 0 2.992 1.60253333 4.096 0 5.808 0 3.856 2.68146667 5.936 5.55333333"></polygon>
23
- </g>
5
+ <g id="编组-13" transform="translate(-14.000000, -138.000000)">
6
+ <g id="编组-21备份-21" transform="translate(0.000000, 126.000000)">
7
+ <g id="编组-18" transform="translate(14.000000, 12.000000)">
8
+ <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="39" height="41"></rect>
9
+ <g id="编组-10" transform="translate(6.000000, 4.000000)">
10
+ <g id="编组-6">
11
+ <path d="M4,28 L4,2 C4,0.8954305 4.8954305,-1.91384796e-17 6,0 L20.1028879,0 L20.1028879,0 L28,7.2545499 L28,28 C28,29.1045695 27.1045695,30 26,30 L6,30 C4.8954305,30 4,29.1045695 4,28 Z" id="路径-6" fill="#1B79FF"></path>
12
+ <g id="编组-2" transform="translate(0.000000, 9.000000)">
13
+ <path d="M11,0.5 C11.4142136,0.5 11.7892136,0.667893219 12.0606602,0.939339828 C12.3321068,1.21078644 12.5,1.58578644 12.5,2 L12.5,2 L12.5,11 C12.5,11.4142136 12.3321068,11.7892136 12.0606602,12.0606602 C11.7892136,12.3321068 11.4142136,12.5 11,12.5 L11,12.5 L2,12.5 C1.58578644,12.5 1.21078644,12.3321068 0.939339828,12.0606602 C0.667893219,11.7892136 0.5,11.4142136 0.5,11 L0.5,11 L0.5,2 C0.5,1.58578644 0.667893219,1.21078644 0.939339828,0.939339828 C1.21078644,0.667893219 1.58578644,0.5 2,0.5 L2,0.5 Z" id="矩形" stroke="#005CFF" fill="#FFFFFF"></path>
14
+ <g id="X" transform="translate(3.986000, 4.100000)" fill="#005CFF" fill-rule="nonzero">
15
+ <polygon id="路径" points="3.598 4.9 2.583 3.381 1.582 4.9 0 4.9 1.785 2.422 0.077 0 1.638 0 2.618 1.414 3.584 0 5.082 0 3.374 2.366 5.194 4.9"></polygon>
24
16
  </g>
25
- <path d="M17.1428571,11.3333333 L20.5714286,11.3333333 C21.2026111,11.3333333 21.7142857,11.8450079 21.7142857,12.4761905 L21.7142857,13.5904762 C21.7142857,14.2216588 21.2026111,14.7333333 20.5714286,14.7333333 L17.1428571,14.7333333 C16.5116746,14.7333333 16,14.2216588 16,13.5904762 L16,12.4761905 C16,11.8450079 16.5116746,11.3333333 17.1428571,11.3333333 Z" id="矩形备份-7" fill="#005CFF"></path>
26
- <path d="M24,11.3333333 L27.4285714,11.3333333 C28.059754,11.3333333 28.5714286,11.8450079 28.5714286,12.4761905 L28.5714286,13.5904762 C28.5714286,14.2216588 28.059754,14.7333333 27.4285714,14.7333333 L24,14.7333333 C23.3688174,14.7333333 22.8571429,14.2216588 22.8571429,13.5904762 L22.8571429,12.4761905 C22.8571429,11.8450079 23.3688174,11.3333333 24,11.3333333 Z" id="矩形备份-18" fill="#005CFF"></path>
27
- <path d="M17.1428571,15.8666667 L20.5714286,15.8666667 C21.2026111,15.8666667 21.7142857,16.3783412 21.7142857,17.0095238 L21.7142857,18.1238095 C21.7142857,18.7549921 21.2026111,19.2666667 20.5714286,19.2666667 L17.1428571,19.2666667 C16.5116746,19.2666667 16,18.7549921 16,18.1238095 L16,17.0095238 C16,16.3783412 16.5116746,15.8666667 17.1428571,15.8666667 Z" id="矩形备份-20" fill="#005CFF"></path>
28
- <path d="M24,15.8666667 L27.4285714,15.8666667 C28.059754,15.8666667 28.5714286,16.3783412 28.5714286,17.0095238 L28.5714286,18.1238095 C28.5714286,18.7549921 28.059754,19.2666667 27.4285714,19.2666667 L24,19.2666667 C23.3688174,19.2666667 22.8571429,18.7549921 22.8571429,18.1238095 L22.8571429,17.0095238 C22.8571429,16.3783412 23.3688174,15.8666667 24,15.8666667 Z" id="矩形备份-19" fill="#005CFF"></path>
29
- <path d="M17.1428571,20.4 L20.5714286,20.4 C21.2026111,20.4 21.7142857,20.9116746 21.7142857,21.5428571 L21.7142857,22.6571429 C21.7142857,23.2883254 21.2026111,23.8 20.5714286,23.8 L17.1428571,23.8 C16.5116746,23.8 16,23.2883254 16,22.6571429 L16,21.5428571 C16,20.9116746 16.5116746,20.4 17.1428571,20.4 Z" id="矩形备份-22" fill="#005CFF"></path>
30
- <path d="M24,20.4 L27.4285714,20.4 C28.059754,20.4 28.5714286,20.9116746 28.5714286,21.5428571 L28.5714286,22.6571429 C28.5714286,23.2883254 28.059754,23.8 27.4285714,23.8 L24,23.8 C23.3688174,23.8 22.8571429,23.2883254 22.8571429,22.6571429 L22.8571429,21.5428571 C22.8571429,20.9116746 23.3688174,20.4 24,20.4 Z" id="矩形备份-21" fill="#005CFF"></path>
31
- <polygon id="路径-19" fill="#005CFF" points="22.9906832 0 22.9906832 8.22182322 32 8.22182322"></polygon>
32
17
  </g>
18
+ <path d="M15,10 L18,10 C18.5522847,10 19,10.4477153 19,11 L19,12 C19,12.5522847 18.5522847,13 18,13 L15,13 C14.4477153,13 14,12.5522847 14,12 L14,11 C14,10.4477153 14.4477153,10 15,10 Z" id="矩形备份-7" fill="#005CFF"></path>
19
+ <path d="M21,10 L24,10 C24.5522847,10 25,10.4477153 25,11 L25,12 C25,12.5522847 24.5522847,13 24,13 L21,13 C20.4477153,13 20,12.5522847 20,12 L20,11 C20,10.4477153 20.4477153,10 21,10 Z" id="矩形备份-18" fill="#005CFF"></path>
20
+ <path d="M15,14 L18,14 C18.5522847,14 19,14.4477153 19,15 L19,16 C19,16.5522847 18.5522847,17 18,17 L15,17 C14.4477153,17 14,16.5522847 14,16 L14,15 C14,14.4477153 14.4477153,14 15,14 Z" id="矩形备份-20" fill="#005CFF"></path>
21
+ <path d="M21,14 L24,14 C24.5522847,14 25,14.4477153 25,15 L25,16 C25,16.5522847 24.5522847,17 24,17 L21,17 C20.4477153,17 20,16.5522847 20,16 L20,15 C20,14.4477153 20.4477153,14 21,14 Z" id="矩形备份-19" fill="#005CFF"></path>
22
+ <path d="M15,18 L18,18 C18.5522847,18 19,18.4477153 19,19 L19,20 C19,20.5522847 18.5522847,21 18,21 L15,21 C14.4477153,21 14,20.5522847 14,20 L14,19 C14,18.4477153 14.4477153,18 15,18 Z" id="矩形备份-22" fill="#005CFF"></path>
23
+ <path d="M21,18 L24,18 C24.5522847,18 25,18.4477153 25,19 L25,20 C25,20.5522847 24.5522847,21 24,21 L21,21 C20.4477153,21 20,20.5522847 20,20 L20,19 C20,18.4477153 20.4477153,18 21,18 Z" id="矩形备份-21" fill="#005CFF"></path>
24
+ <polygon id="路径-19" fill="#005CFF" points="20.1168478 0 20.1168478 7.2545499 28 7.2545499"></polygon>
33
25
  </g>
34
- <g id="编组-8" mask="url(#mask-2)">
35
- <g transform="translate(24.000000, 21.000000)">
36
- <circle id="椭圆形" stroke="#FFFFFF" fill="#FE0300" cx="8" cy="8" r="7.5"></circle>
37
- <g id="编组-9" stroke="none" fill="none" transform="translate(5.000000, 5.000000)" stroke-linecap="round">
38
- <polyline id="路径-20" stroke="#FFFFFF" stroke-width="1.13795117" transform="translate(3.181981, 3.181981) rotate(-315.000000) translate(-3.181981, -3.181981) " points="3.18198052 7.18198052 3.18198052 1.99975567 3.18198052 -0.818019485"></polyline>
39
- <polyline id="路径-20备份" stroke="#FFFFFF" stroke-width="1.13795117" transform="translate(3.181981, 3.181981) scale(-1, 1) rotate(-315.000000) translate(-3.181981, -3.181981) " points="3.18198052 7.18198052 3.18198052 1.99975567 3.18198052 -0.818019485"></polyline>
40
- </g>
26
+ <g id="编组-8" transform="translate(17.000000, 19.000000)" stroke="#FFFFFF">
27
+ <circle id="椭圆形" fill="#FE0300" cx="8" cy="8" r="7.5"></circle>
28
+ <g id="编组-9" transform="translate(5.000000, 5.000000)" stroke-linecap="round" stroke-width="1.13795117">
29
+ <polyline id="路径-20" transform="translate(3.181981, 3.181981) rotate(-315.000000) translate(-3.181981, -3.181981) " points="3.18198052 7.18198052 3.18198052 1.99975567 3.18198052 -0.818019485"></polyline>
30
+ <polyline id="路径-20备份" transform="translate(3.181981, 3.181981) scale(-1, 1) rotate(-315.000000) translate(-3.181981, -3.181981) " points="3.18198052 7.18198052 3.18198052 1.99975567 3.18198052 -0.818019485"></polyline>
41
31
  </g>
42
32
  </g>
43
33
  </g>
package/src/assets/exportProcessing.svg CHANGED
@@ -1,36 +1,26 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
- <title>下载中-icon</title>
4
- <defs>
5
- <rect id="path-1" x="0" y="0" width="40" height="40"></rect>
6
- </defs>
2
+ <svg width="40px" height="42px" viewBox="0 0 40 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <title>编组 17</title>
7
4
  <g id="导出功能" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8
- <g id="列表数据导出功能-导出列表" transform="translate(-1584.000000, -75.000000)">
9
- <g id="编组-13" transform="translate(1570.000000, 0.000000)">
10
- <g id="编组-21备份-20" transform="translate(0.000000, 64.000000)">
11
- <g id="编组-6" transform="translate(14.000000, 11.000000)">
12
- <mask id="mask-2" fill="white">
13
- <use xlink:href="#path-1"></use>
14
- </mask>
15
- <use id="下载中-icon" fill="#D8D8D8" opacity="0" xlink:href="#path-1"></use>
16
- <g mask="url(#mask-2)">
17
- <g transform="translate(4.000000, 3.000000)">
18
- <path d="M4.57142857,31.7142857 L4.57142857,2.28571429 C4.57142857,1.02334914 5.59477771,-6.56285705e-16 6.85714286,0 L22.974729,0 L22.974729,0 L32,8.22182322 L32,31.7142857 C32,32.9766509 30.9766509,34 29.7142857,34 L6.85714286,34 C5.59477771,34 4.57142857,32.9766509 4.57142857,31.7142857 Z" id="路径-6" fill="#1B79FF"></path>
19
- <g id="编组-2" stroke-width="1" fill="none" transform="translate(0.000000, 10.200000)">
20
- <path d="M12.5714286,0.571428571 C13.0448155,0.571428571 13.4733869,0.763306536 13.7836116,1.07353123 C14.0938363,1.38375593 14.2857143,1.81232736 14.2857143,2.28571429 L14.2857143,2.28571429 L14.2857143,12.447619 C14.2857143,12.921006 14.0938363,13.3495774 13.7836116,13.6598021 C13.4733869,13.9700268 13.0448155,14.1619048 12.5714286,14.1619048 L12.5714286,14.1619048 L2.28571429,14.1619048 C1.81232736,14.1619048 1.38375593,13.9700268 1.07353123,13.6598021 C0.763306536,13.3495774 0.571428571,12.921006 0.571428571,12.447619 L0.571428571,12.447619 L0.571428571,2.28571429 C0.571428571,1.81232736 0.763306536,1.38375593 1.07353123,1.07353123 C1.38375593,0.763306536 1.81232736,0.571428571 2.28571429,0.571428571 L2.28571429,0.571428571 Z" id="矩形" stroke="#005CFF" stroke-width="1.14285714" fill="#FFFFFF"></path>
21
- <g id="X" transform="translate(4.555429, 4.646667)" fill="#005CFF" fill-rule="nonzero">
22
- <polygon id="路径" points="4.112 5.55333333 2.952 3.8318 1.808 5.55333333 0 5.55333333 2.04 2.74493333 0.088 0 1.872 0 2.992 1.60253333 4.096 0 5.808 0 3.856 2.68146667 5.936 5.55333333"></polygon>
23
- </g>
24
- </g>
25
- <path d="M17.1428571,11.3333333 L20.5714286,11.3333333 C21.2026111,11.3333333 21.7142857,11.8450079 21.7142857,12.4761905 L21.7142857,13.5904762 C21.7142857,14.2216588 21.2026111,14.7333333 20.5714286,14.7333333 L17.1428571,14.7333333 C16.5116746,14.7333333 16,14.2216588 16,13.5904762 L16,12.4761905 C16,11.8450079 16.5116746,11.3333333 17.1428571,11.3333333 Z" id="矩形备份-7" fill="#005CFF"></path>
26
- <path d="M24,11.3333333 L27.4285714,11.3333333 C28.059754,11.3333333 28.5714286,11.8450079 28.5714286,12.4761905 L28.5714286,13.5904762 C28.5714286,14.2216588 28.059754,14.7333333 27.4285714,14.7333333 L24,14.7333333 C23.3688174,14.7333333 22.8571429,14.2216588 22.8571429,13.5904762 L22.8571429,12.4761905 C22.8571429,11.8450079 23.3688174,11.3333333 24,11.3333333 Z" id="矩形备份-18" fill="#005CFF"></path>
27
- <path d="M17.1428571,15.8666667 L20.5714286,15.8666667 C21.2026111,15.8666667 21.7142857,16.3783412 21.7142857,17.0095238 L21.7142857,18.1238095 C21.7142857,18.7549921 21.2026111,19.2666667 20.5714286,19.2666667 L17.1428571,19.2666667 C16.5116746,19.2666667 16,18.7549921 16,18.1238095 L16,17.0095238 C16,16.3783412 16.5116746,15.8666667 17.1428571,15.8666667 Z" id="矩形备份-20" fill="#005CFF"></path>
28
- <path d="M24,15.8666667 L27.4285714,15.8666667 C28.059754,15.8666667 28.5714286,16.3783412 28.5714286,17.0095238 L28.5714286,18.1238095 C28.5714286,18.7549921 28.059754,19.2666667 27.4285714,19.2666667 L24,19.2666667 C23.3688174,19.2666667 22.8571429,18.7549921 22.8571429,18.1238095 L22.8571429,17.0095238 C22.8571429,16.3783412 23.3688174,15.8666667 24,15.8666667 Z" id="矩形备份-19" fill="#005CFF"></path>
29
- <path d="M17.1428571,20.4 L20.5714286,20.4 C21.2026111,20.4 21.7142857,20.9116746 21.7142857,21.5428571 L21.7142857,22.6571429 C21.7142857,23.2883254 21.2026111,23.8 20.5714286,23.8 L17.1428571,23.8 C16.5116746,23.8 16,23.2883254 16,22.6571429 L16,21.5428571 C16,20.9116746 16.5116746,20.4 17.1428571,20.4 Z" id="矩形备份-22" fill="#005CFF"></path>
30
- <path d="M24,20.4 L27.4285714,20.4 C28.059754,20.4 28.5714286,20.9116746 28.5714286,21.5428571 L28.5714286,22.6571429 C28.5714286,23.2883254 28.059754,23.8 27.4285714,23.8 L24,23.8 C23.3688174,23.8 22.8571429,23.2883254 22.8571429,22.6571429 L22.8571429,21.5428571 C22.8571429,20.9116746 23.3688174,20.4 24,20.4 Z" id="矩形备份-21" fill="#005CFF"></path>
31
- <polygon id="路径-19" fill="#005CFF" points="22.9906832 0 22.9906832 8.22182322 32 8.22182322"></polygon>
5
+ <g id="编组-13" transform="translate(-14.000000, -74.000000)">
6
+ <g id="编组-21备份-20" transform="translate(0.000000, 64.000000)">
7
+ <g id="编组-17" transform="translate(14.000000, 10.000000)">
8
+ <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="39" height="41"></rect>
9
+ <g id="编组-6" transform="translate(6.000000, 6.000000)">
10
+ <path d="M4,28 L4,2 C4,0.8954305 4.8954305,-1.91384796e-17 6,0 L20.1028879,0 L20.1028879,0 L28,7.2545499 L28,28 C28,29.1045695 27.1045695,30 26,30 L6,30 C4.8954305,30 4,29.1045695 4,28 Z" id="路径-6" fill="#1B79FF"></path>
11
+ <g id="编组-2" transform="translate(0.000000, 9.000000)">
12
+ <path d="M11,0.5 C11.4142136,0.5 11.7892136,0.667893219 12.0606602,0.939339828 C12.3321068,1.21078644 12.5,1.58578644 12.5,2 L12.5,2 L12.5,11 C12.5,11.4142136 12.3321068,11.7892136 12.0606602,12.0606602 C11.7892136,12.3321068 11.4142136,12.5 11,12.5 L11,12.5 L2,12.5 C1.58578644,12.5 1.21078644,12.3321068 0.939339828,12.0606602 C0.667893219,11.7892136 0.5,11.4142136 0.5,11 L0.5,11 L0.5,2 C0.5,1.58578644 0.667893219,1.21078644 0.939339828,0.939339828 C1.21078644,0.667893219 1.58578644,0.5 2,0.5 L2,0.5 Z" id="矩形" stroke="#005CFF" fill="#FFFFFF"></path>
13
+ <g id="X" transform="translate(3.986000, 4.100000)" fill="#005CFF" fill-rule="nonzero">
14
+ <polygon id="路径" points="3.598 4.9 2.583 3.381 1.582 4.9 0 4.9 1.785 2.422 0.077 0 1.638 0 2.618 1.414 3.584 0 5.082 0 3.374 2.366 5.194 4.9"></polygon>
32
15
  </g>
33
16
  </g>
17
+ <path d="M15,10 L18,10 C18.5522847,10 19,10.4477153 19,11 L19,12 C19,12.5522847 18.5522847,13 18,13 L15,13 C14.4477153,13 14,12.5522847 14,12 L14,11 C14,10.4477153 14.4477153,10 15,10 Z" id="矩形备份-7" fill="#005CFF"></path>
18
+ <path d="M21,10 L24,10 C24.5522847,10 25,10.4477153 25,11 L25,12 C25,12.5522847 24.5522847,13 24,13 L21,13 C20.4477153,13 20,12.5522847 20,12 L20,11 C20,10.4477153 20.4477153,10 21,10 Z" id="矩形备份-18" fill="#005CFF"></path>
19
+ <path d="M15,14 L18,14 C18.5522847,14 19,14.4477153 19,15 L19,16 C19,16.5522847 18.5522847,17 18,17 L15,17 C14.4477153,17 14,16.5522847 14,16 L14,15 C14,14.4477153 14.4477153,14 15,14 Z" id="矩形备份-20" fill="#005CFF"></path>
20
+ <path d="M21,14 L24,14 C24.5522847,14 25,14.4477153 25,15 L25,16 C25,16.5522847 24.5522847,17 24,17 L21,17 C20.4477153,17 20,16.5522847 20,16 L20,15 C20,14.4477153 20.4477153,14 21,14 Z" id="矩形备份-19" fill="#005CFF"></path>
21
+ <path d="M15,18 L18,18 C18.5522847,18 19,18.4477153 19,19 L19,20 C19,20.5522847 18.5522847,21 18,21 L15,21 C14.4477153,21 14,20.5522847 14,20 L14,19 C14,18.4477153 14.4477153,18 15,18 Z" id="矩形备份-22" fill="#005CFF"></path>
22
+ <path d="M21,18 L24,18 C24.5522847,18 25,18.4477153 25,19 L25,20 C25,20.5522847 24.5522847,21 24,21 L21,21 C20.4477153,21 20,20.5522847 20,20 L20,19 C20,18.4477153 20.4477153,18 21,18 Z" id="矩形备份-21" fill="#005CFF"></path>
23
+ <polygon id="路径-19" fill="#005CFF" points="20.1168478 0 20.1168478 7.2545499 28 7.2545499"></polygon>
34
24
  </g>
35
25
  </g>
36
26
  </g>
package/src/assets/exportSuccess.svg CHANGED
@@ -1,41 +1,31 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
- <title>下载中-icon</title>
4
- <defs>
5
- <rect id="path-1" x="0" y="0" width="40" height="40"></rect>
6
- </defs>
2
+ <svg width="40px" height="42px" viewBox="0 0 40 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <title>编组 19</title>
7
4
  <g id="导出功能" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8
- <g id="列表数据导出功能-导出列表" transform="translate(-1584.000000, -199.000000)">
9
- <g id="编组-13" transform="translate(1570.000000, 0.000000)">
10
- <g id="编组-21备份-22" transform="translate(0.000000, 188.000000)">
11
- <g id="编组-6" transform="translate(14.000000, 11.000000)">
12
- <mask id="mask-2" fill="white">
13
- <use xlink:href="#path-1"></use>
14
- </mask>
15
- <use id="下载中-icon" fill="#D8D8D8" opacity="0" xlink:href="#path-1"></use>
16
- <g mask="url(#mask-2)">
17
- <g transform="translate(4.000000, 3.000000)">
18
- <path d="M4.57142857,31.7142857 L4.57142857,2.28571429 C4.57142857,1.02334914 5.59477771,-1.10037491e-15 6.85714286,0 L22.974729,0 L22.974729,0 L32,8.22182322 L32,31.7142857 C32,32.9766509 30.9766509,34 29.7142857,34 L6.85714286,34 C5.59477771,34 4.57142857,32.9766509 4.57142857,31.7142857 Z" id="路径-6" fill="#1B79FF"></path>
19
- <g id="编组-2" stroke-width="1" fill="none" transform="translate(0.000000, 10.200000)">
20
- <path d="M12.5714286,0.571428571 C13.0448155,0.571428571 13.4733869,0.763306536 13.7836116,1.07353123 C14.0938363,1.38375593 14.2857143,1.81232736 14.2857143,2.28571429 L14.2857143,2.28571429 L14.2857143,12.447619 C14.2857143,12.921006 14.0938363,13.3495774 13.7836116,13.6598021 C13.4733869,13.9700268 13.0448155,14.1619048 12.5714286,14.1619048 L12.5714286,14.1619048 L2.28571429,14.1619048 C1.81232736,14.1619048 1.38375593,13.9700268 1.07353123,13.6598021 C0.763306536,13.3495774 0.571428571,12.921006 0.571428571,12.447619 L0.571428571,12.447619 L0.571428571,2.28571429 C0.571428571,1.81232736 0.763306536,1.38375593 1.07353123,1.07353123 C1.38375593,0.763306536 1.81232736,0.571428571 2.28571429,0.571428571 L2.28571429,0.571428571 Z" id="矩形" stroke="#005CFF" stroke-width="1.14285714" fill="#FFFFFF"></path>
21
- <g id="X" transform="translate(4.555429, 4.646667)" fill="#005CFF" fill-rule="nonzero">
22
- <polygon id="路径" points="4.112 5.55333333 2.952 3.8318 1.808 5.55333333 0 5.55333333 2.04 2.74493333 0.088 0 1.872 0 2.992 1.60253333 4.096 0 5.808 0 3.856 2.68146667 5.936 5.55333333"></polygon>
23
- </g>
5
+ <g id="编组-13" transform="translate(-14.000000, -200.000000)">
6
+ <g id="编组-21备份-22" transform="translate(0.000000, 188.000000)">
7
+ <g id="编组-19" transform="translate(14.000000, 12.000000)">
8
+ <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="39" height="41"></rect>
9
+ <g id="编组-16" transform="translate(6.000000, 4.000000)">
10
+ <g id="编组-6">
11
+ <path d="M4,28 L4,2 C4,0.8954305 4.8954305,-1.91384796e-17 6,0 L20.1028879,0 L20.1028879,0 L28,7.2545499 L28,28 C28,29.1045695 27.1045695,30 26,30 L6,30 C4.8954305,30 4,29.1045695 4,28 Z" id="路径-6" fill="#1B79FF"></path>
12
+ <g id="编组-2" transform="translate(0.000000, 9.000000)">
13
+ <path d="M11,0.5 C11.4142136,0.5 11.7892136,0.667893219 12.0606602,0.939339828 C12.3321068,1.21078644 12.5,1.58578644 12.5,2 L12.5,2 L12.5,11 C12.5,11.4142136 12.3321068,11.7892136 12.0606602,12.0606602 C11.7892136,12.3321068 11.4142136,12.5 11,12.5 L11,12.5 L2,12.5 C1.58578644,12.5 1.21078644,12.3321068 0.939339828,12.0606602 C0.667893219,11.7892136 0.5,11.4142136 0.5,11 L0.5,11 L0.5,2 C0.5,1.58578644 0.667893219,1.21078644 0.939339828,0.939339828 C1.21078644,0.667893219 1.58578644,0.5 2,0.5 L2,0.5 Z" id="矩形" stroke="#005CFF" fill="#FFFFFF"></path>
14
+ <g id="X" transform="translate(3.986000, 4.100000)" fill="#005CFF" fill-rule="nonzero">
15
+ <polygon id="路径" points="3.598 4.9 2.583 3.381 1.582 4.9 0 4.9 1.785 2.422 0.077 0 1.638 0 2.618 1.414 3.584 0 5.082 0 3.374 2.366 5.194 4.9"></polygon>
24
16
  </g>
25
- <path d="M17.1428571,11.3333333 L20.5714286,11.3333333 C21.2026111,11.3333333 21.7142857,11.8450079 21.7142857,12.4761905 L21.7142857,13.5904762 C21.7142857,14.2216588 21.2026111,14.7333333 20.5714286,14.7333333 L17.1428571,14.7333333 C16.5116746,14.7333333 16,14.2216588 16,13.5904762 L16,12.4761905 C16,11.8450079 16.5116746,11.3333333 17.1428571,11.3333333 Z" id="矩形备份-7" fill="#005CFF"></path>
26
- <path d="M24,11.3333333 L27.4285714,11.3333333 C28.059754,11.3333333 28.5714286,11.8450079 28.5714286,12.4761905 L28.5714286,13.5904762 C28.5714286,14.2216588 28.059754,14.7333333 27.4285714,14.7333333 L24,14.7333333 C23.3688174,14.7333333 22.8571429,14.2216588 22.8571429,13.5904762 L22.8571429,12.4761905 C22.8571429,11.8450079 23.3688174,11.3333333 24,11.3333333 Z" id="矩形备份-18" fill="#005CFF"></path>
27
- <path d="M17.1428571,15.8666667 L20.5714286,15.8666667 C21.2026111,15.8666667 21.7142857,16.3783412 21.7142857,17.0095238 L21.7142857,18.1238095 C21.7142857,18.7549921 21.2026111,19.2666667 20.5714286,19.2666667 L17.1428571,19.2666667 C16.5116746,19.2666667 16,18.7549921 16,18.1238095 L16,17.0095238 C16,16.3783412 16.5116746,15.8666667 17.1428571,15.8666667 Z" id="矩形备份-20" fill="#005CFF"></path>
28
- <path d="M24,15.8666667 L27.4285714,15.8666667 C28.059754,15.8666667 28.5714286,16.3783412 28.5714286,17.0095238 L28.5714286,18.1238095 C28.5714286,18.7549921 28.059754,19.2666667 27.4285714,19.2666667 L24,19.2666667 C23.3688174,19.2666667 22.8571429,18.7549921 22.8571429,18.1238095 L22.8571429,17.0095238 C22.8571429,16.3783412 23.3688174,15.8666667 24,15.8666667 Z" id="矩形备份-19" fill="#005CFF"></path>
29
- <path d="M17.1428571,20.4 L20.5714286,20.4 C21.2026111,20.4 21.7142857,20.9116746 21.7142857,21.5428571 L21.7142857,22.6571429 C21.7142857,23.2883254 21.2026111,23.8 20.5714286,23.8 L17.1428571,23.8 C16.5116746,23.8 16,23.2883254 16,22.6571429 L16,21.5428571 C16,20.9116746 16.5116746,20.4 17.1428571,20.4 Z" id="矩形备份-22" fill="#005CFF"></path>
30
- <path d="M24,20.4 L27.4285714,20.4 C28.059754,20.4 28.5714286,20.9116746 28.5714286,21.5428571 L28.5714286,22.6571429 C28.5714286,23.2883254 28.059754,23.8 27.4285714,23.8 L24,23.8 C23.3688174,23.8 22.8571429,23.2883254 22.8571429,22.6571429 L22.8571429,21.5428571 C22.8571429,20.9116746 23.3688174,20.4 24,20.4 Z" id="矩形备份-21" fill="#005CFF"></path>
31
- <polygon id="路径-19" fill="#005CFF" points="22.9906832 0 22.9906832 8.22182322 32 8.22182322"></polygon>
32
17
  </g>
18
+ <path d="M15,10 L18,10 C18.5522847,10 19,10.4477153 19,11 L19,12 C19,12.5522847 18.5522847,13 18,13 L15,13 C14.4477153,13 14,12.5522847 14,12 L14,11 C14,10.4477153 14.4477153,10 15,10 Z" id="矩形备份-7" fill="#005CFF"></path>
19
+ <path d="M21,10 L24,10 C24.5522847,10 25,10.4477153 25,11 L25,12 C25,12.5522847 24.5522847,13 24,13 L21,13 C20.4477153,13 20,12.5522847 20,12 L20,11 C20,10.4477153 20.4477153,10 21,10 Z" id="矩形备份-18" fill="#005CFF"></path>
20
+ <path d="M15,14 L18,14 C18.5522847,14 19,14.4477153 19,15 L19,16 C19,16.5522847 18.5522847,17 18,17 L15,17 C14.4477153,17 14,16.5522847 14,16 L14,15 C14,14.4477153 14.4477153,14 15,14 Z" id="矩形备份-20" fill="#005CFF"></path>
21
+ <path d="M21,14 L24,14 C24.5522847,14 25,14.4477153 25,15 L25,16 C25,16.5522847 24.5522847,17 24,17 L21,17 C20.4477153,17 20,16.5522847 20,16 L20,15 C20,14.4477153 20.4477153,14 21,14 Z" id="矩形备份-19" fill="#005CFF"></path>
22
+ <path d="M15,18 L18,18 C18.5522847,18 19,18.4477153 19,19 L19,20 C19,20.5522847 18.5522847,21 18,21 L15,21 C14.4477153,21 14,20.5522847 14,20 L14,19 C14,18.4477153 14.4477153,18 15,18 Z" id="矩形备份-22" fill="#005CFF"></path>
23
+ <path d="M21,18 L24,18 C24.5522847,18 25,18.4477153 25,19 L25,20 C25,20.5522847 24.5522847,21 24,21 L21,21 C20.4477153,21 20,20.5522847 20,20 L20,19 C20,18.4477153 20.4477153,18 21,18 Z" id="矩形备份-21" fill="#005CFF"></path>
24
+ <polygon id="路径-19" fill="#005CFF" points="20.1168478 0 20.1168478 7.2545499 28 7.2545499"></polygon>
33
25
  </g>
34
- <g id="编组-8" mask="url(#mask-2)" stroke="#FFFFFF">
35
- <g transform="translate(24.000000, 24.000000)">
36
- <circle id="椭圆形" stroke-width="1" fill="#14C255" fill-rule="evenodd" cx="8" cy="8" r="7.5"></circle>
37
- <polyline id="路径-20" stroke-width="1.13795117" fill="none" stroke-linecap="round" points="4 7.78993765 7.25875897 11 12 5"></polyline>
38
- </g>
26
+ <g id="编组-8" transform="translate(17.000000, 19.000000)" stroke="#FFFFFF">
27
+ <circle id="椭圆形" fill="#14C255" cx="8" cy="8" r="7.5"></circle>
28
+ <polyline id="路径-20" stroke-width="1.13795117" stroke-linecap="round" points="4 7.78993765 7.25875897 11 12 5"></polyline>
39
29
  </g>
40
30
  </g>
41
31
  </g>
package/src/assets/upExport.svg CHANGED
@@ -1,20 +1,20 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
- <title>下载记录-icon</title>
3
+ <title>xinglan-icon-message备份 5</title>
4
4
  <defs>
5
5
  <rect id="path-1" x="0" y="0" width="24" height="24"></rect>
6
6
  </defs>
7
- <g id="首页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8
- <g id="首页-消息入口" transform="translate(-1653.000000, -13.000000)">
9
- <g id="编组-11备份-2" transform="translate(1653.000000, 13.000000)">
7
+ <g id="导出功能" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8
+ <g id="导出功能-导出数据转入后台提示" transform="translate(-1659.000000, -18.000000)">
9
+ <g id="导入、导出记录icon" transform="translate(1659.000000, 18.000000)">
10
10
  <mask id="mask-2" fill="white">
11
11
  <use xlink:href="#path-1"></use>
12
12
  </mask>
13
13
  <use id="xinglan-icon-message" fill="#D8D8D8" opacity="0" xlink:href="#path-1"></use>
14
- <g id="编组-43" mask="url(#mask-2)" fill="#A9B7E0">
15
- <g transform="translate(3.000000, 5.000000)">
16
- <path d="M6.13636364,0 C8.63317229,0 10.7816931,1.49524673 11.7399047,3.64143255 C12.2798603,3.40935387 12.8750529,3.28161372 13.5,3.28161372 C15.9852814,3.28161372 18,5.30180291 18,7.79383258 C18,10.0230473 16.3878264,11.8746964 14.2687972,12.2404603 C14.2465364,11.7876875 14.070622,11.3415459 13.7391397,10.9841303 C13.1286438,10.3258726 12.1783769,10.1711683 11.4091093,10.5396215 L11.4091093,10.5396215 L11.4090909,8.93969663 L11.4036052,8.79043429 C11.327256,7.75557442 10.4634527,6.93969663 9.40909091,6.93969663 C8.30452141,6.93969663 7.40909091,7.83512713 7.40909091,8.93969663 L7.40909091,8.93969663 L7.41007537,10.5401022 C6.64063099,10.1710339 5.68980332,10.3255866 5.07904209,10.9841303 C4.78169022,11.3047453 4.60952003,11.696756 4.56026628,12.099988 C1.93590154,11.404792 0,9.00559976 0,6.15302572 C0,2.75480345 2.74734358,0 6.13636364,0 Z" id="形状结合" fill-rule="evenodd"></path>
17
- <path d="M9.40909091,8.13969663 C9.81693196,8.13969663 10.1534925,8.44488478 10.2028578,8.83934633 L10.2090909,8.93969663 L10.209,13.166 L11.7287222,11.757578 C12.0526731,11.4571323 12.5588465,11.476187 12.8592923,11.8001379 C13.1324247,12.0946387 13.1415072,12.5397367 12.8975122,12.843959 L12.8167323,12.930708 L9.40909091,16.0910982 L6.00144947,12.930708 C5.67749858,12.6302623 5.65844386,12.1240888 5.95888956,11.8001379 C6.23202202,11.5056371 6.67517742,11.4631166 6.99688293,11.6835488 L7.08945962,11.757578 L8.609,13.166 L8.60909091,8.93969663 C8.60909091,8.49786883 8.96726311,8.13969663 9.40909091,8.13969663 Z" id="形状结合备份-2" fill-rule="nonzero"></path>
14
+ <g id="responsetime" mask="url(#mask-2)" fill="#000000" fill-rule="nonzero">
15
+ <g transform="translate(3.000000, 2.000000)">
16
+ <path d="M5.21516417,6.74357406 L4.07552238,7.8711358 L0,3.83881343 L3.87940299,0 L5.02011939,1.12756173 L3.05785074,3.06796734 L9.4438209,3.06903059 C14.112,3.06903059 17.9075821,6.76802848 17.9978507,11.3659924 L18,11.5345153 C18,16.2095638 14.1689552,20 9.4438209,20 C4.71814925,20 0.887104494,16.2095638 0.887104469,11.5345153 L2.49904477,11.5345153 C2.49904477,15.3292044 5.6084776,18.4051461 9.4438209,18.4051461 C13.2786269,18.4051461 16.3880597,15.3292044 16.3880597,11.5345153 C16.3880597,7.73982616 13.2786269,4.66388453 9.4438209,4.66388453 L3.11265671,4.66335292 L5.21516417,6.74357406 Z" id="形状"></path>
17
+ <path d="M10.4,7.2 L10.399,12.381 L12.4660494,10.315207 L13.6934831,11.5426407 L9.55833777,15.677786 L5.2,11.5508424 L6.44018239,10.31066 L8.599,12.309 L8.6,7.2 L10.4,7.2 Z" id="形状结合" transform="translate(9.446742, 11.438893) scale(1, -1) translate(-9.446742, -11.438893) "></path>
18
18
  </g>
19
19
  </g>
20
20
  </g>
package/src/components/Business/AddSelectBusiness/index.tsx CHANGED
@@ -23,6 +23,7 @@ export const AddSkuSelect = (parProps: any) => {
23
23
  filter: 'qp-name-like', // 过滤参数 支持'qp-name-like'和['qp-name-like', 'qp-code-like']两种结构
24
24
  otherParams: {
25
25
  'qp-combination-eq': false,
26
+ 'qp-approveStatus-eq': 1,
26
27
  }, // 默认参数
27
28
  mappingTextField: 'name',
28
29
  mappingValueField: 'skuCode',
@@ -244,7 +245,7 @@ export const AddSkuSelect = (parProps: any) => {
244
245
  return basePackUnit.name || basePackUnit.unitCode
245
246
  }
246
247
 
247
-
248
+
248
249
  return <></>
249
250
  },
250
251
  },
package/src/components/Functional/AddSelect/index.md CHANGED
@@ -30,6 +30,7 @@ export default () => {
30
30
  filter: 'qp-name-like', // 过滤参数 支持'qp-name-like'和['qp-name-like', 'qp-code-like']两种结构
31
31
  otherParams: {
32
32
  'qp-combination-eq': false,
33
+ 'qp-approveStatus-eq': 1,
33
34
  }, // 默认参数
34
35
  mappingTextField: 'name',
35
36
  mappingValueField: 'skuCode',
package/src/components/Functional/BillEntry/index.tsx CHANGED
@@ -19,7 +19,7 @@ const InputElement = ({
19
19
 
20
20
  const onSerchdata = (name: any) => {
21
21
  axios
22
- .get(`/items/sku/pager/v2?${stringify({ 'skuCodeAndSkuName': name, 'pageSize': 100 })}`)
22
+ .get(`/items/sku/pager/v2?${stringify({ 'skuCodeAndSkuName': name, 'pageSize': 100, 'qp-combination-eq': false, 'qp-approveStatus-eq': 1 })}`)
23
23
  .then(({ data, status }: any) => {
24
24
  if (status === 200) {
25
25
  if (data.status === '0') {
@@ -423,7 +423,7 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
423
423
  return basePackUnit.name || basePackUnit.unitCode
424
424
  }
425
425
 
426
-
426
+
427
427
  return <></>
428
428
  },
429
429
  },
@@ -520,7 +520,7 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
520
520
  return (
521
521
  <div className='add_select'>
522
522
  <div className='add_select_quick_header'>
523
- <div className='add_select_quick_header_title'><div>快速录入</div><Button type="primary" onClick={() => {
523
+ <div className='add_select_quick_header_title'><div>快速录入</div><Button type="primary" onClick={() => {
524
524
  onSaveCallback(data)
525
525
  }}>提交</Button></div>
526
526
  <span><span>*</span> &nbsp;快捷键：【Tab】-跳格切换；【Shift+←、→】-当前行左、右移动；【 ↑、↓】-当前列上、下移动；【ctrl+Delete】-删除当前行；</span>
@@ -544,4 +544,4 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
544
544
  );
545
545
  };
546
546
 
547
- export default BillEntry;
547
+ export default BillEntry;
package/src/components/Functional/ExportFunctions/ExportIcon/index.md ADDED
@@ -0,0 +1,37 @@
1
+ ---
2
+ title: 导出按钮
3
+ order: 5
4
+ nav:
5
+ title: 组件
6
+ order: 1
7
+ group:
8
+ path: /components/functional
9
+ order: 0
10
+ title: 功能组件
11
+ ---
12
+
13
+ ## ExportIcon
14
+
15
+ 导出按钮demo
16
+
17
+ ```tsx
18
+ import React, { useState, useRef } from 'react';
19
+ import {ExportIcon} from '../../../../index';
20
+
21
+
22
+
23
+ export default () => {
24
+
25
+ const tableRef = useRef()
26
+
27
+ return (
28
+ <div>
29
+ <ExportIcon request={{url:'abc'}} tableRef={tableRef}/>
30
+ </div>
31
+ );
32
+ };
33
+ ```
34
+
35
+ <API></API>
36
+
37
+ More skills for writing demo: https://d.umijs.org/guide/demo-principle
package/src/components/Functional/ExportFunctions/ExportIcon/index.tsx CHANGED
@@ -2,26 +2,44 @@ import React, {Ref} from 'react'
2
2
  import {message, Popconfirm, Tooltip} from "antd";
3
3
  import axios from 'axios'
4
4
  import exportlogo from '../../../../assets/exportlogo.png'
5
-
5
+ import {omit} from 'lodash'
6
6
  interface exportIconType{
7
- url: string,
8
- params: any,
9
- otherParams?: any
7
+ /** others选填，使用axios发请求，*/
8
+ request:{
9
+ url: string,
10
+ params: Function | Object,
11
+ others?: Object
12
+ },
13
+ /** BsSulaQueryTable的tableRef*/
14
+ tableRef: any,
10
15
  }
11
16
 
12
- const ExportIcon = ({params, url, otherParams}: exportIconType) => {
13
-
17
+ const ExportIcon = ({request, tableRef}: exportIconType) => {
18
+ const {url, params, others} = request
14
19
 
15
20
  return (
16
21
  <div style={{ cursor: 'pointer' }}>
17
22
  <Tooltip title="导出数据">
18
23
  <img width={32} src={exportlogo} onClick={() =>{
24
+ const convertedParams = tableRef?.current?.getExportParams()
25
+ let requestData: any
26
+
27
+ if(typeof params === 'function'){
28
+ requestData = {...omit(params(convertedParams),'selectedRows')}
29
+ }else if(typeof params === 'object'){
30
+ requestData = {...params}
31
+ }
32
+ if(!params){
33
+ requestData = omit(convertedParams, 'selectedRows')
34
+ }
35
+
36
+ requestData['qp-id-in'] = convertedParams?.selectedRows?.map((d: any) => d.id)?.join(',')
19
37
 
20
38
  axios({
21
39
  url,
22
40
  method:'POST',
23
- data:params?.current || (typeof params == 'function' ? params() : params),
24
- ...otherParams,
41
+ data:requestData,
42
+ ...others,
25
43
  })
26
44
  .then((result: any) => {
27
45
  result = result.data;
package/src/components/Functional/SearchSelect/index.tsx CHANGED
@@ -71,7 +71,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
71
71
  // 优化搜索参数 支持传多个
72
72
  let searchParams = {};
73
73
  if (typeof selectParamsKey === 'string') {
74
- searchParams = v ? { [selectParamsInitKey]: initVal } : { [selectParamsKey]: searchValue }
74
+ let selectParamsInitValue = initVal
75
+ if(labelInValue) {
76
+ selectParamsInitValue = Array.isArray(initVal)? initVal.map((i: any) => i.value || i.key).join(','): initVal
77
+ } else {
78
+ selectParamsInitValue = Array.isArray(initVal)? initVal.join(','): initVal
79
+ }
80
+ searchParams = v ? { [selectParamsInitKey]: selectParamsInitValue } : { [selectParamsKey]: searchValue }
75
81
  }
76
82
  if (Array.isArray(selectParamsKey)) {
77
83
  selectParamsKey.forEach((i: any) => {
package/src/utils/utils.ts ADDED
@@ -0,0 +1,22 @@
1
+ import dayjs from 'dayjs'
2
+
3
+ export function downloadExcel(data: any, fileName?: any, isResUrl?: boolean) {
4
+ const resUrl = isResUrl
5
+ ? data
6
+ : window.URL.createObjectURL(
7
+ new Blob([data], {
8
+ type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
9
+ }),
10
+ );
11
+ const save_link = document.createElement('a');
12
+ save_link.href = resUrl;
13
+ if (fileName) {
14
+ save_link.download = fileName; /// 设置下载文件名
15
+ }
16
+ save_link.click();
17
+ }
18
+
19
+ export function handleCommonTimeRender(text: any, format?: any) {
20
+ const formatType = format || 'YYYY-MM-DD HH:mm:ss';
21
+ return text && dayjs(text).format(formatType);
22
+ }