hanjian/salpa-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hanjian:develop-20231222
Branches Tags
hanjian:main
hanjian:develop-20231228
hanjian:develop-20231222
..
compare: hanjian:main
Branches Tags
hanjian:develop-20231228
hanjian:develop-20231222
hanjian:main

No commits in common. "develop-20231222" and "main" have entirely different histories.
develop-20 ... main

9 changed files with 5114 additions and 53162 deletions
Show Stats Expand all files Collapse all files

13
config/proxy.ts
View File

@ -1,12 +1,3 @@
/*
* @version: V1.0.0
* @Date: 2023-12-26 13:54:58
* @LastEditors: lzq
* @LastEditTime: 2023-12-26 14:14:09
* @company: 睿展数据
* @FilePath: \salpa-web\config\proxy.ts
* @Descripttion:
*/
/** /**
* 在生产环境 代理是无法生效的，所以这里没有生产环境的配置 * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
* ------------------------------- * -------------------------------
@ -19,7 +10,7 @@ export default {
dev: { dev: {
'/api/': { '/api/': {
// target: 'http://192.168.103.172:8080', // target: 'http://192.168.103.172:8080',
target: 'http://192.168.1.217:9080', target: 'http://192.168.2.58:8080',
changeOrigin: true, changeOrigin: true,
pathRewrite: { '^/api': '' }, pathRewrite: { '^/api': '' },
}, },
@ -28,7 +19,7 @@ export default {
target: 'http://192.168.113.251:8080', target: 'http://192.168.113.251:8080',
changeOrigin: true, changeOrigin: true,
}, }
}, },
test: { test: {
'/api/': { '/api/': {

57256
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -26,6 +26,7 @@
"lint:prettier": "prettier -c --write \"src/**/*\" --end-of-line auto", "lint:prettier": "prettier -c --write \"src/**/*\" --end-of-line auto",
"lint:style": "stylelint --fix \"src/**/*.less\" --syntax less", "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
"openapi": "umi openapi", "openapi": "umi openapi",
"precommit": "lint-staged",
"prettier": "prettier -c --write \"src/**/*\"", "prettier": "prettier -c --write \"src/**/*\"",
"serve": "umi-serve", "serve": "umi-serve",
"start": "cross-env UMI_ENV=dev umi dev", "start": "cross-env UMI_ENV=dev umi dev",

93
src/app.tsx
View File

