@bit-sun/business-component 2.4.24 → 2.4.25

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

@@ -1,164 +1,158 @@
-// @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';
-import { formatMessage, history } from 'umi';
-import ENUM from '@/utils/enumConfig';
-import './index.less';
-
-
-export const judgeIsEmpty = (value: any) => {
-  if (value == null || value == undefined || String(value).trim() == '') {
-    return true;
-  }
-  return false;
-};
-
-const GlobalHeaderCom = (props: any) => {
-  const { route: {routes=[]}, showSelectStore = false, employeeCode = "EMP231011000002", } = props;
-  const [keyWord, setKeyWord] = useState('');
-  const [routeList, setroutesData] = useState<any[]>([]);
-  
-  const getFullPathName = (nameId:string) => {
-    const nameIdArr = nameId.split('.');
-    let nameStr = '';
-    for (let i = 0; i < nameIdArr.length; i++) {
-      let itemId = nameIdArr.slice(0, i+1).join('.');
-      nameStr += `${i === 0 ? '': '-'}${formatMessage({ id: `menu.${itemId}` })}`;
-    }
-    return nameStr;
-  }
-  const initRoute = (router: any, name?: any) => {
-    const resultList: any = [];
-    const newRouter = cloneDeep(router);
-    const btnAuth = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) || '[]');
-    const deep = (router: any) => {
-      if (router && Array.isArray(router)) {
-        router.forEach((item) => {
-          if (item.routes && Array.isArray(item.routes)) {
-            item.routes.forEach((d: any) => {
-              if (!d.nameEdit) {
-                d.name = item.name + '.' + d.name;
-                d.nameEdit = true;
-              }
-            });
-            deep(item.routes);
-          } else if (
-            !item.hideInMenu &&
-            (name
-              ? formatMessage({ id: `menu.${item.name}` }).indexOf(name) !== -1
-              : true)
-              && btnAuth.find((d: any) => d === item.code)
-          ) {
-            resultList.push({
-              ...item,
-              fullPathName: getFullPathName(item.name),
-            });
-          }
-        });
-      } else if (
-        (name ? router.name.indexOf(name) !== -1 : true)
-        //  && btnAuth.find((d: any) => d.code === router.code)
-      ) {
-        resultList.push({
-          ...router,
-          name: formatMessage({ id: `menu.${router.name}` }),
-        });
-      }
-    };
-    deep(newRouter);
-    setroutesData([...resultList]);
-  };
-
-  const renderLineStyl = (name: string) => {
-    let newName = name.split('-').join(' > ');
-    const index = newName.lastIndexOf(keyWord);
-    if (index > -1) {
-      const beforeStr = newName.substr(0, index);
-      const afterStr = newName.substr(index + keyWord.length);
-      return (
-        <>
-          <span>{beforeStr}</span>
-          <span style={{color: '#1890ff'}}>{keyWord}</span>
-          <span>{afterStr}</span>
-        </>
-      )
-    }
-    return newName
-  }
-
-  return (
-    <div style={{paddingLeft: props.collapsed ? '135px': '45px'}} className={'headerContent'}>
-      <div style={{flex: '1 1 0%', padding: '0 15px 0', marginLeft: '15px', display: 'flex', borderLeft: '1px solid #f0f0f0'}}>
-        {/* <div  
-          className={'navigationBtn'}
-          onClick={() => {
-            message.warning('当前功能暂不支持。');
-          }}
-        >
-          <ApartmentOutlined />
-          &nbsp;&nbsp;
-          流程导航
-        </div> */}
-        <div style={{position: 'relative'}}>
-          <Input 
-            style={{width: '268px', height: '32px', borderRadius:'4px'}} 
-            placeholder="搜索菜单"
-            allowClear
-            onFocus= {(e) => {
-              setKeyWord(e?.target?.value)
-              initRoute(routes, e?.target?.value)
-            }}
-            onBlur={() => {
-              setTimeout(() => {
-                setKeyWord('')
-              }, 600)
-            }}
-           
-            prefix={<SearchOutlined />}
-            onChange={debounce((e: any) => {
-              setKeyWord(e?.target?.value)
-              initRoute(routes, e?.target?.value)
-            }, 600)}
-          />
-          <div style={{display: judgeIsEmpty(keyWord) ? 'none' : 'block'}} className={'searchPanel'}>
-            <p className={'searchTitle'}>
-              共搜到{' '}
-              <span className={'themeColor'}>
-                {routeList.length || 0}
-              </span>{' '}
-              条结果{' '}
-            </p>
-            <div style={{marginTop: '10px'}}>
-              {
-                routeList.map(item => (
-                  <div
-                    className={'itemPath'}
-                    onClick={() => {
-                      history.push({
-                        pathname: item.path
-                      })
-                      // setKeyWord('')
-                    }}
-                    title={item.fullPathName}
-                  >{renderLineStyl(item.fullPathName)}</div>
-                ))
-              }
-            </div>
-          </div>
-        </div>
-      </div>
-      {
-        showSelectStore && (
-          <ChooseStore employeeCode={employeeCode} />
-        )
-      }
-      <RightContent />
-    </div>
-  )
-}
-
+// @ts-nocheck
+import React, { useState } from "react";
+import RightContent from '../RightContent';
+import { Input } from 'antd';
+import { SearchOutlined } from '@ant-design/icons';
+import { debounce, cloneDeep } from 'lodash';
+import { formatMessage, history } from 'umi';
+import ENUM from '@/utils/enumConfig';
+import './index.less';
+
+
+export const judgeIsEmpty = (value: any) => {
+  if (value == null || value == undefined || String(value).trim() == '') {
+    return true;
+  }
+  return false;
+};
+
+const GlobalHeaderCom = (props: any) => {
+  const { route: {routes=[]}} = props;
+  const [keyWord, setKeyWord] = useState('');
+  const [routeList, setroutesData] = useState<any[]>([]);
+  
+  const getFullPathName = (nameId:string) => {
+    const nameIdArr = nameId.split('.');
+    let nameStr = '';
+    for (let i = 0; i < nameIdArr.length; i++) {
+      let itemId = nameIdArr.slice(0, i+1).join('.');
+      nameStr += `${i === 0 ? '': '-'}${formatMessage({ id: `menu.${itemId}` })}`;
+    }
+    return nameStr;
+  }
+  const initRoute = (router: any, name?: any) => {
+    const resultList: any = [];
+    const newRouter = cloneDeep(router);
+    const btnAuth = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) || '[]');
+    const deep = (router: any) => {
+      if (router && Array.isArray(router)) {
+        router.forEach((item) => {
+          if (item.routes && Array.isArray(item.routes)) {
+            item.routes.forEach((d: any) => {
+              if (!d.nameEdit) {
+                d.name = item.name + '.' + d.name;
+                d.nameEdit = true;
+              }
+            });
+            deep(item.routes);
+          } else if (
+            !item.hideInMenu &&
+            (name
+              ? formatMessage({ id: `menu.${item.name}` }).indexOf(name) !== -1
+              : true)
+              && btnAuth.find((d: any) => d === item.code)
+          ) {
+            resultList.push({
+              ...item,
+              fullPathName: getFullPathName(item.name),
+            });
+          }
+        });
+      } else if (
+        (name ? router.name.indexOf(name) !== -1 : true)
+        //  && btnAuth.find((d: any) => d.code === router.code)
+      ) {
+        resultList.push({
+          ...router,
+          name: formatMessage({ id: `menu.${router.name}` }),
+        });
+      }
+    };
+    deep(newRouter);
+    setroutesData([...resultList]);
+  };
+
+  const renderLineStyl = (name: string) => {
+    let newName = name.split('-').join(' > ');
+    const index = newName.lastIndexOf(keyWord);
+    if (index > -1) {
+      const beforeStr = newName.substr(0, index);
+      const afterStr = newName.substr(index + keyWord.length);
+      return (
+        <>
+          <span>{beforeStr}</span>
+          <span style={{color: '#1890ff'}}>{keyWord}</span>
+          <span>{afterStr}</span>
+        </>
+      )
+    }
+    return newName
+  }
+
+  return (
+    <div style={{paddingLeft: props.collapsed ? '135px': '45px'}} className={'headerContent'}>
+      <div style={{flex: '1 1 0%', padding: '0 15px 0', marginLeft: '15px', display: 'flex', borderLeft: '1px solid #f0f0f0'}}>
+        {/* <div  
+          className={'navigationBtn'}
+          onClick={() => {
+            message.warning('当前功能暂不支持。');
+          }}
+        >
+          <ApartmentOutlined />
+          &nbsp;&nbsp;
+          流程导航
+        </div> */}
+        <div style={{position: 'relative'}}>
+          <Input 
+            style={{width: '268px', height: '32px', borderRadius:'4px'}} 
+            placeholder="搜索菜单"
+            allowClear
+            onFocus= {(e) => {
+              setKeyWord(e?.target?.value)
+              initRoute(routes, e?.target?.value)
+            }}
+            onBlur={() => {
+              setTimeout(() => {
+                setKeyWord('')
+              }, 600)
+            }}
+           
+            prefix={<SearchOutlined />}
+            onChange={debounce((e: any) => {
+              setKeyWord(e?.target?.value)
+              initRoute(routes, e?.target?.value)
+            }, 600)}
+          />
+          <div style={{display: judgeIsEmpty(keyWord) ? 'none' : 'block'}} className={'searchPanel'}>
+            <p className={'searchTitle'}>
+              共搜到{' '}
+              <span className={'themeColor'}>
+                {routeList.length || 0}
+              </span>{' '}
+              条结果{' '}
+            </p>
+            <div style={{marginTop: '10px'}}>
+              {
+                routeList.map(item => (
+                  <div
+                    className={'itemPath'}
+                    onClick={() => {
+                      history.push({
+                        pathname: item.path
+                      })
+                      // setKeyWord('')
+                    }}
+                    title={item.fullPathName}
+                  >{renderLineStyl(item.fullPathName)}</div>
+                ))
+              }
+            </div>
+          </div>
+        </div>
+      </div>
+      <RightContent />
+    </div>
+  )
+}
+
 export default GlobalHeaderCom;

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

