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

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

@@ -14,28 +14,39 @@ export default class ColumnSettingTable extends React.Component {
     super(props);
     this.state = {
       showColumns: [],
+      selectedRowKeys: [], // 新增状态，用于跟踪选中的行的键
+      selectedRows: [],
+      showSummary: null
     }
   }
 
   componentDidMount() {
-    const { columns }: any = this.props;
-    this.setInitialShowColumn(columns || [])
+    const { columns, updateSummary }: any = this.props;
+    this.setInitialShowColumn(columns || [], () => {
+      // 首次加载时调用 recalculateSummary 方法
+      this.recalculateSummary(updateSummary || '');
+    });
   }
 
 
   componentWillReceiveProps(nextProps: any) {
     // if (JSON.stringify(this.props.columns) !== JSON.stringify(nextProps.columns)) {
     // }
-    this.setInitialShowColumn(nextProps.columns || [])
-  }
+    this.setInitialShowColumn(nextProps.columns || [], () => {
+      this.recalculateSummary(nextProps.updateSummary);
+    });
+    if(nextProps.newUpdateSummary){
+      this.recalculateSummary(nextProps.newUpdateSummary);
+    }
+  };
 
-  setInitialShowColumn = (columns: any[]) => {
+  setInitialShowColumn = (columns: any[], callback?: () => void) => {
     // 获取当前列表定义数据
     let columnConfig = this.getConfigFromlocalstorage();
     let showColumns = getShowColumns(columns, columnConfig);
     this.setState({
-      showColumns,
-    })
+      showColumns
+    }, callback);
   }
 
   reSetInitialShowColumn = () => {
@@ -68,32 +79,97 @@ export default class ColumnSettingTable extends React.Component {
     return [];
   };
 
+  /**
+     * 新增函数，用于根据传入的小数位数进行四舍五入
+     * @param number 
+     * @param decimalPlaces 
+     * @returns 
+     */
+  roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
+    const factor = Math.pow(10, (decimalPlaces || 2));
+    return Math.round(Number(number || 0) * factor) / factor;
+  };
+
+  /**
+   * 合计行逻辑
+   * @returns 
+   */
   getTableSummaryInfo = () => {
-    const { summary = undefined, rowSelection, expandable }: any = this.props;
-    const { showColumns }: any = this.state;
-    // let summaryRow = rowSelection ? [{}, ...showColumns] : [...showColumns];
-    let summaryRow = rowSelection && expandable ? [{}, {}, ...showColumns] : rowSelection || expandable ? [{}, ...showColumns] : [...showColumns]; //兼容table配置展开expandable属性导致汇总列位置不对的问题
-    let summaryInitial = summary().cont;
-    let summaryDom: any = <Table.Summary fixed>
-      <Table.Summary.Row>
-        {
-          [...summaryRow].map((item: any, index: number) => {
+    const { summary = undefined, rowSelection, expandable, modeType, dataSource, isSpecial = false, }: any = this.props;
+    const { showColumns } = this.state;
+
+    // 封装生成 summaryRow 的逻辑
+    const generateSummaryRow = () => {
+      if (rowSelection && expandable) {
+        return [{}, {}, ...showColumns];
+      } else if (rowSelection || expandable || isSpecial) {
+        return [{}, ...showColumns];
+      }
+      return [...showColumns];
+    };
+
+    const summaryRow = generateSummaryRow();
+
+    let summaryInitial: any = [];
+    // 完善判断逻辑
+    if (typeof summary === 'function') {
+      const summaryResult = summary();
+      if (summaryResult.diy && !Array.isArray(summaryResult)) {
+        summaryInitial = summaryResult.cont;
+      }
+    } else if (typeof summary === 'object' && summary !== null && summary.diy && !Array.isArray(summary)) {
+      summaryInitial = summary.cont;
+    }
+
+    // let offset = 0;
+    let validSummaryRow = summaryRow;
+    // if(summaryInitial && summaryInitial.length > 0){
+    //   summaryRow.filter((item) => {
+    //     if (Object.keys(item).length === 0) {
+    //       offset++;
+    //       return false;
+    //     }
+    //     return true;
+    //   });
+    // }
+
+    const summaryDom = (
+      <Table.Summary fixed>
+        <Table.Summary.Row>
+          {validSummaryRow.map((item, index) => {
+            const actualIndex = index;
+            let cellContent;
+
+            if (item.showTotal) {
+              cellContent = <Text type="danger">合计</Text>;
+            } else if (summaryInitial && summaryInitial.length > 0) {
+              const matchedItem = summaryInitial.find((inner: any) => inner.key === item.dataIndex || inner.key === item.key);
+              cellContent = <Text type="danger">{matchedItem ? matchedItem.value : ''}</Text>;
+            } else {
+              if (item.showSummary) {
+                const sum = dataSource.reduce((acc: any, record: any) => {
+                  const value = record[item.dataIndex];
+                  return acc + Number(value || 0);
+                }, 0);
+                const decimalPlaces = item.showDigit || 2;
+                const roundedSum = this.roundToDecimalPlaces(sum, decimalPlaces);
+                cellContent = <Text type="danger">{roundedSum}</Text>;
+              } else {
+                cellContent = <Text type="danger"></Text>;
+              }
+            }
+
             return (
-              <Table.Summary.Cell index={index}>
-                <Text type="danger">
-                  {
-                    summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key).length ?
-                      `${item.title}: ${summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key)[0].value}` : ''
-
-                  }
-                </Text>
+              <Table.Summary.Cell index={item.showTotal ? actualIndex + 1 : actualIndex}>
+                {cellContent}
               </Table.Summary.Cell>
-            )
-          })
-        }
-      </Table.Summary.Row >
-    </Table.Summary>
-  return () => summaryDom
+            );
+          })}
+        </Table.Summary.Row>
+      </Table.Summary>
+    );
+
+    return () => summaryDom;
   };
 
   handledynamicColumns = (col: any[]) => {
@@ -154,19 +230,52 @@ export default class ColumnSettingTable extends React.Component {
     }
   };
 
