@bit-sun/business-component 1.0.13 → 1.0.17

package/dist/index.esm.js

@@ -3,6 +3,7 @@ import React, { createContext, useContext, useEffect, forwardRef, createElement,
 import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal } from 'antd';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
+import _ from 'loadsh';
 import { useDebounceFn } from 'ahooks';
 
 function ownKeys(object, enumerableOnly) {
@@ -1716,7 +1717,24 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           defaultRowHeight: 20,
           defaultColWidth: 120,
           config: {},
-          celldata: data,
+          celldata: data && data.length !== 0 ? data : _.flattenDeep(Array.from({
+            length: 100
+          }).map(function (a, b) {
+            return Array.from({
+              length: 100
+            }).map(function (c, d) {
+              return {
+                "r": b,
+                "c": d,
+                "v": {
+                  "ct": {
+                    "fa": "@",
+                    "t": "s"
+                  }
+                }
+              };
+            });
+          })),
           scrollLeft: 0,
           // "scrollTop": 315, //上下滚动条位置
           luckysheet_select_save: [],
@@ -1876,7 +1894,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           updateData = _this$props.updateData,
           columns = _this$props.columns;
 
-      var resultData = _this.getData();
+      var resultData = _this.getData().filter(function (d) {
+        return _.compact(Object.values(d)).length;
+      });
 
       axios.post(validDataUrl, {
         columns: columns,
@@ -2052,7 +2072,11 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         id: "item-0".concat(index),
         content: mapping.get(item),
         code: item,
-        type: "string"
+        "ct": {
+          "fa": "General",
+          "t": "s" //格式类型为数字类型
+
+        }
       };
     });
     _this.state = {

package/dist/index.js

@@ -7,6 +7,7 @@ var React = require('react');
 var antd = require('antd');
 var reactBeautifulDnd = require('react-beautiful-dnd');
 var classNames = require('classnames');
+var _ = require('loadsh');
 var ahooks = require('ahooks');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -14,6 +15,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
+var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -1726,7 +1728,24 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           defaultRowHeight: 20,
           defaultColWidth: 120,
           config: {},
-          celldata: data,
+          celldata: data && data.length !== 0 ? data : ___default['default'].flattenDeep(Array.from({
+            length: 100
+          }).map(function (a, b) {
+            return Array.from({
+              length: 100
+            }).map(function (c, d) {
+              return {
+                "r": b,
+                "c": d,
+                "v": {
+                  "ct": {
+                    "fa": "@",
+                    "t": "s"
+                  }
+                }
+              };
+            });
+          })),
           scrollLeft: 0,
           // "scrollTop": 315, //上下滚动条位置
           luckysheet_select_save: [],
@@ -1886,7 +1905,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           updateData = _this$props.updateData,
           columns = _this$props.columns;
 
-      var resultData = _this.getData();
+      var resultData = _this.getData().filter(function (d) {
+        return ___default['default'].compact(Object.values(d)).length;
+      });
 
       axios__default['default'].post(validDataUrl, {
         columns: columns,
@@ -2062,7 +2083,11 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         id: "item-0".concat(index),
         content: mapping.get(item),
         code: item,
-        type: "string"
+        "ct": {
+          "fa": "General",
+          "t": "s" //格式类型为数字类型
+
+        }
       };
     });
     _this.state = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "1.0.13",
+  "version": "1.0.17",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -31,6 +31,7 @@
     "antd": "4.17.2",
     "axios": "^0.24.0",
     "classnames": "^2.3.1",
+    "loadsh": "^0.0.4",
     "react": "^16.12.0",
     "react-beautiful-dnd": "10.0.0"
   },

package/src/components/DataValidation/index.md

@@ -23,7 +23,9 @@ export default () => {
   return (
     <div>
       <DataValidation
-        columns={['skuCode', 'quantity', 'price']}
+        // columns={['skuCode', 'quantity', 'price']}
+        columns={["skuCode", "quantity", "price"]}  // 需要哪些列展示，以及展示的顺序
+          validDataUrl="http://test.i-baby.net/wms-ops/recordDetailImport/check" // 校验的接口url
         onRef={(ref) => {
           dataValidationRef = ref;
         }}

package/src/components/DataValidation/index.tsx

@@ -27,6 +27,7 @@ import {
 } from '@ant-design/icons';
 import axios from 'axios';
 import './index.less';
+import _ from "loadsh"
 
 const luckysheet = window.luckysheet;
 
@@ -106,7 +107,10 @@ class DataValidation extends React.Component {
         id: `item-0${index}`,
         content: mapping.get(item),
         code: item,
-        type: "string"
+        "ct": { //单元格值格式
+          "fa": "General",  //格式名称为自动格式
+          "t": "s" //格式类型为数字类型
+        }
       };
     });
 
@@ -206,7 +210,13 @@ class DataValidation extends React.Component {
           defaultRowHeight: 20, //自定义行高
           defaultColWidth: 120, //自定义列宽
           config: {},
-          celldata: data,
+          celldata:
+            data && data.length !== 0 ? data : _.flattenDeep(Array.from({ length: 100 }).map((a, b) => Array.from({ length: 100 }).map((c, d) => ({
+              "r": b,
+              "c": d,
+              "v": { "ct": { "fa": "@", "t": "s" }, }
+            }))))
+          ,
           scrollLeft: 0, //左右滚动条位置
           // "scrollTop": 315, //上下滚动条位置
           luckysheet_select_save: [], //选中的区域
@@ -333,6 +343,7 @@ class DataValidation extends React.Component {
 
   getValidateData = () => {
     const { resultData } = this.state;
+
     return {
       successData: resultData
         .filter((item) => item.flag)
@@ -363,7 +374,9 @@ class DataValidation extends React.Component {
 
   resetData = () => {
     const { validDataUrl, updateData, columns } = this.props;
-    const resultData = this.getData();
+    const resultData = this.getData().filter(d => {
+      return _.compact(Object.values(d)).length
+    })
 
     axios
       .post(validDataUrl, {