src/index.js
@@ -59,8 +59,8 @@ // 测试系统文件置于admin中 // fetch(process.env.NODE_ENV === 'production' ? '../options.json' : './options.json') fetch('./options.json') // fetch(process.env.NODE_ENV === 'production' ? '../options.json' : './options.json') .then(response => response.json()) .catch(() => { document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">系统配置信息获取失败，请联系管理员！</div>' src/menu/components/carousel/prop-card/index.scss
@@ -39,12 +39,12 @@ } .ant-carousel:not(.ant-carousel-vertical) { .slick-dots li button { height: 5px; height: 8px; } } .ant-carousel.ant-carousel-vertical { .slick-dots li button { width: 5px; width: 8px; } } .ant-carousel { src/menu/stylecontroller/styleInput/index.jsx
@@ -51,7 +51,7 @@ } } let _val = parseInt(val) let _val = parseFloat(val) if (isNaN(_val)) { _val = '' @@ -81,7 +81,7 @@ } } let _val = parseInt(val) let _val = parseFloat(val) if (isNaN(_val)) { _val = '' @@ -105,7 +105,14 @@ changeValue = (e) => { const { unit } = this.state let val = e.target.value let _val = parseInt(val) if (/\d+\.$/.test(val)) { this.setState({ value: val }) return } let _val = parseFloat(val) if (isNaN(_val)) { _val = '' src/pc/components/navbar/normal-navbar/index.jsx
@@ -215,7 +215,7 @@ ) } else { return ( <Menu.Item key={fst.MenuID} onClick={(e) => e.stopPropagation()}> <Menu.Item key={fst.MenuID}> <span onClick={(e) => e.stopPropagation()} onDoubleClick={() => this.changeMenu(fst)}>{fst.name}</span> </Menu.Item> ) src/pc/components/navbar/normal-navbar/index.scss
@@ -40,6 +40,9 @@ .ant-menu-item:hover, .ant-menu-item-active, .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, .ant-menu-submenu-active, .ant-menu-submenu-title:hover { color: unset; } .ant-menu-item span { display: inline-block; } } .ant-menu-horizontal > .ant-menu-item:hover, .ant-menu-horizontal > .ant-menu-submenu:hover, .ant-menu-horizontal > .ant-menu-item-active, .ant-menu-horizontal > .ant-menu-submenu-active, .ant-menu-horizontal > .ant-menu-item-open, .ant-menu-horizontal > .ant-menu-submenu-open, .ant-menu-horizontal > .ant-menu-item-selected, .ant-menu-horizontal > .ant-menu-submenu-selected { color: unset; src/templates/menuconfig/editfirstmenu/index.jsx
@@ -336,7 +336,7 @@ <div className="tipcard card5" style={{backgroundImage: 'url(' + card5 + ')'}}> <p>编辑状态中，菜单之外区域会锁定，查看系统数据请点击。</p> <div> <a target="blank" href="#/main" >新页面</a> <span className="new-view" onClick={() => {window.open('#/main')}} >新页面</span> </div> </div> </div> src/templates/menuconfig/editfirstmenu/index.scss
@@ -61,8 +61,9 @@ } div { text-align: center; a { .new-view { display: inline-block; cursor: pointer; color: #fff; padding: 2px 10px; border-radius: 4px; src/templates/menuconfig/editsecmenu/index.jsx
@@ -415,7 +415,7 @@ <div className="tipcard card5" style={{backgroundImage: 'url(' + card5 + ')'}}> <p>编辑状态中，菜单之外区域会锁定，查看系统数据请点击。</p> <div> <a target="blank" href="#/main" >新页面</a> <span className="new-view" onClick={() => {window.open('#/main')}} >新页面</span> </div> </div> </div> src/templates/menuconfig/editsecmenu/index.scss
@@ -63,8 +63,9 @@ } div { text-align: center; a { .new-view { display: inline-block; cursor: pointer; color: #fff; padding: 2px 10px; border-radius: 4px; src/templates/menuconfig/editthdmenu/index.jsx
@@ -786,7 +786,7 @@ <div className="tipcard card5" style={{backgroundImage: 'url(' + card5 + ')'}}> <p>编辑状态中，菜单之外区域会锁定，查看系统数据请点击。</p> <div> <a target="blank" href="#/main" >新页面</a> <span className="new-view" onClick={() => {window.open('#/main')}} >新页面</span> </div> </div> </div> : null src/templates/menuconfig/editthdmenu/index.scss
@@ -63,8 +63,9 @@ } div { text-align: center; a { .new-view { display: inline-block; cursor: pointer; color: #fff; padding: 2px 10px; border-radius: 4px; src/templates/menuconfig/menuelement/card.jsx
@@ -52,7 +52,7 @@ </div> {/* 自定义模板，在新页面编辑 */} {!card.forbidden && card.type !== 'CustomPage' ? <Icon className="edit" type="edit" onClick={edit} /> : null} {card.type === 'CustomPage' ? <a href={`#/menudesign/${_param}`} target="_blank" rel="noopener noreferrer"><Icon className="edit" type="edit" /></a> : null} {card.type === 'CustomPage' ? <Icon className="edit" onClick={() => {window.open(`#/menudesign/${_param}`)}} type="edit" /> : null} <Icon className="close" type="close" onClick={close} /> </div> ) src/views/appmanage/index.scss
@@ -1,6 +1,7 @@ .mk-app-manage { background: #fff; min-height: 100vh; padding-bottom: 70px; .mob-header-container { padding-right: 0px; src/views/design/header/index.jsx
@@ -324,14 +324,14 @@ {editLevel === 'HS' ? <Button className="level4-close" type="primary" onClick={this.exitManage}>退出</Button> : null} {/* 进入编辑按钮 */} {!editLevel ? <Icon onClick={this.enterEdit} className="edit-check" type="edit" /> : null} {!editLevel && options.sysType === 'local' && window.GLOB.systemType !== 'production' ? <a href="#/appmanage" target="_blank" className="mobile" type="edit"> 应用管理 <Icon type="arrow-right" /></a> : null {!editLevel && options.sysType === 'local' && window.GLOB.systemType !== 'production' && this.props.memberLevel >= 30 ? <span onClick={() => {window.open('#/appmanage')}} className="mobile" type="edit"> 应用管理 <Icon type="arrow-right" /></span> : null } {/* window.btoa(window.encodeURIComponent(JSON.stringify({ MenuType: 'home', MenuId: 'home_page_id', MenuName: '首页' }))) */} {!editLevel && window.GLOB.systemType !== 'production' && this.props.memberLevel >= 20 ? <a className="home-edit" href={`#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=`} target="_blank" rel="noopener noreferrer"> <span className="home-edit" onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}> 首页 <Icon type="arrow-right" /> </a> : null </span> : null } {/* 编辑菜单 */} {editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null} src/views/design/header/index.scss
@@ -128,11 +128,13 @@ top: 135px; right: 50px; color: #1890ff; cursor: pointer; } .home-edit { position: absolute; top: 100px; right: 50px; cursor: pointer; color: #1890ff; } } src/views/login/index.jsx
@@ -504,7 +504,7 @@ </div> <div className="login-bottom"> {webSite && copyRight ? <a target="blank" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> : <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> : <p dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></p> } {ICP ? <p dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></p> : null} src/views/pcdesign/index.jsx
@@ -67,6 +67,7 @@ } UNSAFE_componentWillMount() { if (this.props.memberLevel < 30) return try { let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param))) @@ -110,6 +111,10 @@ } componentDidMount () { if (this.props.memberLevel < 30) { document.getElementById('mk-pc-design-view').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh; height: 100vh; background: #fff;">本应用没有PC端页面的编辑权限，请联系管理员！</div>' return } MKEmitter.addListener('delButtons', this.delButtons) MKEmitter.addListener('thawButtons', this.thawButtons) MKEmitter.addListener('copyButtons', this.copyButtons) @@ -163,7 +168,11 @@ param.MenuName = menu.MenuName } this.props.history.push('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify(param)))) param = window.btoa(window.encodeURIComponent(JSON.stringify(param))) if (param === this.props.match.params.param) return this.props.history.push('/pcdesign/' + param) } getAppMessage = () => { @@ -1396,7 +1405,7 @@ return ( <ConfigProvider locale={localedict}> <div className={'mk-pc-view '} id="mk-menu-design-view"> <div className={'mk-pc-view '} id="mk-pc-design-view"> {loading ? <Spin className="view-spin" size="large" /> : null} <DndProvider backend={HTML5Backend}> <div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}> @@ -1460,8 +1469,10 @@ } } const mapStateToProps = () => { return {} const mapStateToProps = (state) => { return { memberLevel: state.memberLevel } } const mapDispatchToProps = (dispatch) => {
