@bit-sun/business-component 2.4.19 → 3.0.0-alpha.0

package/dist/utils/request.d.ts

@@ -0,0 +1,2 @@
+declare const requestUtil: any;
+export default requestUtil;

package/dist/utils/utils.d.ts

@@ -15,3 +15,9 @@ export declare const handleAntdColumnsSpecialParams: (col: any) => void;
 export declare const getDictionarySource: (dicCode: string, needConvertInterger?: boolean) => any;
 export declare function uuid(): string;
 export declare const judgeIsEmpty: (value: any) => boolean;
+/**
+ * 处理错误请求
+ * @param {*} response         返回结果
+ * @param {*} needBackError    是否需要将错误回传到页面单独处理
+ */
+export declare function handleError(response: object, needBackError?: boolean): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.4.19",
+  "version": "3.0.0-alpha.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -28,8 +28,8 @@
   },
   "peerDependencies": {
     "antd": "^4.17.2",
-    "bssula": "^2.0.0",
-    "umi-plugin-bssula": "1.0.13",
+    "bssula": "3.0.0-alpha.1",
+    "umi-plugin-bssula": "3.0.0-alpha.1",
     "umi": "^3.5.20",
     "@ant-design/pro-layout": "^6.5.0",
     "react-dnd": "^16.0.1",
@@ -47,11 +47,13 @@
     "classnames": "^2.3.1",
     "lodash": "^4.17.21",
     "moment": "^2.25.3",
+    "qs": "^6.11.2",
     "querystring": "^0.2.1",
     "react": "^16.12.0",
     "react-beautiful-dnd": "10.0.0",
     "react-resizable": "^3.0.4",
     "react-sortable-hoc": "^2.0.0",
+    "umi-request": "^1.4.0",
     "warning": "^4.0.3",
     "ast-types": "^0.13.3",
     "js-cookie": "^3.0.1"
@@ -63,7 +65,7 @@
     "acorn": "^7.2.0",
     "acorn-walk": "^7.1.1",
     "antd": "^4.17.2",
-    "bssula": "^2.1.29",
+    "bssula": "3.0.0-alpha.1",
     "dumi": "^1.0.14",
     "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",

package/src/assets/arrow_top.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>arrow_icon_up</title>
+    <g id="零售【单据详情】改造" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-462.000000, -1828.000000)" id="编组-5">
+            <g transform="translate(372.000000, 1534.000000)">
+                <g id="编组-2" transform="translate(10.000000, 286.000000)">
+                    <g id="编组-17" transform="translate(80.000000, 8.000000)">
+                        <rect id="arrow_icon_up" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                        <g id="编组" transform="translate(2.500000, 2.500000)" fill="#B6B6B6" fill-rule="nonzero">
+                            <path d="M7.5,0 C11.6422059,0 15,3.35779411 15,7.5 C15,11.6422059 11.6422059,15 7.5,15 C3.35779411,15 0,11.6422059 0,7.5 C0,3.35779411 3.35779411,0 7.5,0 Z M7.61029411,4.79955883 L3.58632353,8.82352941 L4.52205883,9.7592647 L7.61029411,6.67102942 L10.6985294,9.7592647 L11.6342647,8.82352941 L7.61029411,4.79955883 Z" id="形状"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

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

@@ -7,7 +7,7 @@
  */
 import React, { useState, useEffect } from 'react';
 import { Tooltip, Select, message } from 'antd';
-import axios from 'axios';
+import request from '@/utils/request';
 import { AddSelect } from '../../../index';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
@@ -22,24 +22,28 @@ function handleSelectColumn(c: any, parentProps: any) {
   const coverColumns = parentProps?.coverColumns || [];
   const additionColumns = parentProps?.additionColumns || [];
   // 仅展示内容
-  if(showColumns?.length) {
-    result = result.filter((i: any) => showColumns.includes(i.dataIndex))
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
+  if (showColumns?.length) {
+    result = result.filter((i: any) => showColumns.includes(i.dataIndex));
   }
   // 过滤不需要展示内容
-  if(exceptColumns?.length) {
-    result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex))
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
+  if (exceptColumns?.length) {
+    result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex));
   }
   // 追加(最好不用这个，当组件不固定时候会有影响)
