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

package/src/components/Business/BsLayouts/service.ts

@@ -1,8 +1,8 @@
-import request from '@/utils/request';
+import axios from 'axios';
 
 export async function outLogin(params: any) {
 
-   let res = await request({
+   let res = await axios({
     url: '/user/web/loginOut',
     method: 'GET',
   })

package/src/components/Business/BsLayouts/utils.tsx

@@ -1,203 +1,203 @@
-// @ts-nocheck
-import cloneDeep from 'lodash/cloneDeep';
-import memoizeOne from 'memoize-one';
-import ENUM from '@/utils/enumConfig';
-import { history } from 'umi';
-
-const cache = {};
-const cacheLimit = 10000;
-let cacheCount = 0;
-
-function compilePath(path, options, pathToRegexp) {
-  const cacheKey = `${options.end}${options.strict}${options.sensitive}`;
-  const pathCache = cache[cacheKey] || (cache[cacheKey] = {});
-
-  if (pathCache[path]) return pathCache[path];
-
-  const keys = [];
-  const regexp = pathToRegexp(path, keys, options);
-  const result = { regexp, keys };
-
-  if (cacheCount < cacheLimit) {
-    pathCache[path] = result;
-    // eslint-disable-next-line no-plusplus
-    cacheCount++;
-  }
-
-  return result;
-}
-
-/**
- * Public API for matching a URL pathname to a path.
- */
- export const  matchPath = (pathname, options = {}, pathToRegexp) => {
-  if (typeof options === 'string' || Array.isArray(options)) {
-    // eslint-disable-next-line no-param-reassign
-    options = { path: options };
-  }
-
-  const { path, exact = false, strict = false, sensitive = false } = options;
-
-  const paths = [].concat(path);
-
-  // eslint-disable-next-line no-shadow
-  return paths.reduce((matched, path) => {
-    if (!path && path !== '') return null;
-    if (matched) return matched;
-
-    const { regexp, keys } = compilePath(path, {
-      end: exact,
-      strict,
-      sensitive,
-    }, pathToRegexp);
-    const match = regexp.exec(pathname);
-
-    if (!match) return null;
-
-    const [url, ...values] = match;
-    const isExact = pathname === url;
-
-    if (exact && !isExact) return null;
-
-    return {
-      path, // the path used to match
-      url: path === '/' && url === '' ? '/' : url, // the matched portion of the URL
-      isExact, // whether or not we matched exactly
-      params: keys.reduce((memo, key, index) => {
-        // eslint-disable-next-line no-param-reassign
-        memo[key.name] = values[index];
-        return memo;
-      }, {}),
-    };
-  }, null);
-}
-
-
-export const searchMenuData = (router: any, name?: any, callBack) => {
-  if (!name) {
-    callBack([]);
-    return;
-  }
-  const btnAuth = JSON.parse(
-    localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) || '[]',
-  );
-  const resultList: any = [];
-  const newRouter = cloneDeep(router);
-  const deep = (router: any) => {
-    if (router && Array.isArray(router)) {
-      router.forEach((item) => {
-        if (item.children && Array.isArray(item.children)) {
-          deep(item.children);
-        } else if (
-          !item.hideInMenu &&
-          (name ? item.name.indexOf(name) !== -1 : true) &&
-          btnAuth.find((d: any) => d === item.code)
-        ) {
-          resultList.push({
-            ...item,
-          });
-        }
-      });
-      // } else if ((name ? router.name.indexOf(name) !== -1 : true) && btnAuth.find((d: any) => d.code === router.code)) {
-    } else if (
-      (name ? router.name.indexOf(name) !== -1 : true) &&
-      btnAuth.find((d: any) => d === router.code)
-    ) {
-      resultList.push({
-        ...router,
-      });
-    }
-  };
-  deep(newRouter);
-  callBack([...resultList]);
-};
-
-export const setMenuTreeData = (routesData: Array<any>) => {
-  const authButton = localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES)
-    ? JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) as string)
-    : [];
-  for (let i = routesData.length - 1; i >= 0; i--) {
-    if (routesData[i].hideInMenu) {
-      routesData.splice(i, 1);
-      continue;
-    }
-    if (
-      routesData[i].code &&
-      authButton.every((item) => {
-        return routesData[i].code != item;
-      })
-    ) {
-      routesData.splice(i, 1);
-      continue;
-    }
-    if (routesData[i].children) {
-      setMenuTreeData(routesData[i].children);
-    }
-  }
-};
-
-export const setLoginOutPath = () => {
-  if (window.__POWERED_BY_WUJIE__) {
-    window.$wujie?.props.goToLogin();
-  } else {
-    history.push({
-      pathname: '/user/login'
-    })
-  }
-};
-
-export const getBreadcrumbNameMap = (menuData) => {
-  const routerMap = {};
-
-  const flattenMenuData = (data) => {
-    data.forEach((menuItem) => {
-      if (menuItem.children) {
-        flattenMenuData(menuItem.children);
-      }
-      // Reduce memory usage
-      routerMap[menuItem.path] = menuItem;
-    });
-  };
-  flattenMenuData(menuData);
-  return routerMap;
-};
-
-export const ergodicMenuRoutes = (routes) => {
-  const codeArray = [];
-
-  function ergodicRoutes(routesParam) {
-    routesParam.forEach((element) => {
-      // element.code &&
-      if (element.hideInMenu) {
-        codeArray.push(element);
-      }
-      if (element.routes) {
-        ergodicRoutes(element.routes);
-      }
-    });
-  }
-
-  ergodicRoutes(routes);
-
-  return codeArray;
-};
-
-export const encodeUrlQuery = (pathStr: any) => {
-  let newPathStr='';
-  if (pathStr.indexOf('#') > -1) {
-    let index = pathStr.indexOf('?');
-    let str1 = pathStr.substr(0, index+1);
-    let str2 = pathStr.substr(index+1, pathStr.length - index -1);
-    let queryArr = str2.split('&');
-    let newArr = queryArr.map(item => {
-      let index = item.indexOf('=');
-      let s1 = item.substr(0, index);
-      let s2 = item.substr(index+1, item.length - index -1);
-      return `${s1}=${encodeURIComponent(s2)}`;
-    })
-    newPathStr = `${str1}${newArr.join('&')}`;
-  } else {
-    newPathStr = pathStr;
-  }
-  return newPathStr;
-}
+// @ts-nocheck
+import cloneDeep from 'lodash/cloneDeep';
+import memoizeOne from 'memoize-one';
+import ENUM from '@/utils/enumConfig';
+import { history } from 'umi';
+
+const cache = {};
+const cacheLimit = 10000;
+let cacheCount = 0;
+
+function compilePath(path, options, pathToRegexp) {
+  const cacheKey = `${options.end}${options.strict}${options.sensitive}`;
+  const pathCache = cache[cacheKey] || (cache[cacheKey] = {});
+
+  if (pathCache[path]) return pathCache[path];
+
+  const keys = [];
+  const regexp = pathToRegexp(path, keys, options);
+  const result = { regexp, keys };
+
+  if (cacheCount < cacheLimit) {
+    pathCache[path] = result;
+    // eslint-disable-next-line no-plusplus
+    cacheCount++;
+  }
+
+  return result;
+}
+
+/**
+ * Public API for matching a URL pathname to a path.
+ */
+ export const  matchPath = (pathname, options = {}, pathToRegexp) => {
+  if (typeof options === 'string' || Array.isArray(options)) {
+    // eslint-disable-next-line no-param-reassign
+    options = { path: options };
+  }
+
+  const { path, exact = false, strict = false, sensitive = false } = options;
+
+  const paths = [].concat(path);
+
+  // eslint-disable-next-line no-shadow
+  return paths.reduce((matched, path) => {
+    if (!path && path !== '') return null;
+    if (matched) return matched;
+
+    const { regexp, keys } = compilePath(path, {
+      end: exact,
+      strict,
+      sensitive,
+    }, pathToRegexp);
+    const match = regexp.exec(pathname);
+
+    if (!match) return null;
+
+    const [url, ...values] = match;
+    const isExact = pathname === url;
+
+    if (exact && !isExact) return null;
+
+    return {
+      path, // the path used to match
+      url: path === '/' && url === '' ? '/' : url, // the matched portion of the URL
+      isExact, // whether or not we matched exactly
+      params: keys.reduce((memo, key, index) => {
+        // eslint-disable-next-line no-param-reassign
+        memo[key.name] = values[index];
+        return memo;
+      }, {}),
+    };
+  }, null);
+}
+
+
+export const searchMenuData = (router: any, name?: any, callBack) => {
+  if (!name) {
+    callBack([]);
+    return;
+  }
+  const btnAuth = JSON.parse(
+    localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) || '[]',
+  );
+  const resultList: any = [];
+  const newRouter = cloneDeep(router);
+  const deep = (router: any) => {
+    if (router && Array.isArray(router)) {
+      router.forEach((item) => {
+        if (item.children && Array.isArray(item.children)) {
+          deep(item.children);
+        } else if (
+          !item.hideInMenu &&
+          (name ? item.name.indexOf(name) !== -1 : true) &&
+          btnAuth.find((d: any) => d === item.code)
+        ) {
+          resultList.push({
+            ...item,
+          });
+        }
+      });
+      // } else if ((name ? router.name.indexOf(name) !== -1 : true) && btnAuth.find((d: any) => d.code === router.code)) {
+    } else if (
+      (name ? router.name.indexOf(name) !== -1 : true) &&
+      btnAuth.find((d: any) => d === router.code)
+    ) {
+      resultList.push({
+        ...router,
+      });
+    }
+  };
+  deep(newRouter);
+  callBack([...resultList]);
+};
+
+export const setMenuTreeData = (routesData: Array<any>) => {
+  const authButton = localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES)
+    ? JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) as string)
+    : [];
+  for (let i = routesData.length - 1; i >= 0; i--) {
+    if (routesData[i].hideInMenu) {
+      routesData.splice(i, 1);
+      continue;
+    }
+    if (
+      routesData[i].code &&
+      authButton.every((item) => {
+        return routesData[i].code != item;
+      })
+    ) {
+      routesData.splice(i, 1);
+      continue;
+    }
+    if (routesData[i].children) {
+      setMenuTreeData(routesData[i].children);
+    }
+  }
+};
+
+export const setLoginOutPath = () => {
+  if (window.__POWERED_BY_WUJIE__) {
+    window.$wujie?.props.goToLogin();
+  } else {
+    history.push({
+      pathname: '/user/login'
+    })
+  }
+};
+
+export const getBreadcrumbNameMap = (menuData) => {
+  const routerMap = {};
+
+  const flattenMenuData = (data) => {
+    data.forEach((menuItem) => {
+      if (menuItem.children) {
+        flattenMenuData(menuItem.children);
+      }
+      // Reduce memory usage
+      routerMap[menuItem.path] = menuItem;
+    });
+  };
+  flattenMenuData(menuData);
+  return routerMap;
+};
+
+export const ergodicMenuRoutes = (routes) => {
+  const codeArray = [];
+
+  function ergodicRoutes(routesParam) {
+    routesParam.forEach((element) => {
+      // element.code &&
+      if (element.hideInMenu) {
+        codeArray.push(element);
+      }
+      if (element.routes) {
+        ergodicRoutes(element.routes);
+      }
+    });
+  }
+
+  ergodicRoutes(routes);
+
+  return codeArray;
+};
+
+export const encodeUrlQuery = (pathStr: any) => {
+  let newPathStr='';
+  if (pathStr.indexOf('#') > -1) {
+    let index = pathStr.indexOf('?');
+    let str1 = pathStr.substr(0, index+1);
+    let str2 = pathStr.substr(index+1, pathStr.length - index -1);
+    let queryArr = str2.split('&');
+    let newArr = queryArr.map(item => {
+      let index = item.indexOf('=');
+      let s1 = item.substr(0, index);
+      let s2 = item.substr(index+1, item.length - index -1);
+      return `${s1}=${encodeURIComponent(s2)}`;
+    })
+    newPathStr = `${str1}${newArr.join('&')}`;
+  } else {
+    newPathStr = pathStr;
+  }
+  return newPathStr;
+}

