Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

README.md

 ## god-template
 
-### 为数商云&醒电构建项目提供react脚手架模板
+### 为&醒电构建项目提供react脚手架模板
 
 - god页面模板， 依赖于[umi](https://umijs.org/), 更多配置可以查看
 - god组件库[文档](http://10.0.0.22:8080/)
@@ -24,4 +24,4 @@
 1. 样式
   - 全局样式需写在src/global/global.less下， 涉及到color， size之类的属性尽量变量化 并且储存在/styles/theme.less中
 
- "umi-plugin-antd-theme": "^2.1.2"
+ "umi-plugin-antd-theme": "^2.1.2"
\ No newline at end of file

src/hooks/useTreeData.ts

@@ -4,6 +4,7 @@ import { Modal } from 'antd'
 import { TabTreeActions } from '@/components/TabTree'
 import { ISchemaFormActions } from '@formily/antd'
 import { isObject } from '@/utils'
+import { usePageStatus } from './usePageStatus'
 
 export enum FormState {
   FREE, // 空闲状态
@@ -13,7 +14,7 @@ export enum FormState {
 
 export interface useTreeTabOptions {
   selectCallback?(selectKey?, node?),
-  fetchMenuData?(),
+  fetchMenuData?(roleId?: number),
   fetchItemDetailData?(id),
   // 重置右侧详情
   resetDetail?(),
@@ -47,13 +48,14 @@ export const useTreeData = (options: useTreeTabOptions = {}) => {
   const [nodeRecord, setNodeRecord] = useState<any>(null)
 
   const [isEditForm, setIsEditForm] = useState<boolean>(false)
+  const { id } = usePageStatus();
 
   useEffect(() => {
     resetMenu()
   }, [])
   const resetMenu = async () => {
     if (fetchMenuData) {
-      const res = await fetchMenuData()
+      const res = await fetchMenuData(Number(id))
       setTreeData(res.data || [])
     }
   }

src/layouts/BasicLayout.tsx

@@ -55,7 +55,7 @@ export const getSelectedMenuKeys = (
 
 const defaultFooterDom = (
   <DefaultFooter
-    // copyright={`瓴犀-${new Date().getFullYear()} 前端组体验出品`}
+    copyright={`全链数字化解决方案`}
     links={[]}
   />
 );

src/layouts/components/BaseFooter.tsx

@@ -4,8 +4,8 @@ import cx from 'classnames'
 
 const BaseFooter: React.FC = (props) => {
   return (
-    <footer className={cx(styles.lingxiBusinessUserFooter)}>Copy Right©广州市数商云网络科技有限公司 粤ICP备13044797号-5</footer>
+    <footer className={cx(styles.lingxiBusinessUserFooter)}>全链数字化解决方案</footer>
   )
 }
 
-export default BaseFooter
+export default BaseFooter
\ No newline at end of file

src/locales/en-US.ts

@@ -37,7 +37,7 @@ import marketing from './en-US/marketing'
 import responseCode from './en-US/responseCode'
 
 export default {
-  'global.siteName': '瓴犀',
+  'global.siteName': '',
   ...common,
   ...menu,
   ...home,

src/locales/ko-KR.ts

@@ -37,7 +37,7 @@ import marketing from './ko-KR/marketing'
 import responseCode from './ko-KR/responseCode'
 
 export default {
-  'global.siteName': '瓴犀',
+  'global.siteName': '',
   ...common,
   ...menu,
   ...home,

src/locales/zh-CN.ts

@@ -37,7 +37,7 @@ import marketing from './zh-CN/marketing'
 import responseCode from './zh-CN/responseCode'
 
 export default {
-  'global.siteName': '瓴犀',
+  'global.siteName': '',
   ...common,
   ...menu,
   ...home,

src/locales/zh-CN/common.ts

@@ -96,7 +96,7 @@ export default {
   'common.error.diannaoweilianjie': '电脑未连接到网络',
   'common.error.fanghuoqianghuosha': '防火墙或杀毒软件阻止',
   'common.error.shuaxinyemianshi': '刷新页面试试',
-  'common.error.shushangyunfu': '数商云服务',
+  'common.error.shushangyunfu': '服务',
 
   /** 其他 */
   'common.money': '¥',

src/locales/zh-CN/components.ts

@@ -239,11 +239,11 @@ export default {
   'components.daoruwanchengqingdianjidao': '导入完成请点击导入完成',
   'components.daorujiancha': '导入检查',
   'components.shujudaoru': '数据导入',
-  'components.shangyeshuzihuayoulingxi': '商业数字化有瓴犀',
+  'components.shangyeshuzihuayoulingxi': '商业数字化',
   'components.dianjixiazaishoujikehu': '点击下载手机客户端',
   'components.dianjiyoushangjiaoxuanzeliu': '点击右上角选择浏览器打开',
-  'components.lingxishangchengAPP': '瓴犀商城APP',
-  'components.CopyRightguangzhoushishushangyun': 'Copy Right©广州市数商云网络科技有限公司 粤ICP备13044797号-5',
+  'components.lingxishangchengAPP': '商城APP',
+  'components.CopyRightguangzhoushishushangyun': '全链数字化解决方案',
   'components.mianzhaishengming': '免责声明',
   'components.fuwutiaokuan': '服务条款',
   'components.lianxiwomen': '联系我们',

src/pages/403.tsx

@@ -28,7 +28,7 @@ const NoFoundPage: React.FC<{}> = () => {
             </div>
           </Col>
           <Col span={12}>
-            <img className={styles.image} src={Img} alt={intl.formatMessage({ id: 'common.error.shushangyunfu', defaultMessage: '数商云服务' })}/>
+            <img className={styles.image} src={Img} alt={intl.formatMessage({ id: 'common.error.shushangyunfu', defaultMessage: '服务' })}/>
           </Col>
         </Row>
       </div>

src/pages/404.tsx

@@ -33,7 +33,7 @@ const NoFoundPage: React.FC<{}> = () => {
             </div>
           </Col>
           <Col span={12}>
-            <img className={styles.image} src={Img} alt={intl.formatMessage({ id: 'common.error.shushangyunfu', defaultMessage: '数商云服务' })} />
+            <img className={styles.image} src={Img} alt={intl.formatMessage({ id: 'common.error.shushangyunfu', defaultMessage: '服务' })} />
           </Col>
         </Row>
       </div>

src/pages/500.tsx

@@ -33,7 +33,7 @@ const InternetError: React.FC<{}> = () => {
             </div>
           </Col>
           <Col span={12}>
-            <img className={styles.image} src={Img} alt={intl.formatMessage({ id: 'common.error.shushangyunfu', defaultMessage: '数商云服务' })} />
+            <img className={styles.image} src={Img} alt={intl.formatMessage({ id: 'common.error.shushangyunfu', defaultMessage: '服务' })} />
           </Col>
         </Row>
       </div>

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -54,11 +54,6 @@ const TabFormErrors = props => {
   );
 };
 
-const fetchMenuData = async () => {
-  const res = await getMemberRoleAuthTree();
-  return { data: res.data.menus };
-};
-
 const TabsItem = Tabs.TabPane;
 
 const menuActions = createFormActions();
@@ -109,6 +104,14 @@ const MemberDetail: React.FC<{}> = () => {
   } = useTreeTabs({
     fetchMenuData: fetchOrgsTreeData,
   });
+
+  const fetchMenuData = useCallback(async (roleId: number) => {
+    const res = await getMemberRoleAuthTree({
+      memberRoleId: roleId
+    });
+    return { data: res.data.menus };
+  }, []);
+
   const { treeData, handleSelect } = useTreeData({
     fetchMenuData,
     fetchItemDetailData: ({ id }) =>

src/pages/editor/configs/componentConfigs/LingXiUI/index.ts

@@ -3,7 +3,7 @@
  * @Date: 2021-01-28 10:32:29
  * @LastEditTime: 2021-03-01 11:39:28
  * @LastEditors: Please set LastEditors
- * @Description: 瓴犀装修组件配置集合
+ * @Description: 装修组件配置集合
  * @FilePath: /lingxi-business-paltform/src/pages/editor/configs/componentConfigs/LingXiUI/index.ts
  */
 import TopBar from './TopBar'

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/WebDesignPanel/components/WebLayout/topbar.tsx

@@ -13,7 +13,7 @@ const TopBar = () => {
     <div className={styles.topBar}>
       <div className={styles['topBar-content']}>
         <div>
-          <div>瓴犀企业商城</div>
+          <div>企业商城</div>
         </div>
         <div className={styles.right}>
           <div className={styles.toLogin}>你好，请登录</div>

src/pages/user/register.tsx

@@ -256,7 +256,7 @@ const UserRegistry = () => {
         <title>{intl.formatMessage({id: 'user.yonghuzhuce'})}</title>
       </Helmet>
       <div className={cx('register', globalStyles.lingxiBusinessContent1024)}>
-        {/* <h3>欢迎您注册数商云账号</h3> */}
+        {/* <h3>欢迎您注册账号</h3> */}
         <div className={cx('registerBox', globalStyles.lingxiBusinessMarginContent)}>
           <Steps current={current} className={'stepWrap'} size='small'>
             {stepList.map(v => <Steps.Step title={v.title} key={v.key}></Steps.Step>)}