@bit-sun/business-component 4.2.0-alpha.3 → 4.2.0-alpha.30

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Table as SulaTable, request } from 'bssula';
 import { Resizable } from 'react-resizable';
@@ -22,7 +23,7 @@ export default class ColumnSettingSulaTable extends React.Component {
       showColumns: [],
       selectedRowKeys: [], // 新增状态，用于跟踪选中的行的键
       selectedRows: [],
-      showSummary: null 
+      showSummary: null
     }
     this.sulaTableRef = React.createRef<any>();
   }
@@ -79,9 +80,9 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 新增函数，用于根据传入的小数位数进行四舍五入
-   * @param number 
-   * @param decimalPlaces 
-   * @returns 
+   * @param number
+   * @param decimalPlaces
+   * @returns
    */
   roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
     const factor = Math.pow(10, (decimalPlaces || 2));
@@ -90,7 +91,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 合计行逻辑
-   * @returns 
+   * @returns
    */
   getTableSummaryInfo = () => {
     const { summary = undefined, rowSelection, expandable, isSpecial = false, modeType }: any = this.props;
@@ -167,10 +168,10 @@ export default class ColumnSettingSulaTable extends React.Component {
         </Table.Summary.Row>
       </Table.Summary>
     );
-    
+
     return () => summaryDom;
-  }; 
-  
+  };
+
   handledynamicColumns = (col: any[]) => {
     let { dynamicColumns, modeType }: any = this.props;
     col = col.map((item: any) => {
@@ -205,7 +206,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   ResizeableTitle = (props: any) => {
     const { onResize, width, ...restProps } = props;
-    
+
     const [innerWidth, setInnerWidth] = useState(width);
     const [isResizing, setIsResizing] = useState(false); // 标记是否正在拖拽
     const [isDragging, setIsDragging] = useState(false); // 标记拖拽句柄是否被拖拽
@@ -213,9 +214,9 @@ export default class ColumnSettingSulaTable extends React.Component {
     const markerPosition = useRef({ left: 0, top: 0 });
     const currentStart = useRef(0);
     const uuidref = useRef(uuid());
-    
+
     const prevWidthRef = useRef(width);
-  
+
     const handleMouseDown = (e: any) => {
       currentStart.current = e.clientX;
       markerPosition.current = { left: e.clientX, top: e.clientY }
@@ -223,35 +224,35 @@ export default class ColumnSettingSulaTable extends React.Component {
       document.addEventListener('mousemove', handleMouseMove);
       document.addEventListener('mouseup', handleMouseUp);
     };
-  
+
     const handleMouseMove = (e: any) => {
       e.stopPropagation();
       e.preventDefault();
       // 更新标记位置
       markerPosition.current = { left: e.clientX, top: e.clientY }
       const dom: HTMLElement | null =  document.getElementById('text1');
-  
+
       if (dom && dom.style) {
         dom.style.left = `${e.clientX}px`;
         dom.style.top = `${e.clientY - 20}px`;
       }
     };
-  
+
     const handleMouseUp = (e: any) => {
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
       setIsResizing(false);
     };
-    
+
     const handleresize = (e: any, data: any, title: string) => {
       const newWidth = data?.size?.width || 0;
       setInnerWidth(newWidth); // 更新内部分宽度
     };
-  
+
     const handleResizeStart = () => {
       setIsResizing(true);
     };
-  
+
     const handleResizeStop = (e: any, data: any) => {
       setIsResizing(false);
       if (onResize) {
@@ -265,11 +266,11 @@ export default class ColumnSettingSulaTable extends React.Component {
         setInnerWidth(width);
       }
     }, [width]);
-  
+
     const thStyle = {
       boxShadow: isResizing ? '2px 2px 10px rgba(0, 0, 0, 0.3)' : 'none',
     };
-  
+
     return (
       <Resizable
         width={innerWidth}
@@ -333,7 +334,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 处理行点击事件
-   * @param record 
+   * @param record
    */
   handleRowClick = (record: any) => {
     const { selectedRowKeys, selectedRows, } = this.state;
@@ -420,7 +421,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         ...propRowSelection,
         selectedRowKeys: this.state.selectedRowKeys,
         onChange: (selectedRowKeys: any, selectedRows: any) => {
-            this.setState({ 
+            this.setState({
                 selectedRowKeys,
                 selectedRows
             });
@@ -436,7 +437,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         };
       },
     }
-    
+
     return (
       <div style={{ position: 'relative' }}>
         <span style={{ position: 'absolute', zIndex: '10', right: '8px', top: '10px' }} className="ant-dropdown-link">

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

@@ -222,6 +222,98 @@ const AddSelect = (props: any) => {
               acc[key] = typeof value === 'function' ? value?.(record) : value;
               return acc;
             }, {});
+
+            // 可输入非数字字符
+            if(item.canInputString) {
+              return (
+                <InputNumber
+                  min={0}
+                  precision={0}
+                  controls={false}
+                  {...inputProps}
+                  value={text || ''}
+                  keyboard={false}
+                  onPressEnter={(e: any) => {
+                    e.target.blur();
+                  }}
+                  onBlur={async (e: any) => {
+                    const {
+                      target: { value },
+                    } = e;
+                    record[item.dataIndex] = value
+                    editRecord(record)
+                  }}
+                  onKeyDown={(e) => {
+                    if(e.keyCode === 13 && e.ctrlKey) {
+                      handleOk(true)
+                      document.getElementById("first-query")?.focus()
+                    }
+                    if(e.keyCode === 8 && e.ctrlKey) {
+                      message.success('删除当前行')
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                      deleteRecord(record, popvalue);
+                    }
+                    if (e.keyCode === 37 && e.shiftKey) {   // 左滑动
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex - 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 39 && e.shiftKey) {  //  右滑
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex + 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 40) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    } else if (e.keyCode === 38) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom1 = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex]
+                      if (dom1) {
+                        // dom1.value=""
+                        // dom1.setSelectionRange(100, 0);
+                        dom1.select();
+                        dom1.focus();
+                        dom1.scrollIntoViewIfNeeded(false)
+                        // dom1.value=record['count']
+                      }
+                      dom1 = null
+                    } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                    }
+                  }}
+                />
+              );
+            }
             
             return (
               <InputNumber
@@ -577,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)) })
       })
