From b66f1643396b524eb7c3ca1a654d8d1e22e0249f Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 07 十一月 2022 18:50:45 +0800 Subject: [PATCH] 2022-11-07 --- src/menu/components/table/edit-table/index.scss | 15 -- src/templates/comtableconfig/updatetable/index.scss | 30 ------ src/menu/components/card/table-card/index.scss | 10 -- src/menu/components/timeline/normal-timeline/index.scss | 18 --- src/menu/components/carousel/prop-card/index.scss | 18 --- src/menu/components/card/prop-card/index.scss | 18 --- src/menu/components/chart/antv-pie/index.scss | 16 --- src/templates/comtableconfig/updatetable/index.jsx | 6 src/menu/transfer/index.jsx | 7 - src/menu/components/card/balcony/index.scss | 18 --- src/menu/components/table/base-table/index.scss | 16 -- src/menu/components/table/normal-table/index.scss | 16 -- src/menu/components/card/data-card/index.scss | 10 -- src/menu/transfer/index.scss | 9 - src/pc/components/navbar/normal-navbar/index.scss | 28 ----- src/templates/sharecomponent/actioncomponent/index.scss | 4 src/menu/components/chart/antv-dashboard/index.scss | 16 --- src/menu/components/carousel/data-card/index.scss | 24 ---- src/menu/components/chart/chart-custom/index.scss | 19 --- 19 files changed, 15 insertions(+), 283 deletions(-) diff --git a/src/menu/components/card/balcony/index.scss b/src/menu/components/card/balcony/index.scss index 97c2b34..7253e9b 100644 --- a/src/menu/components/card/balcony/index.scss +++ b/src/menu/components/card/balcony/index.scss @@ -57,24 +57,6 @@ right: -30px; font-size: 16px; } - .model-menu-action-list { - line-height: 40px; - .ant-row > .anticon-plus { - position: absolute; - right: -30px; - font-size: 16px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } } .menu-balcony-edit-box::after { display: block; diff --git a/src/menu/components/card/data-card/index.scss b/src/menu/components/card/data-card/index.scss index baf9613..0ffc607 100644 --- a/src/menu/components/card/data-card/index.scss +++ b/src/menu/components/card/data-card/index.scss @@ -62,16 +62,6 @@ font-size: 16px; } } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } .ant-pagination { float: right; margin: 10px; diff --git a/src/menu/components/card/prop-card/index.scss b/src/menu/components/card/prop-card/index.scss index 92e00e6..b87a34f 100644 --- a/src/menu/components/card/prop-card/index.scss +++ b/src/menu/components/card/prop-card/index.scss @@ -53,24 +53,6 @@ right: -30px; font-size: 16px; } - .model-menu-action-list { - line-height: 40px; - .ant-row > .anticon-plus { - position: absolute; - right: -30px; - font-size: 16px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } .flex-layout { display: flex; width: 100%; diff --git a/src/menu/components/card/table-card/index.scss b/src/menu/components/card/table-card/index.scss index c03d640..8ececec 100644 --- a/src/menu/components/card/table-card/index.scss +++ b/src/menu/components/card/table-card/index.scss @@ -71,16 +71,6 @@ font-size: 16px; } } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } .ant-pagination { text-align: right; } diff --git a/src/menu/components/carousel/data-card/index.scss b/src/menu/components/carousel/data-card/index.scss index cd42494..b4a77ec 100644 --- a/src/menu/components/carousel/data-card/index.scss +++ b/src/menu/components/carousel/data-card/index.scss @@ -47,33 +47,9 @@ right: -30px; font-size: 16px; } - .model-menu-action-list { - line-height: 40px; - .ant-row > .anticon-plus { - position: absolute; - right: -30px; - font-size: 16px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } .ant-pagination { float: right; margin: 10px; - } - - .model-menu-action-list { - .page-card { - line-height: 55px; - } } } .menu-data-carousel-edit-box::after { diff --git a/src/menu/components/carousel/prop-card/index.scss b/src/menu/components/carousel/prop-card/index.scss index 3121478..59a4b5a 100644 --- a/src/menu/components/carousel/prop-card/index.scss +++ b/src/menu/components/carousel/prop-card/index.scss @@ -62,24 +62,6 @@ right: -30px; font-size: 16px; } - .model-menu-action-list { - line-height: 40px; - .ant-row > .anticon-plus { - position: absolute; - right: -30px; - font-size: 16px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } } .menu-prop-carousel-edit-box::after { display: block; diff --git a/src/menu/components/chart/antv-dashboard/index.scss b/src/menu/components/chart/antv-dashboard/index.scss index b017bc1..a9696d8 100644 --- a/src/menu/components/chart/antv-dashboard/index.scss +++ b/src/menu/components/chart/antv-dashboard/index.scss @@ -26,22 +26,6 @@ color: rgba(0, 0, 0, 0.85); background: rgba(255, 255, 255, 0.55); } - - .model-menu-action-list { - position: absolute; - right: 0px; - z-index: 4; - padding-top: 10px; - font-size: 16px; - - .ant-row .anticon-plus { - float: right; - } - - .page-card { - float: right; - } - } } .menu-dashboard-edit-box:hover { z-index: 1; diff --git a/src/menu/components/chart/antv-pie/index.scss b/src/menu/components/chart/antv-pie/index.scss index 13d75d2..3944c20 100644 --- a/src/menu/components/chart/antv-pie/index.scss +++ b/src/menu/components/chart/antv-pie/index.scss @@ -26,22 +26,6 @@ color: rgba(0, 0, 0, 0.85); background: rgba(255, 255, 255, 0.55); } - - .model-menu-action-list { - position: absolute; - right: 0px; - z-index: 4; - padding-top: 10px; - font-size: 16px; - - .ant-row .anticon-plus { - float: right; - } - - .page-card { - float: right; - } - } } .menu-pie-chart-edit-box:hover { z-index: 1; diff --git a/src/menu/components/chart/chart-custom/index.scss b/src/menu/components/chart/chart-custom/index.scss index 8bd0443..7e6eedb 100644 --- a/src/menu/components/chart/chart-custom/index.scss +++ b/src/menu/components/chart/chart-custom/index.scss @@ -45,25 +45,6 @@ color: rgba(0, 0, 0, 0.85); background: rgba(255, 255, 255, 0.55); } - - .model-menu-action-list { - position: absolute; - right: 0px; - top: 30px; - z-index: 4; - font-size: 16px; - - .ant-row .anticon-plus { - float: right; - } - - .page-card { - float: right; - } - } - .normal-header + .canvas + .model-menu-action-list { - top: 45px; - } } .menu-custom-chart-edit-box:hover { z-index: 1; diff --git a/src/menu/components/table/base-table/index.scss b/src/menu/components/table/base-table/index.scss index a5c6fd6..017fbe0 100644 --- a/src/menu/components/table/base-table/index.scss +++ b/src/menu/components/table/base-table/index.scss @@ -41,21 +41,11 @@ background: rgba(255, 255, 255, 0.55); } .model-menu-action-list { - line-height: 55px; + line-height: 40px; padding: 0px; - min-height: 55px; >.ant-row { - min-height: 30px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; + padding-top: 10px; + min-height: 55px; } } diff --git a/src/menu/components/table/edit-table/index.scss b/src/menu/components/table/edit-table/index.scss index 227900c..60bc249 100644 --- a/src/menu/components/table/edit-table/index.scss +++ b/src/menu/components/table/edit-table/index.scss @@ -67,20 +67,11 @@ background: rgba(255, 255, 255, 0.55); } .model-menu-action-list { - line-height: 55px; + line-height: 40px; padding: 0px; >.ant-row { - min-height: 30px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; + padding-top: 10px; + min-height: 55px; } } diff --git a/src/menu/components/table/normal-table/index.scss b/src/menu/components/table/normal-table/index.scss index 7db4e8e..c5c5f42 100644 --- a/src/menu/components/table/normal-table/index.scss +++ b/src/menu/components/table/normal-table/index.scss @@ -67,21 +67,11 @@ background: rgba(255, 255, 255, 0.55); } .model-menu-action-list { - line-height: 55px; + line-height: 40px; padding: 0px; - min-height: 55px; >.ant-row { - min-height: 30px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; + padding-top: 10px; + min-height: 55px; } } diff --git a/src/menu/components/timeline/normal-timeline/index.scss b/src/menu/components/timeline/normal-timeline/index.scss index 3e27678..dffd8b4 100644 --- a/src/menu/components/timeline/normal-timeline/index.scss +++ b/src/menu/components/timeline/normal-timeline/index.scss @@ -50,24 +50,6 @@ right: -30px; font-size: 16px; } - .model-menu-action-list { - line-height: 40px; - .ant-row > .anticon-plus { - position: absolute; - right: -30px; - font-size: 16px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } } .menu-timeline-edit-box::after { display: block; diff --git a/src/menu/transfer/index.jsx b/src/menu/transfer/index.jsx index 5409632..b766970 100644 --- a/src/menu/transfer/index.jsx +++ b/src/menu/transfer/index.jsx @@ -8,8 +8,7 @@ import Api from '@/api' import Utils from '@/utils/utils.js' import { getTables } from '@/utils/utils-custom.js' -// import MKEmitter from '@/utils/events.js' -import './index.scss' +// import './index.scss' const { confirm } = Modal @@ -254,9 +253,7 @@ render() { return ( - <div className="mk-replace-field" style={{display: 'inline-block'}}> - <Button className="mk-border-green" icon="retweet" onClick={this.trigger}>妯℃澘鍒囨崲</Button> - </div> + <Button className="mk-border-green" icon="retweet" onClick={this.trigger}>妯℃澘鍒囨崲</Button> ) } } diff --git a/src/menu/transfer/index.scss b/src/menu/transfer/index.scss index de57aff..e69de29 100644 --- a/src/menu/transfer/index.scss +++ b/src/menu/transfer/index.scss @@ -1,9 +0,0 @@ -.replace-field-modal { - .ant-modal { - top: 70px; - } - .ant-modal-body { - min-height: 150px; - padding-top: 40px; - } -} \ No newline at end of file diff --git a/src/pc/components/navbar/normal-navbar/index.scss b/src/pc/components/navbar/normal-navbar/index.scss index 5882cf7..ea0f488 100644 --- a/src/pc/components/navbar/normal-navbar/index.scss +++ b/src/pc/components/navbar/normal-navbar/index.scss @@ -98,34 +98,6 @@ right: -30px; font-size: 16px; } - .model-menu-action-list { - line-height: 40px; - .ant-row > .anticon-plus { - position: absolute; - right: -30px; - font-size: 16px; - } - } - .card-add-button { - text-align: right; - clear: left; - .anticon-plus { - font-size: 20px; - color: #26C281; - padding: 5px; - margin-right: 10px; - } - } - .ant-pagination { - float: right; - margin: 10px; - } - - .model-menu-action-list { - .page-card { - line-height: 55px; - } - } } .normal-navbar-edit-box::after { display: block; diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx index a480f2b..9bac7bf 100644 --- a/src/templates/comtableconfig/updatetable/index.jsx +++ b/src/templates/comtableconfig/updatetable/index.jsx @@ -10,7 +10,7 @@ import { getTables } from '@/utils/utils-custom.js' import Api from '@/api' import Utils from '@/utils/utils.js' -import './index.scss' +// import './index.scss' const { confirm } = Modal @@ -1083,9 +1083,7 @@ render() { return ( - <div style={{display: 'inline-block'}}> - <Button className="mk-border-purple" onClick={this.trigger}><ArrowUpOutlined /> 鍗囩骇</Button> - </div> + <Button className="mk-border-purple" onClick={this.trigger}><ArrowUpOutlined /> 鍗囩骇</Button> ) } } diff --git a/src/templates/comtableconfig/updatetable/index.scss b/src/templates/comtableconfig/updatetable/index.scss index e4f4b2f..e69de29 100644 --- a/src/templates/comtableconfig/updatetable/index.scss +++ b/src/templates/comtableconfig/updatetable/index.scss @@ -1,30 +0,0 @@ -.version-modal { - .ant-modal-body { - padding: 32px 32px 24px; - } - .ant-modal-footer { - display: none; - } - .header { - color: rgba(0, 0, 0, 0.85); - font-weight: 500; - font-size: 16px; - .anticon { - color: #faad14; - margin-right: 16px; - font-size: 22px; - } - } - .detail { - margin-top: 8px; - margin-bottom: 24px; - color: rgba(0, 0, 0, 0.5); - font-size: 14px; - } - .footer { - text-align: right; - .ant-btn + .ant-btn { - margin-left: 15px; - } - } -} \ No newline at end of file diff --git a/src/templates/sharecomponent/actioncomponent/index.scss b/src/templates/sharecomponent/actioncomponent/index.scss index ed09980..605875c 100644 --- a/src/templates/sharecomponent/actioncomponent/index.scss +++ b/src/templates/sharecomponent/actioncomponent/index.scss @@ -1,9 +1,9 @@ .model-table-action-list { position: relative; - padding: 15px 25px 15px; - min-height: 65px; + padding: 0px 25px; > .ant-row { + padding-top: 15px; min-height: 65px; } .mk-hidden { -- Gitblit v1.8.0