From d823c59ba0b5f73e06c90d8bcae4dd25f5dfab64 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 07 九月 2023 17:18:02 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/views/rolemanage/index.jsx | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx index ce7203b..e246e2b 100644 --- a/src/views/rolemanage/index.jsx +++ b/src/views/rolemanage/index.jsx @@ -3,8 +3,8 @@ import { Spin, notification, Button, Table, Modal, ConfigProvider, Tree, Input, Empty } from 'antd' import moment from 'moment' import md5 from 'md5' -import enUS from 'antd/es/locale/en_US' import zhCN from 'antd/es/locale/zh_CN' +import { ApiOutlined } from '@ant-design/icons' import Api from '@/api' import Utils from '@/utils/utils.js' @@ -15,7 +15,6 @@ const { TreeNode } = Tree const { Search } = Input -const _locale = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS const Header = asyncComponent(() => import('./header')) const TransferForm = asyncComponent(() => import('@/templates/zshare/basetransferform')) @@ -29,6 +28,8 @@ title: '鑿滃崟鍚嶇О', dataIndex: 'MenuName', key: 'MenuName', align: 'center', render: (text, record) => { if (record.extra) { return <span style={{color: '#1890ff'}}>{text}</span> + } else if (record.interfaces === 'true') { + return <span><ApiOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡澶栭儴鎺ュ彛" />{text}</span> } return text } @@ -140,6 +141,7 @@ try { let pageParam = JSON.parse(window.decodeURIComponent(window.atob(item.menus_rolelist))) item.nodes = pageParam + item.interfaces = pageParam.interfaces || 'false' if (pageParam.type) { item.type = pageParam.type @@ -886,7 +888,7 @@ return ( <div className="mk-role-manage"> - <ConfigProvider locale={_locale}> + <ConfigProvider locale={zhCN}> <Header app={app} /> {loading ? <div className="loading-mask"> -- Gitblit v1.8.0