package/src/components/Business/BsSulaQueryTable/SearchItemSetting.tsx

@@ -14,7 +14,7 @@ import {
   SortableElement,
   SortableHandle,
 } from 'react-sortable-hoc';
-import request from '@/utils/request';
+import axios from 'axios';
 import { SearchOutlined } from '@ant-design/icons';
 import { arrayMoveImmutable } from 'array-move';
 import close from '../../../assets/close.svg';
@@ -51,7 +51,7 @@ class SearchItemTable extends React.Component {
         }))
       : '';
 
-    request({
+    axios({
       url: handleRequestUrl('/user','/appConfig/saveQueryCriteria', appRequestConfig),
       method: 'POST',
       data: {
@@ -94,7 +94,7 @@ class SearchItemTable extends React.Component {
         "detail": JSON.stringify(configvalue)
       })
     }
-     
+
     localStorage.setItem(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION, JSON.stringify(configArray));
     this.setState({
       visible: false,
@@ -154,10 +154,10 @@ class SearchItemTable extends React.Component {
   };
 
   componentDidMount() {
-    const { 
-      datasource, 
-      showSearchFields, 
-      bsTableCode 
+    const {
+      datasource,
+      showSearchFields,
+      bsTableCode
     }: any = this.props;
 
     let config = this.getConfigFromlocalstorage();
@@ -420,7 +420,7 @@ class SearchItemTable extends React.Component {
               <div>
                 <Button key="back" onClick={this.handleReset} style={{marginRight: 0}}>
                   恢复默认
-                </Button>
+                </Button>,
                 <Button key="back" onClick={this.handleResetSetting}>
                   重置设置
                 </Button>
@@ -428,7 +428,7 @@ class SearchItemTable extends React.Component {
               <div>
                 <Button key="submit" onClick={this.handleCancel} style={{marginRight: 0}}>
                   取消
-                </Button>
+                </Button>,
                 <Button key="submit" type="primary" onClick={this.handleOk}>
                   确认
                 </Button>