@bit-sun/business-component 4.2.0-alpha.19 → 4.2.0-alpha.20

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, {
@@ -4281,7 +4284,11 @@ var convertBodyParams = function convertBodyParams(params) {
   }
   // body参数来源：sku选择器固定参数 > 调用所传bodyParams > 默认参数-无
   // post 方式参数 来源默认的bodyParams 以及原有搜索项的参数
-  return unique_params || omit(_objectSpread2(_objectSpread2({}, params), params === null || params === void 0 ? void 0 : params.bodyParams), ['bodyParams', 'noUrlQueryParams']);
+  return unique_params || (params === null || params === void 0 ? void 0 : params.bodyParams) || null;
+  // return unique_params || omit({
+  //   ...params,
+  //   ...params?.bodyParams,
+  // },['bodyParams', 'noUrlQueryParams']);
 };
 var convertRes = function convertRes(data, otherParams) {
   var mappingTextField = otherParams.mappingTextField,
@@ -8387,6 +8394,8 @@ var AddSelect = function AddSelect(props) {
     });
   };
   var handleTableChange = function handleTableChange(pagination) {
+    // 设置分页tablePagination
+    setTablePagination(_objectSpread2(_objectSpread2({}, tablePagination), pagination));
     getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
@@ -14059,7 +14068,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",
@@ -14068,7 +14077,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 = {
@@ -14105,7 +14114,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     tableSearchForm: mTpTableSearchForm,
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList
+    promiseLoadList: mTpPromiseLoadList,
+    topTablePagination: (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

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, {
@@ -4304,7 +4307,11 @@ var convertBodyParams = function convertBodyParams(params) {
   }
   // body参数来源：sku选择器固定参数 > 调用所传bodyParams > 默认参数-无
   // post 方式参数 来源默认的bodyParams 以及原有搜索项的参数
-  return unique_params || _.omit(_objectSpread2(_objectSpread2({}, params), params === null || params === void 0 ? void 0 : params.bodyParams), ['bodyParams', 'noUrlQueryParams']);
+  return unique_params || (params === null || params === void 0 ? void 0 : params.bodyParams) || null;
+  // return unique_params || omit({
+  //   ...params,
+  //   ...params?.bodyParams,
+  // },['bodyParams', 'noUrlQueryParams']);
 };
 var convertRes = function convertRes(data, otherParams) {
   var mappingTextField = otherParams.mappingTextField,
@@ -8410,6 +8417,8 @@ var AddSelect = function AddSelect(props) {
     });
   };
   var handleTableChange = function handleTableChange(pagination) {
+    // 设置分页tablePagination
+    setTablePagination(_objectSpread2(_objectSpread2({}, tablePagination), pagination));
     getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
@@ -14082,7 +14091,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",
@@ -14091,7 +14100,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 = {
@@ -14128,7 +14137,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     tableSearchForm: mTpTableSearchForm,
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList
+    promiseLoadList: mTpPromiseLoadList,
+    topTablePagination: (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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.0-alpha.19",
+  "version": "4.2.0-alpha.20",
   "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,
+    topTablePagination: parProps?.pagination || {},
   }
 
   return (

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

@@ -669,7 +669,7 @@ const AddSelect = (props: any) => {
         }
         // 数据源 不可以有重复key
         source = Array.isArray(source) ? _.uniqBy(source, 'value') : [];
-     
+
         setTableData(source)
         setTablePagination({ ...tablePagination, total: Number(res?.total || res?.totalCount || source.length), pageSize: Number(res?.size || res?.pageSize || (params?.pageSize || pageSize)), current: Number(res?.page || res?.currentPage || (params?.currentPage || currentPage)) })
       })
@@ -807,6 +807,8 @@ const AddSelect = (props: any) => {
   }
 
   const handleTableChange = (pagination) => {
+    // 设置分页tablePagination
+    setTablePagination({ ...tablePagination, ...pagination })
     getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
 

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">

package/src/components/Functional/SearchSelect/utils.tsx

@@ -234,10 +234,11 @@ export const convertBodyParams = (params: any) => {
 
   // body参数来源：sku选择器固定参数 > 调用所传bodyParams > 默认参数-无
   // post 方式参数 来源默认的bodyParams 以及原有搜索项的参数
-  return unique_params || omit({
-    ...params,
-    ...params?.bodyParams,
-  },['bodyParams', 'noUrlQueryParams']);
+  return unique_params || params?.bodyParams || null;
+  // return unique_params || omit({
+  //   ...params,
+  //   ...params?.bodyParams,
+  // },['bodyParams', 'noUrlQueryParams']);
 }