@ -5,59 +5,60 @@
* *
* */ * */
import RightContent from '@/components/RightContent'; import RightContent from '@/components/RightContent'
import type { Settings as LayoutSettings } from '@ant-design/pro-layout'; import type { Settings as LayoutSettings } from '@ant-design/pro-layout'
import { PageLoading } from '@ant-design/pro-layout'; import { PageLoading } from '@ant-design/pro-layout'
import type { RunTimeLayoutConfig } from 'umi'; import type { RunTimeLayoutConfig } from 'umi'
import { history, Link } from 'umi'; import { history, Link } from 'umi'
// import Footer from '@/components/Footer'; // import Footer from '@/components/Footer';
import { BookOutlined, LinkOutlined } from '@ant-design/icons'; import { BookOutlined, LinkOutlined } from '@ant-design/icons'
import defaultSettings from '../config/defaultSettings'; import defaultSettings from '../config/defaultSettings'
import { getRoutersInfo, getUserInfo } from './services/session'; import iconStyle from '../public/樽海鞘_图案.svg'
const isDev = process.env.NODE_ENV === 'development'; import { getRoutersInfo, getUserInfo } from './services/session'
const loginPath = '/user/login'; const isDev = process.env.NODE_ENV === 'development'
const loginPath = '/user/login'
/** 获取用户信息比较慢的时候会展示一个 loading */ /** 获取用户信息比较慢的时候会展示一个 loading */
export const initialStateConfig = { export const initialStateConfig = {
loading: <PageLoading />, loading: <PageLoading />
}; }
/** /**
* @see https://umijs.org/zh-CN/plugins/plugin-initial-state * @see https://umijs.org/zh-CN/plugins/plugin-initial-state
* */ * */
export async function getInitialState(): Promise<{ export async function getInitialState(): Promise<{
settings?: Partial<LayoutSettings>; settings?: Partial<LayoutSettings>
currentUser?: API.CurrentUser; currentUser?: API.CurrentUser
loading?: boolean; loading?: boolean
fetchUserInfo?: () => Promise<API.CurrentUser | undefined>; fetchUserInfo?: () => Promise<API.CurrentUser | undefined>
}> { }> {
const fetchUserInfo = async () => { const fetchUserInfo = async () => {
try { try {
console.log(1111111111111111111111111111111); console.log(1111111111111111111111111111111)
const resp = await getUserInfo(); const resp = await getUserInfo()
if (resp === undefined || resp.code !== 200) { if (resp === undefined || resp.code !== 200) {
history.push(loginPath); history.push(loginPath)
} else { } else {
return { ...resp.user, permissions: resp.permissions } as API.CurrentUser; return { ...resp.user, permissions: resp.permissions } as API.CurrentUser
} }
} catch (error) { } catch (error) {
history.push(loginPath); history.push(loginPath)
}
return undefined
} }
return undefined;
};
// 如果是登录页面，不执行 // 如果是登录页面，不执行
if (history.location.pathname !== loginPath) { if (history.location.pathname !== loginPath) {
console.log(222222222222222222222222222222); console.log(222222222222222222222222222222)
const currentUser = await fetchUserInfo(); const currentUser = await fetchUserInfo()
return { return {
settings: defaultSettings, settings: defaultSettings,
currentUser, currentUser,
fetchUserInfo, fetchUserInfo
}; }
} }
return { return {
fetchUserInfo, fetchUserInfo,
settings: defaultSettings, settings: defaultSettings
}; }
} }
// ProLayout 支持的api https://procomponents.ant.design/components/layout // ProLayout 支持的api https://procomponents.ant.design/components/layout
@ -65,14 +66,14 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
return { return {
rightContentRender: () => <RightContent />, rightContentRender: () => <RightContent />,
waterMarkProps: { waterMarkProps: {
content: initialState?.currentUser?.userName, content: initialState?.currentUser?.userName
}, },
// footerRender: () => <Footer />, // footerRender: () => <Footer />,
onPageChange: () => { onPageChange: () => {
const { location } = history; const { location } = history
// 如果没有登录，重定向到 login // 如果没有登录，重定向到 login
if (!initialState?.currentUser && location.pathname !== loginPath) { if (!initialState?.currentUser && location.pathname !== loginPath) {
history.push(loginPath); history.push(loginPath)
} }
}, },
links: isDev links: isDev
@ -84,27 +85,27 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
<Link key="docs" to="/~docs"> <Link key="docs" to="/~docs">
<BookOutlined /> <BookOutlined />
<span>业务组件文档</span> <span>业务组件文档</span>
</Link>, </Link>
] ]
: [], : [],
menuHeaderRender: false, menuHeaderRender: undefined,
menu: { menu: {
// 每当 initialState?.currentUser?.userid 发生修改时重新执行 request // 每当 initialState?.currentUser?.userid 发生修改时重新执行 request
params: { params: {
userId: initialState?.currentUser?.userId, userId: initialState?.currentUser?.userId
}, },
request: async () => { request: async () => {
if (!initialState?.currentUser?.userId) { if (!initialState?.currentUser?.userId) {
return []; return []
} }
// initialState.currentUser 中包含了所有用户信息 // initialState.currentUser 中包含了所有用户信息
const menus = await getRoutersInfo(); const menus = await getRoutersInfo()
setInitialState((preInitialState: any) => ({ setInitialState((preInitialState: any) => ({
...preInitialState, ...preInitialState,
menus, menus
})); }))
return menus; return menus
}, }
}, },
// 自定义 403 页面 // 自定义 403 页面
// unAccessible: <div>unAccessible</div>, // unAccessible: <div>unAccessible</div>,
@ -115,11 +116,9 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
{children} {children}
{!props.location?.pathname?.includes('/login')} {!props.location?.pathname?.includes('/login')}
</div> </div>
); )
}, },
...initialState?.settings, ...initialState?.settings,
// logo: <div />, logo: <img src={iconStyle} />
// title: <div />, }
// logo: <img src={iconStyle} /> }
};
};

19
src/components/RightContent/index.tsx
View File

