From 325aa13d3b61d1c066f8fcab107003ef36713df3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 10:20:09 +0800
Subject: [PATCH] 2025-01-16
---
src/views/mobdesign/index.jsx | 121 +++++++++++++++++++++++++++++++---------
1 files changed, 93 insertions(+), 28 deletions(-)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index fff66dd..1dbe670 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -4,7 +4,7 @@
import { is, fromJS } from 'immutable'
import HTML5Backend from 'react-dnd-html5-backend'
import { notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
-import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, ArrowLeftOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
+import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, ArrowLeftOutlined, EyeOutlined, EyeInvisibleOutlined, CopyOutlined } from '@ant-design/icons'
import moment from 'moment'
import md5 from 'md5'
@@ -114,7 +114,6 @@
sessionStorage.setItem('sysBgColor', param.sysBgColor || '#ffffff')
sessionStorage.setItem('direction', param.direction || 'vertical')
sessionStorage.setItem('userbind', param.userbind || '')
- sessionStorage.setItem('instantMessage', param.instantMessage || '')
if (param.applangList) {
sessionStorage.setItem('applangList', param.applangList)
@@ -765,9 +764,6 @@
// if (sessionStorage.getItem('userbind')) {
// appIndeList = appIndeList + ',' + sessionStorage.getItem('userbind')
// }
- if (sessionStorage.getItem('instantMessage')) {
- appIndeList = appIndeList + ',' + sessionStorage.getItem('instantMessage')
- }
let menus = res.menus.filter(item => appIndeList.indexOf(item.MenuID) === -1)
menus = menus.map(item => {
@@ -1492,33 +1488,34 @@
for (let i = 0; i < 18; i++) {
uuid += String.fromCharCode(Math.floor(Math.random() * 26) + 65)
}
+ uuid = uuid.replace(/minke/ig, 'MNKIE')
return uuid
}
long_data = []
- let oriIds = {}
- if (config.allSqls) {
- config.allSqls.forEach(item => {
- if (!item.md5) return
- oriIds[item.uuid + item.md5] = item.v_id
- })
- }
+ // let oriIds = {}
+ // if (config.allSqls) {
+ // config.allSqls.forEach(item => {
+ // if (!item.md5) return
+ // oriIds[item.uuid + item.md5] = item.v_id
+ // })
+ // }
config.allSqls = sqls.map(item => {
let v_id = _t + getguid()
- if (oriIds[item.uuid + item.md5]) {
- v_id = oriIds[item.uuid + item.md5]
- }
+ // if (oriIds[item.uuid + item.md5]) {
+ // v_id = oriIds[item.uuid + item.md5]
+ // }
- long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))}`)
+ long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${config.sqlperm === 'false' ? '' : item.roleId || ''}`)
return {
uuid: item.uuid,
v_id: v_id,
type: item.type,
reps: item.reps,
- md5: item.md5 || '',
+ // md5: item.md5 || '',
luser: item.luser === true
}
})
@@ -1619,6 +1616,7 @@
}
let subMenus = this.getSubMenus()
+ subMenus = subMenus.filter(item => item.MenuID !== config.uuid)
let menus_used_list = subMenus.map(m => `'${config.uuid}','${config.MenuName || ''}','${config.MenuNo || ''}','${m.MenuID}','${m.MenuName}'`).join(';')
menus_used_list = window.btoa(window.encodeURIComponent(menus_used_list || 'del'))
@@ -1628,6 +1626,14 @@
roleParam.msg = msg
roleParam.backend = 'level1'
let langSql = getLangTrans(config)
+
+ roleParam.pds = 'false'
+ if (config.interfaces) {
+ config.interfaces.forEach(item => {
+ if (item.status !== 'true') return
+ roleParam.pds = 'true'
+ })
+ }
let param = {
func: 'sPC_TrdMenu_AddUpt',
@@ -1663,7 +1669,7 @@
let _config = fromJS(config).toJS()
let NavBar = null
_config.components = _config.components.map(item => {
- if (item.type === 'navbar') {
+ if (item.type === 'navbar' && item.wrap) {
NavBar = fromJS(item).toJS()
return {
type: 'navbar',
@@ -1908,7 +1914,7 @@
} else if (item.type === 'group') {
check(item.components, level, sign)
return
- } else if (item.type === 'navbar' && !item.wrap.MenuNo) {
+ } else if (item.type === 'navbar' && item.wrap && !item.wrap.MenuNo) {
error = `瀵艰埅鏍忋��${item.name}銆嬫湭璁剧疆鑿滃崟鍙傛暟锛乣
} else if (item.type === 'topbar') {
if (item.wrap.type === 'search' || item.wrap.type === 'searchIcon' || (item.wrap.type === 'navbar' && item.wrap.search === 'true')) {
@@ -1982,11 +1988,22 @@
insert = (item) => {
let config = fromJS(this.state.config).toJS()
- if (item.type === 'topbar' && !config.style.paddingTop) {
- config.style.paddingTop = '50px'
+ if (item.copyType === 'components') {
+ if (item.components.findIndex(m => m.type === 'topbar') > -1 && !config.style.paddingTop) {
+ config.style.paddingTop = '50px'
+ }
+ config.components.push(...item.components)
+ if (!config.interfaces) {
+ config.interfaces = item.interfaces
+ } else {
+ config.interfaces.push(...item.interfaces)
+ }
+ } else {
+ if (item.type === 'topbar' && !config.style.paddingTop) {
+ config.style.paddingTop = '50px'
+ }
+ config.components.push(item)
}
-
- config.components.push(item)
this.setState({config})
window.GLOB.customMenu = config
@@ -2164,6 +2181,53 @@
return is(fromJS(oriConfig), fromJS(config))
}
+ copyMenu = () => {
+ const { config } = this.state
+
+ if (!config.enabled) {
+ notification.warning({
+ top: 92,
+ message: '鑿滃崟鏈惎鐢紝涓嶅彲澶嶅埗銆�',
+ duration: 5
+ })
+ } else {
+ let msg = { copyType: 'components', type: 'mob' }
+
+ msg.components = []
+ msg.interfaces = config.interfaces || []
+
+ config.components.forEach(item => {
+ if (item.type === 'navbar') return
+
+ msg.components.push(item)
+ })
+
+ if (msg.components.length === 0) {
+ notification.warning({
+ top: 92,
+ message: '鏈坊鍔犵粍浠讹紝涓嶅彲澶嶅埗銆�',
+ duration: 5
+ })
+ return
+ }
+
+ try {
+ msg = window.btoa(window.encodeURIComponent(JSON.stringify(msg)))
+ } catch (e) {
+ console.warn('Stringify Failure')
+ msg = ''
+ }
+
+ let oInput = document.createElement('input')
+ oInput.value = msg
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }
+ }
+
updateLogConfig = (config) => {
config.open_edition = this.state.config.open_edition || ''
@@ -2211,8 +2275,9 @@
<UrlFieldComponent config={config} updateConfig={this.updateConfig}/>
{/* 琛ㄥ悕娣诲姞 */}
<TableComponent config={config} updatetable={this.updateConfig}/>
- <Paragraph style={{padding: '15px 0px 0px 18px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
- <Paragraph style={{padding: '10px 0px 0px 18px'}} copyable={{ text: `${window.GLOB.baseurl}mob/index.html#/index/${sessionStorage.getItem('kei_no')}/${sessionStorage.getItem('typename')}/${sessionStorage.getItem('lang')}/${MenuId}/@BID@` }}>鑿滃崟閾炬帴</Paragraph>
+ <Paragraph style={{padding: '15px 0px 0px 37px'}} copyable={{ text: MenuId }}>鑿滃崟ID</Paragraph>
+ <Paragraph style={{padding: '0px 0px 0px 23px'}} copyable={{ text: `${window.GLOB.baseurl}mob/index.html#/index/${sessionStorage.getItem('kei_no')}/${sessionStorage.getItem('typename')}/${sessionStorage.getItem('lang')}/${MenuId}/@BID@` }}>鑿滃崟閾炬帴</Paragraph>
+ <Paragraph style={{padding: '0px 0px 0px 18px'}}>鑿滃崟缁勪欢锛�<CopyOutlined onClick={this.copyMenu} style={{cursor: 'pointer', color: '#1890ff'}} /></Paragraph>
<NormalCss config={config} updateConfig={this.updateConfig}/>
</> : null}
</Panel>
@@ -2241,15 +2306,15 @@
{config ? <Debug config={config}/> : null}
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
<CreateView resetmenu={this.getAppMenus} />
- <PasteController insert={this.insert} />
+ <PasteController vType="mob" insert={this.insert} />
<TableNodes config={config} />
<ViewNodes config={config} MenuId={MenuId}/>
<SysInterface config={config} updateConfig={this.updateConfig}/>
<PictureController/>
<Quotecomponent config={config} updateConfig={this.updateConfig}/>
<StyleCombControlButton menu={config} />
- <Button className="mk-border-green set-home" disabled={MenuId === appHomeId} onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
- <Button className="mk-border-purple" disabled={MenuId === appLoginId} onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
+ <Button className="mk-border-green set-home" disabled={MenuId === appHomeId} data-title="褰撳墠鑿滃崟涓哄簲鐢ㄩ椤�" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
+ <Button className="mk-border-purple" disabled={MenuId === appLoginId} data-title="褰撳墠鑿滃崟涓哄簲鐢ㄧ櫥褰曢〉" onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
<Transfer MenuID={MenuId} />
{config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
--
Gitblit v1.8.0