From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 21 一月 2022 17:21:25 +0800 Subject: [PATCH] 2022-01-21 --- src/pc/components/login/normal-login/index.jsx | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/pc/components/login/normal-login/index.jsx b/src/pc/components/login/normal-login/index.jsx index 1ffb207..48d29f8 100644 --- a/src/pc/components/login/normal-login/index.jsx +++ b/src/pc/components/login/normal-login/index.jsx @@ -1,14 +1,13 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Icon, Popover } from 'antd' +import { Popover } from 'antd' +import { EditOutlined, FontColorsOutlined, ToolOutlined, DeleteOutlined } from '@ant-design/icons' import asyncIconComponent from '@/utils/asyncIconComponent' import asyncComponent from '@/utils/asyncComponent' import MKEmitter from '@/utils/events.js' -import zhCN from '@/locales/zh-CN/model.js' -import enUS from '@/locales/en-US/model.js' import { resetStyle } from '@/utils/utils-custom.js' import getWrapForm from './options' import './index.scss' @@ -24,7 +23,6 @@ } state = { - dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, card: null, back: false } @@ -76,6 +74,9 @@ let _card = fromJS(card).toJS() if (_card.loginWays.length === 2) { _card.loginWays.push({type: 'app_scan', label: '鎵爜鐧诲綍'}) + } + if (_card.wrap.link && _card.wrap.link === 'menu') { + _card.wrap.linkmenu = _card.uuid } this.setState({ card: _card @@ -143,9 +144,9 @@ } getWrapForms = () => { - const { wrap } = this.state.card + const { card } = this.state - return getWrapForm(wrap) + return getWrapForm(card.wrap) } updateWrap = (res) => { @@ -161,7 +162,7 @@ } render() { - const { card, dict } = this.state + const { card } = this.state let style = resetStyle(card.style) if (card.wrap.maxWidth) { style.maxWidth = card.wrap.maxWidth @@ -179,15 +180,15 @@ <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={ <div className="mk-popover-control"> <NormalForm title="鐧诲綍璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}> - <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/> + <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/> </NormalForm> - <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" /> - <Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} /> + <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/> + <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} /> </div> } trigger="hover"> - <Icon type="tool" /> + <ToolOutlined /> </Popover> - <LoginForm loginWays={card.loginWays} wrap={card.wrap} menuId={card.uuid} dict={dict} /> + <LoginForm loginWays={card.loginWays} wrap={card.wrap} /> </div> ) } -- Gitblit v1.8.0