@bit-sun/business-component 2.3.22-beta9 → 2.3.23-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,79 +1,80 @@
-import axios from 'axios';
-import { stringify } from 'querystring';
-import { message } from 'antd';
-
-// 下拉框数据源
-// 情况①：每条记录下拉框数据不同----查询接口每条记录返回字段，前后端约定好，用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;
-}
-
-export const loadSelectSource = (url: string, params?: any) => {
-  return new Promise((resolve, reject) => {
-    axios
-      .get(`${url}?${stringify(params)}`)
-      .then((result: any) => {
-        result = result.data;
-        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
-          message.error(result.msg);
-          resolve(result);
-          return;
-        }
-        resolve(result);
-      })
-      .catch((err) => {
-        reject(err);
-      });
-  })
-};
-
-export const formatSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['code', 'name']) => {
-  const data = reData && reData[position]?.data;
-  const list = Array.isArray(data) ? data :(data?.items || data?.list || data?.children || []);
-  const formatData = list?.length ? list.map((v: any) => ({ text: v[resKeyValue[1]], value: v[resKeyValue[0]] })) : [];
-  changeSearchForm[changePosition] = {...changeSearchForm[changePosition], initialSource: formatData}
-}
-// 格式化树选择器数据源
-export const mapSearchTree = (treeDataItem: any, resKeyValue: any) => {
-  const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
-  return {
-    title: treeDataItem[resKeyValue[1]],
-    value: treeDataItem[resKeyValue[0]],
-    parentId: treeDataItem.parent,
-    data: { ...treeDataItem },
-    isLeaf: !haveChildren,
-    disabled: haveChildren,
-    children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue)) : [],
-  };
-};
-export const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
-  const data = reData && reData[position]?.data;
-  const formatData = (data &&
-    Array.isArray(data) &&
-    data.length &&
-    data.map((ites: any) => mapSearchTree(ites, resKeyValue))) ||
-    []
-  changeSearchForm[changePosition].field.props.treeData = formatData;
-}
-
-export const formatFormSourceList = (x: any,loadList: any, tableSearchForm: any)=> {
-  loadList.forEach((i: any,index: any) => {
-    if(i.resType == 'list') {
-      const resKeyValue = i.resKeyValue || ['code', 'name']
-      formatSource(x,index, i.resPosition, tableSearchForm,resKeyValue)
-    }
-    if(i.resType == 'treeList') {
-      const resKeyValue = i.resKeyValue || ['id', 'name']
-      formatTreeDataSource(x,index, i.resPosition, tableSearchForm,resKeyValue)
-    }
-  })
-}
+import axios from 'axios';
+import { stringify } from 'querystring';
+import { message } from 'antd';
+import { judgeIsRequestError } from '@/utils/requestUtils';
+
+// 下拉框数据源
+// 情况①：每条记录下拉框数据不同----查询接口每条记录返回字段，前后端约定好，用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;
+}
+
+export const loadSelectSource = (url: string, params?: any) => {
+  return new Promise((resolve, reject) => {
+    axios
+      .get(`${url}?${stringify(params)}`)
+      .then((result: any) => {
+        result = result.data;
+        if (judgeIsRequestError(result)) {
+          message.error(result.msg);
+          resolve(result);
+          return;
+        }
+        resolve(result);
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  })
+};
+
+export const formatSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['code', 'name']) => {
+  const data = reData && reData[position]?.data;
+  const list = Array.isArray(data) ? data :(data?.items || data?.list || data?.children || []);
+  const formatData = list?.length ? list.map((v: any) => ({ text: v[resKeyValue[1]], value: v[resKeyValue[0]] })) : [];
+  changeSearchForm[changePosition] = {...changeSearchForm[changePosition], initialSource: formatData}
+}
+// 格式化树选择器数据源
+export const mapSearchTree = (treeDataItem: any, resKeyValue: any) => {
+  const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  return {
+    title: treeDataItem[resKeyValue[1]],
+    value: treeDataItem[resKeyValue[0]],
+    parentId: treeDataItem.parent,
+    data: { ...treeDataItem },
+    isLeaf: !haveChildren,
+    disabled: haveChildren,
+    children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue)) : [],
+  };
+};
+export const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
+  const data = reData && reData[position]?.data;
+  const formatData = (data &&
+    Array.isArray(data) &&
+    data.length &&
+    data.map((ites: any) => mapSearchTree(ites, resKeyValue))) ||
+    []
+  changeSearchForm[changePosition].field.props.treeData = formatData;
+}
+
+export const formatFormSourceList = (x: any,loadList: any, tableSearchForm: any)=> {
+  loadList.forEach((i: any,index: any) => {
+    if(i.resType == 'list') {
+      const resKeyValue = i.resKeyValue || ['code', 'name']
+      formatSource(x,index, i.resPosition, tableSearchForm,resKeyValue)
+    }
+    if(i.resType == 'treeList') {
+      const resKeyValue = i.resKeyValue || ['id', 'name']
+      formatTreeDataSource(x,index, i.resPosition, tableSearchForm,resKeyValue)
+    }
+  })
+}