@@ -715,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;
@@ -477,9 +482,10 @@ customSort = (a, b) => {
     });
   }
 
-  resetData = () => {
-    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping } = this.props;
-    const resultData = this.getData().filter(d => {
+  resetData = async () => {
+    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping, checkSharedValue, beforeCheckCallback } = this.props;
+   
+    let resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
 
@@ -491,6 +497,24 @@ customSort = (a, b) => {
       otherParams = { brandAuth: 'ctl-withAuth' }
     }
 
+    // 处理校验参数，隐藏校验参数（公用的部分）
+    if(checkSharedValue){
+      resultData = resultData.map(d => {
+        return {
+          ...d,
+          ...checkSharedValue,
+        }
+      })
+    }
+
+    // 调用回调函数
+     if(beforeCheckCallback){
+      resultData = await beforeCheckCallback(resultData);
+      if(!resultData){
+        return;
+      }
+    }
+
     request
       .post(validDataUrl, {
         ...otherParams,
@@ -551,7 +575,6 @@ customSort = (a, b) => {
           resultData: res,
         });
 
-        console.log(setExportData);
         setExportData([123123]);
       })
       .catch((err:any) => { });
@@ -801,7 +824,6 @@ customSort = (a, b) => {
       top: '0px',
     };
 
-    console.log('itemsTemp', itemsTemp)
     return (
       <>
         <div className="sheet_table_top">

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

@@ -13,7 +13,7 @@ export const getValue = (value: any, selectMode?: any) => {
 }
 
 const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps={}, ctx }: any) => {
-  const { filter, method = 'get', url, extralHeaders = {}, otherParams = {}, specialBracket = false, noNeedSplit = false, } = requestConfig;
+  const { filter, method = 'get', url, extralHeaders = {}, otherParams = {}, specialBracket = false, noNeedSplit = false, requestType = 'get' } = requestConfig;
   const selectParamsKey = filter || 'qp-codeAndName-like';
   const resultSourceKey = handleSourceName(requestConfig?.sourceName || ctx?.name || 'skuCode')
   const currentSelectProps = {
@@ -106,7 +106,7 @@ const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps
     let getRequest;
     const methodName = method?.toLocaleLowerCase();
     if(['post','patch','put'].includes(methodName)) {
-      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams),{headers: { ...extralHeaders }})
+      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams({...queryParams, requestType}),{headers: { ...extralHeaders }})
     } else {
       getRequest = request.get( `${url}${convertUrlQueryParams(queryParams)}`,{headers: { ...extralHeaders }})
     }

