From 0ba276caaffedaf757b932f26aac86f695008175 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十一月 2022 17:34:50 +0800
Subject: [PATCH] 2022-11-28
---
src/tabviews/treepage/index.jsx | 6
src/views/design/index.jsx | 2
src/menu/datasource/verifycard/utils.jsx | 10 +
src/tabviews/formtab/index.jsx | 29 +----
src/templates/zshare/verifycard/customscript/index.jsx | 2
src/views/design/header/editfirstmenu/index.jsx | 8 -
src/tabviews/calendar/index.jsx | 5 -
src/components/mkIcon/index.scss | 38 +++++++
src/menu/components/share/actioncomponent/dragaction/index.jsx | 2
src/views/billprint/index.scss | 3
src/menu/components/form/formaction/index.jsx | 2
src/views/billprint/index.jsx | 1
src/tabviews/custom/components/form/simple-form/index.jsx | 3
src/tabviews/subtable/index.jsx | 6 -
src/tabviews/subtabtable/index.jsx | 6 -
src/views/design/sidemenu/editthdmenu/index.jsx | 8 -
src/components/mk-icon/index.jsx | 14 +-
src/menu/datasource/verifycard/index.jsx | 5 +
src/tabviews/custom/components/form/tab-form/index.jsx | 3
src/views/design/sidemenu/editsecmenu/index.jsx | 5
src/tabviews/custom/components/table/normal-table/index.jsx | 4
src/components/mkIcon/index.jsx | 74 ++++++++++++--
src/tabviews/zshare/mutilform/index.jsx | 5
src/mob/components/menubar/normal-menubar/index.scss | 7 +
src/tabviews/custom/components/form/step-form/index.jsx | 3
25 files changed, 167 insertions(+), 84 deletions(-)
diff --git a/src/components/mk-icon/index.jsx b/src/components/mk-icon/index.jsx
index 9fff348..bb8a2ee 100644
--- a/src/components/mk-icon/index.jsx
+++ b/src/components/mk-icon/index.jsx
@@ -464,11 +464,15 @@
render() {
const { type, ...resProps } = this.props
- if (!type || !MkIcons[type]) return null
-
- return (
- MkIcons[type](resProps)
- )
+ if (!type) {
+ return null
+ } else if (MkIcons[type]) {
+ return (
+ MkIcons[type](resProps)
+ )
+ } else {
+ return <span className={'anticon ' + (resProps.className || '')} style={resProps.style || null} dangerouslySetInnerHTML={{ __html: type }}></span>
+ }
}
}
export default MkIcon
\ No newline at end of file
diff --git a/src/components/mkIcon/index.jsx b/src/components/mkIcon/index.jsx
index dcb0684..0447f06 100644
--- a/src/components/mkIcon/index.jsx
+++ b/src/components/mkIcon/index.jsx
@@ -1,13 +1,15 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, Row, Col, Button } from 'antd'
-import { CloseCircleFilled } from '@ant-design/icons'
+import { Modal, Row, Col, Button, Tabs, notification } from 'antd'
+import { CloseCircleFilled, RedoOutlined } from '@ant-design/icons'
+import Api from '@/api'
import { minkeIconSystem } from '@/utils/option.js'
import MkIcon from '@/components/mk-icon'
import './index.scss'
+const { TabPane } = Tabs
// ['direction', 'edit', 'normal', 'data', 'hint']
class MkEditIcon extends Component {
@@ -19,6 +21,7 @@
selectIcon: '',
allowClear: false,
icons: [],
+ cusicons: [],
visible: false
}
@@ -42,6 +45,16 @@
this.setState({selectIcon: val, allowClear: this.props.allowClear === true, icons})
}
+ componentDidMount() {
+ if (!window.GLOB.designView) {
+ if (sessionStorage.getItem('systemIcons')) {
+ this.setState({cusicons: JSON.parse(sessionStorage.getItem('systemIcons'))})
+ } else {
+ this.getIcons()
+ }
+ }
+ }
+
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -51,8 +64,33 @@
this.props.onChange(val)
}
+ getIcons = () => {
+ Api.getSystemConfig({ func: 's_get_icons' }).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ sessionStorage.setItem('systemIcons', JSON.stringify([]))
+ return
+ } else if (!res.data) {
+ return
+ }
+
+ let icons = res.data.map(item => {
+ item.icon_svg = window.decodeURIComponent(window.atob(item.icon_svg))
+ return item
+ })
+
+ sessionStorage.setItem('systemIcons', JSON.stringify(icons))
+
+ this.setState({cusicons: icons})
+ })
+ }
+
render() {
- const { selectIcon, visible, icons, allowClear } = this.state
+ const { selectIcon, visible, icons, allowClear, cusicons } = this.state
return (
<div className="mk-icon-box">
@@ -60,8 +98,8 @@
<MkIcon className="trigger" onClick={() => this.setState({visible: true})} type="swap"/>
{allowClear && selectIcon ? <CloseCircleFilled className="close" onClick={() => this.checkIcon('')}/> : null}
<Modal
- wrapClassName="popview-modal mk-icon-wrap"
- title={'鍥炬爣閫夋嫨'}
+ wrapClassName="mk-pop-modal mk-icon-wrap"
+ // title={'鍥炬爣閫夋嫨'}
visible={visible}
width={800}
maskClosable={false}
@@ -71,11 +109,27 @@
]}
destroyOnClose
>
- <Row>
- {icons.map(icon => <Col className={icon === selectIcon ? 'active' : ''} key={icon} span={4}>
- <MkIcon onClick={() => this.checkIcon(icon)} type={icon} />
- </Col>)}
- </Row>
+ <Tabs className={cusicons.length > 0 ? 'dubble-tabs' : ''}>
+ <TabPane tab="绯荤粺" key="setting">
+ <Row>
+ {icons.map(icon => <Col className={icon === selectIcon ? 'active' : ''} key={icon} span={4}>
+ <MkIcon onClick={() => this.checkIcon(icon)} type={icon} />
+ </Col>)}
+ </Row>
+ </TabPane>
+ <TabPane tab={
+ <span className="tab-control">
+ <RedoOutlined onClick={(e) => {this.getIcons()}}/>
+ 鑷畾涔�
+ </span>
+ } key="scripts">
+ <Row>
+ {cusicons.map(icon => <Col key={icon.id} span={4} onClick={() => this.checkIcon(icon.icon_svg)}>
+ <MkIcon type={icon.icon_svg} />
+ </Col>)}
+ </Row>
+ </TabPane>
+ </Tabs>
</Modal>
</div>
)
diff --git a/src/components/mkIcon/index.scss b/src/components/mkIcon/index.scss
index ebbd502..9338b1b 100644
--- a/src/components/mkIcon/index.scss
+++ b/src/components/mkIcon/index.scss
@@ -49,9 +49,6 @@
clear: both;
}
.mk-icon-wrap {
- .ant-modal {
- top: 50px!important;
- }
.ant-col {
text-align: center;
line-height: 55px;
@@ -65,4 +62,39 @@
color: #1890ff;
}
}
+ .tab-control {
+ position: relative;
+ .anticon-redo {
+ display: none;
+ position: absolute;
+ left: -20px;
+ top: 0px;
+ }
+ }
+ .ant-tabs-tab-active.ant-tabs-tab {
+ .tab-control {
+ .anticon-redo {
+ display: inline-block;
+ }
+ }
+ }
+ .ant-tabs-nav .ant-tabs-tab {
+ padding: 12px 20px;
+ }
+ .ant-tabs-top.dubble-tabs {
+ .ant-tabs-bar {
+ padding-top: 10px!important;
+ }
+ }
+ .ant-tabs-top:not(.dubble-tabs) {
+ .ant-tabs-top-bar {
+ border-bottom: 0px;
+ .ant-tabs-nav-container {
+ display: none;
+ }
+ }
+ .ant-tabs-content {
+ max-height: calc(100vh - 180px)!important;
+ }
+ }
}
diff --git a/src/menu/components/form/formaction/index.jsx b/src/menu/components/form/formaction/index.jsx
index 57d9865..50fae57 100644
--- a/src/menu/components/form/formaction/index.jsx
+++ b/src/menu/components/form/formaction/index.jsx
@@ -63,6 +63,8 @@
group.subButton.style = style
} else if (card.type === 'next') {
group.nextButton.style = style
+ } else if (card.type === 'close') {
+ group.closeButton.style = style
}
this.props.updateconfig(group)
diff --git a/src/menu/components/share/actioncomponent/dragaction/index.jsx b/src/menu/components/share/actioncomponent/dragaction/index.jsx
index b59ac72..73abf27 100644
--- a/src/menu/components/share/actioncomponent/dragaction/index.jsx
+++ b/src/menu/components/share/actioncomponent/dragaction/index.jsx
@@ -114,7 +114,7 @@
newcard.focus = true
newcard.label = 'button'
newcard.verify = null
- newcard.show = 'link'
+ newcard.show = 'button'
newcard.Ot = 'requiredSgl'
newcard.OpenType = item.value
newcard.class = 'primary'
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 59ae132..507b1ed 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -595,6 +595,11 @@
return
}
+ if (change && columns.length === 0) {
+ reject()
+ return
+ }
+
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch, timestamp)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index d4145df..06c8b82 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -22,6 +22,10 @@
})
}
+ if (!arr_field) {
+ arr_field = '*'
+ }
+
if (setting.interType === 'system' && setting.execute !== 'false') {
_dataresource = setting.dataresource || ''
}
@@ -161,7 +165,7 @@
let sumSql = ''
- if (arr_field && _dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
+ if (_dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
let _sql = _dataresource.replace(/\/\*\$sum@|@sum\$\*\//ig, '')
_sql = `/*system_query*/${_sql} ${_search}`
if (_customScript) {
@@ -180,7 +184,7 @@
}
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
- if (arr_field && _dataresource) {
+ if (_dataresource) {
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
@@ -234,7 +238,7 @@
sumSql = sumSql.replace(/\n/g, ' ')
}
sql = sql.replace(/\n/g, ' ')
-
+
return { error, sql, sumSql, errors: errors.join('锛�') }
}
}
\ No newline at end of file
diff --git a/src/mob/components/menubar/normal-menubar/index.scss b/src/mob/components/menubar/normal-menubar/index.scss
index 8732c16..e8b3434 100644
--- a/src/mob/components/menubar/normal-menubar/index.scss
+++ b/src/mob/components/menubar/normal-menubar/index.scss
@@ -89,6 +89,13 @@
}
}
}
+ .grid-layout {
+ >.ant-col {
+ display: inline-block;
+ float: none;
+ vertical-align: top;
+ }
+ }
}
.menu-menubar-edit-box::after {
display: block;
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index 6eda2ef..7dec056 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -104,11 +104,6 @@
}
// 鏉冮檺杩囨护
- if (!window.GLOB.mkHS) {
- if (config.tab && !window.GLOB.mkActions[config.tab.linkTab]) {
- config.tab = null
- }
- }
if (config.tab) {
config.tab.uuid = Utils.getuuid()
}
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 00ca0ca..b29ce9c 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -288,8 +288,6 @@
render() {
const { config, loading, BID, BData, data, group, dict } = this.state
- if (config.setting.supModule && !BID) return null
-
return (
<div className="custom-simple-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
@@ -305,6 +303,7 @@
dict={dict}
data={data}
action={group}
+ unload={config.setting.supModule && !BID}
inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 4fdc3f0..c5c8315 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -380,8 +380,6 @@
render() {
const { config, loading, BID, BData, data, group, dict, step } = this.state
- if (config.setting.supModule && !BID) return null
-
return (
<div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
@@ -406,6 +404,7 @@
dict={dict}
data={data}
action={group}
+ unload={config.setting.supModule && !BID}
inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 519040b..66e5dd2 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -300,8 +300,6 @@
render() {
const { config, loading, BID, BData, data, group, dict } = this.state
- if (config.setting.supModule && !BID) return null
-
return (
<div className="custom-tab-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
@@ -323,6 +321,7 @@
dict={dict}
data={data}
action={group}
+ unload={config.setting.supModule && !BID}
inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index d95478b..9349ff3 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -714,7 +714,7 @@
BData={BData}
columns={config.columns}
selectedData={selectedData}
- /> : <div style={{height: '25px'}}></div>}
+ /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
<div className="main-table-box">
<MainTable
setting={setting}
@@ -743,7 +743,7 @@
BData={BData}
columns={config.columns}
selectedData={selectedData}
- /> : <div style={{height: '15px'}}></div>}
+ /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
<div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
<MainTable
setting={setting}
diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index d5dab3d..98691d1 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -102,28 +102,15 @@
config.tabgroups = _tabgroups
}
- if (!window.GLOB.mkHS) {
- config.action = config.action.filter(item => window.GLOB.mkActions[item.uuid])
- config.tabgroups.forEach(group => {
- group.sublist = group.sublist.filter(tab => {
- if (tab.supMenu === 'mainTable') {
- tab.supMenu = MenuID
- }
- tab.ContainerId = this.state.ContainerId
- return window.GLOB.mkActions[tab.linkTab]
- })
+ config.tabgroups.forEach(group => {
+ group.sublist = group.sublist.map(tab => {
+ if (tab.supMenu === 'mainTable') {
+ tab.supMenu = MenuID
+ }
+ tab.ContainerId = this.state.ContainerId
+ return tab
})
- } else {
- config.tabgroups.forEach(group => {
- group.sublist = group.sublist.filter(tab => {
- if (tab.supMenu === 'mainTable') {
- tab.supMenu = MenuID
- }
- tab.ContainerId = this.state.ContainerId
- return true
- })
- })
- }
+ })
// 鎸夐挳绫诲瀷鍏煎
config.action = config.action.map(item => {
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 51ebb7b..b261601 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -134,11 +134,7 @@
config = updateSubTable(config)
// 鏉冮檺杩囨护
- if (!window.GLOB.mkHS) {
- config.action = config.action.filter(item => item.hidden !== 'true' && window.GLOB.mkActions[item.uuid])
- } else {
- config.action = config.action.filter(item => item.hidden !== 'true')
- }
+ config.action = config.action.filter(item => item.hidden !== 'true')
config.search = Utils.initSearchVal(config.search)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 9ef2fed..154233c 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -127,11 +127,7 @@
}
// 鏉冮檺杩囨护
- if (!window.GLOB.mkHS) {
- config.action = config.action.filter(item => item.hidden !== 'true' && window.GLOB.mkActions[item.uuid])
- } else {
- config.action = config.action.filter(item => item.hidden !== 'true')
- }
+ config.action = config.action.filter(item => item.hidden !== 'true')
config.search = Utils.initSearchVal(config.search)
diff --git a/src/tabviews/treepage/index.jsx b/src/tabviews/treepage/index.jsx
index 11e2f0b..29bc25e 100644
--- a/src/tabviews/treepage/index.jsx
+++ b/src/tabviews/treepage/index.jsx
@@ -115,7 +115,7 @@
// 鏉冮檺杩囨护
config.tabgroups.forEach(group => {
- group.sublist = group.sublist.filter(tab => {
+ group.sublist = group.sublist.map(tab => {
if (tab.supMenu === 'mainTable' || (!tab.supMenu && tab.level === 0)) {
tab.isTreeNode = true
}
@@ -124,8 +124,8 @@
}
tab.ContainerId = this.state.ContainerId
- return window.GLOB.mkActions[tab.linkTab]}
- )
+ return tab
+ })
})
let _tabgroups = []
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 31e52f0..1f25c6c 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -35,6 +35,7 @@
data: PropTypes.any, // 琛ㄦ牸鏁版嵁
BID: PropTypes.any, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
+ unload: PropTypes.any, // 涓嬫媺鑿滃崟涓嶅姞杞芥暟鎹�
inputSubmit: PropTypes.func // input鍥炶溅鎻愪氦
}
@@ -45,7 +46,7 @@
record = {}
componentDidMount () {
- const { action } = this.props
+ const { action, unload } = this.props
let data = {}
let BData = {}
@@ -506,6 +507,8 @@
this.record = record
this.setState({ formlist }, () => {
+ if (unload) return
+
if (action.setting && action.setting.focus && fieldMap.has(action.setting.focus)) {
setTimeout(() => {
MKEmitter.emit('mkFC', 'focus', fieldMap.get(action.setting.focus).uuid)
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 944c203..1f172d4 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -333,7 +333,7 @@
</Col>
<Col span={24} className="sql">
<Form.Item label={
- <Tooltip placement="topLeft" overlayStyle={{width: '320px', maxWidth: '320px'}} title={<><div>{'璋冭瘯鏇挎崲绗� /*$breakpoint_begin_xxxx@ 銆丂breakpoint_end_xxxx$*/锛屽湪鎺у埗鍙颁腑杈撳叆 window.debug = \'xxxx\' 浼氬惎鐢ㄥ搴旂殑璋冭瘯璇彞锛屽揩鎹烽敭 ctrl+c 鎴栧湪鎺у埗鍙颁腑杈撳叆 window.debug = false 鍏抽棴璋冭瘯銆傛敞锛氳皟璇曟椂瀛楃 $breakpoint_proc@ 灏嗚鏇挎崲銆�'}</div><div style={{height: '5px'}}></div><div>{'鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> \'\'銆� @check$ -> \'\'锛孍rrorCode绛変簬C鏃� $check@ -> /*銆� @check$ -> */銆傛敞锛�1銆侀渶浣跨敤绯荤粺鎺ュ彛 2銆佽璁剧疆涓衡�滈�夋嫨澶氳鈥濇椂鏃犳晥銆�'}</div></>}>
+ <Tooltip placement="topLeft" overlayStyle={{width: '320px', maxWidth: '320px'}} title={<><div>{'璋冭瘯鏇挎崲绗� /*$breakpoint_begin_xxxx@ 銆丂breakpoint_end_xxxx$*/锛屽湪鎺у埗鍙颁腑杈撳叆 window.debug = \'xxxx\' 浼氬惎鐢ㄥ搴旂殑璋冭瘯璇彞锛屽揩鎹烽敭 ctrl+c 鎴栧湪鎺у埗鍙颁腑杈撳叆 window.debug = false 鍏抽棴璋冭瘯銆傛敞锛氳皟璇曟椂瀛楃 $breakpoint_proc@ 灏嗚鏇挎崲銆�'}</div><div style={{height: '5px'}}></div><div>{'鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> \'\'銆� @check$ -> \'\'锛孍rrorCode绛変簬C鏃朵細璇㈤棶鏄惁缁х画鎵ц锛岀‘瀹氭椂 $check@ -> /*銆� @check$ -> */銆傛敞锛�1銆侀渶浣跨敤绯荤粺鎺ュ彛 2銆佽璁剧疆涓衡�滈�夋嫨澶氳鈥濇椂鏃犳晥銆�'}</div></>}>
<QuestionCircleOutlined className="mk-form-tip" />
sql
</Tooltip>
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 379eecf..1b0e280 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -343,6 +343,7 @@
})
}
component.cols = getColumns(component.cols)
+ component.statFields = []
}
if (component.wrap && component.wrap.datatype === 'static') {
diff --git a/src/views/billprint/index.scss b/src/views/billprint/index.scss
index 835f079..0903dc2 100644
--- a/src/views/billprint/index.scss
+++ b/src/views/billprint/index.scss
@@ -46,6 +46,9 @@
.g2-tooltip {
display: none;
}
+ .mk-action-space {
+ display: none;
+ }
}
.print-page {
diff --git a/src/views/design/header/editfirstmenu/index.jsx b/src/views/design/header/editfirstmenu/index.jsx
index c565b22..58bee24 100644
--- a/src/views/design/header/editfirstmenu/index.jsx
+++ b/src/views/design/header/editfirstmenu/index.jsx
@@ -118,11 +118,11 @@
}
handleButton = (type) => {
+ const that = this
// 鑿滃崟缂栬緫锛氭坊鍔狅紝纭畾锛屽彇娑�
let _menuchange = !is(fromJS(this.state.menulist), fromJS(this.props.menulist))
if (type === 'confirm' && _menuchange) {
- let _this = this
let param = {
func: 'sPC_Menu_SortUpt',
LText: this.state.menulist.map((item, index) => {
@@ -141,7 +141,7 @@
onOk() {
return Api.getSystemConfig(param).then(res => {
if (res.status) {
- _this.props.reload()
+ that.props.reload()
} else {
notification.warning({
top: 92,
@@ -154,13 +154,11 @@
onCancel() {}
})
} else if (type === 'cancel' && _menuchange) {
- let _this = this
-
confirm({
title: '鑿滃崟椤哄簭宸茶皟鏁达紝鏀惧純淇濆瓨鍚楋紵',
content: '',
onOk() {
- _this.props.exitEdit()
+ that.props.exitEdit()
},
onCancel() {}
})
diff --git a/src/views/design/index.jsx b/src/views/design/index.jsx
index 01b330d..0c565d0 100644
--- a/src/views/design/index.jsx
+++ b/src/views/design/index.jsx
@@ -7,6 +7,7 @@
import { setGLOBFuncs } from '@/utils/utils.js'
import Sidemenu from './sidemenu'
+import '@/assets/css/design.scss'
import './index.scss'
const _locale = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
@@ -15,6 +16,7 @@
componentDidMount() {
window.debugger = false
window.GLOB.breakpoint = false
+ window.GLOB.designView = true
sessionStorage.removeItem('breakpoint')
setGLOBFuncs()
}
diff --git a/src/views/design/sidemenu/editsecmenu/index.jsx b/src/views/design/sidemenu/editsecmenu/index.jsx
index c76db28..ad44fad 100644
--- a/src/views/design/sidemenu/editsecmenu/index.jsx
+++ b/src/views/design/sidemenu/editsecmenu/index.jsx
@@ -106,6 +106,7 @@
}
handleSubBtn = (type) => {
+ const that = this
if (type === 'confirm') { // 淇濆瓨璋冩暣鍚庣殑椤哄簭
let param = {
func: 'sPC_Menu_SortUpt',
@@ -139,13 +140,11 @@
})
} else if (type === 'close') { // 閫�鍑虹紪杈�
if (this.state.change) {
- let _this = this
-
confirm({
title: '鑿滃崟椤哄簭宸茶皟鏁达紝鏀惧純淇濆瓨鍚楋紵',
content: '',
onOk() {
- _this.props.exitEdit()
+ that.props.exitEdit()
},
onCancel() {}
})
diff --git a/src/views/design/sidemenu/editthdmenu/index.jsx b/src/views/design/sidemenu/editthdmenu/index.jsx
index 3357669..4da6159 100644
--- a/src/views/design/sidemenu/editthdmenu/index.jsx
+++ b/src/views/design/sidemenu/editthdmenu/index.jsx
@@ -136,6 +136,7 @@
}
handleSubBtn = (type) => {
+ const that = this
// 鎿嶄綔鎸夐挳锛氭坊鍔犮�佽В闄ゅ喕缁撱�佺‘璁ゅ強鍏抽棴
if (type === 'confirm') {
let param = {
@@ -170,15 +171,12 @@
})
} else if (type === 'close') {
if (this.state.change) {
- let _this = this
-
confirm({
title: '鑿滃崟椤哄簭宸茶皟鏁达紝鏀惧純淇濆瓨鍚楋紵',
content: '',
onOk() {
- _this.props.exitEdit()
- },
- onCancel() {}
+ that.props.exitEdit()
+ }
})
} else {
this.props.exitEdit()
--
Gitblit v1.8.0