@bit-sun/business-component 4.2.0-alpha.16 → 4.2.0-alpha.18

package/dist/index.esm.js

@@ -2561,11 +2561,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 cell.v = cell.m;
               }
             }
-            // console.log(postion);
           },
           cellAllRenderBefore: function cellAllRenderBefore(data, sheetFile, ctx) {
             sheetFile.config.borderInfo = [];
-            // console.info(data,sheetFile,ctx)
           }
         },
         showtoolbarConfig: {
@@ -2733,14 +2731,21 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       };
     };
     _this.getData = function () {
-      console.time();
+      // 是否使用字符串值 默认为false
+      var useStringValue = _this.props.useStringValue || false;
       var sheetData = luckysheet.getSheetData();
       var data = JSON.parse(JSON.stringify(sheetData)).filter(function (item) {
         return item[0];
       }).map(function (item) {
         var obj = {};
         item.slice(0, itemsTemp.length).map(function (innerItem, index) {
-          obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          // 如果使用字符串值，直接赋值字符串
+          if (useStringValue) {
+            obj[_this.state.items[index].code] = innerItem && innerItem.m;
+          } else {
+            // 否则根据值是否相等来判断是否使用字符串值
+            obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          }
         });
         return obj;
       });
@@ -2881,7 +2886,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 errorListCheck: false,
                 resultData: res
               });
-              console.log(setExportData);
               setExportData([123123]);
             }).catch(function (err) {});
           case 3:
@@ -3177,7 +3181,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         left: '0px',
         top: '0px'
       };
-      console.log('itemsTemp', itemsTemp);
       return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("div", {
         className: "sheet_table_top"
       }, /*#__PURE__*/React$1.createElement(Space, null, /*#__PURE__*/React$1.createElement("span", null, "\u6392\u5E8F\u5217"), /*#__PURE__*/React$1.createElement(Dropdown, {
@@ -14058,7 +14061,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       'ctl-withAuth': true
     },
     resType: 'list',
-    resPosition: isNoUseItemBarcode ? 3 : 4,
+    resPosition: isNoUseItemBarcode ? 4 : 5,
     resKeyValue: ['id', 'name']
   }, {
     url: "/items/category/queryCategoryTree",
@@ -14067,7 +14070,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       currentPage: 1
     },
     resType: 'treeList',
-    resPosition: isNoUseItemBarcode ? 4 : 5
+    resPosition: isNoUseItemBarcode ? 5 : 6
   }];
   var mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   var props = {
@@ -14104,7 +14107,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     tableSearchForm: mTpTableSearchForm,
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList
+    promiseLoadList: mTpPromiseLoadList,
+    pagination: (parProps === null || parProps === void 0 ? void 0 : parProps.pagination) || {}
   };
   return /*#__PURE__*/React$1.createElement("div", null, /*#__PURE__*/React$1.createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -20137,9 +20141,16 @@ var BsSulaQueryTable = (function (props) {
           }
         }));
       }));
-    } else {
-      return undefined;
     }
+    // 判断summaryList 是否为reactNode
+    if (/*#__PURE__*/React$1.isValidElement(summaryList)) {
+      return summaryList;
+    }
+    // 判断summaryList 是否为函数
+    if (Object.prototype.toString.call(summaryList) === '[object Function]') {
+      return summaryList();
+    }
+    return undefined;
   };
   var columnsDom = /*#__PURE__*/React$1.createElement("span", {
     className: "ant-dropdown-link"
@@ -20164,7 +20175,7 @@ var BsSulaQueryTable = (function (props) {
   var memoConfig = useMemo(function () {
     return _objectSpread2(_objectSpread2({}, config), {}, {
       summary: props.summary,
-      summaryList: props.summaryList ? getTableSummaryInfo : props.summary,
+      summaryList: props.summaryList ? getTableSummaryInfo : undefined,
       statusMapping: props.statusMapping,
       isBsSulaQueryTable: true,
       columnsDom: columnsDom,

package/dist/index.js

@@ -2584,11 +2584,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 cell.v = cell.m;
               }
             }
-            // console.log(postion);
           },
           cellAllRenderBefore: function cellAllRenderBefore(data, sheetFile, ctx) {
             sheetFile.config.borderInfo = [];
-            // console.info(data,sheetFile,ctx)
           }
         },
         showtoolbarConfig: {
@@ -2756,14 +2754,21 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       };
     };
     _this.getData = function () {
-      console.time();
+      // 是否使用字符串值 默认为false
+      var useStringValue = _this.props.useStringValue || false;
       var sheetData = luckysheet.getSheetData();
       var data = JSON.parse(JSON.stringify(sheetData)).filter(function (item) {
         return item[0];
       }).map(function (item) {
         var obj = {};
         item.slice(0, itemsTemp.length).map(function (innerItem, index) {
-          obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          // 如果使用字符串值，直接赋值字符串
+          if (useStringValue) {
+            obj[_this.state.items[index].code] = innerItem && innerItem.m;
+          } else {
+            // 否则根据值是否相等来判断是否使用字符串值
+            obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          }
         });
         return obj;
       });
@@ -2904,7 +2909,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 errorListCheck: false,
                 resultData: res
               });
-              console.log(setExportData);
               setExportData([123123]);
             }).catch(function (err) {});
           case 3:
@@ -3200,7 +3204,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         left: '0px',
         top: '0px'
       };