@ -1,20 +1,11 @@
/*
* @version: V1.0.0
* @Date: 2023-12-26 13:54:59
* @LastEditors: lzq
* @LastEditTime: 2023-12-26 14:24:26
* @company: 睿展数据
* @FilePath: \salpa-web\src\components\RightContent\index.tsx
* @Descripttion:
*/
import { QuestionCircleOutlined } from '@ant-design/icons';
import { Space } from 'antd'; import { Space } from 'antd';
import { QuestionCircleOutlined } from '@ant-design/icons';
import React from 'react'; import React from 'react';
import { SelectLang, useModel } from 'umi'; import { useModel, SelectLang } from 'umi';
import HeaderSearch from '../HeaderSearch';
import NoticeIconView from '../NoticeIcon';
import Avatar from './AvatarDropdown'; import Avatar from './AvatarDropdown';
import HeaderSearch from '../HeaderSearch';
import styles from './index.less'; import styles from './index.less';
import NoticeIconView from '../NoticeIcon';
export type SiderTheme = 'light' | 'dark'; export type SiderTheme = 'light' | 'dark';
@ -31,7 +22,7 @@ const GlobalHeaderRight: React.FC = () => {
if ((navTheme === 'dark' && layout === 'top') || layout === 'mix') { if ((navTheme === 'dark' && layout === 'top') || layout === 'mix') {
className = `${styles.right} ${styles.dark}`; className = `${styles.right} ${styles.dark}`;
} }
return <span />;
return ( return (
<Space className={className}> <Space className={className}>
<HeaderSearch <HeaderSearch

11
src/e2e/baseLayout.e2e.js
View File

@ -1,16 +1,7 @@
/*
* @version: V1.0.0
* @Date: 2023-12-26 13:54:59
* @LastEditors: lzq
* @LastEditTime: 2023-12-26 14:10:35
* @company: 睿展数据
* @FilePath: \salpa-web\src\e2e\baseLayout.e2e.js
* @Descripttion:
*/
const { uniq } = require('lodash'); const { uniq } = require('lodash');
const RouterConfig = require('../../config/config').default.routes; const RouterConfig = require('../../config/config').default.routes;
const BASE_URL = `http://localhost:${process.env.PORT || 8000}`; const BASE_URL = `http://localhost:${process.env.PORT || 8001}`;
function formatter(routes, parentPath = '') { function formatter(routes, parentPath = '') {
const fixedParentPath = parentPath.replace(/\/{1,}/g, '/'); const fixedParentPath = parentPath.replace(/\/{1,}/g, '/');

45
src/global.less
View File

@ -56,28 +56,29 @@ ol {
} }
} }
// .ant-layout{
// background: #fff;
// }
// .ant-layout-header{
// //display: none;
// }
// #contentContainer{ .ant-layout{
// //display: none; background: #fff;
// } }
// .ant-pro-right-content{ .ant-layout-header{
//display: none; //display: none;
// } }
// .ant-modal-mask{
// background-color: rgba(255, 0, 0, 0); #contentContainer{
// }
// .chiner-modal{
// background-color: rgba(255, 0, 0, 0);
// }
// .ant-pro-top-nav-header-logo{
//display: none; //display: none;
// } }
// .ant-pro-top-nav-header-main-left{ .ant-pro-right-content{
// min-width: 0px; display: none;
// } }
.ant-modal-mask{
background-color: rgba(255, 0, 0, 0);
}
.chiner-modal{
background-color: rgba(255, 0, 0, 0);
}
.ant-pro-top-nav-header-logo{
display: none;
}
.ant-pro-top-nav-header-main-left{
min-width: 0px;
}

149
src/modelstyle.css
View File

@ -1,149 +0,0 @@
body .ant-layout{
background: #fff;
}
/*ant-btn*/
body .ant-btn:focus,
body .ant-btn:hover {
color: #2B50C4;
border-color: #2B50C4;
background: #fff;
}
body .ant-btn:active {
color:#042281;
border-color:#042281;
background:#fff
}
body .ant-btn-primary {
color: #fff;
border-color: #233A82;
background: #233A82;
}
body .ant-btn-primary:focus,
body .ant-btn-primary:hover {
color: #fff;
border-color: #2B50C4;
background: #2B50C4;
}
body .ant-btn-primary:active {
color: #fff;
border-color: #042281;
background: #042281;
}
html {
--antd-wave-shadow-color:#233A82 !important;
}
body .ant-input:hover {
border-color: #233A82;
}
body .ant-input-affix-wrapper-focused,
body .ant-input-affix-wrapper:focus {
border-color:#233A82;
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused,
body .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus {
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused,
body .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus {
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-input-search-rtl>.ant-input-group>.ant-input-affix-wrapper-focused,
body .ant-input-search-rtl>.ant-input-group>.ant-input-affix-wrapper:hover {
border-right-color:#233A82;
}
body .ant-input-affix-wrapper:not(.ant-input-affix-wrapper-disabled):hover {
border-color: #233A82;
}
body .ant-select:not(.ant-select-disabled):hover .ant-select-selector {
border-color: #233A82;
}
body .ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector,
body .ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector {
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector,
body .ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector {
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
border-color:#233A82;
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-input-group-addon .ant-select-focused .ant-select-selector,
body .ant-input-group-addon .ant-select-open .ant-select-selector {
color:#233A82;
}
body .namediv:hover {
color: #233A82;
}
body .ant-select-item-option-selected:not(.ant-select-item-option-disabled) {
color: #1d2129;
background: #e9ecf4;
}
body .ant-select-item-option-selected:hover{
background: #e9ecf4;
}
body .ant-select-item-option-selected:not(.ant-select-item-option-disabled) .ant-select-item-option-state {
color: #233a82;
}
body .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused,
body .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-input-affix-wrapper-focused,
body .ant-input-affix-wrapper:focus {
border-color:#233a82;
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-input-focused,
body .ant-input:focus {
border-color:#233a82;
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-pagination-options-quick-jumper input-focused,
body .ant-pagination-options-quick-jumper input:focus {
border-color:#233a82;
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-pagination-simple .ant-pagination-simple-pager input:focus {
border-color:#233a82;
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused,
body .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
}
body .spandes:hover{
color:#233a82;
}
body .cardstyle:hover .deletestyle:hover {
color: #233a82;
}
body .ant-pagination-item-active {
border-color: #233a82;
}
body .ant-pagination-item:hover a {
color: #233a82;
}
body .ant-pagination-item:hover {
border-color: #233a82;
}
body .ant-pagination-next:hover .ant-pagination-item-link,
body .ant-pagination-prev:hover .ant-pagination-item-link {
color: #233a82;
border-color: #233a82;
}

195
src/pages/pdManer/pages/Main/HeaderTool.js
View File

@ -1,140 +1,103 @@
import { executeSql } from '@/services/api.ts'; import React, { useState, forwardRef, useImperativeHandle, useRef, useEffect } from 'react'
import { Divider } from 'antd'; import { FormatMessage, GroupIcon, Icon, SearchSuggest, Slider, NumberInput, Modal } from '../../components'
import numeral from 'numeral'; import { SketchPicker } from 'react-color'
import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'; import numeral from 'numeral'
import { SketchPicker } from 'react-color'; import { validateNeedSave } from '../../lib/datasource_util'
import { applyMiddleware, legacy_createStore } from 'redux'; import { Divider, message } from 'antd'
import { logger } from 'redux-logger'; import { executeSql } from '@/services/api.ts'
import thunkMiddleware from 'redux-thunk'; import { getAllDataSQLByFilter } from '../../lib/json2code_util'
import { import './style/index.less'
FormatMessage, const GroupIconGroup = GroupIcon.GroupIconGroup
GroupIcon,
Icon, export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorChange, openModal, templateType,
Modal, activeTab, resize, sliderChange, dataSource,
NumberInput, jumpPosition, jumpDetail }, ref) => {
SearchSuggest, const dbConn = dataSource?.dbConn || []
Slider, const properties = dbConn[0]?.properties
} from '../../components'; const [isCellSelected, setIsCellSelected] = useState(false)
import { validateNeedSave } from '../../lib/datasource_util'; const [scaleNumber, setScaleNumber] = useState(1)
import { getAllDataSQLByFilter } from '../../lib/json2code_util';
import reducers from '../../reducers';
import './style/index.less';
const GroupIconGroup = GroupIcon.GroupIconGroup;
export default React.memo(
forwardRef(
(
{
currentPrefix,
close,
iconClick,
colorChange,
openModal,
templateType,
activeTab,
resize,
sliderChange,
dataSource,
jumpPosition,
jumpDetail,
},
ref,
) => {
const dbConn = dataSource?.dbConn || [];
const properties = dbConn[0]?.properties;
const [isCellSelected, setIsCellSelected] = useState(false);
const [scaleNumber, setScaleNumber] = useState(1);
const [colorState, setColor] = useState({ const [colorState, setColor] = useState({
fontColor: 'rgba(0, 0, 0, 0.65)', fontColor: 'rgba(0, 0, 0, 0.65)',
fillColor: '#ACDAFC', fillColor: '#ACDAFC',
}); })
useImperativeHandle( useImperativeHandle(ref, () => {
ref,
() => {
return { return {
setScaleNumber, setScaleNumber,
setIsCellSelected, setIsCellSelected,
}; }
}, }, [])
[],
);
const _colorChange = (key, value) => { const _colorChange = (key, value) => {
setColor((pre) => { setColor((pre) => {
return { return {
...pre, ...pre,
[key]: value.hex, [key]: value.hex,
}; }
}); })
colorChange && colorChange(key, value); colorChange && colorChange(key, value)
}; }
const _close = () => { const _close = () => {
if (validateNeedSave(dataSource)) { if (validateNeedSave(dataSource)) {
Modal.confirm({ Modal.confirm({
title: FormatMessage.string({ id: 'closeConfirmTitle' }), title: FormatMessage.string({ id: 'closeConfirmTitle' }),
message: FormatMessage.string({ id: 'closeConfirm' }), message: FormatMessage.string({ id: 'closeConfirm' }),
onOk: () => { onOk: () => {
close(); close()
}, },
}); })
} else { } else {
close(); close()
} }
}; }
const defaultTemplate = ['createTable', 'createIndex', 'content']; const defaultTemplate = ['createTable', 'createIndex', 'content']
const templateRef = useRef(defaultTemplate); const templateRef = useRef(defaultTemplate)
const dataTypeSupports = _.get(dataSource, 'profile.dataTypeSupports', []); const dataTypeSupports = _.get(dataSource, 'profile.dataTypeSupports', [])
const defaultDb = _.get(dataSource, 'profile.default.db', dataTypeSupports[0]?.id); const defaultDb = _.get(dataSource, 'profile.default.db', dataTypeSupports[0]?.id)
const [codeData, setCodeData] = useState(() => { const [codeData, setCodeData] = useState(() => {
return getAllDataSQLByFilter( return getAllDataSQLByFilter(dataSource,
dataSource, templateType === 'dict' ? 'dictSQLTemplate' : defaultDb, templateRef.current)
templateType === 'dict' ? 'dictSQLTemplate' : defaultDb, })
templateRef.current,
);
});
const backGroup = async () => { const backGroup = async () => {
if (!properties) { if (!properties) {
Modal.error({ Modal.error({
title: FormatMessage.string({ id: 'dbConnect.connectError' }), title: FormatMessage.string({ id: 'dbConnect.connectError' }),
message: '请连接数据库', message: '请连接数据库',
}); })
} else { } else {
const data = { const data = {
driverName: properties.driver_class_name, driverName: properties.driver_class_name,
url: properties.url, url: properties.url,
username: properties.username, username: properties.username,
password: properties.password, password: properties.password,
sql: codeData, sql: codeData
}; }
const res = await executeSql(data); const res = await executeSql(data)
if (res.code == 200) { if (res.code == 200) {
Modal.success({ Modal.success({
title: FormatMessage.string({ id: 'dbConnect.connectSuccess' }), title: FormatMessage.string({ id: 'dbConnect.connectSuccess' }),
message: `${res.msg}`, message: `${res.msg}`,
}); })
} else { } else {
Modal.error({ Modal.error({
bodyStyle: { width: '50%' }, bodyStyle: { width: '50%' },
contentStyle: { width: '100%', height: '100%' }, contentStyle: { width: '100%', height: '100%' },
title: FormatMessage.string({ id: 'dbConnect.connectError' }), title: FormatMessage.string({ id: 'dbConnect.connectError' }),
message: `${res.msg}`, message: `${res.msg}`
}); })
} }
} }
};
const [issee, setIssee] = useState(false); }
const [isfill, setIsfill] = useState(false); const [issee, setIssee] = useState(false)
const [isfill, setIsfill] = useState(false)
const fill = () => { const fill = () => {
setIsfill(!isfill); setIsfill(!isfill)
setIssee(false); setIssee(false)
}; }
const see = () => { const see = () => {
setIsfill(false); setIsfill(false)
setIssee(!issee); setIssee(!issee)
}; }
const handleExportSqlDict = () => {
const store = legacy_createStore(reducers, applyMiddleware(thunkMiddleware, logger));
console.log(dataSource);
};
return ( return (
<div className={`${currentPrefix}-head`}> <div className={`${currentPrefix}-head`}>
@ -149,7 +112,7 @@ export default React.memo(
</div> </div>
</div> </div>
</div> </div>
<Divider className="divider" /> <Divider className='divider' />
<div className={`${currentPrefix}-iconstyle`}> <div className={`${currentPrefix}-iconstyle`}>
<GroupIconGroup> <GroupIconGroup>
<GroupIcon <GroupIcon
@ -159,6 +122,7 @@ export default React.memo(
groupKey="save" groupKey="save"
icon="icon-bianzu2" icon="icon-bianzu2"
onClick={iconClick} onClick={iconClick}
/> />
<GroupIcon <GroupIcon
className={`${currentPrefix}-icongroup`} className={`${currentPrefix}-icongroup`}
@ -231,21 +195,11 @@ export default React.memo(
//onMouseDown={e => iconClick(e, 'polygon')} //onMouseDown={e => iconClick(e, 'polygon')}
/> />
<div className="fontColor1"> <div className='fontColor1'>
<Icon <Icon type="icon-zitiyanse" onClick={see}
type="icon-zitiyanse" disable={activeTab?.type !== 'diagram' || !isCellSelected} title="字体颜色" />
onClick={see}
disable={activeTab?.type !== 'diagram' || !isCellSelected}
title="字体颜色"
/>
{/* display: issee ? 'block' : 'none' */} {/* display: issee ? 'block' : 'none' */}
<div <div style={{ display: activeTab?.type == 'diagram' && issee && isCellSelected ? 'block' : 'none' }} className='fontColor2' >
style={{
display:
activeTab?.type == 'diagram' && issee && isCellSelected ? 'block' : 'none',
}}
className="fontColor2"
>
<SketchPicker <SketchPicker
disableAlpha disableAlpha
presetColors={[ presetColors={[
@ -271,20 +225,9 @@ export default React.memo(
/> />
</div> </div>
</div> </div>
<div className="fontColor1"> <div className='fontColor1'>
<Icon <Icon type="icon-tianchongyanse" onClick={fill} disable={activeTab?.type !== 'diagram' || !isCellSelected} title="填充颜色" />
type="icon-tianchongyanse" <div style={{ display: activeTab?.type == 'diagram' && isfill && isCellSelected ? 'block' : 'none' }} className='fontColor2' >
onClick={fill}
disable={activeTab?.type !== 'diagram' || !isCellSelected}
title="填充颜色"
/>
<div
style={{
display:
activeTab?.type == 'diagram' && isfill && isCellSelected ? 'block' : 'none',
}}
className="fontColor2"
>
<SketchPicker <SketchPicker
disableAlpha disableAlpha
presetColors={[ presetColors={[
@ -497,12 +440,6 @@ export default React.memo(
icon="fa-toggle-right" icon="fa-toggle-right"
onClick={backGroup} onClick={backGroup}
/> />
<GroupIcon
className={`${currentPrefix}-icongroup`}
onClick={() => handleExportSqlDict()}
hoverTitle={FormatMessage.string({ id: 'toolbar.export' })}
icon={<Icon type="icon-daochu" />}
/>
</GroupIconGroup> </GroupIconGroup>
<div className={`${currentPrefix}-head-search`}> <div className={`${currentPrefix}-head-search`}>
<SearchSuggest <SearchSuggest
@ -514,7 +451,5 @@ export default React.memo(
</div> </div>
</div> </div>
</div> </div>
); )
}, }))
),
);