@bit-sun/business-component 4.2.0-alpha.0 → 4.2.0-alpha.10

package/src/components/Business/SystemLog/index.md

@@ -0,0 +1,37 @@
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 业务组件
+  order: 1
+title: 日志组件
+order: 1
+---
+
+# SystemLog
+
+
+## 日志业务组件
+
+```tsx
+import React, { useState } from 'react';
+import { SystemLog } from '../../../index.ts';
+
+export default () => {
+  const [modeType, setModeType] = useState('view');
+  const renderLogRef = useRef<any>();
+
+  return {
+   fields: [
+      SystemLog({
+        modeType,
+        code: '123',
+        containerName: 'Test_Log_Info',
+        renderLogRef,
+        extraParams: {},
+      })
+    ],
+  };
+};
+```

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

@@ -0,0 +1,87 @@
+import { handleCommonTimeRender } from '@/utils/TableUtils';
+import { formContainerAndItemLayout, handleConvertResponse } from '@/utils/utils';
+import { Table as BsTable } from 'bssula';
+import React from 'react';
+
+//操作日志
+const SystemLog = ({
+  modeType,
+  code,
+  containerName,
+  renderLogRef = {},
+  extraParams = {},
+}: {
+  modeType: string,
+  code: any
+  containerName: string,
+  renderLogRef: object,
+  extraParams?: object,
+}) => {
+  return {
+    ...formContainerAndItemLayout('table', '操作日志', containerName),
+    initialVisible: modeType != 'create',
+    fields: [
+      {
+        name: 'table',
+        label: false,
+        itemLayout: {
+          span: 24,
+          labelCol: {
+            span: 0,
+          },
+          wrapperCol: {
+            span: 24,
+          },
+        },
+        field: (ctx: any) => {
+          return code && <BsTable
+            remoteDataSource={{
+              url: `/oms-ops/logInfo?qp-businessCode-eq=${code}`,
+              convertParams: ({ params }: any) => {
+                return {
+                  pageSize: params.pageSize,
+                  currentPage: params.current,
+                  ...extraParams,
+                };
+              },
+              converter: ({ data }: any) => {
+                return {
+                  ...handleConvertResponse(data.list, data.total || data.totalCount),
+                };
+              },
+            }}
+            columns={[
+              {
+                title: '操作人',
+                dataIndex: 'handlerName',
+              },
+              {
+                title: '操作名称',
+                dataIndex: 'handlerType',
+              },
+              {
+                title: '操作时间',
+                dataIndex: 'handlerTime',
+                render: ({ text }: { text: any }) => handleCommonTimeRender(text)
+              },
+              {
+                title: '操作内容',
+                dataIndex: 'logcontent',
+              },
+            ]}
+            style={{ width: '100%', marginTop: '-16px', padding: '0px' }}
+            rowKey="id"
+            scroll={{ x: 'max-content' }}
+            pagination={{
+              showTotal: (total: any) => `共 ${total} 条`,
+              showQuickJumper: true,
+              hideOnSinglePage: true,
+            }}
+            ref={renderLogRef}
+          />
+        },
+      },
+    ],
+  }
+}
+export default SystemLog

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

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React, { useState } from 'react';
 import { Table, Tooltip, Typography } from 'antd';
 import { Resizable } from 'react-resizable';
@@ -81,9 +82,9 @@ export default class ColumnSettingTable 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));
@@ -92,7 +93,7 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
    * 合计行逻辑