-  if(additionColumns?.length) {
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
+  if (additionColumns?.length) {
     additionColumns.forEach((i: any) => {
-      result.splice(i.position,0,i.column)
-    })
+      result.splice(i.position, 0, i.column);
+    });
   }
   // 覆盖内容
-  if(coverColumns?.length) {
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
+  if (coverColumns?.length) {
     result = coverColumns;
   }
-  return result
+  return result;
 }
 function handleSearchForm(c: any, parentProps: any) {
   let result = c;
@@ -47,14 +51,17 @@ function handleSearchForm(c: any, parentProps: any) {
   const exceptTableSearchForm= parentProps?.exceptTableSearchForm|| [];
   const coverTableSearchForm = parentProps?.coverTableSearchForm || [];
   // 仅展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(showTableSearchForm?.length) {
     result = result.filter((i: any) => showTableSearchForm.includes(i.name))
   }
   // 过滤不需要展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(exceptTableSearchForm?.length) {
     result = result.filter((i: any) => !exceptTableSearchForm.includes(i.name))
   }
   // 覆盖内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(coverTableSearchForm?.length) {
     result = coverTableSearchForm;
   }
@@ -67,14 +74,17 @@ function handleFormSearchSourceLoad(c: any, parentProps: any) {
   const coverTableFormSearchSourceLoad = parentProps?.coverTableFormSearchSourceLoad || [];
   const noNeedTableFormSearchSourceLoad = parentProps?.noNeedTableFormSearchSourceLoad
   // 仅展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(showTableFormSearchSourceLoad?.length) {
     result = result.filter((i: any) => showTableFormSearchSourceLoad.includes(i.url))
   }
   // 过滤不需要展示内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(exceptTableFormSearchSourceLoad?.length) {
     result = result.filter((i: any) => !exceptTableFormSearchSourceLoad.includes(i.url))
   }
   // 覆盖内容
+  // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115617
   if(coverTableFormSearchSourceLoad?.length) {
     result = coverTableFormSearchSourceLoad;
   }
@@ -106,6 +116,7 @@ export const AddSkuSelect = (parProps: any) => {
           showTitle: false,
         },
         dataIndex: 'itemEancode',
+        // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115627
         render: (text: any) => (
           <Tooltip placement="topLeft" title={text}>
             {text}
@@ -153,6 +164,7 @@ export const AddSkuSelect = (parProps: any) => {
         showTitle: false,
       },
       render: (text: any, record: any) => {
+        // FIXME http://192.168.13.78/mep-fed-group/web/libs/business-component/-/merge_requests/45#note_115636
         if (record?.packingUnitList?.length) {
           const basePackUnit = record?.packingUnitList[0]
           record.selectUnitCode = basePackUnit.unitCode
@@ -238,6 +250,11 @@ export const AddSkuSelect = (parProps: any) => {
         ),
       }
     ]),
