From 0d8af0af44fa23d482fc3e20cf1a51e4f8862bea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 18 七月 2023 15:07:54 +0800
Subject: [PATCH] 2023-07-18
---
src/components/tabview/index.jsx | 2
src/components/tabview/index.scss | 7 +
src/tabviews/custom/components/card/cardcellList/index.jsx | 9 -
src/assets/css/viewstyle.scss | 86 -----------------
src/tabviews/custom/components/form/tab-form/index.scss | 6
src/components/header/index.jsx | 23 +++-
src/views/mkiframe/index.jsx | 2
src/tabviews/custom/components/group/normal-group/index.scss | 3
src/components/breadview/index.jsx | 2
/dev/null | 35 -------
src/tabviews/home/index.jsx | 55 +++-------
src/tabviews/zshare/topSearch/index.scss | 14 ++
src/components/breadview/index.scss | 7
src/assets/css/main.scss | 17 +++
14 files changed, 91 insertions(+), 177 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 713b55b..8dfb4c9 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -296,6 +296,12 @@
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
}
+ .ant-modal-footer {
+ .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
+ color: var(--mk-sys-color7);
+ border-color: var(--mk-sys-color7);
+ }
+ }
}
// 璁剧疆妯℃�佹鏍峰紡锛岃瀹氭渶澶ф渶灏忛珮搴︼紝閲嶇疆婊氬姩鏉�
@@ -325,6 +331,17 @@
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
}
+
+ .ant-modal-footer {
+ .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
+ color: var(--mk-sys-color7);
+ border-color: var(--mk-sys-color7);
+ }
+ .ant-btn-primary {
+ background-color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
+ }
+ }
}
.moveable-modal {
overflow-x: hidden!important;
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index 4ecf104..89d0402 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -9,32 +9,6 @@
// color9 9闃惰壊
// color10 10闃惰壊
@mixin viewstyle($color1, $color2, $color3, $color4, $color5, $color6, $color7) {
- #root > .mk-main-view {
- >.mk-tabview-wrap {
- >.content-header {
- >.ant-tabs {
- >.ant-tabs-bar {
- .ant-tabs-tab:hover {
- color: $color5;
- }
- .ant-tabs-tab.ant-tabs-tab-active {
- color: $color6;
- }
- .ant-tabs-ink-bar {
- background-color: $color6;
- }
- }
- }
- }
- }
- >.mk-breadview-wrap {
- >.ant-breadcrumb {
- .anticon-redo:hover, .anticon-home:hover {
- color: $color5;
- }
- }
- }
- }
.custom-data-card-box, .custom-prop-card-box {
.data-zoom.radio.active, .data-zoom.checkbox.active {
.mk-card:not(.active):not(.selected):hover {
@@ -106,34 +80,6 @@
}
}
}
- .normal-group-wrap {
- .print-button:hover, .print-button:focus, .print-button:active {
- color: $color5;
- }
- }
- // 鎼滅储鏍�
- .mk-search-wrap {
- >.ant-row {
- .ant-col.search-button {
- .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link).active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):hover, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):focus {
- color: $color7;
- border-color: $color7;
- }
- .ant-btn-primary {
- background-color: $color6;
- border-color: $color6;
- }
- .ant-btn-link {
- color: $color6;
- }
- }
- }
- .advanced-list {
- .advance-value {
- color: $color6;
- }
- }
- }
// 琛ㄦ牸
.normal-data-table, .normal-custom-table, .edit-custom-table {
table {
@@ -153,28 +99,6 @@
> tr.ant-table-row-selected.mk-row-active:not(.background):hover .ant-table-column-sort {
background-color: $color3;
}
- }
- }
- }
- // 寮圭獥鎸夐挳
- .popview-modal {
- .ant-modal-footer {
- .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
- color: $color7;
- border-color: $color7;
- }
- }
- }
- // 琛ㄥ崟寮圭獥
- .action-modal {
- .ant-modal-footer {
- .ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
- color: $color7;
- border-color: $color7;
- }
- .ant-btn-primary {
- background-color: $color6;
- border-color: $color6;
}
}
}
@@ -313,16 +237,6 @@
color: $color6;
}
- .custom-tab-form-box .mk-normal-form-title.mkbtn {
- .form-title {
- color: $color6;
- border-color: $color6;
- }
- .form-title.active {
- background: $color6;
- color: #ffffff;
- }
- }
.ant-input-search .ant-input-group-addon .ant-input-search-button {
background-color: $color6;
border-color: $color6;
diff --git a/src/components/breadview/index.jsx b/src/components/breadview/index.jsx
index 15a578b..4773add 100644
--- a/src/components/breadview/index.jsx
+++ b/src/components/breadview/index.jsx
@@ -153,7 +153,7 @@
const { tabview, hasNavBar } = this.state
return (
- <section id="mk-breadview-wrap" className="mk-breadview-wrap">
+ <section id="mk-tabgroup-wrap" className="mk-breadview-wrap">
{hasNavBar && tabview ? <Breadcrumb separator="">
<Breadcrumb.Item>
<HomeOutlined onClick={this.gotoHome} />
diff --git a/src/components/breadview/index.scss b/src/components/breadview/index.scss
index 84c6567..bf7a267 100644
--- a/src/components/breadview/index.scss
+++ b/src/components/breadview/index.scss
@@ -13,15 +13,16 @@
cursor: pointer;
margin-right: 5px;
}
+ .anticon-redo:hover, .anticon-home:hover {
+ color: var(--mk-sys-color5);
+ }
.ant-breadcrumb-link + .ant-breadcrumb-separator {
display: none;
}
}
- >.commontable, >.calendar-page {
+ >.commontable {
padding-left: 15px;
padding-right: 15px;
- }
- >.commontable, >.calendar-page {
> .mk-search-wrap {
padding-left: 0;
padding-right: 0;
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 8317b28..6157a99 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -135,12 +135,9 @@
window.GLOB.mkThdMenus = [...thdMenuList, {MenuID: 'home_page_id', EasyCode: '', MenuName: 'home', type: 'CustomPage'}]
- if (_menu) { // 寤舵椂鎵撳紑锛岄槻姝㈡爣绛剧粍鏈畬鎴愬姞杞�
- setTimeout(() => {
- MKEmitter.emit('modifyTabs', _menu)
- }, 200)
+ if (_menu) {
+ this.openTab(_menu, 0)
}
- MKEmitter.emit('mkMenuLoaded')
})
// 鑾峰彇瑙掕壊鏉冮檺, edition_type 鎺ュ彛鐗堟湰鎺у埗 ''銆�'Y'銆�'A'
@@ -167,12 +164,26 @@
})
}
- MKEmitter.emit('mkActionLoaded')
window.GLOB.mkActions = _permAction
})
}, 50)
}
+ openTab = (menu, times) => {
+ if (times > 50) return
+ times++
+
+ let tabgroup = document.getElementById('mk-tabgroup-wrap')
+
+ if (window.GLOB.mkActions.loaded && tabgroup) {
+ MKEmitter.emit('modifyTabs', menu)
+ } else {
+ setTimeout(() => {
+ this.openTab(times)
+ }, 200)
+ }
+ }
+
getMenulist = (result) => {
let thdMenuList = []
let menulist = []
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index 789e4ad..1c79abe 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -251,7 +251,7 @@
const { tabviews, activeId } = this.state
return (
- <section className={'mk-tabview-wrap' + (this.props.collapse ? ' collapsed' : '')}>
+ <section id="mk-tabgroup-wrap" className={'mk-tabview-wrap' + (this.props.collapse ? ' collapsed' : '')}>
<div className="content-header">
{tabviews && tabviews.length > 0 &&
<Tabs activeKey={activeId}>
diff --git a/src/components/tabview/index.scss b/src/components/tabview/index.scss
index 13cb998..4e303c7 100644
--- a/src/components/tabview/index.scss
+++ b/src/components/tabview/index.scss
@@ -47,6 +47,7 @@
}
}
.ant-tabs-tab:hover {
+ color: var(--mk-sys-color5);
span.tab-control .anticon-close {
display: inline-block;
}
@@ -56,6 +57,12 @@
display: inline-block;
}
}
+ .ant-tabs-tab.ant-tabs-tab-active {
+ color: var(--mk-sys-color);
+ }
+ .ant-tabs-ink-bar {
+ background-color: var(--mk-sys-color);
+ }
}
>.ant-tabs-content {
height: 100%;
diff --git a/src/tabviews/custom/components/card/cardcellList/asyncButtonComponent.jsx b/src/tabviews/custom/components/card/cardcellList/asyncButtonComponent.jsx
deleted file mode 100644
index aa0307b..0000000
--- a/src/tabviews/custom/components/card/cardcellList/asyncButtonComponent.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, {Component} from 'react'
-/**
- * @description 寮傛鍔犺浇妯″潡
- * @param {*} importComponent
- */
-export default function asyncComponent(importComponent) {
- return class extends Component {
- constructor(props) {
- super(props)
-
- this.state = {
- component: null
- }
- }
-
- async componentDidMount() {
- const {default: component} = await importComponent()
-
- this.setState({component})
- }
-
- componentWillUnmount () {
- this.setState = () => {
- return
- }
- }
-
- // <Button className="loading-skeleton" disabled={true}></Button> // 楠ㄦ灦鎸夐挳
- render() {
- const C = this.state.component
-
- return C ? <C {...this.props} /> : null
- }
- }
-}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 275b422..42ff8eb 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -5,8 +5,7 @@
import moment from 'moment'
// import Api from '@/api'
-import asyncComponent from './asyncButtonComponent'
-import asyncElementComponent from '@/utils/asyncComponent'
+import asyncComponent from '@/utils/asyncComponent'
import { getMark } from '@/utils/utils.js'
import MkIcon from '@/components/mk-icon'
import Encrypts from '@/components/encrypts'
@@ -25,9 +24,9 @@
const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
-const BarCode = asyncElementComponent(() => import('@/components/barcode'))
-const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
-const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
+const BarCode = asyncComponent(() => import('@/components/barcode'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
+const MkProgress = asyncComponent(() => import('@/components/mkProgress'))
const Video = asyncComponent(() => import('@/components/video'))
const MkPicture = asyncComponent(() => import('@/components/mkPicture'))
const PicRadio = {
diff --git a/src/tabviews/custom/components/form/tab-form/index.scss b/src/tabviews/custom/components/form/tab-form/index.scss
index 04a53bd..c26ee74 100644
--- a/src/tabviews/custom/components/form/tab-form/index.scss
+++ b/src/tabviews/custom/components/form/tab-form/index.scss
@@ -24,12 +24,12 @@
.mk-normal-form-title.mkbtn {
.form-title {
background: #ffffff;
- color: #1890ff;
- border: 1px solid #1890ff;
+ color: var(--mk-sys-color);
+ border: 1px solid var(--mk-sys-color);
transition: all 0.3s;
}
.form-title.active {
- background: #1890ff;
+ background: var(--mk-sys-color);
color: #ffffff;
}
.form-title:first-child {
diff --git a/src/tabviews/custom/components/group/normal-group/index.scss b/src/tabviews/custom/components/group/normal-group/index.scss
index a179389..cafae68 100644
--- a/src/tabviews/custom/components/group/normal-group/index.scss
+++ b/src/tabviews/custom/components/group/normal-group/index.scss
@@ -7,6 +7,9 @@
border: 0;
background: transparent;
}
+ .print-button:hover, .print-button:focus, .print-button:active {
+ color: var(--mk-sys-color5);
+ }
.group-header {
position: relative;
diff --git a/src/tabviews/home/index.jsx b/src/tabviews/home/index.jsx
index 23338d0..a6a8a60 100644
--- a/src/tabviews/home/index.jsx
+++ b/src/tabviews/home/index.jsx
@@ -4,7 +4,6 @@
import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
-import MKEmitter from '@/utils/events.js'
import './index.scss'
const DefaultHome = asyncComponent(() => import('./defaulthome'))
@@ -18,27 +17,14 @@
state = {
loading: true,
background: sessionStorage.getItem('home_background'),
- waitMenu: true,
- waitAction: true,
+ waiting: true,
view: ''
}
componentDidMount () {
this.loadHomeConfig()
- if (window.GLOB.mkThdMenus.length > 0) {
- this.setState({
- waitMenu: false
- })
- } else {
- MKEmitter.addListener('mkMenuLoaded', this.mkMenuLoaded)
- }
- if (window.GLOB.mkActions.loaded) {
- this.setState({
- waitAction: false
- })
- } else {
- MKEmitter.addListener('mkActionLoaded', this.mkActionLoaded)
- }
+
+ this.check(0)
}
/**
@@ -48,20 +34,20 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('mkMenuLoaded', this.mkMenuLoaded)
- MKEmitter.removeListener('mkActionLoaded', this.mkActionLoaded)
}
- mkMenuLoaded = () => {
- this.setState({
- waitMenu: false
- })
- }
+ check = (times) => {
+ times++
- mkActionLoaded = () => {
- this.setState({
- waitAction: false
- })
+ if ((window.GLOB.mkThdMenus.length > 0 && window.GLOB.mkActions.loaded) || times > 50) {
+ this.setState({
+ waiting: false
+ })
+ } else {
+ setTimeout(() => {
+ this.check(times)
+ }, 200)
+ }
}
loadHomeConfig = () => {
@@ -84,8 +70,7 @@
if (!config || !config.enabled) {
this.setState({
loading: false,
- waitMenu: false,
- waitAction: false,
+ waiting: false,
view: 'default'
})
} else {
@@ -97,16 +82,14 @@
} else {
this.setState({
loading: false,
- waitMenu: false,
- waitAction: false,
+ waiting: false,
view: 'default'
})
}
} else {
this.setState({
loading: false,
- waitMenu: false,
- waitAction: false,
+ waiting: false,
view: 'default'
})
notification.warning({
@@ -119,9 +102,9 @@
}
render() {
- const { loading, waitAction, waitMenu, view, background } = this.state
+ const { loading, waiting, view, background } = this.state
- if (loading || waitAction || waitMenu) {
+ if (loading || waiting) {
return (<div className="home-loading-view" style={{background: background}}><Spin className="home-box-spin" size="large" /></div>)
} else if (view === 'custom') {
return (<CustomPage MenuID={this.props.MenuID} MenuName="棣栭〉"/>)
diff --git a/src/tabviews/zshare/topSearch/index.scss b/src/tabviews/zshare/topSearch/index.scss
index 0f226d7..e7cb88c 100644
--- a/src/tabviews/zshare/topSearch/index.scss
+++ b/src/tabviews/zshare/topSearch/index.scss
@@ -64,6 +64,17 @@
transform: rotate(180deg);
}
}
+ .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link).active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):hover, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):focus {
+ color: var(--mk-sys-color7);
+ border-color: var(--mk-sys-color7);
+ }
+ .ant-btn-primary {
+ background-color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
+ }
+ .ant-btn-link {
+ color: var(--mk-sys-color);
+ }
}
.advanced-list {
font-size: 13px;
@@ -83,6 +94,9 @@
padding: 2px;
}
}
+ .advance-value {
+ color: var(--mk-sys-color);
+ }
}
.ant-calendar-picker-clear, .ant-calendar-picker-icon {
right: 8px;
diff --git a/src/views/mkiframe/index.jsx b/src/views/mkiframe/index.jsx
index b2f079b..d9f7572 100644
--- a/src/views/mkiframe/index.jsx
+++ b/src/views/mkiframe/index.jsx
@@ -38,7 +38,7 @@
localStorage.removeItem('getSysPermission')
localStorage.removeItem('sysPermissions')
- if (window.GLOB.mkActions) {
+ if (window.GLOB.mkActions && window.GLOB.mkActions.loaded) {
this.setState({loading: false})
} else {
this.getPermRole()
--
Gitblit v1.8.0