@bit-sun/business-component 2.4.31-alpha.9 → 2.4.31

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

@@ -45,8 +45,6 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import ENUM from '@/utils/enumConfig';
 import { memoizeOneFormatter } from '@/utils/utils';
 import Item from 'antd/lib/list/Item';
-import { getLimitMenuDataKey, shouldUseAuth } from '@/utils';
-import NoFoundPage from '@/components/Functional/AccessWrapper';
 
 const { TabPane } = Tabs;
 
@@ -64,43 +62,6 @@ export type BasicLayoutContext = { [K in 'location']: BasicLayoutProps[K] } & {
   breadcrumbNameMap: Record<string, MenuDataItem>;
 };
 
-const getId = (str) => {
-  // 找到最后一个 / 的位置
-  var lastSlashIndex = str.lastIndexOf("/");
-
-  // 如果找到了 /，则返回它后面的部分
-  if (lastSlashIndex !== -1) {
-    return str.substring(lastSlashIndex + 1);
-  } else {
-    // 如果没有找到 /，则返回整个字符串
-    return null;
-  }
-}
-
-// 获取权限菜单path&通用单据id
-const getAuthMenuPathAndDocsId = (pathToRegexp) => {
-  const limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
-  const menuKeys = [];
-  const docsId = [];
-  const getLimitedMenuKeys = (data) => {
-    data.forEach((item) => {
-      if (item.children && item.children.length > 0) {
-        getLimitedMenuKeys(item.children);
-      } else {
-        const originPath = item.path.replace(/^\/\w+\//, '/');
-        menuKeys.push(originPath);
-        if (pathToRegexp('/operation-and-maintenance-center/configuration-management/all-general-documents-specific/:id').test(originPath)) {
-         getId(originPath) && docsId.push(getId(originPath))
-        }
-      }
-    });
-  };
-  try {
-    getLimitedMenuKeys(limitedMenuData);
-  } catch(e) {}
-  return {menuKeys, docsId};
-}
-
 const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
   menuList.map((item) => {
     return {
@@ -111,8 +72,6 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
 
 let UN_LISTTEN_DRP;
 let routerArray = [];
-let authMenuPathList = [];
-let docsId = [];
 let lastTwoRouterArray = [1, 2];
 
 let draggerTabKeys = [];
@@ -328,9 +287,7 @@ class BasicLayout extends React.PureComponent {
   }>();
   constructor(props) {
     super(props);
-    authMenuPathList = getAuthMenuPathAndDocsId(props.pathToRegexp)?.menuKeys || [];
-    docsId = getAuthMenuPathAndDocsId(props.pathToRegexp)?.docsId || [];
-    routerArray = this.updateTree(props.route.routes, authMenuPathList);
+    routerArray = this.updateTree(props.route.routes);
     const homeRouter = routerArray.filter(
       (itemroute) => itemroute.key === '/',
     )[0];
@@ -434,27 +391,9 @@ class BasicLayout extends React.PureComponent {
       let newListenRouterState = [...listenRouterState];
       let newListenRouterKey = [...listenRouterKey];
 
-           /**
-       * 根据给定的路由数组和当前路由信息，筛选出与当前路由匹配的路由项。
-       * 
-       * @param routerArray 路由数组，包含多个路由项，每个路由项有一个键（key）。
-       * @param route 当前的路由信息，包含路径（pathname）等信息。
-       * @param docsId 通用单据ID的数组，用于进一步筛选路由。
-       * @returns 返回与当前路由匹配的第一个路由项，如果没有匹配项则返回undefined。
-       */
-      let replaceRouter = routerArray.filter((itemRoute) => {
-        // 单独处理通用单据预览
-        if (window.top !== window && !window.__POWERED_BY_WUJIE__ && route.pathname?.includes('all-general-documents')) {
-          return pathToRegexp(itemRoute.key || '').test(route.pathname);
-        }
-        // 当路由路径包含'all-general-documents'时，按通用单据处理
-        if (route.pathname?.includes('all-general-documents') && shouldUseAuth()) {
-          // 检查路由路径是否匹配路由项的键，并且路径中包含至少一个通用单据ID
-          return pathToRegexp(itemRoute.key || '').test(route.pathname) && docsId.some(item => route.pathname.includes(item));
-        }
-        // 对于不包含'all-general-documents'的路径，只检查路由路径是否匹配路由项的键
-        return  pathToRegexp(itemRoute.key || '').test(route.pathname);
-      })[0];
+      let replaceRouter = routerArray.filter((itemRoute) =>
+        pathToRegexp(itemRoute.key || '').test(route.pathname),
+      )[0];
 
       let currentKey = '';
 
@@ -481,23 +420,24 @@ class BasicLayout extends React.PureComponent {
       }
 
       if (!listenRouterKey.includes(currentKey)) {
-
         if (!replaceRouter) {
-          replaceRouter = {
-            content: currentKey,
-            key: currentKey,
-            name:'404',
-            tab: '404',
-            isNotFound: true,
-          }
+          replaceRouter = routerArray.filter(
+            (itemroute) => itemroute.key === '/404',
+          )?.[0];
 
-          newListenRouterState = [
-            ...newListenRouterState,
+          this.setState(
             {
-              ...replaceRouter,
+              listenRouterState: [
+                ...listenRouterState,
+                { ...replaceRouter, key: currentKey, tab: '404' },
+              ],
+              activeKey: currentKey,
+              listenRouterKey: [...listenRouterKey, currentKey],
             },
-          ];
-          newListenRouterKey = [...listenRouterKey, currentKey];
+            () => {
+              this.checkisNavSlide();
+            },
+          );
         } else {
           const match = matchPath(route.pathname, { path: replaceRouter.key }, pathToRegexp);
           newListenRouterState = [
@@ -600,44 +540,15 @@ class BasicLayout extends React.PureComponent {
     return queryString;
   };
 
-  updateTree = (Tree, authMenuKeys = []) => {
+  updateTree = (Tree) => {
     const treeData = Tree;
     const treeList = [];
-
-   
-
-    // 是否为权限菜单路径
-    const getLimitedMenuPath = (node) => {
-      return authMenuKeys.some(item => (node.path || '').includes(item));
-    }
-
-    // 是否为通用单据菜单路径
-    const getGenerateDocs = (node) => {
-      return (node.path || '').includes('all-general-documents');
-    }
-
     // 递归获取树列表
     const getTreeList = (data) => {
       data.forEach((node) => {
         if (node.routes && node.routes.length > 0) {
           getTreeList(node.routes);
-          return;
-        }
-        // todo:暂时处理非wujie环境不做404管控
-        if (!window.__POWERED_BY_WUJIE__) {
-          treeList.push({
-            tab: node.locale,
-            key: node.path,
-            locale: node.locale,
-            closable: true,
-            content: node.component,
-            name: node.name,
-            hideInMenu: node.hideInMenu,
-            isOnlyOnePage: node.isOnlyOnePage,
-          });
-          return;
-        }
-        if (node.path === '/' || getLimitedMenuPath(node) || getGenerateDocs(node)) {
+        } else {
           treeList.push({
             tab: node.locale,
             key: node.path,
@@ -725,6 +636,7 @@ class BasicLayout extends React.PureComponent {
   };
 
   onChange = (key) => {
+    // console.log('onChange');
     if (key !== this.state.activeKey) {
       this.setState({
         activeKey: key,
@@ -1540,10 +1452,10 @@ class WrapperComponent extends React.Component {
       timeFormat,
       transparentProps,
     } = this.props;
+    console.log('child wrapper conpent', this.props)
     return (
       <>
-        {item.isNotFound ? ( <NoFoundPage />) :
-         React.createElement(item.content, {
+        {React.createElement(item.content, {
           getDictionarySource: getDictionarySource,
           getDictionaryTextByValue: getDictionaryTextByValue,
           timeFormat: timeFormat,

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

@@ -3,7 +3,6 @@ import cloneDeep from 'lodash/cloneDeep';
 import memoizeOne from 'memoize-one';
 import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils'
 import { history } from 'umi';
-import { shouldUseAuth } from '@/utils';
 
 const cache = {};
 const cacheLimit = 10000;
@@ -123,7 +122,6 @@ export const setMenuTreeData = (routesData: Array<any>) => {
       continue;
     }
     if (
-      shouldUseAuth() && 
       routesData[i].code &&
       authButton.every((item) => {
         return routesData[i].code != item;

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

@@ -20,7 +20,20 @@ import ExportIcon from '@/components/Functional/ExportFunctions/ExportIcon';
 import ENUM from '@/utils/enumConfig';
 import { handleBssulaColumnsSpecialParams } from '@/utils/utils';
 import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils';
-import { shouldUseAuth } from '@/utils';
+
+interface Field {
+  name: string;
+  label: string;
+  field: any;
+}
+
+interface Column {
+  key?: string | string[];
+  dataIndex?: string | string[];
+  notRegularCheckList?: boolean;
+  width?: number | string;
+  onHeaderCell?: (column: Column) => any; // 仅作示例，具体类型根据实际情况定义
+}
 
 const MemoQueryTable = React.memo(QueryTable);
 
@@ -44,6 +57,20 @@ const ResizeableTitle = (props) => {
 
 export default (props: any) => {
   const bsTableCode = props?.tableCode || window.location.hash; //设置列字段的唯一标识
+
+   // 获取 table columns中所有的 key  防止有的地方是 dataindex
+   const checkedList = useMemo(
+    () =>
+      props.columns
+        .filter((col: any) => !col.hidden)
+        .map((d: any) =>
+          Array.isArray(d.key || d.dataIndex)
+            ? JSON.stringify(d.key || d.dataIndex)
+            : d.key || d.dataIndex,
+        ),
+    [props.columns],
+  );
+
   const getConfigFromlocalstorage = (type: string) => {
     let config = localStorage.getItem(type) || '[]';
     let configArray = JSON.parse(config);
@@ -56,32 +83,68 @@ export default (props: any) => {
     }
     return [];
   };
-  const getInitialSearchFieldsInfo = () =>{
-    //获取搜索字段的缓存配置
-    const { fields = [] } = props;
-    let searchFieldsConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION);
-    let showSearchFields = searchFieldsConfig.length ? searchFieldsConfig.map((item) => {
-      let inner = fields.filter(
-        (inneritem) => {
-          let innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-          let itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
-          return innerKey && innerKey === itemKey;
-        }
-      )[0];
 
-      return {
-        ...inner,
-        ...item,
-      };
-    }) : fields;
-    return [...showSearchFields]
+   /**
+ * 根据保存的配置和原始配置，获取设置的字段或列。
+ * @param savedConfig 保存的配置数组，可能包含字段或列的配置。
+ * @param originConfig 原始配置数组，包含完整的字段或列信息。
+ * @param type 字段或列的类型，用于确定配置的属性。
+ * @returns 返回根据保存的配置处理后的字段或列数组，如果未保存任何配置，则返回原始配置。
+ */
+const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
+  /**
+   * 判断值是否为字符串数组。
+   * @param value 待判断的值。
+   * @returns 如果值是字符串数组，则返回true，否则返回false。
+   */
+  const isStringArray = (value: any): value is string[] => {
+    return Array.isArray(value) && value.every(v => typeof v === 'string');
   }
+
+  /**
+   * 根据配置项和类型，获取配置项的键。
+   * @param config 配置项，可以是字段或列。
+   * @param type 配置项的类型。
+   * @returns 返回配置项的键，如果无法获取，则返回空字符串。
+   */
+  const getItemKey = (config: Column | Field, type: string): string => {
+    try {
+      if (type === 'columns') {
+        return isStringArray(config.key) ? JSON.stringify(config.key) : isStringArray(config.dataIndex) ? JSON.stringify(config.dataIndex) : config.key || config.dataIndex || '';
+      }
+      return isStringArray(config.name) ? JSON.stringify(config.name) : config.name || '';
+    } catch(e) {}
+    return '';
+  }
+
+  const newConfig = [];
+
+  if (savedConfig.length) {
+    const hash = originConfig.reduce((prev, inneritem) => {
+      prev[getItemKey(inneritem, type)] = inneritem;
+      return prev;
+    }, {} as { [key: string]: Column | Field });
+
+    savedConfig.forEach((config, index) => {
+      let inner = hash[getItemKey(config, type)];
+      inner && newConfig.push({ ...inner, ...config });
+    })
+  }
+
+  if (newConfig.length) return newConfig;
+
+  if (type === 'columns') {
+    return originConfig.filter(column => {
+      const columnKey = getItemKey(column, type);
+      return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
+    });
+  }
+
+  return [...originConfig];
+}
+
   const refs = useRef(null);
   const [pagePath, setPagePath] = useState('');
-  // 获取 table columns中所有的 key  防止有的地方是 dataindex
-  const [checkedList, setCheckedList] = useState(
-    props.columns.filter((col: any) => !col.hidden).map((d: any) => Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : (d.key || d.dataIndex)),
-  );
   const { pathname } = useLocation();
   const [id]: any = useState(
     Number(Math.random().toString().substr(2, 0) + Date.now()).toString(36),
@@ -89,8 +152,9 @@ export default (props: any) => {
   const [isFullScreen, setIsFnllScreen]: any = useState(false);
   // @ts-nocheck
   const [value, setValue]: any = useState(props);
+  const { fields = [] } = props;
   const [showColumn, setShowColumns] = useState([]); // 列字段
-  const originSearchFields = getInitialSearchFieldsInfo();
+  const originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
   const [showSearchFields, setShowSearchFields] = useState(originSearchFields); //搜索项字段
   const { isPage = true, pagination, tableCode, appRequestConfig } = props;
 
@@ -178,7 +242,7 @@ export default (props: any) => {
         if (Number(item.slice(-1)) >= 1) {
           Item = item.substr(0, item.length - 1);
         }
-        if (shouldUseAuth() && !authButton.filter((itemInner: any) => Item === itemInner).length) {
+        if (!authButton.filter((itemInner: any) => Item === itemInner).length) {
           resourceCodeArray[item].visible = false;
         }
       });
@@ -190,25 +254,7 @@ export default (props: any) => {
     });
     const { columns } = props;
     let columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
-    let showColumns = columnConfig.length ? columnConfig.map((item) => {
-      let inner = columns.filter(
-        (inneritem) => {
-          let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : (inneritem.key || inneritem.dataIndex);
-          let itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : (item.key || item.dataIndex);
-          return innerKey && innerKey === itemKey;
-        }
-      )[0];
-
-      return {
-        ...inner,
-        ...item,
-      };
-    }) : columns.filter(
-      (column) => {
-        let columnKey = Array.isArray(column.key || column.dataIndex) ? JSON.stringify(column.key || column.dataIndex) : (column.key || column.dataIndex);
-        return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
-      }
-    )
+    let showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
 
     showColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);

package/src/components/Business/CommodityEntry/index.md

@@ -54,21 +54,7 @@ export default () => {
  const props = {
    callbackHideModal,
    callbackHandleOk,
-   isCheckStockNum: false,   // 默认为true，校验库存数量，false，则不校验库存
-   customerColumnsMapping: [
-      {
-        title: 'SKU编码',
-        name: 'skuCode'
-      },
-      {
-        title: '批号',
-        name: 'lotNumberCode'
-      },
-      {
-        title: '数量',
-        name: 'quantity'
-      }
-  ] // 自定义展示列
+   isCheckStockNum: false   // 默认为true，校验库存数量，false，则不校验库存
  }
  
   return (

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

@@ -66,7 +66,6 @@ const CommodityEntry = (props: any) => {
       {modalProps.visible && (
         <Modal {...modalProps} onOk={handleOk} onCancel={handleCancel} destroyOnClose={true} zIndex={15} {...otherModalProps} >
           <DataValidation
-            {...props}
             onRef={(ref) => { dataValidationRef = ref }}
             columns={columns}
             validDataUrl={validDataUrl}

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

@@ -17,7 +17,6 @@ import moreIcon from '../../../assets/btn-more.svg';
 import { useLocation, formatMessage } from 'umi';
 import CommonAlert from '../CommonAlert';
 import { getMenuAuthDataKey, getLimitMenuDataKey } from '@/utils/LocalstorageUtils';
-import { shouldUseAuth } from '@/utils';
 
 interface actionItem {
   type?: string;
@@ -155,7 +154,7 @@ const DetailWrapper = React.memo(
       let visibleActions = actionLists.filter(
         (action) =>
           ((action.visible && action.visible !== 'false') || judgeIsEmpty(action.visible)) &&
-          (!shouldUseAuth() || (judgeIsEmpty(action.code) || authButton.filter(item => item === action.code))),
+          (judgeIsEmpty(action.code) || authButton.filter(item => item === action.code)),
       );
 
       const renderButton = (item: actionItem, type?: any) => {

package/src/components/Business/SearchSelect/index.md

@@ -102,7 +102,7 @@ export default () => {
 
 ```tsx
 import React, { useState } from 'react';
-import { Tabs, Button } from 'antd';
+import { Tabs } from 'antd';
 import {BusinessSearchSelect} from '../../../index.ts';
 
 const { TabPane } = Tabs;
@@ -121,10 +121,6 @@ export default () => {
     modalRadioNeedFooter: true
   }
 
-   const fieldComponentProps = {
-    fieldComponent: <Button type='primary'>添加</Button>
-  }
-
   const [ tabKey, setTabKey ] = useState('single')
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
   
@@ -165,11 +161,6 @@ export default () => {
           {tabKey === 'singleConfirm' && (
             <BusinessSearchSelect {...props} modalTableProps={singleConfirmModalTableProps} />
           )}
-        </TabPane>
-         <TabPane tab='点击按钮弹窗' key='buttonModal'>
-          {tabKey === 'buttonModal' && (
-            <BusinessSearchSelect {...props} {...fieldComponentProps} selectProps={selectPropsMultiple} />
-          )}
         </TabPane>
         <TabPane tab='多选' key='multiple'>
           {tabKey === 'multiple' && (

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

@@ -10,7 +10,7 @@ import { judgeIsRequestError } from '@/utils/requestUtils';
 export const getSelectDataList = (record: any,item: any, selectKey: string) => {
   let result = [];
   if(item?.dataSourceCode) {
-    result = record?.[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