@bit-sun/business-component 2.4.24 → 2.4.26-beta01

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,5 +1,4 @@
-
-import request from '@/utils/request';
+import axios from 'axios';
 import { stringify } from 'querystring';
 import { message } from 'antd';
 import { judgeIsRequestError } from '@/utils/requestUtils';
@@ -21,7 +20,7 @@ export const getSelectDataList = (record: any,item: any, selectKey: string) => {
 
 export const loadSelectSource = (url: string, params?: any) => {
   return new Promise((resolve, reject) => {
-    request
+    axios
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
@@ -32,7 +31,7 @@ export const loadSelectSource = (url: string, params?: any) => {
         }
         resolve(result);
       })
-      .catch((err:any) => {
+      .catch((err) => {
         reject(err);
       });
   })