From 9a16cb432ed0a597caf9ba78c9dda63ad2134207 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 七月 2020 12:42:40 +0800
Subject: [PATCH] 2020-07-01
---
src/components/tabview/index.jsx | 3 +
src/tabviews/treepage/index.jsx | 5 +-
src/mob/mobshell/index.jsx | 5 ++
src/tabviews/zshare/cardcomponent/index.scss | 2 +
src/store/options.js | 2
scripts/build.js | 1
src/mob/contupdate/index.jsx | 34 +++++++++++++++--
src/components/sidemenu/config.jsx | 4 +-
src/mob/login/index.scss | 1
src/mob/login/index.jsx | 9 +++-
src/tabviews/commontable/index.jsx | 5 +-
src/mob/contupdate/index.scss | 5 ++
src/mob/mobshell/card.jsx | 4 +-
src/utils/utils.js | 4 +-
14 files changed, 64 insertions(+), 20 deletions(-)
diff --git a/scripts/build.js b/scripts/build.js
index a8c7bc6..a107a7b 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -3,6 +3,7 @@
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'production';
process.env.NODE_ENV = 'production';
+process.env.GENERATE_SOURCEMAP = 'false';
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
diff --git a/src/components/sidemenu/config.jsx b/src/components/sidemenu/config.jsx
index 5551f1a..3201ea4 100644
--- a/src/components/sidemenu/config.jsx
+++ b/src/components/sidemenu/config.jsx
@@ -60,8 +60,8 @@
type: 'ManageTable',
MenuID: '1585192949946f3et2ts8tn82krmumdf',
MenuNo: 'MyAppManage',
- MenuName: '搴旂敤绠＄悊',
- text: '搴旂敤绠＄悊'
+ MenuName: '绯荤粺UI',
+ text: '绯荤粺UI'
}, {
src: '',
systems: ['SSO', 'cloud'],
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index b779de6..d0f9961 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -11,6 +11,7 @@
import {modifyTabview, toggleIsiframe, refreshTabView} from '@/store/action'
import asyncComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'
+import options from '@/store/options.js'
import mzhCN from '@/locales/zh-CN/main.js'
import menUS from '@/locales/en-US/main.js'
@@ -224,7 +225,7 @@
key={view.MenuID}
>
{this.selectcomponent(view)}
- {!['CommonTable', 'TreePage', 'ManageTable'].includes(view.type) ?
+ {options.sysType !== 'cloud' && !['CommonTable', 'TreePage', 'ManageTable'].includes(view.type) ?
<Button
icon="copy"
shape="circle"
diff --git a/src/mob/contupdate/index.jsx b/src/mob/contupdate/index.jsx
index e47b566..c633eef 100644
--- a/src/mob/contupdate/index.jsx
+++ b/src/mob/contupdate/index.jsx
@@ -14,7 +14,8 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+ dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ visible: false
}
UNSAFE_componentWillMount () {
@@ -26,14 +27,39 @@
// }
onVisibleChange = (visible) => {
+ const { element } = this.props
let val = this.props.form.getFieldValue('content')
- console.log(visible)
- console.log(val)
+
+ this.setState({
+ visible: visible
+ })
+
+ if (val && element.content !== val) {
+ this.props.updateContent({...element, content: val})
+ } else {
+ this.props.form.setFieldsValue({content: element.content})
+ }
+ }
+
+ handleSubmit = () => {
+ const { element } = this.props
+ let val = this.props.form.getFieldValue('content')
+
+ this.setState({
+ visible: false
+ })
+
+ if (val && element.content !== val) {
+ this.props.updateContent({...element, content: val})
+ } else {
+ this.props.form.setFieldsValue({content: element.content})
+ }
}
render () {
const { element } = this.props
const { getFieldDecorator } = this.props.form
+ const { visible } = this.state
return (
<div className="mob-content-update">
@@ -43,7 +69,7 @@
initialValue: element.content
})(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
</div>
- } overlayClassName="mob-content-update-popover" placement="bottomRight" title="" trigger="click" onVisibleChange={this.onVisibleChange}>
+ } overlayClassName="mob-content-update-popover" placement="bottomRight" title="" visible={visible} trigger="click" onVisibleChange={this.onVisibleChange}>
<Icon type="edit" />
</Popover>
</div>
diff --git a/src/mob/contupdate/index.scss b/src/mob/contupdate/index.scss
index 7f8e8e7..c959945 100644
--- a/src/mob/contupdate/index.scss
+++ b/src/mob/contupdate/index.scss
@@ -6,12 +6,15 @@
border-radius: 2px;
color: #ffffff;
font-size: 14px;
+ display: none;
i {
padding: 2px 5px;
cursor: pointer;
}
-
+}
+.editing .mob-content-update {
+ display: inline-block;
}
.mob-content-update-popover {
.ant-popover-content {
diff --git a/src/mob/login/index.jsx b/src/mob/login/index.jsx
index 4387a21..ca4ca5f 100644
--- a/src/mob/login/index.jsx
+++ b/src/mob/login/index.jsx
@@ -19,6 +19,7 @@
card: PropTypes.object,
editId: PropTypes.any,
triggerEdit: PropTypes.func,
+ updateConfig: PropTypes.func,
onDoubleClick: PropTypes.func
}
@@ -98,8 +99,8 @@
this.props.triggerEdit(element)
}
- updateContent = () => {
-
+ updateContent = (card) => {
+ this.props.updateConfig(card)
}
render () {
@@ -110,10 +111,11 @@
return (
<div className="mob-login" onClick={this.editBox} style={{paddingTop: `calc(17vh - 10px)`}}>
<div className={'logo ' + (editId === card.logo.uuid ? 'editing' : '')} onClick={this.editLogo}>
+ <ContentUpdate element={card.logo} updateContent={(ele) => this.updateContent({...card, logo: ele})}/>
<img src={card.logo.content} alt=""/>
</div>
<div className={'plat-name ' + (editId === card.title.uuid ? 'editing' : '')} onClick={this.editTitle}>
- {editId === card.title.uuid ? <ContentUpdate element={card.title} updateContent={this.updateContent}/> : null}
+ <ContentUpdate element={card.title} updateContent={(ele) => this.updateContent({...card, title: ele})}/>
{card.title.content}
</div>
<InputItem
@@ -149,6 +151,7 @@
</div>
<Button type="primary" onDoubleClick={() => this.props.doubleClickCard(card.login)}>鐧诲綍</Button>
<div className={'company-msg ' + (editId === card.copyright.uuid ? 'editing' : '')} onClick={this.editMsg}>
+ <ContentUpdate element={card.copyright} updateContent={(ele) => this.updateContent({...card, copyright: ele})}/>
<p>{card.copyright.content}</p>
</div>
</div>
diff --git a/src/mob/login/index.scss b/src/mob/login/index.scss
index 13499ee..a79d3d8 100644
--- a/src/mob/login/index.scss
+++ b/src/mob/login/index.scss
@@ -6,6 +6,7 @@
background: linear-gradient(#378DBE, #46C29E, #48A9D6);
.logo {
+ position: relative;
max-width: 280px;
min-height: 10px;
margin: 0 auto;
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index 6a2da4e..2cf4204 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -9,7 +9,7 @@
// const Home = asyncComponent(() => import('@/mob/home'))
const Login = asyncComponent(() => import('@/mob/login'))
-const Card = ({ id, card, moveCard, findCard, editId, editCard, delCard, hasDrop, doubleClickCard }) => {
+const Card = ({ id, card, moveCard, findCard, editId, editCard, delCard, hasDrop, doubleClickCard, updateConfig }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'mob', id, originalIndex },
@@ -45,7 +45,7 @@
const getCardComponent = () => {
if (card.type === 'login') {
if (card.subtype === 'mob-login-1') {
- return (<Login card={card} triggerEdit={editCard} editId={editId} onDoubleClick={doubleClickCard} />)
+ return (<Login card={card} triggerEdit={editCard} editId={editId} onDoubleClick={doubleClickCard} updateConfig={updateConfig} />)
}
}
}
diff --git a/src/mob/mobshell/index.jsx b/src/mob/mobshell/index.jsx
index 92108d3..12010de 100644
--- a/src/mob/mobshell/index.jsx
+++ b/src/mob/mobshell/index.jsx
@@ -34,6 +34,10 @@
target = item
}
+ const updateConfig = (element) => {
+ handleList({...config, components: cards.map(item => item.uuid === element.uuid ? element : item)})
+ }
+
const [, drop] = useDrop({
accept: 'mob',
drop(item) {
@@ -84,6 +88,7 @@
delCard={deleteCard}
findCard={findCard}
hasDrop={hasDrop}
+ updateConfig={updateConfig}
doubleClickCard={doubleClickCard}
/>
))}
diff --git a/src/store/options.js b/src/store/options.js
index 0b368da..82066e3 100644
--- a/src/store/options.js
+++ b/src/store/options.js
@@ -1,6 +1,6 @@
// 绯荤粺閰嶇疆
export default {
- sysType: 'bG9j$mkYWw=', // yun ( Y2xvdWQ= ) 銆� dandian ( U1NP ) 銆� yewu ( bG9jYWw= )
+ sysType: 'bG9j$mkYWw=', // yun ( Y2xv$mkdWQ= ) 銆� dandian ( U1$mkNP ) 銆� yewu ( bG9j$mkYWw= )
caId: 'MjAyMDAxMTYxMjMzMzU1MDd$mkGQzkyMzI1Rjk4MDY0QUNGQjQ2Mg==', // mk
cakey: 'MjAyMDAxMTYxMjQwMDQ2NDM$mk2N0QzODE2MjExNUI0MTc4OTVDMQ==', // mk
cdomain: 'aHR0cDovL2Nsb3V$mkkLm1rOWguY24=' // mk
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 16be35f..c5f75a0 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -6,6 +6,7 @@
import moment from 'moment'
import Api from '@/api'
+import options from '@/store/options.js'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
@@ -1256,12 +1257,12 @@
</Tabs>)
)
}
- <Button
+ {options.sysType !== 'cloud' ? <Button
icon="copy"
shape="circle"
className="common-table-copy"
onClick={this.handleviewconfig}
- />
+ /> : null}
<Modal
className="menu-tree-modal"
title={'鑿滃崟缁撴瀯鏍�'}
diff --git a/src/tabviews/treepage/index.jsx b/src/tabviews/treepage/index.jsx
index 455b130..b2e333a 100644
--- a/src/tabviews/treepage/index.jsx
+++ b/src/tabviews/treepage/index.jsx
@@ -6,6 +6,7 @@
import moment from 'moment'
import Api from '@/api'
+import options from '@/store/options.js'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
@@ -880,12 +881,12 @@
</Col>
</Row> : null}
- <Button
+ {options.sysType !== 'cloud' ? <Button
icon="copy"
shape="circle"
className="tree-page-copy"
onClick={this.handleviewconfig}
- />
+ /> : null}
<Modal
className="menu-tree-modal"
title={'鑿滃崟缁撴瀯鏍�'}
diff --git a/src/tabviews/zshare/cardcomponent/index.scss b/src/tabviews/zshare/cardcomponent/index.scss
index 778634f..371dc8d 100644
--- a/src/tabviews/zshare/cardcomponent/index.scss
+++ b/src/tabviews/zshare/cardcomponent/index.scss
@@ -168,6 +168,7 @@
.ant-card-meta-avatar {
position: relative;
+ height: 0;
padding-top: 0px;
padding-left: 0px;
float: unset;
@@ -222,6 +223,7 @@
text-overflow: ellipsis;
}
.mk-card-detail-item:not(.line1) {
+ word-break: break-word;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 12faef9..9b4447d 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -946,7 +946,7 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if (window.GLOB.systemType !== 'official') {
+ if (window.GLOB.systemType !== 'official' && options.sysType !== 'cloud') {
let fsql = `
${_sql}
${_sqlInsert}
@@ -1576,7 +1576,7 @@
_sql += `
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if (window.GLOB.systemType !== 'official') {
+ if (window.GLOB.systemType !== 'official' && options.sysType !== 'cloud') {
_sql = _sql.replace(/\n\s{8}/ig, '\n')
console.log(_sql)
}
--
Gitblit v1.8.0