package/src/components/Functional/SearchSelect/index.md

@@ -138,4 +138,113 @@ export default () => {
 };
 ```
 
+## POST Body Request Demo
+
+```tsx
+import React, { useState } from 'react';
+import { Button } from 'antd';
+import { SearchSelect } from '../../../index';
+
+export default () => {
+  const [tableSource, setTableSource] = useState([]);
+  const userInfo = { employeeResVo: { id: 'mock-id' } }; // Mock userInfo
+
+  return (
+    <SearchSelect
+      selectBusinessType="salesOrder" // Custom key
+      modalTableProps={{
+        modalTableTitle: '选择销售单明细',
+        tableSearchForm: [
+          {
+            name: 'orderNo',
+            label: '单据编号',
+            item: {
+              type: 'input'
+            }
+          },
+          {
+            name: 'orderDate',
+            label: '单据日期',
+            item: {
+              type: 'rangepicker'
+            }
+          },
+          {
+            name: 'saleOrgCode',
+            label: '销售组织',
+            item: {
+              type: 'select',
+              props: {
+                showSearch: true,
+                optionFilterProp: 'children'
+              }
+            },
+            remoteSource: {
+              url: `/user/orgViewNode/listNoPage?qp-orgViewCode-eq=sales-organizational-view&qp-employeeId-eq=${userInfo?.employeeResVo?.id}`,
+              method: 'GET',
+              converter: ({ data }: { data: any }) => {
+                return (
+                  (data &&
+                    Array.isArray(data) &&
+                    data.length &&
+                    data.map((v: any) => ({ text: v.name, value: v.code }))) ||
+                  []
+                );
+              },
+            },
+          },
+          {
+            name: 'customerCode',
+            label: '客户',
+            item: {
+              type: 'bs-customer2SearchSelect',
+              props: {
+                selectBusinessType: 'customer2',
+              }
+            },
+          }
+        ],
+        tableColumns: [
+          { title: '单据编号', key: 'orderNo' },
+          { title: '单据日期', key: 'orderDate' },
+          { title: '销售组织', key: 'saleDepartmentName' },
+          { title: '客户', key: 'customerName' },
+          { title: 'SKU', key: 'skuCode' },
+          { title: '商品名称', key: 'spuName' },
+          { title: '数量', key: 'planQuantity' },
+          { title: '销售金额', key: 'saleTaxedAmount' },
+        ],
+      }}
+
+
+      fieldComponent={<Button type="primary">新增</Button>}
+      selectProps={{
+        mode: 'multiple', // Allow multiple selection
+      }}
+      onSaveCallback={(rows: any) => {
+        if (!rows || rows.length === 0) return;
+        const newDetails = rows.map((item: any) => ({
+          key: Date.now() + Math.random(),
+          saleOrderNo: item.orderNo,
+          saleOrderDetailLineNo: item.lineNo,
+          skuCode: item.skuCode,
+          quantity: item.planQuantity,
+          saleAmount: item.saleTaxedAmount,
+          subsidyAmount: 0,
+        }));
+        setTableSource([...tableSource, ...newDetails]);
+        return Promise.resolve();
+      }}
+      requestConfig={{
+        url: '/drp-ops/new/tradeSubOrder/pageListAndDetailByData',
+        method: 'post',
+        isBodyRequest: true, // Enable body params for POST
+        mappingValueField: 'detailId', // Unique ID for selection
+        mappingTextField: 'orderNo', // Just for display if needed
+      }}
+    />
+  );
+};
+```
+
 More skills for writing demo: https://d.umijs.org/guide/demo-principle