@@ -1,85 +1,85 @@
-// @ts-ignore
-import React from 'react';
-import { Form, Input, Button, Modal } from 'antd';
-import { getAccountID, getUserId } from '@/utils/LocalstorageUtils';
-import request from '@/utils/request';
-
-export default (props: any) => {
-  const { loginOut } = props;
-  const [form] = Form.useForm();
-  return (
-    <>
-      <Modal
-        {...props}
-        visible={props.visible}
-        onCancel={() => {
-          props.onCancel();
-        }}
-        footer={[
-          <Button onClick={() => props.onCancel()}>取消</Button>,
-          <Button
-            onClick={() => {
-              form.validateFields().then((res) => {
-                request({
-                  url: `/bop/api/account/changePassWord/${getAccountID()}`,
-                  method: 'patch',
-                  params: res,
-                }).then(() => {
-                  loginOut();
-                })
-              });
-            }}
-            type="primary"
-          >
-            确认
-          </Button>,
-        ]}
-      >
-        <Form
-          form={form}
-          name="login"
-          labelCol={{ span: 4 }}
-          wrapperCol={{ span: 20 }}
-          initialValues={{
-            username: getUserId(),
-          }}
-        >
-          <Form.Item label="账号" name="username">
-            <Input disabled />
-          </Form.Item>
-          <Form.Item
-            label="旧密码"
-            name="oldPassword"
-            rules={[{ required: true, message: '请输入您的旧密码' }]}
-          >
-            <Input.Password />
-          </Form.Item>
-          <Form.Item
-            label="新密码"
-            name="newPassword"
-            help="密码最少要包含一个大写字母+一个小写字母+一个数字+一个特殊符号最少6位"
-            rules={[
-              { required: true, message: '请输入您的新密码' },
-              {
-                pattern:
-                  /^\S*(?=\S{6,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/,
-                message: '密码强度不够请重新输入',
-              },
-            ]}
-          >
-            <Input.Password />
-          </Form.Item>
-
-          <Form.Item
-            label="请确认密码"
-            name="confirmPassword"
-            help="请确认密码和第一次输入一致"
-            rules={[{ required: true, message: '请确认您的密码' }]}
-          >
-            <Input.Password />
-          </Form.Item>
-        </Form>
-      </Modal>
-    </>
-  );
-};
+// @ts-ignore
+import React from 'react';
+import { Form, Input, Button, Modal } from 'antd';
+import { getAccountID, getUserId } from '@/utils/LocalstorageUtils';
+import axios from 'axios';
+
+export default (props: any) => {
+  const { loginOut } = props;
+  const [form] = Form.useForm();
+  return (
+    <>
+      <Modal
+        {...props}
+        visible={props.visible}
+        onCancel={() => {
+          props.onCancel();
+        }}
+        footer={[
+          <Button onClick={() => props.onCancel()}>取消</Button>,
+          <Button
+            onClick={() => {
+              form.validateFields().then((res) => {
+                axios({
+                  url: `/bop/api/account/changePassWord/${getAccountID()}`,
+                  method: 'patch',
+                  params: res,
+                }).then(res => {
+                  loginOut();
+                })
+              });
+            }}
+            type="primary"
+          >
+            确认
+          </Button>,
+        ]}
+      >
+        <Form
+          form={form}
+          name="login"
+          labelCol={{ span: 4 }}
+          wrapperCol={{ span: 20 }}
+          initialValues={{
+            username: getUserId(),
+          }}
+        >
+          <Form.Item label="账号" name="username">
+            <Input disabled />
+          </Form.Item>
+          <Form.Item
+            label="旧密码"
+            name="oldPassword"
+            rules={[{ required: true, message: '请输入您的旧密码' }]}
+          >
+            <Input.Password />
+          </Form.Item>
+          <Form.Item
+            label="新密码"
+            name="newPassword"
+            help="密码最少要包含一个大写字母+一个小写字母+一个数字+一个特殊符号最少6位"
+            rules={[
+              { required: true, message: '请输入您的新密码' },
+              {
+                pattern:
+                  /^\S*(?=\S{6,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/,
+                message: '密码强度不够请重新输入',
+              },
+            ]}
+          >
+            <Input.Password />
+          </Form.Item>
+
+          <Form.Item
+            label="请确认密码"
+            name="confirmPassword"
+            help="请确认密码和第一次输入一致"
+            rules={[{ required: true, message: '请确认您的密码' }]}
+          >
+            <Input.Password />
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  );
+};

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

@@ -1,9 +1,8 @@
 
 // @ts-nocheck
-import { Dropdown, message, Modal, Button } from 'antd';
-import i18n from './i18n';
+import { Dropdown, message, Modal } from 'antd';
 import React, { useState } from 'react';
-import { history, useModel, setLocale } from 'umi';
+import { history, useModel } from 'umi';
 import './home.less';
 import Morentouxiang from '../../../../../assets/morentouxiang-32.svg';
 import Morentouxiang32 from '../../../../../assets/32.svg';
@@ -114,25 +113,9 @@ 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'}