-      console.log('itemsTemp', itemsTemp);
       return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "sheet_table_top"
       }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement("span", null, "\u6392\u5E8F\u5217"), /*#__PURE__*/React__default['default'].createElement(antd.Dropdown, {
@@ -14081,7 +14084,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       'ctl-withAuth': true
     },
     resType: 'list',
-    resPosition: isNoUseItemBarcode ? 3 : 4,
+    resPosition: isNoUseItemBarcode ? 4 : 5,
     resKeyValue: ['id', 'name']
   }, {
     url: "/items/category/queryCategoryTree",
@@ -14090,7 +14093,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       currentPage: 1
     },
     resType: 'treeList',
-    resPosition: isNoUseItemBarcode ? 4 : 5
+    resPosition: isNoUseItemBarcode ? 5 : 6
   }];
   var mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   var props = {
@@ -14127,7 +14130,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     tableSearchForm: mTpTableSearchForm,
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList
+    promiseLoadList: mTpPromiseLoadList,
+    pagination: (parProps === null || parProps === void 0 ? void 0 : parProps.pagination) || {}
   };
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -20160,9 +20164,16 @@ var BsSulaQueryTable = (function (props) {
           }
         }));
       }));
-    } else {
-      return undefined;
     }
+    // 判断summaryList 是否为reactNode
+    if (/*#__PURE__*/React__default['default'].isValidElement(summaryList)) {
+      return summaryList;
+    }
+    // 判断summaryList 是否为函数
+    if (Object.prototype.toString.call(summaryList) === '[object Function]') {
+      return summaryList();
+    }
+    return undefined;
   };
   var columnsDom = /*#__PURE__*/React__default['default'].createElement("span", {
     className: "ant-dropdown-link"
@@ -20187,7 +20198,7 @@ var BsSulaQueryTable = (function (props) {
   var memoConfig = React$1.useMemo(function () {
     return _objectSpread2(_objectSpread2({}, config), {}, {
       summary: props.summary,
-      summaryList: props.summaryList ? getTableSummaryInfo : props.summary,
+      summaryList: props.summaryList ? getTableSummaryInfo : undefined,
       statusMapping: props.statusMapping,
       isBsSulaQueryTable: true,
       columnsDom: columnsDom,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.0-alpha.16",
+  "version": "4.2.0-alpha.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -433,7 +433,7 @@ export const AddSkuSelect = (parProps: any) => {
         'ctl-withAuth': true
       },
       resType: 'list',
-      resPosition: isNoUseItemBarcode ? 3 : 4,
+      resPosition: isNoUseItemBarcode ? 4 : 5,
       resKeyValue: ['id','name']
     },
     {
@@ -443,7 +443,7 @@ export const AddSkuSelect = (parProps: any) => {
         currentPage: 1,
       },
       resType: 'treeList',
-      resPosition: isNoUseItemBarcode ? 4 : 5
+      resPosition: isNoUseItemBarcode ? 5 : 6
     },
   ]
   const mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
@@ -486,6 +486,7 @@ export const AddSkuSelect = (parProps: any) => {
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
     promiseLoadList: mTpPromiseLoadList,
+    pagination: parProps?.pagination || {},
   }
 
   return (

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -1079,9 +1079,16 @@ export default (props: any) => {
             ))}
         </Table.Summary>
       );
-    } else {
-      return undefined;
     }
+     // 判断summaryList 是否为reactNode
+    if(React.isValidElement(summaryList)){
+      return summaryList;
+    }
+    // 判断summaryList 是否为函数
+    if(Object.prototype.toString.call(summaryList) === '[object Function]'){
+      return summaryList();
+    }
+    return undefined;
   };
 
   const columnsDom = <span className="ant-dropdown-link">
@@ -1098,11 +1105,11 @@ export default (props: any) => {
     bsTableCode={bsTableCode}
   />
 
-  const memoConfig = useMemo(
+  const memoConfig = useMemo(    
     () => ({
       ...config,
       summary: props.summary,
-      summaryList: props.summaryList ? getTableSummaryInfo : props.summary,
+      summaryList: props.summaryList ? getTableSummaryInfo : undefined,
       statusMapping: props.statusMapping,
       isBsSulaQueryTable: true,
       columnsDom:columnsDom,

package/src/components/Functional/DataValidation/index.tsx

@@ -242,11 +242,9 @@ class DataValidation extends React.Component {
               cell.v = cell.m
             }
           }
-          // console.log(postion);
         },
         cellAllRenderBefore: function (data, sheetFile, ctx) {
           sheetFile.config.borderInfo = [];
-          // console.info(data,sheetFile,ctx)
         },
       },
       showtoolbarConfig: {
@@ -411,7 +409,8 @@ class DataValidation extends React.Component {
   };
 
   getData = () => {
-    console.time();
+    // 是否使用字符串值 默认为false
+    const useStringValue = this.props.useStringValue || false;
     let sheetData = luckysheet.getSheetData();
     let data = JSON.parse(JSON.stringify(sheetData))
       .filter((item) => item[0])
@@ -419,7 +418,13 @@ class DataValidation extends React.Component {
         let obj = {};
 
         item.slice(0, itemsTemp.length).map((innerItem, index) => {
-          obj[this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          // 如果使用字符串值，直接赋值字符串
+          if (useStringValue) {
+            obj[this.state.items[index].code] = innerItem && innerItem.m;
+          } else {
+            // 否则根据值是否相等来判断是否使用字符串值
+            obj[this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          }
         });
 
         return obj;
@@ -570,7 +575,6 @@ customSort = (a, b) => {
           resultData: res,
         });
 
-        console.log(setExportData);
         setExportData([123123]);
       })
       .catch((err:any) => { });
@@ -820,7 +824,6 @@ customSort = (a, b) => {
       top: '0px',
     };
 
-    console.log('itemsTemp', itemsTemp)
     return (
       <>
         <div className="sheet_table_top">