@bit-sun/business-component 2.2.35 → 2.2.36

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

@@ -24,7 +24,7 @@ export default forwardRef((props, ref) => {
 
   //起始渲染item
   const [startIndex, setStartIndex] = useState(0);
-
+  
   //结束渲染item
   const endIndex = useMemo(() => {
     return startIndex + viewCount;
@@ -129,18 +129,18 @@ export default forwardRef((props, ref) => {
     getDataSource: getDataSource,
   }
 
-
+  
 
   // if (!show) {
   //   return <div>loading</div>;
   // }
-
+  
   const {width, height } = props;
   let tableWidth = width ? `${width}px` : '100%';
   let tableHeight = `${height || 400}px`;
   const rightAreaWidth = 'calc(100% - ' +  `${config.colHeaderWidth}px` + ')';
   return (
-      <div
+      <div 
         style={{width: tableWidth, height: tableHeight}}
         key='moreTreeTable'
         className={'editTableWrapper'}
@@ -156,24 +156,24 @@ export default forwardRef((props, ref) => {
           }}
           ></div>
          {/* -------------------------------------左上角区域--------------------------------------- */}
-         <table
+         <table 
           style={{
-            width: `${config.colHeaderWidth+1}px`,
-            height:  `${config.colHeaderToTop}px`,
+            width: `${config.colHeaderWidth+1}px`, 
+            height:  `${config.colHeaderToTop}px`, 
             display: config.tableType === 'col-header-table' ? 'none' : '',
-          }}
+          }} 
           className={`${'north__west'}`}
         >
         </table>
 
         {/* --------------------------------------纵向表头---------------------------------------- */}
-        <table
+        <table 
           style={{
-            width: `${config.colHeaderWidth+1}px`,
-            top: `${config.colHeaderToTop}px`,
+            width: `${config.colHeaderWidth+1}px`, 
+            top: `${config.colHeaderToTop}px`, 
             left: '0px',
             position: 'sticky',
-          }}
+          }} 
           className={`${'south__west'} ${'editTable__block'} ${'table_border_style'}`}
         >
           <tbody>
@@ -208,7 +208,7 @@ export default forwardRef((props, ref) => {
             })}
           </tbody>
         </table>
-        <table
+        <table 
           className={` ${'editTable__block'} ${'table_border_style'}`}
           style={{
             width: '100%',
@@ -260,30 +260,30 @@ export default forwardRef((props, ref) => {
           style={{
             position: 'absolute',
             left: `${config.colHeaderWidth}px`,
-            top: `${config.colHeaderToTop}px`,
+            top: `${config.colHeaderToTop}px`, 
             minWidth: rightAreaWidth,
             zIndex: 0,
           }}
         >
           {/* --------------------------------------横向表头---------------------------------------- */}
           {/* <div style={{position: 'relative'}}>
-
+            
           </div> */}
-          <div
+          <div 
             style={{
-              width: '100%',
+              width: '100%', 
               position: 'relative'
-            }}
+            }} 
             className={`${'value_table'} ${'table_border_style'}`}
           >
             {/* ------------------------------------纵向表头数据-------------------------------------- */}
-            <table
+            <table 
               style={{
                 tableLayout:'auto',
                 width: '800px',
                 display: config.tableType === 'col-header-table' ? '' : 'none',
                 transform: `translateX(${offsetWidth}px)`
-              }}
+              }} 
               className={`${'editTable__block'} ${'table_border_style'}`}
             >
               <tbody>
@@ -297,7 +297,7 @@ export default forwardRef((props, ref) => {
                           <td
                             style={{
                               display: tdHidden,
-                              background: (index % 2 === 1) || item.fixed ? '#FAFAFA' : '#fff',
+                              background: (index % 2 === 1) || item.fixed ? '#f7f8fb' : '#fff',
                               minWidth: '100px',
                               width: `${itemWidth}px`,
                               height: '40px',
@@ -321,11 +321,11 @@ export default forwardRef((props, ref) => {
               </tbody>
             </table>
             {/* -------------------------------------多表头数据-------------------------------------- */}
-            <table
+            <table 
               style={{
                 width: '100%',
                 display: config.tableType === 'col-header-table' ? 'none' : '',
-              }}
+              }} 
               className={`${'editTable__block'} ${'table_border_style'}`}
             >
               <colgroup>

package/src/components/Business/moreTreeTable/utils.ts

@@ -1,127 +1,127 @@
-// @ts-nocheck
-export const getAllColumns = (columns) => {
-  const result = [];
-  columns.forEach((column) => {
-    if (column.children) {
-      result.push(column);
-      result.push.apply(result, getAllColumns(column.children));
-    } else {
-      result.push(column);
-    }
-  });
-  return result;
-};
-
-export const convertToRows = (originColumns) => {
-  let maxLevel = 1;
-  const traverse = (column, parent) => {
-    if (parent) {
-      column.level = parent.level + 1;
-      if (maxLevel < column.level) {
-        maxLevel = column.level;
-      }
-    }
-    if (column.children) {
-      let colSpan = 0;
-      column.children.forEach((subColumn) => {
-        traverse(subColumn, column);
-        colSpan += subColumn.colSpan;
-      });
-      column.colSpan = colSpan;
-    } else {
-      column.colSpan = 1;
-    }
-  };
-
-  originColumns.forEach((column) => {
-    column.level = 1;
-    traverse(column);
-  });
-  const rows = [];
-  for (let i = 0; i < maxLevel; i++) {
-    rows.push([]);
-  }
-  const allColumns = getAllColumns(originColumns);
-
-  allColumns.forEach((column) => {
-    if (!column.children) {
-      column.rowSpan = maxLevel - column.level + 1;
-    } else {
-      column.rowSpan = 1;
-    }
-    rows[column.level - 1].push(column);
-  });
-
-  let count = 0;
-  let colRow = [];
-  let lastData = [];
-  let cell = [];
-  for (let i = 0; i < maxLevel; i++) {
-    cell.push(null);
-  }
-  allColumns.forEach((column) => {
-    let newCell = JSON.parse(JSON.stringify(cell));
-    if (column.level === maxLevel || !column.children) {
-      colRow[count] = newCell;
-      count++;
-    }
-  });
-
-  let colRowIndex = 0;
-  allColumns.forEach((column) => {
-    if (column.level === maxLevel || !column.children) {
-      colRow[colRowIndex][column.level - 1] = column;
-      lastData.push(column);
-      colRowIndex++;
-    } else {
-      colRow[colRowIndex][column.level - 1] = column;
-    }
-  });
-  return { colHeader: colRow, colLastData: lastData };
-};
-
-export const headersToRows = originColumns => {
-  let maxLevel = 1;
-  const traverse = (column, parent) => {
-    if (parent) {
-      //计算当前元素属于第几个层级
-      column.level = parent.level + 1;
-      if (maxLevel < column.level) {
-        //计算最大层级
-        maxLevel = column.level;
-      }
-    }
-    if (column.children) {
-      let colSpan = 0;
-      column.children.forEach(subColumn => {
-        //进行递归
-        traverse(subColumn, column);
-        colSpan += subColumn.colSpan;
-      });
-      column.colSpan = colSpan;
-    } else {
-      column.colSpan = 1;
-    }
-  };
-
-  originColumns.forEach(column => {
-    column.level = 1;
-    traverse(column);
-  });
-  const rows = [];
-  let lastData = [];
-  for (let i = 0; i < maxLevel; i++) {
-    rows.push([]);
-  }
-  const allColumns = getAllColumns(originColumns);
-  allColumns.forEach(column => {
-    if (!column.children) {
-      column.rowSpan = maxLevel - column.level + 1;
-      lastData.push(column);
-    } else {
-      column.rowSpan = 1;
-    }
-    rows[column.level - 1].push(column);
-  });
-  return { rowHeader: rows, rowLastData: lastData };
+// @ts-nocheck
+export const getAllColumns = (columns) => {
+  const result = [];
+  columns.forEach((column) => {
+    if (column.children) {
+      result.push(column);
+      result.push.apply(result, getAllColumns(column.children));
+    } else {
+      result.push(column);
+    }
+  });
+  return result;
+};
+
+export const convertToRows = (originColumns) => {
+  let maxLevel = 1;
+  const traverse = (column, parent) => {
+    if (parent) {
+      column.level = parent.level + 1;
+      if (maxLevel < column.level) {
+        maxLevel = column.level;
+      }
+    }
+    if (column.children) {
+      let colSpan = 0;
+      column.children.forEach((subColumn) => {
+        traverse(subColumn, column);
+        colSpan += subColumn.colSpan;
+      });
+      column.colSpan = colSpan;
+    } else {
+      column.colSpan = 1;
+    }
+  };
+
+  originColumns.forEach((column) => {
+    column.level = 1;
+    traverse(column);
+  });
+  const rows = [];
+  for (let i = 0; i < maxLevel; i++) {
+    rows.push([]);
+  }
+  const allColumns = getAllColumns(originColumns);
+
+  allColumns.forEach((column) => {
+    if (!column.children) {
+      column.rowSpan = maxLevel - column.level + 1;
+    } else {
+      column.rowSpan = 1;
+    }
+    rows[column.level - 1].push(column);
+  });
+
+  let count = 0;
+  let colRow = [];
+  let lastData = [];
+  let cell = [];
+  for (let i = 0; i < maxLevel; i++) {
+    cell.push(null);
+  }
+  allColumns.forEach((column) => {
+    let newCell = JSON.parse(JSON.stringify(cell));
+    if (column.level === maxLevel || !column.children) {
+      colRow[count] = newCell;
+      count++;
+    }
+  });
+
+  let colRowIndex = 0;
+  allColumns.forEach((column) => {
+    if (column.level === maxLevel || !column.children) {
+      colRow[colRowIndex][column.level - 1] = column;
+      lastData.push(column);
+      colRowIndex++;
+    } else {
+      colRow[colRowIndex][column.level - 1] = column;
+    }
+  });
+  return { colHeader: colRow, colLastData: lastData };
+};
+
+export const headersToRows = originColumns => {
+  let maxLevel = 1;
+  const traverse = (column, parent) => {
+    if (parent) {
+      //计算当前元素属于第几个层级
+      column.level = parent.level + 1;
+      if (maxLevel < column.level) {
+        //计算最大层级
+        maxLevel = column.level;
+      }
+    }
+    if (column.children) {
+      let colSpan = 0;
+      column.children.forEach(subColumn => {
+        //进行递归
+        traverse(subColumn, column);
+        colSpan += subColumn.colSpan;
+      });
+      column.colSpan = colSpan;
+    } else {
+      column.colSpan = 1;
+    }
+  };
+
+  originColumns.forEach(column => {
+    column.level = 1;
+    traverse(column);
+  });
+  const rows = [];
+  let lastData = [];
+  for (let i = 0; i < maxLevel; i++) {
+    rows.push([]);
+  }
+  const allColumns = getAllColumns(originColumns);
+  allColumns.forEach(column => {
+    if (!column.children) {
+      column.rowSpan = maxLevel - column.level + 1;
+      lastData.push(column);
+    } else {
+      column.rowSpan = 1;
+    }
+    rows[column.level - 1].push(column);
+  });
+  return { rowHeader: rows, rowLastData: lastData };
 };

package/src/components/Functional/AddSelect/helps.ts

@@ -1,14 +1,14 @@
-// 下拉框数据源
-// 情况①：每条记录下拉框数据不同----查询接口每条记录返回字段，前后端约定好，用dataSourceCode记录
-// 情况②：所有查询记录共有一个数据源---选择器加载查询记录渲染给到dataSource
-// 特殊情况：要求每条记录下拉框数据不同，后端只能给出每条记录的code拿不到name，就用情况②处理方法配合filterDataSourceCode处理。
-export const getSelectDataList = (record: any,item: any, selectKey: string) => {
-  let result = [];
-  if(item?.dataSourceCode) {
-    result = record?.[item?.dataSourceCode]
-  }
-  if(item?.dataSource?.length) {
-    result = item?.filterDataSourceCode ? item.dataSource.filter((i: any) => record[item?.filterDataSourceCode]?.some((s: any) => s == i[selectKey])) : item.dataSource
-  }
-  return result;
-}
+// 下拉框数据源
+// 情况①：每条记录下拉框数据不同----查询接口每条记录返回字段，前后端约定好，用dataSourceCode记录
+// 情况②：所有查询记录共有一个数据源---选择器加载查询记录渲染给到dataSource
+// 特殊情况：要求每条记录下拉框数据不同，后端只能给出每条记录的code拿不到name，就用情况②处理方法配合filterDataSourceCode处理。
+export const getSelectDataList = (record: any,item: any, selectKey: string) => {
+  let result = [];
+  if(item?.dataSourceCode) {
+    result = record?.[item?.dataSourceCode]
+  }
+  if(item?.dataSource?.length) {
+    result = item?.filterDataSourceCode ? item.dataSource.filter((i: any) => record[item?.filterDataSourceCode]?.some((s: any) => s == i[selectKey])) : item.dataSource
+  }
+  return result;
+}