test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: 增加表格组件注释

This commit is contained in:
teukkk 2024-09-13 15:20:15 +08:00 committed by Craftsman
parent bea89c4f28
commit 560a251a48
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/pure/ms-table/select-all.vue
View File

@ -141,6 +141,7 @@
if (item.children && item.children.length > 0 && !props.rowSelectionDisabledConfig?.disabledChildren) { if (item.children && item.children.length > 0 && !props.rowSelectionDisabledConfig?.disabledChildren) {
return hasUnselectedChildren(item.children, selectedKeys, rowKey); return hasUnselectedChildren(item.children, selectedKeys, rowKey);
} }
// 有数据没有勾选上，且该数据没有被禁用
return ( return (
!selectedKeys.has(item[rowKey]) && !selectedKeys.has(item[rowKey]) &&
!(props?.rowSelectionDisabledConfig?.disabledKey && item[props?.rowSelectionDisabledConfig?.disabledKey]) !(props?.rowSelectionDisabledConfig?.disabledKey && item[props?.rowSelectionDisabledConfig?.disabledKey])
@ -150,7 +151,7 @@
const handleCheckChange = () => { const handleCheckChange = () => {
if (hasUnselectedChildren(props.currentData, props.selectedKeys, props.rowKey)) { if (hasUnselectedChildren(props.currentData, props.selectedKeys, props.rowKey)) {
// 当前页有数据没有勾选上，此时点击全选按钮代表全部选中 // 当前页有数据没有勾选上，且该数据没有被禁用，此时点击全选按钮代表全部选中
handleSelect(SelectAllEnum.CURRENT, false); handleSelect(SelectAllEnum.CURRENT, false);
} else { } else {
// 否则是当前页全部数据已勾选，此时点击全选按钮代表取消当前页面数据勾选 // 否则是当前页全部数据已勾选，此时点击全选按钮代表取消当前页面数据勾选

1
frontend/src/components/pure/ms-table/useTable.ts
View File

@ -365,6 +365,7 @@ export default function useTableProps<T>(
}; };
const collectIds = (data: MsTableDataItem<T>[], rowKey: string) => { const collectIds = (data: MsTableDataItem<T>[], rowKey: string) => {
data.forEach((item: MsTableDataItem<T>) => { data.forEach((item: MsTableDataItem<T>) => {
// 有数据没有勾选上，且该数据没有被禁用
if ( if (
item[rowKey] && item[rowKey] &&
!propsRes.value.selectedKeys.has(item[rowKey]) && !propsRes.value.selectedKeys.has(item[rowKey]) &&