From d9e822b0f72f8e232c7836f366e80bf3be25c4d8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 18 七月 2021 17:54:40 +0800
Subject: [PATCH] 2021-07-18
---
src/menu/components/code/sandbox/index.jsx | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/src/menu/components/code/sandbox/index.jsx b/src/menu/components/code/sandbox/index.jsx
index 0cb56a5..e125817 100644
--- a/src/menu/components/code/sandbox/index.jsx
+++ b/src/menu/components/code/sandbox/index.jsx
@@ -1,12 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
import { Icon, Popover } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-
+import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -18,7 +17,7 @@
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
const EditorCode = asyncIconComponent(() => import('./editorcode'))
-const BraftContent = asyncComponent(() => import('@/tabviews/custom/components/share/braftContent'))
+const CodeContent = asyncComponent(() => import('./codecontent'))
class CodeSandBox extends Component {
static propTpyes = {
@@ -28,7 +27,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
@@ -56,7 +55,8 @@
columns: [],
scripts: [],
html: '',
- css: ''
+ css: '',
+ js: '',
}
if (card.config) {
@@ -67,6 +67,7 @@
_card.style = config.style
_card.html = config.html
_card.css = config.css
+ _card.js = config.js
}
this.setState({
@@ -85,7 +86,7 @@
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || (!this.props.menu && nextProps.menu)
+ return !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -151,8 +152,10 @@
render() {
const { card } = this.state
+ let _style = resetStyle(card.style)
+
return (
- <div className="menu-editor-sand-box" style={{...card.style}} onClick={this.clickComponent} id={card.uuid}>
+ <div className="menu-editor-sand-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<WrapComponent config={card} updateConfig={this.updateComponent} />
@@ -167,23 +170,10 @@
} trigger="hover">
<Icon type="tool" />
</Popover>
- <BraftContent
- value={card.wrap.datatype !== 'static' ? '<p class="empty-content">瀵屾枃鏈�</p>' : card.html}
- encryption="false"
- />
+ <CodeContent name={card.name} html={card.html} css={card.css} js={card.js}/>
</div>
)
}
}
-const mapStateToProps = (state) => {
- return {
- menu: state.customMenu
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(CodeSandBox)
\ No newline at end of file
+export default CodeSandBox
\ No newline at end of file
--
Gitblit v1.8.0