-   * @returns 
+   * @returns
    */
   getTableSummaryInfo = () => {
     const { summary = undefined, rowSelection, expandable, modeType, dataSource, isSpecial = false, }: any = this.props;
@@ -232,7 +233,7 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
    * 处理行点击事件
-   * @param record 
+   * @param record
    */
   handleRowClick = (record: any) => {
     const { selectedRowKeys, selectedRows, } = this.state;
@@ -316,7 +317,7 @@ export default class ColumnSettingTable extends React.Component {
         ...propRowSelection,
         selectedRowKeys: this.state.selectedRowKeys,
         onChange: (selectedRowKeys: any, selectedRows: any) => {
-            this.setState({ 
+            this.setState({
                 selectedRowKeys,
                 selectedRows
             });

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

@@ -87,7 +87,9 @@ const AddSelect = (props: any) => {
     tableCodeList = [], // 非必填 默认取组件定义code,如需自定义----数组第一位为供选择商品的table的code,第二位为已选择商品的table的code
     businessType = 'sku',
     isAllowRepeatedSelect = false,
-    clearTitle
+    clearTitle,
+    batchFormatCallback,
+    batchFormatBtnTitle,
   } = props;
   const { url, method = 'get', sourceKey, otherParams, isMap, mappingValueField = 'code', extralHeaders = {} } = requestConfig || {};
   const realButtonProps = {type: "primary", ...buttonProps};
@@ -214,9 +216,108 @@ const AddSelect = (props: any) => {
                 // precision: unitAccuracy
               }
             }
+            // 如果属性为函数时,则执行该函数
+            const inputProps = Object.keys(item?.inputProps || {})?.reduce((acc, key) => {
+              const value = item?.inputProps?.[key];
+              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
-                {...item.inputProps}
+                {...inputProps}
                 value={text || ''}
                 min={0}
                 autoFocus={record.needFocus}
@@ -615,6 +716,11 @@ const AddSelect = (props: any) => {
     }, 50)
   };
 
+  // 将格式化完的数据回显到 表格中
+  const batchFormatCallbackHandler = () => {
+    setPopValue([...batchFormatCallback?.(popvalue)]);
+  }
+
   const handleShowModal = () => {
     if(beforeShowModal) {
       beforeShowModal(popvalue).then(res => {
@@ -1049,7 +1155,10 @@ const AddSelect = (props: any) => {
                       settingImgAttribute={{ width: 20, style: { marginTop: -2 } }}
                     />
                   </span>
-                  <div style={{ marginRight: 8 }}><span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>{clearTitle??'清空所选商品'}</span></div>
+                  <div style={{ marginRight: 8, display: 'flex', gap: '5px' }}>
+                    <span hidden={!batchFormatCallback} onClick={batchFormatCallbackHandler} style={{ cursor: 'pointer' }}>{batchFormatBtnTitle ?? '一键填充'}</span>
+                    <span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>{clearTitle ?? '清空所选商品'}</span>
+                  </div>
                 </div>
               </div>
               <Table

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

@@ -477,9 +477,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 +492,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,

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

@@ -11,9 +11,9 @@ import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, ConfigProvider } from 'antd';
 import './index.less';
 
-const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
+const QueryMutipleInput = ({ onValueChange,onPressEnter, value: initialValue }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
-  const [value, setValue] = useState('');
+  const [value, setValue] = useState(initialValue);
   const [popvalue, setPopValue] = useState('');
   const { run } = useDebounceFn(
     () => {
@@ -24,6 +24,14 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
     },
   );
 
+  /**
+   * 初始化参数
+   * 处理参数不展示和清空不同步的问题
+  */
+  useEffect(() => {
+    setValue(initialValue);
+  }, [initialValue]);
+
   useEffect(() => {
     setPopValue(value);
     onValueChange(value);
@@ -32,7 +40,7 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
   const showModal = () => {
     setIsModalVisible(true);
     //弹窗打开时 默认搜索内容换行显示
-    setPopValue(data => data.replace(/,/g, '\n'));
+    setPopValue(data => data?.replace?.(/,/g, '\n'));
   };
 
   const handleOk = () => {
@@ -67,6 +75,7 @@ const QueryMutipleInput = ({ onValueChange,onPressEnter }) => {
         <Input
           value={value}
           onChange={outerChange}
+          allowClear
           onBlur={(e) => {
             formaData(e.target.value);
           }}