+  /**
+   * 处理行点击事件
+   * @param record 
+   */
+  handleRowClick = (record: any) => {
+    const { selectedRowKeys, selectedRows, } = this.state;
+    const { rowKey }: any = this.props;
+    let newSelectedRowKeys = [...selectedRowKeys];
+    let newSelectedRows = [...selectedRows];
+
+    const keyIndex = newSelectedRowKeys.indexOf(record[rowKey]);
+    if (keyIndex > -1) {
+      // 如果已经选中，则取消选中
+      newSelectedRowKeys.splice(keyIndex, 1);
+      newSelectedRows.splice(keyIndex, 1);
+    } else {
+      // 如果未选中，则添加到选中列表
+      newSelectedRowKeys.push(record[rowKey]);
+      newSelectedRows.push(record);
+    }
+    this.setState({
+      selectedRowKeys: newSelectedRowKeys,
+      selectedRows: newSelectedRows,
+    });
+
+    // 手动调用外部传入的 onChange 函数
+    const { rowSelection }: any = this.props;
+    if (rowSelection && typeof rowSelection.onChange === 'function') {
+      // 直接将 record 作为数组元素传递
+      rowSelection.onChange(newSelectedRowKeys, newSelectedRows);
+    }
+  };
+
+  recalculateSummary = (nextProps: any) => {
+    if (this.state.showColumns.length) {
+      const showSummary = this.getTableSummaryInfo();
+      this.setState({ showSummary });
+    }
+  };
+
   render() {
-    const { columns, tableCode, appRequestConfig, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
+    const { columns, tableCode, appRequestConfig, summary = undefined, dynamicColumns = [], scroll={}, rowSelection: propRowSelection, ...restProps }: any = this.props;
     let otherTableInfo = {
       ...restProps,
     };
-    let showSummary = null;
-    if (this.state.showColumns.length && !Array.isArray(summary)) {
-      if (summary && summary().diy) {
-        showSummary = this.getTableSummaryInfo();
-      } else {
-        showSummary = summary;
-      }
-    };
+    const { showSummary } = this.state;
 
     const handleColumns = (arr: any, indexArr: any[]) => {
       arr.forEach((item: any, index: any) => {
@@ -195,6 +304,7 @@ export default class ColumnSettingTable extends React.Component {
       showCol = this.handledynamicColumns(showCol);
     }
 
+
     otherTableInfo = {
       ...otherTableInfo,
       scroll: {
@@ -202,6 +312,24 @@ export default class ColumnSettingTable extends React.Component {
         ...scroll,
         x: restProps.overScrollX || this.getTableScrollXWidth(showCol)
       },
+      rowSelection: propRowSelection ? {
+        ...propRowSelection,
+        selectedRowKeys: this.state.selectedRowKeys,
+        onChange: (selectedRowKeys: any, selectedRows: any) => {
+            this.setState({ 
+                selectedRowKeys,
+                selectedRows
+            });
+            if (propRowSelection && propRowSelection.onChange) {
+              propRowSelection.onChange(selectedRowKeys, selectedRows);
+            }
+        },
+      } : false,
+      onRow: (record: any) => {
+        return {
+          onClick: () => this.handleRowClick(record), // 绑定行点击事件
+        };
+      },
       ...(
         showSummary ? { summary: showSummary } : {}
       )

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

@@ -14,35 +14,46 @@ import TableSumComponent from './components/TableSumComponent';
 const { Text } = Typography;
 
 export default class ColumnSettingSulaTable extends React.Component {
-  sulaTableRef: React.RefObject<unknown>;
+  sulaTableRef: React.RefObject<any>;
   state: any;
   constructor(props: any) {
     super(props);
     this.state = {
       showColumns: [],
+      selectedRowKeys: [], // 新增状态，用于跟踪选中的行的键
+      selectedRows: [],
+      showSummary: null 
     }
-    this.sulaTableRef = React.createRef();
+    this.sulaTableRef = React.createRef<any>();
   }
 
   componentDidMount() {
-    const { columns }: any = this.props;
-    this.setInitialShowColumn(columns || [])
+    const { columns, updateSummary }: any = this.props;
+    this.setInitialShowColumn(columns || [], () => {
+      // 首次加载时调用 recalculateSummary 方法
+      this.recalculateSummary(updateSummary || '');
+    });
   }
 
   componentWillReceiveProps(nextProps: any) {
     // if (JSON.stringify(this.props.columns) !== JSON.stringify(nextProps.columns)) {
     // }
-    this.setInitialShowColumn(nextProps.columns || [])
-  }
 
-  setInitialShowColumn = (columns: any[]) => {
+    this.setInitialShowColumn(nextProps.columns || [], () => {
+      this.recalculateSummary(nextProps.updateSummary);
+    });
+    if(nextProps.newUpdateSummary){
+      this.recalculateSummary(nextProps.newUpdateSummary);
+    }
+  };
+
+  setInitialShowColumn = (columns: any[], callback?: () => void) => {
     // 获取当前列表定义数据
     let columnConfig = this.getConfigFromlocalstorage();
     let showColumns = getShowColumns(columns, columnConfig);
     this.setState({
-      showColumns,
-    })
-
+        showColumns
+    }, callback);
   }
 
   setShowColumns = (newColumns: Array<any>) => {
@@ -66,34 +77,100 @@ export default class ColumnSettingSulaTable extends React.Component {
     return [];
   };
 
+  /**
+   * 新增函数，用于根据传入的小数位数进行四舍五入
+   * @param number 
+   * @param decimalPlaces 
+   * @returns 
+   */
+  roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
+    const factor = Math.pow(10, (decimalPlaces || 2));
+    return Math.round(Number(number || 0) * factor) / factor;
+  };
+
+  /**
+   * 合计行逻辑
+   * @returns 
+   */
   getTableSummaryInfo = () => {
-    const { summary = undefined, rowSelection, expandable }: any = this.props;
-    const { showColumns }: any = this.state;
-    // let summaryRow = rowSelection ? [{}, ...showColumns] : [...showColumns];
-    let summaryRow = rowSelection && expandable ? [{}, {}, ...showColumns] : rowSelection || expandable ? [{}, ...showColumns] : [...showColumns]; //兼容table配置展开expandable属性导致汇总列位置不对的问题
-    let summaryInitial = summary().cont;
-    let summaryDom: any = <Table.Summary fixed>
-      <Table.Summary.Row>
-        {
-          [...summaryRow].map((item: any, index: number) => {
-            return (
-              <Table.Summary.Cell index={index}>
-                <Text type="danger">
-                  {
-                    summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key).length ?
-                      `${item.title}: ${summaryInitial.filter((inner: any) => inner.key === item.dataIndex || inner.key === item.key)[0].value}` : ''
+    const { summary = undefined, rowSelection, expandable, isSpecial = false, modeType }: any = this.props;
+    const { showColumns } = this.state;
 
-                  }
-                </Text>
-              </Table.Summary.Cell>
-            )
-          })
-        }
-      </Table.Summary.Row >
-    </Table.Summary>
-  return () => summaryDom
-  };
+    const generateSummaryRow = () => {
+      if (rowSelection && expandable) {
+        return [{}, {}, ...showColumns];
+      } else if (rowSelection || expandable || isSpecial) {
+        return [{}, ...showColumns];
+      }
+      return [...showColumns];
+    };
+
+    const summaryRow = generateSummaryRow();
+
+    let summaryInitial: any = [];
+    // 完善判断逻辑
+    if (typeof summary === 'function') {
+      const summaryResult = summary();
+      if (summaryResult.diy && !Array.isArray(summaryResult)) {
+        summaryInitial = summaryResult.cont;
+      }
+    } else if (typeof summary === 'object' && summary !== null && summary.diy && !Array.isArray(summary)) {
+      summaryInitial = summary.cont;
+    }
+
+    //let offset = 0;
+    let validSummaryRow = summaryRow;
+    // if (summaryInitial && summaryInitial.length > 0) {
+    //   summaryRow.filter((item) => {
+    //     if (Object.keys(item).length === 0) {
+    //       offset++;
+    //       return false;
+    //     }
+    //     return true;
+    //   });
+    // }
+
+    const dataSource = this.sulaTableRef?.current?.getDataSource() || [];
+
+    const summaryDom = (
+      <Table.Summary fixed>
+        <Table.Summary.Row>
+          {validSummaryRow.map((item, index) => {
+            const actualIndex = index;
+            let cellContent;
 
+            if (item.showTotal) {
+              cellContent = <Text type="danger">合计</Text>;
+            } else if (summaryInitial && summaryInitial.length > 0) {
+              const matchedItem = summaryInitial.find((inner: any) => inner.key === item.dataIndex || inner.key === item.key);
+              cellContent = <Text type="danger">{matchedItem ? matchedItem.value : ''}</Text>;
+            } else {
+              if (item.showSummary) {
+                const sum = dataSource.reduce((acc: any, record: any) => {
+                  const value = record[item.dataIndex];
+                  return acc + Number(value || 0);
+                }, 0);
+                const decimalPlaces = item.showDigit || 2;
+                const roundedSum = this.roundToDecimalPlaces(sum, decimalPlaces);
+                cellContent = <Text type="danger">{roundedSum}</Text>;
+              } else {
+                cellContent = <Text type="danger"></Text>;
+              }
+            }
+
+            return (
+              <Table.Summary.Cell index={item.showTotal ? actualIndex + 1 : actualIndex}>
+                {cellContent}
+              </Table.Summary.Cell>
+            );
+          })}
+        </Table.Summary.Row>
+      </Table.Summary>
+    );
+    
+    return () => summaryDom;
+  }; 
+  
   handledynamicColumns = (col: any[]) => {
     let { dynamicColumns, modeType }: any = this.props;
     col = col.map((item: any) => {
@@ -181,7 +258,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         onResize(e, data);
       }
     };
-  
+
     useEffect(() => {
       if (width !== prevWidthRef.current) {
         prevWidthRef.current = width;
@@ -254,19 +331,53 @@ export default class ColumnSettingSulaTable extends React.Component {
     }
   };
 
+  /**
+   * 处理行点击事件
+   * @param record 
+   */
+  handleRowClick = (record: any) => {
+    const { selectedRowKeys, selectedRows, } = this.state;
+    const { rowKey }: any = this.props;
+    let newSelectedRowKeys = [...selectedRowKeys];
+    let newSelectedRows = [...selectedRows];
+
+    const keyIndex = newSelectedRowKeys.indexOf(record[rowKey]);
+    if (keyIndex > -1) {
+      // 如果已经选中，则取消选中
+      newSelectedRowKeys.splice(keyIndex, 1);
+      newSelectedRows.splice(keyIndex, 1);
+    } else {
+      // 如果未选中，则添加到选中列表
+      newSelectedRowKeys.push(record[rowKey]);
+      newSelectedRows.push(record);
+    }
+    this.setState({
+      selectedRowKeys: newSelectedRowKeys,
+      selectedRows: newSelectedRows,
+    });
+
+    // 手动调用外部传入的 onChange 函数
+    const { rowSelection }: any = this.props;
+    if (rowSelection && typeof rowSelection.onChange === 'function') {
+      // 直接将 record 作为数组元素传递
+      rowSelection.onChange(newSelectedRowKeys, newSelectedRows);
+    }
+  };
+
+  recalculateSummary = (nextProps: any) => {
+    if (this.state.showColumns.length) {
+      const showSummary = this.getTableSummaryInfo();
+      this.setState({ showSummary });
+    }
+  };
+
   render() {
-    const { style=null, columns, tableCode, appRequestConfig, summary = undefined, dynamicColumns = [], scroll={}, ...restProps }: any = this.props;
+    const { style=null, columns, tableCode, appRequestConfig, summary = undefined, dynamicColumns = [], scroll={}, rowSelection: propRowSelection, ...restProps }: any = this.props;
     let otherTableInfo = {
       ...restProps,
     };
-    let showSummary = null;
-    if (this.state.showColumns.length && !Array.isArray(summary)) {
-      if (summary && summary().diy) {
-        showSummary = this.getTableSummaryInfo();
-      } else {
-        showSummary = summary;
-      }
-    };
+
+    const { showSummary } = this.state;
 
     const handleColumns = (arr: any, indexArr: any[]) => {
       arr.forEach((item: any, index: any) => {
@@ -292,7 +403,7 @@ export default class ColumnSettingSulaTable extends React.Component {
     handleColumns(showCol, []);
     if (dynamicColumns.length) {
       showCol = this.handledynamicColumns(showCol);
-    }
+    };
 
     otherTableInfo = {
       ...otherTableInfo,
@@ -304,8 +415,28 @@ export default class ColumnSettingSulaTable extends React.Component {
       sticky: true,
       ...(
         showSummary ? { summary: showSummary } : {}
-      )
+      ),
+      rowSelection: propRowSelection ? {
+        ...propRowSelection,
+        selectedRowKeys: this.state.selectedRowKeys,
+        onChange: (selectedRowKeys: any, selectedRows: any) => {
+            this.setState({ 
+                selectedRowKeys,
+                selectedRows
+            });
+            if (propRowSelection && propRowSelection.onChange) {
+              propRowSelection.onChange(selectedRowKeys, selectedRows);
+            }
+        },
+      } : false,
+      onRow: (record: any) => {
+        return {
+          onClick: () => this.handleRowClick(record), // 绑定行点击事件
+          //onDoubleClick: () => this.handleRowDoubleClick(record), // 绑定行点击事件
+        };
+      },
     }
+    
     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

@@ -89,14 +89,14 @@ const AddSelect = (props: any) => {
     isAllowRepeatedSelect = false,
     clearTitle
   } = props;
-  const { url, otherParams, isMap, mappingValueField = 'code' } = requestConfig || {};
+  const { url, method = 'get', sourceKey, otherParams, isMap, mappingValueField = 'code', extralHeaders = {} } = requestConfig || {};
   const realButtonProps = {type: "primary", ...buttonProps};
   const selectRowKey = isAllowRepeatedSelect ? 'uuid' : mappingValueField
 
   const selectMode = selectProps?.mode  // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   const initVal = value || (selectMode ? [] : null);
   const pageSize = 100 // 下拉框默认分页 条数
-  const tableInitPageSize = 10 // 弹框默认分页 条数
+  const tableInitPageSize = modalTableProps?.topTablePagination?.pageSize || 10 // 弹框默认分页 条数
   const currentPage = 1
 
   const [fetching, setFetching] = useState(false);
@@ -108,7 +108,7 @@ const AddSelect = (props: any) => {
   const [tableSearchForm, setTableSearchForm] = useState<Array<SearchFormItem>>(modalTableProps?.tableSearchForm)
   const [caretLeftFlag, setCaretLeftFlag] = useState(true);
   const [tableData, setTableData] = useState([]);
-  const [tablePagination, setTablePagination] = useState({ total: 0, size: "small", current: 1, pageSize: tableInitPageSize })
+  const [tablePagination, setTablePagination] = useState({ total: 0, size: "small", current: 1, pageSize: tableInitPageSize, ...(modalTableProps?.topTablePagination) })
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
   const [tableFormParams, setTableFormParams] = useState({});
   const [confirmLoading, setConfirmLoading] = useState(false);
@@ -518,9 +518,18 @@ const AddSelect = (props: any) => {
         }
       })
     }
-    request
-      .get(`${url}${url.includes("?")?"&":"?"}${stringify(queryParams)}`)
-      .then((result: any) => {
+
+    let getRequest;
+    const methodName = method?.toLocaleLowerCase?.();
+    if(['post','patch','put'].includes(methodName)) {
+      getRequest = request[methodName](`${url}`,queryParams, { headers: { ...extralHeaders }})
+    } else {
+      getRequest = request.get( `${url}${url.includes("?")?"&":"?"}${stringify(queryParams)}`,{headers: { ...extralHeaders }})
+    }
+
+    if (!url || !getRequest) return;
+
+    getRequest.then((result: any) => {
         setFetching(false)
         result = result.data;
         if (judgeIsRequestError(result)) {
@@ -537,7 +546,7 @@ const AddSelect = (props: any) => {
             };
           });
         } else {
-          const keys = res.list ? 'list' : 'items';
+          const keys = sourceKey ? sourceKey :res.list ? 'list' : 'items';
           source = res
             ? res[keys]
               ? res[keys].map((item: any) => {
@@ -557,7 +566,8 @@ const AddSelect = (props: any) => {
               })
             : [];
         }
-        source = Array.isArray(source) ? source : []
+        // 数据源 不可以有重复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)) })
@@ -940,7 +950,7 @@ const AddSelect = (props: any) => {
       </div>
       {isModalVisible && (
         <Modal
-          width='1200px'
+          width={`calc(100% - 320px)`}
           style={{ top: 20 }}
           bodyStyle={{ padding: '0px' }}
           visible={isModalVisible}

package/src/components/Functional/BillEntry/index.less

@@ -361,6 +361,9 @@
     .table_odd {
       background: #f7f8fb;
     }
+    .table_gray {
+      background: #C0C0C0;
+    }
     
     // 浮起的列 设置斑马
     .ant-table-cell-fix-left,

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

@@ -43,6 +43,7 @@ export default () => {
         onRef={(ref) => {
           dataValidationRef = ref;
         }}
+        getTemplate={() => {}}
       />
     </div>
   );