+    {
+      title: 'SKC编码',
+      width: 150,
+      dataIndex: 'skcCode',
+    },
     {
       title: '所属SPU名称',
       width: 100,
@@ -333,9 +350,11 @@ export const AddSkuSelect = (parProps: any) => {
   const mTpTableColumn = handleSelectColumn(initialTableColumn, parProps);
   const initialTableSearchForm = [
     {
-      name: 'qp-skuCode-like', label: 'SKU编码'
+      name: 'qp-skuCode-like', label: 'SKU编码',type:'multipleQueryInput'
     },
     { name: 'qp-skuName-like', label: 'SKU名称' },
+    { name: 'qp-skcCode-like', label: 'SKC编码',type:'multipleQueryInput' },
+    { name: 'qp-itemCode-like', label: 'SPU编码',type:'multipleQueryInput' },
     ...(isNoUseItemBarcode ? []: [
       { name: 'qp-code-in', label: '商品条码', field: {
           type: 'multipleQueryInput',
@@ -355,7 +374,7 @@ export const AddSkuSelect = (parProps: any) => {
           maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
       } },
     { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
@@ -459,7 +478,7 @@ export const AddSkcSelect = (parProps: any) => {
 
   useEffect(() => {
     // type: 1 尺码组; 2 配码组
-    axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
+    request.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
       result = result.data;
       if (judgeIsRequestError(result)) {
         message.error(result.msg);
@@ -467,7 +486,7 @@ export const AddSkcSelect = (parProps: any) => {
       }
       const data = result.data || [];
       setPropertyList(data)
-    }).catch((err) => {});
+    }).catch((err:any) => {});
   },[])
 
   //注⚠️：自定义过表头的请记得传tableCodeList参数
@@ -522,7 +541,7 @@ export const AddSkcSelect = (parProps: any) => {
     {
       url: `/items/item/propertyValue/sizeBySkcConfig`,
       params: {
-        pageSize: 10000,
+        pageSize: 50,
         currentPage: 1,
         type: 2, // 类型：1尺码；2颜色
       },
@@ -533,7 +552,7 @@ export const AddSkcSelect = (parProps: any) => {
     {
       url: `/items/category/queryCategoryTree`,
       params: {
-        pageSize: 5000,
+        pageSize: 50,
         currentPage: 1,
       },
       resType: 'treeList',
@@ -764,7 +783,7 @@ export const AddSpuSelect = (parProps: any) => {
   useEffect(() => {
     if(parProps?.isSingleColor) {
       // type: 1 尺码组; 2 配码组
-      axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
+      request.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1`).then((result: any) => {
         result = result.data;
         if (judgeIsRequestError(result)) {
           message.error(result.msg);
@@ -772,7 +791,7 @@ export const AddSpuSelect = (parProps: any) => {
         }
         const data = result.data || [];
         setPropertyList(data)
-      }).catch((err) => {});
+      }).catch((err: any) => {});
     }
   },[])
 
@@ -862,7 +881,7 @@ export const AddSpuSelect = (parProps: any) => {
     {
       url: `/items/category/queryCategoryTree`,
       params: {
-        pageSize: 5000,
+        pageSize: 50,
         currentPage: 1,
       },
       resType: 'treeList',

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

@@ -0,0 +1,193 @@
+import React, { useEffect, useRef, useState, useMemo } from 'react';
+import { Select, Form, Modal, Input, Radio, List } from 'antd';
+import { getStoreByName } from './services';
+import debounce from 'lodash/debounce';
+
+const debounceTimeout = 800;
+
+const ChooseStore = (props: any) => {
+  const { employeeCode } = props;
+  const plainOptions = ['UR', '本来'];
+  const name: any = localStorage.getItem('WARE_HOUSE_NAME');
+  const code: any = localStorage.getItem('WARE_HOUSE_CODE');
+
+  const fetchRef = useRef(0);
+
+
+  const [index, setIndex] = useState(-1);
+  const [value, setValue] = useState([{ label: name, value: code }]);
+  // const [ key, setKey ] = useState(undefined);
+  const [key, setKey] = useState<'UR' | 'BL' | undefined>(undefined);
+  const [openSelect, setOpenSelect] = useState(false);
+  const [options, setOptions] = useState<any[]>([]);
+  const [rescouse, setRescouse] = useState([]);
+  const [searchValue, setSearchValue] = useState('');
+  const [store, setStore] = useState([{ label: name, value: code }]);
+
+  async function fetchUserList(storeName: any, init?: boolean) {
+    return getStoreByName({
+      orgName: storeName ? storeName : undefined,
+      platCompanyCode: init ? undefined : key,
+      'qp-employeeCode-eq': employeeCode || 'EMP231011000002',
+      'qp-orgViewCode-eq': 'business-organizational-view',
+    }).then((res) => {
+      const { data } = res;
+      if (data.code != '000000') {
+        return;
+      }
+      return data.data.map((item: any) => {
+        return {
+          label: item.orgName,
+          value: item.orgCode,
+          defaultOrg: item.defaultOrg,
+          platCompanyCode: item.platCompanyCode,
+        };
+      });
+    });
+  }
+
+  const debounceFetcher = useMemo(() => {
+    const loadOptions = (str: string) => {
+      fetchRef.current += 1;
+      const fetchId = fetchRef.current;
+      setOptions([]);
+      setRescouse([]);
+      fetchUserList(str).then((newOptions) => {
+        if (fetchId !== fetchRef.current) {
+          return;
+        }
+        setOptions(newOptions);
+        setRescouse(newOptions);
+      });
+    };
+
+    return debounce(loadOptions, debounceTimeout);
+  }, [debounceTimeout, key]);
+
+  const changeInput = async (str: string) => {
+    const res: any = await debounceFetcher(str);
+    setOptions(res);
+    setRescouse(res);
+  };
+
+  useEffect(() => {
+    (async () => {
+      const res: any = await fetchUserList(undefined, true);
+      res.map((item: any, indexNumber: number) => {
+        if (item.label === name) {
+          setIndex(indexNumber);
+        }
+        if (item.defaultOrg) {
+          if (name) {
+            return;
+          }
+          localStorage.setItem('WARE_HOUSE_NAME', item?.label);
+          localStorage.setItem('WARE_HOUSE_CODE', item?.value);
+          setValue([item]);
+        }
+      });
+      setOptions(res);
+      setRescouse(res);
+    })();
+  }, []);
+
+  return (
+    <div>
+      <Select
+        value={value}
+        style={{ width: 280, marginRight: 20 }}
+        open={false}
+        onClick={() => {
+          setOpenSelect(true);
+        }}
+      />
+
+      <Modal
+        open={openSelect}
+        onCancel={() => {
+          setOpenSelect(false);
+        }}
+        onOk={() => {
+          localStorage.setItem('WARE_HOUSE_NAME', store[0]?.label);
+          localStorage.setItem('WARE_HOUSE_CODE', store[0]?.value);
+          window.location.reload();
+        }}
+      >
+        <Form
+          style={{ height: 300, marginTop: 20 }}
+          labelCol={{ span: 3 }}
+          wrapperCol={{ span: 16 }}
+        >
+          <Form.Item label="品牌" name="brand">
+            <Radio.Group
+              options={plainOptions}
+              onChange={(item: any) => {
+                const str = item?.target?.value;
+                setKey(str === 'UR' ? 'UR' : 'BL');
+                if (str === 'UR') {
+                  const res: any = rescouse?.filter((current: any) => {
+                    return current.platCompanyCode === 'UR';
+                  });
+                  setOptions(res);
+                  setSearchValue('');
+                } else {
+                  const res: any = rescouse?.filter((current: any) => {
+                    return current.platCompanyCode === 'BL';
+                  });
+                  setOptions(res);
+                  setSearchValue('');
+                }
+              }}
+              optionType="button"
+              buttonStyle="solid"
+            />
+          </Form.Item>
+          <Form.Item
+            label="门店"
+            name="store"
+            rules={[{ required: true, message: '请选择门店' }]}
+          >
+            <Input
+              placeholder="输入门店名称"
+              value={searchValue}
+              onChange={(e) => {
+                changeInput(e.target.value);
+                setSearchValue(e.target.value);
+              }}
+            />
+            <div
+              style={{
+                height: 220,
+                overflowY: 'scroll',
+              }}
+            >
+              <List
+                dataSource={options}
+                bordered
+                renderItem={(item, indexNumber) => (
+                  <List.Item
+                    style={
+                      indexNumber === index ? {
+                        // opacity
+                        color: '#0047bb',
+                      } : {}
+                    }
+                    onClick={(current: any) => {
+                      // setValue([item]);
+                      setStore([item]);
+                      setIndex(indexNumber);
+                    }}
+                  >
+                    {item.label}
+                  </List.Item>
+                )}
+              />
+            </div>
+          </Form.Item>
+        </Form>
+      </Modal>
+    </div>
+  );
+};
+
+export default ChooseStore;

package/src/components/Business/BsLayouts/Components/ChooseStore/services.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+
+// -- 查询店铺 -- 
+export async function getStoreByName(params: any) {
+  return request({
+    url: '/store-house/orgViewNode/listNoPage',
+    method: 'GET',
+    params: { ...params },
+  })
+}

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

@@ -1,6 +1,7 @@
 // @ts-nocheck
 import React, { useState } from "react";
 import RightContent from '../RightContent';
+import ChooseStore from '../ChooseStore';
 import { Input } from 'antd';
 import { SearchOutlined } from '@ant-design/icons';
 import { debounce, cloneDeep } from 'lodash';
@@ -17,7 +18,7 @@ export const judgeIsEmpty = (value: any) => {
 };
 
 const GlobalHeaderCom = (props: any) => {
-  const { route: {routes=[]}} = props;
+  const { route: {routes=[]}, showSelectStore = false, employeeCode = "EMP231011000002", } = props;
   const [keyWord, setKeyWord] = useState('');
   const [routeList, setroutesData] = useState<any[]>([]);
   
@@ -150,6 +151,11 @@ const GlobalHeaderCom = (props: any) => {
           </div>
         </div>
       </div>
+      {
+        showSelectStore && (
+          <ChooseStore employeeCode={employeeCode} />
+        )
+      }
       <RightContent />
     </div>
   )

package/src/components/Business/BsLayouts/Components/RightContent/LoginModal.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { Form, Input, Button, Modal } from 'antd';
 import { getAccountID, getUserId } from '@/utils/LocalstorageUtils';
-import axios from 'axios';
+import request from '@/utils/request';
 
 export default (props: any) => {
   const { loginOut } = props;
@@ -20,11 +20,11 @@ export default (props: any) => {
           <Button
             onClick={() => {
               form.validateFields().then((res) => {
-                axios({
+                request({
                   url: `/bop/api/account/changePassWord/${getAccountID()}`,
                   method: 'patch',
                   params: res,
-                }).then(res => {
+                }).then(() => {
                   loginOut();
                 })
               });

package/src/components/Business/BsLayouts/Components/RightContent/i18n.ts

@@ -0,0 +1,9 @@
+export default {
+  'zh-CN': {
+    lang: '中文',
+  },
+  
+  'en-US': {
+    lang: 'English',
+  },
+}

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

@@ -1,8 +1,9 @@
 
 // @ts-nocheck
-import { Dropdown, message, Modal } from 'antd';
+import { Dropdown, message, Modal, Button } from 'antd';
+import i18n from './i18n';
 import React, { useState } from 'react';
-import { history, useModel } from 'umi';
+import { history, useModel, setLocale } from 'umi';
 import './home.less';
 import Morentouxiang from '../../../../../assets/morentouxiang-32.svg';
 import Morentouxiang32 from '../../../../../assets/32.svg';
@@ -113,9 +114,25 @@ const GlobalHeaderRight: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
     </div>
   );
 
+  const changeLanguage = (lang: string) => {
+    localStorage.setItem('umi_locale', lang || "zh-CN");
+    setLocale(lang || "zh-CN");
+    window.location.reload();
+  }
+
+  const language = localStorage.getItem('umi_locale') || 'zh-CN';
+
   return (
     <div className={className} style={divStyle()}>
       <div className={'rcom_imgWap'}>
+      <Button
+          style={{
+            marginRight: '20px'
+          }}
+          onClick={() => {
+            changeLanguage(language === 'zh-CN' ? 'en-US' : 'zh-CN')
+        }}>{i18n[language]?.lang || "English"}
+      </Button>
         {/* <Tooltip placement="bottom" title={'全局控制台'}>
           <img
             className={'rcom_img'}

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

@@ -408,7 +408,7 @@ class BasicLayout extends React.PureComponent {
 
       if (!istParent) {
         if (route.pathname === '/') return;
-        window.$wujie?.bus.$emit('sub-route-change', itemPath, currentKey);
+        window.$wujie?.bus.$emit('sub-route-change', itemPath, currentKey, route?.state);
         // window.parent.postMessage(`/parent/${itemPath}${currentKey}`, '*');
       }
 
@@ -454,43 +454,53 @@ class BasicLayout extends React.PureComponent {
         }
       }
 
-      // 处理hideMenu页面自动关闭
+      // -------------------处理页签关闭----------------------------
       lastTwoRouterArray.push(route.pathname);
       lastTwoRouterArray.shift();
-      if (
-        !localStorage.getItem('isTabChange') &&
-        !localStorage.getItem('isMenuClick')
-      ) {
-        if (
-          lastTwoRouterArray[0] &&
-          typeof lastTwoRouterArray[0] === 'string'
-        ) {
-          let needRemoveKeyArray = hideMenuArray.filter((itemRoute) =>
-            pathToRegexp(itemRoute.path || '').test(lastTwoRouterArray[0]),
-          );
-          // lastTwoRouterArray[0] != lastTwoRouterArray[1] 该判断条件用于判断是否是tab删除操作，如果是tab页删除操作，删除的是不是最后一个打开的tab页，执行history.push会导致错误的将最后打开的那个tab页也删除掉
-          if (
-            needRemoveKeyArray.length &&
-            lastTwoRouterArray[0] != lastTwoRouterArray[1] && !route.state?.thisHideInMenuDoNotClose
-          ) {
-            newListenRouterState = newListenRouterState.filter((item) => {
-              const [pathname] = item.key ? item.key.split('?') : [];
-              return pathname && pathname !== lastTwoRouterArray[0];
-            });
-            newListenRouterKey = newListenRouterKey.filter((item) => {
-              const [pathname] = item ? item.split('?') : [];
-              return pathname && pathname !== lastTwoRouterArray[0];
-            });
-          }
-        }
-        // refs?.tableRef?.current?.refreshTable();
+
+      const {
+        thisHideInMenuDoNotClose = false,
+        closePrevPage = false,
+        updateCurrentPage = false,
+      } = route?.state || {};
+
+      let needRemoveKey = '';
+      
+       // lastTwoRouterArray[0] != lastTwoRouterArray[1] 该判断条件用于判断是否是tab删除操作，如果是tab页删除操作，删除的是不是最后一个打开的tab页，执行history.push会导致错误的将最后打开的那个tab页也删除掉
+      let notSamePageFlag = lastTwoRouterArray[0] != lastTwoRouterArray[1];
+
+      // 满足包含closePrevPage标识则直接删除上一页
+      if (closePrevPage) {
+        needRemoveKey = lastTwoRouterArray[0] && typeof lastTwoRouterArray[0] === 'string' && notSamePageFlag ? lastTwoRouterArray[0] : '';
       } else {
-        setTimeout(() => {
-          // 处理页面刷新两面
-          localStorage.removeItem('isTabChange');
-          localStorage.removeItem('isMenuClick');
-        }, 0);
+        // 满足非tabclick或者menuClick的hideInMenu类型菜单自动关闭
+        const shouldClosePrev = (!localStorage.getItem('isTabChange') && !localStorage.getItem('isMenuClick'));
+        const needRemoveKeyArray = lastTwoRouterArray[0] && typeof lastTwoRouterArray[0] === 'string' && shouldClosePrev ? 
+        hideMenuArray.filter((itemRoute) =>
+        pathToRegexp(itemRoute.path || '').test(lastTwoRouterArray[0]),
+        ) : [];
+        needRemoveKey = needRemoveKeyArray.length && notSamePageFlag && !thisHideInMenuDoNotClose ? needRemoveKeyArray[0] : '';
+      }
+
+      if (needRemoveKey) {
+        newListenRouterState = newListenRouterState.filter((item) => {
+          const [pathname] = item.key ? item.key.split('?') : [];
+          return pathname && pathname !== lastTwoRouterArray[0];
+        });
+        newListenRouterKey = newListenRouterKey.filter((item) => {
+          const [pathname] = item ? item.split('?') : [];
+          return pathname && pathname !== lastTwoRouterArray[0];
+        });
       }
+
+      setTimeout(() => {
+        // 处理页面刷新两面
+        localStorage.removeItem('isTabChange');
+        localStorage.removeItem('isMenuClick');
+      }, 0);
+
+      // -------------------处理页签关闭 end----------------------------
+
       this.setState(
         {
           //路由监听函数最后执行setState，避免处理hideMenu类型页面自动关闭的逻辑块内获取不到最新state的listenRouterState和listenRouterKey