From 0c84df247914f893ef5e41d57a422e10a2dc814c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 十一月 2021 17:02:06 +0800
Subject: [PATCH] 2021-11-12
---
src/components/normalform/modalform/index.scss | 7
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 15
src/templates/sharecomponent/columncomponent/columnform/index.scss | 11
src/templates/zshare/modalform/index.jsx | 16
src/templates/formtabconfig/groupform/index.scss | 13
src/menu/components/chart/antv-bar/chartcompile/index.scss | 8
src/tabviews/zshare/mutilform/index.scss | 7
src/components/mkProgress/index.jsx | 4
src/menu/components/card/cardcellcomponent/index.scss | 19
src/menu/sysinterface/settingform/index.scss | 4
src/templates/calendarconfig/calcomponent/calendarform/index.scss | 7
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 15
src/menu/components/chart/antv-scatter/chartcompile/index.jsx | 15
src/templates/zshare/verifycard/customscript/index.jsx | 7
src/views/menudesign/printmenuform/index.jsx | 9
src/menu/stylecontroller/index.scss | 3
src/templates/sharecomponent/searchcomponent/searchform/index.scss | 8
src/menu/components/table/edit-table/columns/editColumn/index.scss | 10
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 5
src/templates/sharecomponent/tablecomponent/index.jsx | 7
src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.scss | 5
src/mob/modalconfig/index.scss | 1
src/templates/calendarconfig/tabcomponent/tabform/index.scss | 16
src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx | 11
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 11
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 3
src/menu/components/table/edit-table/columns/tableIn/index.scss | 3
src/assets/css/main.scss | 18
src/menu/components/share/usercomponent/settingform/index.jsx | 59 +-
src/views/menudesign/menuform/index.scss | 8
src/templates/formtabconfig/settingform/index.jsx | 8
src/tabviews/tabmanage/mutilform/index.scss | 3
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 39
src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx | 17
src/templates/zshare/unattended/settingform/index.jsx | 11
src/menu/components/share/usercomponent/settingform/index.scss | 8
src/menu/sysinterface/settingform/baseform/index.scss | 5
src/tabviews/home/defaulthome/index.scss | 37 -
src/templates/modalconfig/dragelement/index.scss | 6
src/templates/subtableconfig/index.jsx | 7
src/tabviews/zshare/mutilform/index.jsx | 5
src/templates/zshare/modalform/index.scss | 7
src/menu/components/share/actioncomponent/actionform/index.jsx | 13
src/templates/formtabconfig/actionform/index.scss | 8
src/views/appmanage/submutilform/index.jsx | 17
src/mob/searchconfig/groupform/index.scss | 8
src/templates/sharecomponent/columncomponent/colspanform/index.scss | 13
src/menu/components/chart/antv-dashboard/chartcompile/index.jsx | 15
src/views/pcdesign/menuform/index.scss | 8
src/menu/datasource/verifycard/index.scss | 7
src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 9
src/menu/components/form/formaction/actionform/index.jsx | 13
src/templates/comtableconfig/index.jsx | 9
src/templates/zshare/verifycard/billcodeform/index.jsx | 8
src/components/mutilform/index.scss | 3
src/templates/menuconfig/menuform/index.scss | 3
src/menu/components/chart/antv-pie/chartcompile/index.scss | 8
src/views/appmanage/submutilform/index.scss | 7
src/views/mobdesign/menuform/index.scss | 8
src/menu/components/table/normal-table/columns/editColumn/index.scss | 10
src/templates/sharecomponent/actioncomponent/index.scss | 7
src/views/menudesign/homeform/index.scss | 10
src/templates/treepageconfig/index.scss | 6
src/menu/components/chart/antv-dashboard/chartcompile/index.scss | 8
src/templates/formtabconfig/index.scss | 25
src/templates/sharecomponent/tabscomponent/index.jsx | 13
src/menu/components/card/cardcellcomponent/dragaction/mkProgress/index.jsx | 4
src/templates/zshare/verifycard/index.scss | 7
src/templates/calendarconfig/calcomponent/calendarform/index.jsx | 9
src/pc/transfer/settingform/index.jsx | 2
src/menu/components/share/searchcomponent/index.scss | 3
src/menu/sysinterface/settingform/baseform/index.jsx | 9
src/components/simpleform/index.scss | 3
src/menu/urlfieldcomponent/index.scss | 4
src/menu/components/share/actioncomponent/index.scss | 7
src/templates/modalconfig/settingform/index.jsx | 16
src/menu/datasource/verifycard/settingform/index.jsx | 23
src/templates/sharecomponent/tabscomponent/tabform/index.jsx | 17
src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 7
src/menu/urlfieldcomponent/index.jsx | 9
src/templates/subtableconfig/index.scss | 10
src/templates/sharecomponent/chartcomponent/chartcompile/index.scss | 8
src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx | 5
src/templates/sharecomponent/treesettingcomponent/settingform/index.scss | 4
src/pc/createview/settingform/index.jsx | 5
src/templates/menuconfig/editfirstmenu/menuform/index.scss | 3
src/templates/zshare/createinterface/mutilform/index.jsx | 12
src/templates/zshare/createinterface/mutilform/index.scss | 6
src/templates/modalconfig/settingform/index.scss | 18
src/templates/sharecomponent/cardcomponent/carddetailform/index.scss | 16
src/menu/components/form/formaction/actionform/index.scss | 8
src/templates/sharecomponent/actioncomponent/actionform/index.scss | 8
src/views/appcheck/index.scss | 4
src/views/menudesign/homeform/index.jsx | 9
src/templates/treepageconfig/index.jsx | 21
src/views/menudesign/menuform/index.jsx | 7
src/views/printTemplate/mutilform/index.scss | 7
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 6
src/templates/sharecomponent/columncomponent/gridbtnform/index.scss | 8
src/menu/popview/menuform/index.jsx | 9
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 11
src/templates/formtabconfig/groupform/index.jsx | 4
src/mob/searchconfig/settingform/index.scss | 8
src/templates/sharecomponent/tabscomponent/tabform/index.scss | 16
src/menu/components/share/markcomponent/markform/index.scss | 5
src/templates/sharecomponent/cardcomponent/carddetailform/index.jsx | 13
src/templates/formtabconfig/settingform/index.scss | 7
src/templates/sharecomponent/chartgroupcomponent/chartform/index.scss | 10
src/menu/components/chart/antv-scatter/chartcompile/index.scss | 8
src/templates/modalconfig/dragelement/card.jsx | 13
src/tabviews/formtab/formgroup/index.scss | 3
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.scss | 3
src/menu/replaceField/settingform/index.jsx | 5
src/templates/calendarconfig/index.scss | 4
src/menu/components/share/normalform/index.scss | 11
src/views/appmanage/index.scss | 4
src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx | 19
src/views/printTemplate/mutilform/index.jsx | 9
src/menu/components/share/actioncomponent/actionform/index.scss | 8
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 13
src/templates/sharecomponent/columncomponent/index.scss | 6
src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss | 7
src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx | 5
src/menu/versions/index.jsx | 5
src/templates/sharecomponent/tablecomponent/index.scss | 4
src/mob/searchconfig/settingform/index.jsx | 5
src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx | 4
src/menu/components/share/clockcomponent/settingform/index.jsx | 7
src/views/appmanage/index.jsx | 5
src/templates/calendarconfig/tabcomponent/index.jsx | 11
src/templates/sharecomponent/treesettingcomponent/index.scss | 3
src/menu/components/card/cardcellcomponent/elementform/index.scss | 9
src/tabviews/home/defaulthome/index.jsx | 13
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.scss | 3
src/templates/sharecomponent/searchcomponent/index.scss | 6
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 8
src/menu/datasource/verifycard/settingform/index.scss | 7
src/templates/sharecomponent/tabscomponent/index.scss | 6
src/views/appcheck/index.jsx | 5
src/views/mobdesign/menuform/index.jsx | 13
src/views/pcdesign/menuform/index.jsx | 9
src/templates/formtabconfig/index.jsx | 32
src/templates/zshare/verifycard/callbackcustomscript/index.jsx | 5
src/templates/sharecomponent/chartcomponent/chartcompile/index.jsx | 17
src/menu/stylecombcontroller/index.scss | 3
src/pc/transfer/settingform/index.scss | 11
src/mob/searchconfig/index.scss | 1
src/templates/calendarconfig/tabcomponent/index.scss | 2
src/templates/sharecomponent/searchcomponent/index.jsx | 5
src/views/appmanage/scriptform/index.jsx | 5
src/templates/sharecomponent/columncomponent/index.jsx | 7
src/templates/sharecomponent/columncomponent/colspanform/index.jsx | 10
src/templates/calendarconfig/tabcomponent/tabform/index.jsx | 62 -
src/menu/components/share/markcomponent/index.scss | 10
src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx | 13
src/menu/popview/menuform/index.scss | 10
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.scss | 7
src/views/menudesign/printmenuform/index.scss | 10
src/components/normalform/modalform/index.jsx | 5
src/menu/components/chart/antv-pie/chartcompile/index.jsx | 15
src/templates/zshare/verifycard/index.jsx | 63 +-
src/templates/formtabconfig/actionform/index.jsx | 30
src/templates/sharecomponent/settingcomponent/settingform/index.scss | 4
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 1
src/menu/components/card/cardcellcomponent/formconfig.jsx | 11
src/templates/comtableconfig/index.scss | 4
src/menu/modalconfig/index.scss | 1
src/templates/sharecomponent/actioncomponent/index.jsx | 5
src/tabviews/custom/components/card/cardcellList/index.scss | 3
src/menu/components/share/normalform/index.jsx | 17
src/templates/sharecomponent/columncomponent/markcolumn/index.scss | 8
src/menu/components/share/markcomponent/markform/index.jsx | 5
src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss | 4
src/templates/sharecomponent/columncomponent/columnform/index.jsx | 11
174 files changed, 559 insertions(+), 1,161 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index ac95677..668699c 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -349,7 +349,7 @@
}
.mk-popover-control {
white-space: nowrap;
- i {
+ i, span.anticon {
padding: 5px 8px;
cursor: pointer;
font-size: 16px;
@@ -418,7 +418,23 @@
.ant-progress-circle.ant-progress-status-success .ant-progress-text {
color: rgba(0, 0, 0, 0.65)!important;
}
+.ant-progress-line.square {
+ .ant-progress-inner {
+ border-radius: 0;
+ .ant-progress-bg {
+ border-radius: 0;
+ }
+ }
+}
+.mk-form-tip {
+ color: #c49f47;
+ margin-right: 3px;
+}
+
+div.ant-input-number {
+ width: 100%;
+}
// .ant-table.ant-table-mini .ant-table-thead > tr > th {
// padding: 8px 4px;
// }
diff --git a/src/components/mkProgress/index.jsx b/src/components/mkProgress/index.jsx
index 2060b30..6c68405 100644
--- a/src/components/mkProgress/index.jsx
+++ b/src/components/mkProgress/index.jsx
@@ -17,7 +17,7 @@
let type = config.showType || 'line'
if (type === 'line') {
- return <Progress percent={value} type="line" strokeWidth={config.strokeWidth || 8} strokeColor={color} showInfo={config.showInfo === 'true'}/>
+ return <Progress percent={value} type="line" className={config.strokeLinecap || ''} strokeWidth={config.strokeWidth || 8} strokeColor={color} showInfo={config.showInfo === 'true'}/>
}
let width = config.outlineWidth || 0
@@ -28,7 +28,7 @@
return (
<div ref={(ref) => this.progress = ref } style={{textAlign: config.textAlign || 'left'}}>
- <Progress percent={value} width={width} type={type} strokeWidth={config.strokeWidth || 8} strokeColor={color} showInfo={config.showInfo === 'true'}/>
+ <Progress percent={value} width={width} strokeLinecap={config.strokeLinecap || 'round'} type={type} strokeWidth={config.strokeWidth || 8} strokeColor={color} showInfo={config.showInfo === 'true'}/>
</div>
)
}
diff --git a/src/components/mutilform/index.scss b/src/components/mutilform/index.scss
index 838b936..9914d8e 100644
--- a/src/components/mutilform/index.scss
+++ b/src/components/mutilform/index.scss
@@ -15,6 +15,3 @@
.ant-advanced-search-form {
position: relative;
}
-.ant-advanced-search-form .ant-input-number {
- width: 100%;
-}
\ No newline at end of file
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index b8d4c89..ebf07cb 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Tooltip, Icon, Cascader, Input } from 'antd'
+import { Form, Row, Col, Tooltip, Cascader, Input } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import MKEInput from './mkInput'
@@ -215,7 +216,7 @@
if (item.hidden || item.forbid) return
let content = null
- let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><Icon type="question-circle" />{item.label}</Tooltip> : item.label
+ let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip> : item.label
if (item.type === 'text') {
content = (<MKEInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
diff --git a/src/components/normalform/modalform/index.scss b/src/components/normalform/modalform/index.scss
index 594563d..2d38c93 100644
--- a/src/components/normalform/modalform/index.scss
+++ b/src/components/normalform/modalform/index.scss
@@ -8,10 +8,6 @@
padding-left: 1.2%!important;
padding-right: 1.2%!important;
}
- .ant-form-item-label .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.ant-checkbox-group {
line-height: unset;
.ant-checkbox-wrapper {
@@ -36,9 +32,6 @@
width: 33.3%;
}
- .ant-input-number {
- width: 100%;
- }
.ant-form-explain {
overflow:hidden;
text-overflow:ellipsis;
diff --git a/src/components/simpleform/index.scss b/src/components/simpleform/index.scss
index 838b936..9914d8e 100644
--- a/src/components/simpleform/index.scss
+++ b/src/components/simpleform/index.scss
@@ -15,6 +15,3 @@
.ant-advanced-search-form {
position: relative;
}
-.ant-advanced-search-form .ant-input-number {
- width: 100%;
-}
\ No newline at end of file
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/mkProgress/index.jsx b/src/menu/components/card/cardcellcomponent/dragaction/mkProgress/index.jsx
index c0ffa88..bfb3d89 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/mkProgress/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/mkProgress/index.jsx
@@ -16,7 +16,7 @@
let type = config.showType || 'line'
if (type === 'line') {
- return <Progress percent={value} type="line" strokeWidth={config.strokeWidth || 8} strokeColor={config.color} showInfo={config.showInfo === 'true'}/>
+ return <Progress percent={value} type="line" className={config.strokeLinecap || ''} strokeWidth={config.strokeWidth || 8} strokeColor={config.color} showInfo={config.showInfo === 'true'}/>
}
let width = config.outlineWidth || 0
@@ -27,7 +27,7 @@
return (
<div ref={(ref) => this.progress = ref } style={{textAlign: config.textAlign || 'left'}}>
- <Progress percent={value} width={width} type={type} strokeWidth={config.strokeWidth || 8} strokeColor={config.color} showInfo={config.showInfo === 'true'}/>
+ <Progress percent={value} width={width} type={type} strokeLinecap={config.strokeLinecap || 'round'} strokeWidth={config.strokeWidth || 8} strokeColor={config.color} showInfo={config.showInfo === 'true'}/>
</div>
)
}
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 1d0c9d5..e44398f 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -2,6 +2,7 @@
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
import { Form, Row, Col, Input, Select, Icon, Radio, Tooltip, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -19,7 +20,7 @@
picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'noValue'],
icon: ['eleType', 'icon', 'datatype', 'width'],
- slider: ['eleType', 'datatype', 'width', 'color', 'maxValue', 'showInfo', 'showType', 'strokeWidth'],
+ slider: ['eleType', 'datatype', 'width', 'color', 'maxValue', 'showInfo', 'showType', 'strokeWidth', 'strokeLinecap'],
splitline: ['eleType', 'color', 'width', 'borderWidth'],
barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval', 'noValue'],
qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url', 'noValue'],
@@ -278,7 +279,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -303,7 +304,7 @@
<Col span={24} className="textarea" key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -328,7 +329,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -347,7 +348,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -379,7 +380,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -400,7 +401,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.scss b/src/menu/components/card/cardcellcomponent/elementform/index.scss
index f969efa..2fc1e1b 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.scss
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.scss
@@ -1,15 +1,6 @@
.menu-card-detail-form {
min-height: 190px;
- .ant-input-number {
- width: 100%;
- }
- .ant-form-item-label {
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 5px;
- }
- }
>.ant-row {
>.ant-col {
height: 65px;
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 5fd8f8f..4d4da5e 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -207,6 +207,17 @@
},
{
type: 'radio',
+ key: 'strokeLinecap',
+ label: '绾垮瀷',
+ initVal: card.strokeLinecap || 'round',
+ required: false,
+ options: [
+ { value: 'round', text: '鍦嗚' },
+ { value: 'square', text: '鐩磋' },
+ ]
+ },
+ {
+ type: 'radio',
key: 'textAlign',
label: '瀵归綈鏂瑰紡',
initVal: card.textAlign || 'left',
diff --git a/src/menu/components/card/cardcellcomponent/index.scss b/src/menu/components/card/cardcellcomponent/index.scss
index 3b870c3..855eaae 100644
--- a/src/menu/components/card/cardcellcomponent/index.scss
+++ b/src/menu/components/card/cardcellcomponent/index.scss
@@ -1,21 +1,5 @@
.model-menu-card-cell-list {
position: relative;
- .ant-form-item-label {
- .anticon-question-circle {
- color: #c49f47;
- position: absolute;
- left: 5px;
- top: 5px;
- }
- }
-
- .card-detail-row > .anticon-plus {
- color: #26C281;
- font-size: 16px;
- padding: 5px;
- cursor: pointer;
- }
-
.ant-btn {
padding: 0;
}
@@ -39,8 +23,5 @@
}
.card-cell:hover, .card-button-cell:hover {
box-shadow: 0px 0px 1px #1890ff;
- }
- .ant-slider {
- margin: 0px;
}
}
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index 3f31823..ee2421e 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { Modal, Form, Row, Col, Select, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { QuestionCircleOutlined, EditOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import { chartColors } from '@/utils/option.js'
@@ -297,7 +298,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -318,7 +319,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -339,7 +340,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -368,7 +369,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -397,7 +398,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -614,7 +615,7 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" title="缂栬緫" onClick={this.showDrawer} />
+ <EditOutlined title="缂栬緫" onClick={this.showDrawer}/>
<Modal
wrapClassName="popview-modal menu-chart-edit-modal"
title="鍥捐〃缂栬緫"
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.scss b/src/menu/components/chart/antv-bar/chartcompile/index.scss
index 244c6aa..2c9ad88 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.scss
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.scss
@@ -12,14 +12,6 @@
min-height: 50vh;
padding-top: 10px;
.menu-chart-edit-box {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-radio-wrapper {
margin-right: 5px;
}
diff --git a/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx b/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
index 76effa8..3e526c1 100644
--- a/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { Modal, Form, Row, Col, Select, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { QuestionCircleOutlined, EditOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import { getBaseForm, getOptionForm, getRadioOptionForm } from './formconfig'
@@ -78,7 +79,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -99,7 +100,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -120,7 +121,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -149,7 +150,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -178,7 +179,7 @@
<Col span={12} key={index} className="color-col">
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -296,7 +297,7 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" title="缂栬緫" onClick={this.showDrawer} />
+ <EditOutlined title="缂栬緫" onClick={this.showDrawer} />
<Modal
wrapClassName="popview-modal menu-chart-edit-modal"
title="鍥捐〃缂栬緫"
diff --git a/src/menu/components/chart/antv-dashboard/chartcompile/index.scss b/src/menu/components/chart/antv-dashboard/chartcompile/index.scss
index 607a36d..8764153 100644
--- a/src/menu/components/chart/antv-dashboard/chartcompile/index.scss
+++ b/src/menu/components/chart/antv-dashboard/chartcompile/index.scss
@@ -11,14 +11,6 @@
min-height: 50vh;
max-height: calc(100vh - 190px);
padding-top: 10px;
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-tabs-nav-wrap {
text-align: center;
}
diff --git a/src/menu/components/chart/antv-pie/chartcompile/index.jsx b/src/menu/components/chart/antv-pie/chartcompile/index.jsx
index 4f2638b..e9ec92e 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-pie/chartcompile/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { Modal, Form, Row, Col, Select, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { QuestionCircleOutlined, EditOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import { getBaseForm, getOptionForm } from './formconfig'
@@ -104,7 +105,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -125,7 +126,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -146,7 +147,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -175,7 +176,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -204,7 +205,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -322,7 +323,7 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" title="缂栬緫" onClick={this.showDrawer} />
+ <EditOutlined title="缂栬緫" onClick={this.showDrawer} />
<Modal
wrapClassName="popview-modal menu-chart-edit-modal"
title="鍥捐〃缂栬緫"
diff --git a/src/menu/components/chart/antv-pie/chartcompile/index.scss b/src/menu/components/chart/antv-pie/chartcompile/index.scss
index 25a7c53..dd1f229 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/index.scss
+++ b/src/menu/components/chart/antv-pie/chartcompile/index.scss
@@ -11,14 +11,6 @@
min-height: 50vh;
max-height: calc(100vh - 190px);
padding-top: 10px;
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-tabs-nav-wrap {
text-align: center;
}
diff --git a/src/menu/components/chart/antv-scatter/chartcompile/index.jsx b/src/menu/components/chart/antv-scatter/chartcompile/index.jsx
index 0982251..9658562 100644
--- a/src/menu/components/chart/antv-scatter/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-scatter/chartcompile/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs } from 'antd'
+import { Modal, Form, Row, Col, Select, Radio, Tooltip, Input, InputNumber, Tabs } from 'antd'
+import { QuestionCircleOutlined, EditOutlined } from '@ant-design/icons'
import { getBaseForm, getOptionForm } from './formconfig'
import asyncComponent from '@/utils/asyncComponent'
@@ -56,7 +57,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -77,7 +78,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -98,7 +99,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -127,7 +128,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -156,7 +157,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -241,7 +242,7 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" title="缂栬緫" onClick={this.showDrawer} />
+ <EditOutlined title="缂栬緫" onClick={this.showDrawer} />
<Modal
wrapClassName="popview-modal menu-chart-edit-modal"
title="鍥捐〃缂栬緫"
diff --git a/src/menu/components/chart/antv-scatter/chartcompile/index.scss b/src/menu/components/chart/antv-scatter/chartcompile/index.scss
index 5928db8..5b873a2 100644
--- a/src/menu/components/chart/antv-scatter/chartcompile/index.scss
+++ b/src/menu/components/chart/antv-scatter/chartcompile/index.scss
@@ -12,14 +12,6 @@
min-height: 50vh;
padding-top: 10px;
.menu-chart-edit-box {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-tabs-nav-wrap {
text-align: center;
}
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index bdf1bf0..f36d0b1 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
// import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Icon, Radio, Tooltip, InputNumber, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import './index.scss'
@@ -178,7 +179,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -208,7 +209,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -229,7 +230,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -264,7 +265,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -311,7 +312,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/menu/components/form/formaction/actionform/index.scss b/src/menu/components/form/formaction/actionform/index.scss
index 535dd29..2573ed4 100644
--- a/src/menu/components/form/formaction/actionform/index.scss
+++ b/src/menu/components/form/formaction/actionform/index.scss
@@ -18,14 +18,6 @@
margin-right: 4px;
}
}
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.with-button {
.ant-form-item-control-wrapper {
padding-right: 63px;
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a6b6235..3636575 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { btnCustomClasses, formRule } from '@/utils/option.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -532,7 +533,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -562,7 +563,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -583,7 +584,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -618,7 +619,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -665,7 +666,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/menu/components/share/actioncomponent/actionform/index.scss b/src/menu/components/share/actioncomponent/actionform/index.scss
index 535dd29..2573ed4 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.scss
+++ b/src/menu/components/share/actioncomponent/actionform/index.scss
@@ -18,14 +18,6 @@
margin-right: 4px;
}
}
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.with-button {
.ant-form-item-control-wrapper {
padding-right: 63px;
diff --git a/src/menu/components/share/actioncomponent/index.scss b/src/menu/components/share/actioncomponent/index.scss
index 48de527..6141b32 100644
--- a/src/menu/components/share/actioncomponent/index.scss
+++ b/src/menu/components/share/actioncomponent/index.scss
@@ -1,11 +1,4 @@
.model-menu-action-list {
- .anticon-question-circle {
- color: #c49f47;
- position: absolute;
- left: 5px;
- top: 5px;
- }
-
.ant-row > .anticon-plus {
color: #26C281;
padding: 5px;
diff --git a/src/menu/components/share/clockcomponent/settingform/index.jsx b/src/menu/components/share/clockcomponent/settingform/index.jsx
index 22604e5..099f414 100644
--- a/src/menu/components/share/clockcomponent/settingform/index.jsx
+++ b/src/menu/components/share/clockcomponent/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Tooltip, Icon, Input } from 'antd'
+import { Form, Row, Col, Select, Tooltip, Input } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -71,7 +72,7 @@
{(config.subtype === 'balcony' || config.subtype === 'propcard') && timer ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍙互鎸囧畾瀛楁鐢ㄤ簬鎺у埗瀹氭椂鍣ㄧ殑鍏抽棴銆�">
- <Icon type="question-circle" style={{marginRight: '3px', color: '#c49f47'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏抽棴瀹氭椂
</Tooltip>
}>
@@ -87,7 +88,7 @@
{(config.subtype === 'balcony' || config.subtype === 'propcard') && clearField && timer ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="褰撳瓧娈靛�间笌鍏抽棴鍊肩浉绛夋椂锛屽叧闂畾鏃跺櫒锛屽涓�煎彲鐢ㄩ�楀彿鍒嗛殧銆�">
- <Icon type="question-circle" style={{marginRight: '3px', color: '#c49f47'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏抽棴鍊�
</Tooltip>
}>
diff --git a/src/menu/components/share/markcomponent/index.scss b/src/menu/components/share/markcomponent/index.scss
index 3502583..9689a82 100644
--- a/src/menu/components/share/markcomponent/index.scss
+++ b/src/menu/components/share/markcomponent/index.scss
@@ -1,17 +1,9 @@
#mark-column-box-modal {
- .ant-form-item-label .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
table tr td {
word-wrap: break-word;
word-break: break-word;
}
- .ant-input-number {
- width: 100%;
- }
-
+
.mingke-table .ant-empty {
margin: 20px 8px!important;
}
diff --git a/src/menu/components/share/markcomponent/markform/index.jsx b/src/menu/components/share/markcomponent/markform/index.jsx
index c027d4b..5c437a6 100644
--- a/src/menu/components/share/markcomponent/markform/index.jsx
+++ b/src/menu/components/share/markcomponent/markform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Button, Input, Icon, Cascader, Tooltip } from 'antd'
+import { Form, Row, Col, Select, Button, Input, Cascader, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import ColorSketch from '@/mob/colorsketch'
import './index.scss'
@@ -77,7 +78,7 @@
</Col>
<Col span={6}>
<Form.Item label={<Tooltip placement="topLeft" title="瀵规瘮闈欐�佸�兼椂锛岄渶瑕佸～鍐欏姣斿�硷紝榛樿涓虹┖銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{'瀵规瘮鍊�'}
</Tooltip>
}>
diff --git a/src/menu/components/share/markcomponent/markform/index.scss b/src/menu/components/share/markcomponent/markform/index.scss
index 3c119b3..8fd198c 100644
--- a/src/menu/components/share/markcomponent/markform/index.scss
+++ b/src/menu/components/share/markcomponent/markform/index.scss
@@ -1,9 +1,4 @@
.normal-table-mark-form {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.color-sketch-block {
position: relative;
top: 5px;
diff --git a/src/menu/components/share/normalform/index.jsx b/src/menu/components/share/normalform/index.jsx
index 8bacb22..8fee07c 100644
--- a/src/menu/components/share/normalform/index.jsx
+++ b/src/menu/components/share/normalform/index.jsx
@@ -1,8 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Tooltip, Icon, InputNumber, Select, Radio, Cascader } from 'antd'
+import { Form, Row, Col, Input, Tooltip, InputNumber, Select, Radio, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
-import './index.scss'
+// import './index.scss'
class SettingForm extends Component {
static propTpyes = {
@@ -47,7 +48,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -68,7 +69,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -89,7 +90,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -118,7 +119,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -147,7 +148,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -183,7 +184,7 @@
}
return (
- <div className="model-menu-normal-form">
+ <div>
<Form {...formItemLayout}><Row gutter={16}>{this.getFields()}</Row></Form>
</div>
)
diff --git a/src/menu/components/share/normalform/index.scss b/src/menu/components/share/normalform/index.scss
index 5b30221..e69de29 100644
--- a/src/menu/components/share/normalform/index.scss
+++ b/src/menu/components/share/normalform/index.scss
@@ -1,11 +0,0 @@
-.model-menu-normal-form {
- position: relative;
-
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- }
-}
\ No newline at end of file
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index 85b3b7b..7ba8496 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -7,6 +7,7 @@
import './index.scss'
const { MonthPicker, WeekPicker, RangePicker } = DatePicker
+const { Search } = Input
const Card = ({ id, card, moveCard, findCard, copyCard, editCard, delCard }) => {
const originalIndex = findCard(id).index
@@ -76,9 +77,12 @@
label={card.labelShow !== 'false' ? card.label : ''}
required={card.required === 'true'}
>
- {card.type === 'text' ?
+ {card.type === 'text' && card.inputType !== 'search' ?
<Input placeholder={card.label} value={card.initval} /> : null
}
+ {card.type === 'text' && card.inputType === 'search' ?
+ <Search placeholder={card.label} value={card.initval} enterButton/> : null
+ }
{(card.type === 'multiselect' || card.type === 'select' || card.type === 'link') ?
<Select placeholder={card.label} value={_defaultValue}></Select> : null
}
diff --git a/src/menu/components/share/searchcomponent/index.scss b/src/menu/components/share/searchcomponent/index.scss
index 770b589..8effaa7 100644
--- a/src/menu/components/share/searchcomponent/index.scss
+++ b/src/menu/components/share/searchcomponent/index.scss
@@ -25,6 +25,9 @@
.ant-input {
height: 28px;
}
+ .ant-btn {
+ height: 28px;
+ }
.data-range .ant-calendar-picker-input {
padding: 4px 20px 4px 5px;
font-size: 13px;
diff --git a/src/menu/components/share/usercomponent/settingform/index.jsx b/src/menu/components/share/usercomponent/settingform/index.jsx
index 46f1ff3..d918739 100644
--- a/src/menu/components/share/usercomponent/settingform/index.jsx
+++ b/src/menu/components/share/usercomponent/settingform/index.jsx
@@ -1,8 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
-import './index.scss'
+// import './index.scss'
class SettingForm extends Component {
static propTpyes = {
@@ -53,34 +54,32 @@
}
return (
- <div className="model-menu-setting-form">
- <Form {...formItemLayout}>
- <Row gutter={24}>
- <Col span={22}>
- <Form.Item label={
- <Tooltip placement="topLeft" title="鐢ㄤ簬缁勪欢闂寸殑鍖哄垎銆�">
- <Icon type="question-circle" />
- 缁勪欢鍚嶇О
- </Tooltip>
- }>
- {getFieldDecorator('name', {
- initialValue: this.props.name || '',
- rules: [
- {
- required: true,
- message: this.props.dict['form.required.input'] + '缁勪欢鍚嶇О!'
- },
- {
- max: 15,
- message: '缁勪欢鍚嶇О鏈�澶�15涓瓧绗�!'
- }
- ]
- })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit}/>)}
- </Form.Item>
- </Col>
- </Row>
- </Form>
- </div>
+ <Form {...formItemLayout}>
+ <Row gutter={24}>
+ <Col span={22}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鐢ㄤ簬缁勪欢闂寸殑鍖哄垎銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 缁勪欢鍚嶇О
+ </Tooltip>
+ }>
+ {getFieldDecorator('name', {
+ initialValue: this.props.name || '',
+ rules: [
+ {
+ required: true,
+ message: this.props.dict['form.required.input'] + '缁勪欢鍚嶇О!'
+ },
+ {
+ max: 15,
+ message: '缁勪欢鍚嶇О鏈�澶�15涓瓧绗�!'
+ }
+ ]
+ })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit}/>)}
+ </Form.Item>
+ </Col>
+ </Row>
+ </Form>
)
}
}
diff --git a/src/menu/components/share/usercomponent/settingform/index.scss b/src/menu/components/share/usercomponent/settingform/index.scss
index c53f945..e69de29 100644
--- a/src/menu/components/share/usercomponent/settingform/index.scss
+++ b/src/menu/components/share/usercomponent/settingform/index.scss
@@ -1,8 +0,0 @@
-.model-menu-setting-form {
- position: relative;
-
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
-}
\ No newline at end of file
diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
index 18f871c..b8e9de9 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Icon, Modal, notification } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Modal, notification } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { getColumnForm } from './formconfig'
import { formRule } from '@/utils/option.js'
@@ -187,7 +188,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -209,7 +210,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -260,7 +261,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -311,7 +312,7 @@
<Col span={24} key={index} className="textarea">
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.scss b/src/menu/components/table/edit-table/columns/editColumn/index.scss
index e450762..9885df8 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.scss
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.scss
@@ -1,15 +1,5 @@
.commontable-column-form {
min-height: 190px;
- .ant-form-item {
- .ant-input-number {
- width: 100%;
- }
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.ant-cascader-menus {
padding: 5px 0px;
.ant-cascader-menu:last-child {
diff --git a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
index 4ab2a62..d0b5dd8 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Button, notification, Modal, Icon, Tooltip, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -279,7 +280,7 @@
<Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
<Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎵ц浣嶇疆
</Tooltip>
}>
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.scss b/src/menu/components/table/edit-table/columns/tableIn/index.scss
index 6394765..0b2c26b 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.scss
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.scss
@@ -9,9 +9,6 @@
word-wrap: break-word;
word-break: break-word;
}
- .ant-input-number {
- width: 100%;
- }
.count-tip {
position: absolute;
top: 0px;
diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
index 921f31e..b360aaa 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Icon, Cascader, Modal } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader, Modal } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { getColumnForm } from './formconfig'
import { formRule } from '@/utils/option.js'
@@ -170,7 +171,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -192,7 +193,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -243,7 +244,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -316,7 +317,7 @@
<Col span={24} key={index} className="textarea">
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.scss b/src/menu/components/table/normal-table/columns/editColumn/index.scss
index e450762..9885df8 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.scss
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.scss
@@ -1,15 +1,5 @@
.commontable-column-form {
min-height: 190px;
- .ant-form-item {
- .ant-input-number {
- width: 100%;
- }
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.ant-cascader-menus {
padding: 5px 0px;
.ant-cascader-menu:last-child {
diff --git a/src/menu/datasource/verifycard/index.scss b/src/menu/datasource/verifycard/index.scss
index 68433a2..bef6747 100644
--- a/src/menu/datasource/verifycard/index.scss
+++ b/src/menu/datasource/verifycard/index.scss
@@ -33,9 +33,6 @@
z-index: 2;
}
.verify-form {
- .ant-input-number {
- width: 100%;
- }
.sql {
.ant-col-sm-8 {
width: 10.5%;
@@ -67,10 +64,6 @@
}
.add {
padding-top: 4px;
- }
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
}
}
.custom-table .ant-empty {
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index e61ed99..4d61040 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, notification, Select, InputNumber, Cascader } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, notification, Select, InputNumber, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
@@ -230,7 +231,7 @@
{interType === 'system' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鑷畾涔夎剼鏈腑鐨勫彉閲忥紙闄ゆ姤閿欏強鍙敤瀛楁澶栵級锛岄渶浠ユ鏍囪瘑寮�澶淬��'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍙橀噺鏍囪瘑
</Tooltip>
}>
@@ -252,7 +253,7 @@
{interType === 'inner' ? <Col span={8}>
<Form.Item label={tooltip ?
<Tooltip placement="topLeft" title={tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍐呴儴鍑芥暟
</Tooltip> : '鍐呴儴鍑芥暟'
}>
@@ -283,7 +284,7 @@
</Col> : null}
{interType === 'outer' ? <Col className="outer-interface" span={24}>
<Form.Item label={<Tooltip placement="topLeft" title="姝ｅ紡绯荤粺鎺ュ彛鍦板潃锛屼负绌烘椂浣跨敤鎺ュ彛鍦板潃">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
姝ｅ紡鍦板潃
</Tooltip>
}>
@@ -305,7 +306,7 @@
{interType === 'system' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
<Form.Item labelCol={{xs: { span: 24 }, sm: { span: 2 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 22 }} } label={
<Tooltip placement="topLeft" title={`浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� ''銆� @$ -> */ 鎴� ''锛涙煡璇㈡浛鎹㈢ $select@ -> /* 鎴� ''銆� @select$ -> */ 鎴� ''锛涚粺璁℃浛鎹㈢ $sum@ -> /* 鎴� ''銆� @sum$ -> */ 鎴� ''銆俙}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏁版嵁婧�
</Tooltip>
}>
@@ -317,7 +318,7 @@
{interType === 'system' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏌ヨ鏃讹紝鎼滅储鏉′欢浠here鏉′欢鎷兼帴杩涘叆sql锛岀粺璁℃椂锛屽皢鏁版嵁婧愪腑浠モ�淍+鎼滅储瀛楁+@鈥濈殑鍐呭锛屼互鎼滅储鏉′欢涓殑鍊艰繘琛屾浛鎹㈠悗锛屾彁浜ゆ煡璇紝娉細鏌ヨ绫诲瀷浠呭湪浣跨敤绯荤粺鍑芥暟鏃舵湁鏁堛��'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏌ヨ绫诲瀷
</Tooltip>
}>
@@ -373,7 +374,7 @@
{!['navbar', 'balcony', 'menubar'].includes(config.type) ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'璇ョ粍浠跺鏋滃彈鍏朵粬缁勪欢鎺у埗锛岃閫夐」鐩稿簲鐨勭粍浠讹紝娌℃湁鏃堕�夆�滄棤鈥濄��'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
涓婄骇缁勪欢
</Tooltip>
}>
@@ -405,7 +406,7 @@
{config.pageable && laypage !== 'false' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title="閫夋嫨鍒嗛〉鏃舵湁鏁堛��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
姣忛〉鏁伴噺
</Tooltip>
}>
@@ -424,7 +425,7 @@
{!['navbar', 'menubar'].includes(config.type) && (!config.pageable || (config.pageable && laypage === 'false')) && (!supModule || supModule.length === 0 || supModule[0] === 'empty') ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鍒濆鍖栧姞杞芥椂锛屾槸鍚︿笌鍏朵粬缁勪欢涓�鍚屽姞杞芥暟鎹紝娉細浠呭湪浣跨敤绯荤粺鍑芥暟锛屼笖鍒濆鍖栧姞杞芥暟鎹椂鏈夋晥锛屽垎椤佃姹傛椂鏃犳晥銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍚屾鏌ヨ
</Tooltip>
}>
@@ -441,7 +442,7 @@
{!['navbar', 'balcony', 'menubar'].includes(config.type) ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'浼樺厛浣跨敤鍚岀骇鐨勬悳绱㈡潯浠剁粍浠讹紝鍚岀骇鎼滅储涓嶅瓨鍦ㄦ椂锛屼緷娆″悜涓婇�夊彇锛屼笌褰撳墠缁勪欢鐨勬悳绱㈡潯浠朵竴鍚岀敤浣滄暟鎹繃婊わ紙褰撳墠缁勪欢鐨勬悳绱㈡潯浠朵紭鍏堬級銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
澶栭儴鎼滅储
</Tooltip>
}>
@@ -458,7 +459,7 @@
{!['navbar', 'balcony', 'menubar'].includes(config.type) && useMSearch === 'true' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'澶栧眰鎼滅储鏉′欢鏀瑰彉鏃讹紝鏄惁鍒锋柊褰撳墠缁勪欢鏁版嵁銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍚屾鍒锋柊
</Tooltip>
}>
diff --git a/src/menu/datasource/verifycard/settingform/index.scss b/src/menu/datasource/verifycard/settingform/index.scss
index d0943f6..fbc8fed 100644
--- a/src/menu/datasource/verifycard/settingform/index.scss
+++ b/src/menu/datasource/verifycard/settingform/index.scss
@@ -13,13 +13,6 @@
height: 150px;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- }
- .ant-input-number {
- width: 100%;
}
.ant-radio-group {
white-space: nowrap;
diff --git a/src/menu/modalconfig/index.scss b/src/menu/modalconfig/index.scss
index 19fe376..556a72a 100644
--- a/src/menu/modalconfig/index.scss
+++ b/src/menu/modalconfig/index.scss
@@ -241,7 +241,6 @@
margin-top: 4px;
}
.ant-input-number {
- width: 100%;
margin-top: 4px;
}
.normal-braft-editor {
diff --git a/src/menu/popview/menuform/index.jsx b/src/menu/popview/menuform/index.jsx
index e25ccd0..4de1e6f 100644
--- a/src/menu/popview/menuform/index.jsx
+++ b/src/menu/popview/menuform/index.jsx
@@ -1,8 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Radio, Icon, Input, Tooltip, InputNumber } from 'antd'
+import { Form, Row, Col, Radio, Input, Tooltip, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
-import './index.scss'
+// import './index.scss'
class CustomMenuForm extends Component {
static propTpyes = {
@@ -54,7 +55,7 @@
}
return (
- <Form {...formItemLayout} className="custom-menu-form">
+ <Form {...formItemLayout}>
<Row>
<Col span={24}>
<Form.Item label={dict['mob.menu'] + dict['mob.name']}>
@@ -85,7 +86,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="瀵逛簬涓嶇粡甯告�у彉鍔ㄧ殑淇℃伅锛岀紦瀛樻暟鎹湁鍔╀簬鎻愰珮鏌ヨ鏁堢巼銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
缂撳瓨鏁版嵁
</Tooltip>
}>
diff --git a/src/menu/popview/menuform/index.scss b/src/menu/popview/menuform/index.scss
index 71a1a33..e69de29 100644
--- a/src/menu/popview/menuform/index.scss
+++ b/src/menu/popview/menuform/index.scss
@@ -1,10 +0,0 @@
-.custom-menu-form {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
-}
\ No newline at end of file
diff --git a/src/menu/replaceField/settingform/index.jsx b/src/menu/replaceField/settingform/index.jsx
index a5b82e6..ed8d59a 100644
--- a/src/menu/replaceField/settingform/index.jsx
+++ b/src/menu/replaceField/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Tooltip, Icon, Select } from 'antd'
+import { Form, Row, Col, Tooltip, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
// import './index.scss'
@@ -45,7 +46,7 @@
<Col span={20}>
<Form.Item label={
<Tooltip placement="topLeft" title="鐢ㄤ簬瀛楁鏇挎崲鐨勮〃鍚嶃��">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
琛ㄥ悕
</Tooltip>
}>
diff --git a/src/menu/stylecombcontroller/index.scss b/src/menu/stylecombcontroller/index.scss
index c05ed9e..1350691 100644
--- a/src/menu/stylecombcontroller/index.scss
+++ b/src/menu/stylecombcontroller/index.scss
@@ -25,9 +25,6 @@
display: block;
clear: both;
}
- .ant-input-number {
- width: 100%;
- }
.ant-form-item {
margin-bottom: 2px;
diff --git a/src/menu/stylecontroller/index.scss b/src/menu/stylecontroller/index.scss
index 082735e..43a8e7c 100644
--- a/src/menu/stylecontroller/index.scss
+++ b/src/menu/stylecontroller/index.scss
@@ -25,9 +25,6 @@
display: block;
clear: both;
}
- .ant-input-number {
- width: 100%;
- }
.mk-source-wrap {
height: 32px;
.anticon-paper-clip {
diff --git a/src/menu/sysinterface/settingform/baseform/index.jsx b/src/menu/sysinterface/settingform/baseform/index.jsx
index 8364ae0..ea3b695 100644
--- a/src/menu/sysinterface/settingform/baseform/index.jsx
+++ b/src/menu/sysinterface/settingform/baseform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import './index.scss'
@@ -143,7 +144,7 @@
{procMode === 'inner' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={funcTooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍓嶇疆鍑芥暟
</Tooltip>
}>
@@ -179,7 +180,7 @@
<Col className="data-source" span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="姝ｅ紡绯荤粺鎵�浣跨敤鐨勭殑鎺ュ彛鍦板潃銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
姝ｅ紡鍦板潃
</Tooltip>
}>
@@ -208,7 +209,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'濡傛灉鑷畾涔夋帴鍙ｄ笉鏀寔璺ㄥ煙璇锋眰锛屼細閫氳繃褰撳墠绯荤粺杞彂銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
璺ㄥ煙璇锋眰
</Tooltip>
}>
diff --git a/src/menu/sysinterface/settingform/baseform/index.scss b/src/menu/sysinterface/settingform/baseform/index.scss
index a6d2df7..aeabe5f 100644
--- a/src/menu/sysinterface/settingform/baseform/index.scss
+++ b/src/menu/sysinterface/settingform/baseform/index.scss
@@ -13,10 +13,5 @@
height: 150px;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
-
}
\ No newline at end of file
diff --git a/src/menu/sysinterface/settingform/index.scss b/src/menu/sysinterface/settingform/index.scss
index d4d8d9d..4d9d692 100644
--- a/src/menu/sysinterface/settingform/index.scss
+++ b/src/menu/sysinterface/settingform/index.scss
@@ -21,10 +21,6 @@
width: 83.33333333%;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.text-area {
.CodeMirror {
height: 150px;
diff --git a/src/menu/urlfieldcomponent/index.jsx b/src/menu/urlfieldcomponent/index.jsx
index ac0aecc..69625a0 100644
--- a/src/menu/urlfieldcomponent/index.jsx
+++ b/src/menu/urlfieldcomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal, Tooltip, notification } from 'antd'
+import { Modal, Tooltip, notification } from 'antd'
+import { QuestionCircleOutlined, PlusOutlined, CloseOutlined } from '@ant-design/icons'
import SettingForm from './settingform'
import './index.scss'
@@ -98,16 +99,16 @@
<div className="url-field-component">
<div className="field-plus">
<Tooltip placement="topLeft" title="椤甸潰鍙帴鏀剁殑鍙傛暟瀛楁锛屽湪鏌ヨ鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤 @瀛楁@ 鎺ユ敹銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
url鍙橀噺
</Tooltip>
- <Icon type="plus" title="娣诲姞" onClick={() => this.editDataSource()} />
+ <PlusOutlined title="娣诲姞" onClick={() => this.editDataSource()} />
</div>
<div>
{urlFields.map((field, index) => {
return (
<div className="field-item" key={index}>
- <Icon type="close" title="鍒犻櫎" onClick={() => this.deleteField(field)} />
+ <CloseOutlined title="鍒犻櫎" onClick={() => this.deleteField(field)} />
{field}
</div>
)
diff --git a/src/menu/urlfieldcomponent/index.scss b/src/menu/urlfieldcomponent/index.scss
index 467a30c..0a3a73a 100644
--- a/src/menu/urlfieldcomponent/index.scss
+++ b/src/menu/urlfieldcomponent/index.scss
@@ -7,10 +7,6 @@
padding: 2px 5px;
margin-left: 5px;
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
.field-item {
position: relative;
diff --git a/src/menu/versions/index.jsx b/src/menu/versions/index.jsx
index ab7ae02..da697a0 100644
--- a/src/menu/versions/index.jsx
+++ b/src/menu/versions/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, Button, Icon, notification } from 'antd'
+import { Modal, Button, notification } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -140,7 +141,7 @@
footer={[]}
destroyOnClose
>
- <div className="header"><Icon type="question-circle"/>鐗堟湰鍒囨崲</div>
+ <div className="header"><QuestionCircleOutlined/>鐗堟湰鍒囨崲</div>
<div className="detail">璇烽�夋嫨闇�瑕佸垏鎹㈢殑鐗堟湰锛屾垨鐐瑰嚮鍙栨秷鍏抽棴寮圭獥銆�</div>
<div className="footer">
<Button key="pre" type="primary" loading={preconfirming} onClick={this.preVersion}>涓婁竴鐗堟湰</Button>
diff --git a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx
index ebc060f..fd4048a 100644
--- a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, Select } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -128,7 +129,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="缁戝畾鎻愮ず瀛楁鍚庯紝浼氬湪鑿滃崟鍙充笂瑙掓樉绀烘彁绀轰俊鎭�傛敞锛氬湪娣诲姞鍥炬爣鏃舵湁鏁堛��">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
鎻愮ず
</Tooltip>
}>
@@ -196,7 +197,7 @@
{property === 'linkmenu' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍏宠仈褰撳墠app涓凡鏈夌殑鑿滃崟銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏宠仈鑿滃崟
</Tooltip>
}>
@@ -216,7 +217,7 @@
{property === 'menu' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟涓嶅瓨鍦ㄦ椂鏈夋晥銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
澶嶅埗鑿滃崟
</Tooltip>
}>
diff --git a/src/mob/modalconfig/index.scss b/src/mob/modalconfig/index.scss
index 7a4737d..d9c2725 100644
--- a/src/mob/modalconfig/index.scss
+++ b/src/mob/modalconfig/index.scss
@@ -251,7 +251,6 @@
margin-top: 4px;
}
.ant-input-number {
- width: 100%;
margin-top: 4px;
}
.normal-braft-editor {
diff --git a/src/mob/searchconfig/groupform/index.scss b/src/mob/searchconfig/groupform/index.scss
index 9a74987..2b4f0de 100644
--- a/src/mob/searchconfig/groupform/index.scss
+++ b/src/mob/searchconfig/groupform/index.scss
@@ -7,12 +7,4 @@
width: 83.33333333%;
}
}
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
}
\ No newline at end of file
diff --git a/src/mob/searchconfig/index.scss b/src/mob/searchconfig/index.scss
index fac4043..934712f 100644
--- a/src/mob/searchconfig/index.scss
+++ b/src/mob/searchconfig/index.scss
@@ -284,7 +284,6 @@
margin-top: 4px;
}
.ant-input-number {
- width: 100%;
margin-top: 4px;
}
.normal-braft-editor {
diff --git a/src/mob/searchconfig/settingform/index.jsx b/src/mob/searchconfig/settingform/index.jsx
index 619d7b3..7f27665 100644
--- a/src/mob/searchconfig/settingform/index.jsx
+++ b/src/mob/searchconfig/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Select, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, Radio, Select, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import './index.scss'
@@ -86,7 +87,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤鎼滅储鏍忔椂锛屾爣棰樼敤浜庢悳绱㈡潯浠堕殣钘忔椂鏄剧ず銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏍囬
</Tooltip>
}>
diff --git a/src/mob/searchconfig/settingform/index.scss b/src/mob/searchconfig/settingform/index.scss
index f0d30ef..0bfd8f4 100644
--- a/src/mob/searchconfig/settingform/index.scss
+++ b/src/mob/searchconfig/settingform/index.scss
@@ -7,14 +7,6 @@
width: 83.33333333%;
}
}
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.ant-col.ant-col-12 {
display: inline-block;
float: none;
diff --git a/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx b/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx
index 77f1387..41ab933 100644
--- a/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, Select } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -138,7 +139,7 @@
{property === 'linkmenu' ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍏宠仈褰撳墠app涓凡鏈夌殑鑿滃崟銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏宠仈鑿滃崟
</Tooltip>
}>
diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
index 9e71f6e..39da53f 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, Select } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -165,7 +166,7 @@
{property === 'linkmenu' ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍏宠仈褰撳墠app涓凡鏈夌殑鑿滃崟銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏宠仈鑿滃崟
</Tooltip>
}>
@@ -185,7 +186,7 @@
{property === 'menu' ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟涓嶅瓨鍦ㄦ椂鏈夋晥銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
澶嶅埗鑿滃崟
</Tooltip>
}>
diff --git a/src/pc/createview/settingform/index.jsx b/src/pc/createview/settingform/index.jsx
index 3598b9e..a8e54c8 100644
--- a/src/pc/createview/settingform/index.jsx
+++ b/src/pc/createview/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Input, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Select, Input, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -88,7 +89,7 @@
<Col span={20}>
<Form.Item label={
<Tooltip placement="topLeft" title="鑷畾涔夎彍鍗旾D鍊笺��">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
鑿滃崟ID
</Tooltip>
}>
diff --git a/src/pc/transfer/settingform/index.jsx b/src/pc/transfer/settingform/index.jsx
index 40d2fb0..614887c 100644
--- a/src/pc/transfer/settingform/index.jsx
+++ b/src/pc/transfer/settingform/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { Form, Row, Col, Select } from 'antd'
-import './index.scss'
+// import './index.scss'
class SettingForm extends Component {
static propTpyes = {
diff --git a/src/pc/transfer/settingform/index.scss b/src/pc/transfer/settingform/index.scss
index 159130b..e69de29 100644
--- a/src/pc/transfer/settingform/index.scss
+++ b/src/pc/transfer/settingform/index.scss
@@ -1,11 +0,0 @@
-.model-menu-setting-form {
- position: relative;
-
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- }
-}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index a890f89..0a10c7a 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -135,9 +135,6 @@
}
}
}
- .ant-slider {
- margin: 0px;
- }
.ant-mk-picture {
background-size: cover;
background-position: center center;
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index b31fa58..ee3ebc1 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -157,7 +157,6 @@
}
.ant-input-number {
border: none;
- width: 100%;
box-shadow: none!important;
height: auto;
.ant-input-number-handler-wrap {
diff --git a/src/tabviews/formtab/formgroup/index.scss b/src/tabviews/formtab/formgroup/index.scss
index bb8c383..1d63657 100644
--- a/src/tabviews/formtab/formgroup/index.scss
+++ b/src/tabviews/formtab/formgroup/index.scss
@@ -21,9 +21,6 @@
width: 89.5%;
}
}
- .ant-input-number {
- width: 100%;
- }
.ant-form-explain {
overflow:hidden;
text-overflow:ellipsis;
diff --git a/src/tabviews/home/defaulthome/index.jsx b/src/tabviews/home/defaulthome/index.jsx
index fc95665..77f61be 100644
--- a/src/tabviews/home/defaulthome/index.jsx
+++ b/src/tabviews/home/defaulthome/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import { Chart } from '@antv/g2'
-import { Icon, Tabs, Slider } from 'antd'
+import { Icon, Tabs, Progress } from 'antd'
import './index.scss'
const { TabPane } = Tabs
@@ -120,9 +120,8 @@
</div>
</div>
<div className="antd-chart-content">
- <div className="antd-content-fixed orange">
- <Slider defaultValue={67} tipFormatter={null} />
- <div className="mask"></div>
+ <div className="antd-content-fixed">
+ <Progress percent={67} showInfo={false} strokeColor="orange"/>
</div>
</div>
<div className="antd-chart-footer">
@@ -158,8 +157,7 @@
</div>
<div className="antd-chart-content">
<div className="antd-content-fixed primary">
- <Slider defaultValue={77} tipFormatter={null} />
- <div className="mask"></div>
+ <Progress percent={77} showInfo={false} strokeColor="#1890ff"/>
</div>
</div>
<div className="antd-chart-footer">
@@ -195,8 +193,7 @@
</div>
<div className="antd-chart-content">
<div className="antd-content-fixed">
- <Slider defaultValue={87} tipFormatter={null} />
- <div className="mask"></div>
+ <Progress percent={87} showInfo={false} strokeColor="#13C2C2"/>
</div>
</div>
<div className="antd-chart-footer">
diff --git a/src/tabviews/home/defaulthome/index.scss b/src/tabviews/home/defaulthome/index.scss
index db64534..794aadc 100644
--- a/src/tabviews/home/defaulthome/index.scss
+++ b/src/tabviews/home/defaulthome/index.scss
@@ -91,43 +91,6 @@
color: #52c41a;
}
}
- .mask {
- position: absolute;
- top: 0px;
- left: 0px;
- right: 0px;
- bottom: 0px;
- z-index: 1;
- }
- }
- .ant-slider {
- margin: 14px 0px 10px;
- }
- .ant-slider-track {
- height: 7px;
- background-color: #13C2C2;
- }
- .ant-slider-handle {
- border-color: #13C2C2;
- }
- .orange {
- .ant-slider-track {
- background-color: orange;
- }
- .ant-slider-handle {
- border-color: lightsalmon;
- }
- }
- .primary {
- .ant-slider-track {
- background-color: #1890ff;
- }
- .ant-slider-handle {
- border-color: #91d5ff;
- }
- }
- .ant-slider-rail {
- height: 7px;
}
}
.antd-chart-footer {
diff --git a/src/tabviews/tabmanage/mutilform/index.scss b/src/tabviews/tabmanage/mutilform/index.scss
index 59c912c..f0d1e6e 100644
--- a/src/tabviews/tabmanage/mutilform/index.scss
+++ b/src/tabviews/tabmanage/mutilform/index.scss
@@ -21,9 +21,6 @@
width: 89.5%;
}
}
- .ant-input-number {
- width: 100%;
- }
.ant-form-explain {
overflow:hidden;
text-overflow:ellipsis;
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 373b36e..73a64e4 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, notification, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, notification, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -674,7 +675,7 @@
} else {
let content = null
let className = ''
- let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><Icon type="question-circle" />{item.label}</Tooltip> : item.label
+ let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><QuestionCircleOutlined style={{color: '#c49f47', marginRight: '3px'}}/>{item.label}</Tooltip> : item.label
if (item.type === 'text' || item.type === 'linkMain') {
content = (<MKInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
diff --git a/src/tabviews/zshare/mutilform/index.scss b/src/tabviews/zshare/mutilform/index.scss
index d492dbb..537c050 100644
--- a/src/tabviews/zshare/mutilform/index.scss
+++ b/src/tabviews/zshare/mutilform/index.scss
@@ -8,10 +8,6 @@
padding-left: 1.2%!important;
padding-right: 1.2%!important;
}
- .ant-form-item-label .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.ant-checkbox-group {
line-height: unset;
.ant-checkbox-wrapper {
@@ -80,9 +76,6 @@
width: 7.5%;
}
}
- }
- .ant-input-number {
- width: 100%;
}
.ant-form-explain {
overflow:hidden;
diff --git a/src/templates/calendarconfig/calcomponent/calendarform/index.jsx b/src/templates/calendarconfig/calcomponent/calendarform/index.jsx
index 5a25c6a..6ee2fa0 100644
--- a/src/templates/calendarconfig/calcomponent/calendarform/index.jsx
+++ b/src/templates/calendarconfig/calcomponent/calendarform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Checkbox, Tooltip, Icon, Radio } from 'antd'
-import './index.scss'
+import { Form, Row, Col, Select, Checkbox, Tooltip, Radio } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+// import './index.scss'
class MainTab extends Component {
static propTpyes = {
@@ -37,7 +38,7 @@
}
}
return (
- <Form {...formItemLayout} className="model-calendar-form">
+ <Form {...formItemLayout}>
<Row gutter={24}>
<Col span={24}>
<Form.Item label={'寮�濮嬫椂闂�'}>
@@ -133,7 +134,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="寮�鍚悗锛屼娇鐢ㄧ郴缁熷嚱鏁版椂浼氳嚜鍔ㄦ浛鎹㈡暟鎹簮鍙婅嚜瀹氫箟鑴氭湰涓殑calendarDate涓巆alendarDate1锛屽叾鍊煎垎鍒负閫夋嫨骞翠唤鐨勫紑濮嬪拰缁撴潫鏃堕棿锛屼娇鐢ㄨ嚜瀹氫箟鍑芥暟鏃讹紝浼氬鍔燾alendarDate浼犲弬锛屽叾鍊间负閫夋嫨骞翠唤銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏁版嵁鍒锋柊
</Tooltip>
}>
diff --git a/src/templates/calendarconfig/calcomponent/calendarform/index.scss b/src/templates/calendarconfig/calcomponent/calendarform/index.scss
index 1d2e501..e69de29 100644
--- a/src/templates/calendarconfig/calcomponent/calendarform/index.scss
+++ b/src/templates/calendarconfig/calcomponent/calendarform/index.scss
@@ -1,7 +0,0 @@
-.model-calendar-form {
- min-height: 180px;
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
-}
\ No newline at end of file
diff --git a/src/templates/calendarconfig/index.scss b/src/templates/calendarconfig/index.scss
index cdffc0f..dcfe8d0 100644
--- a/src/templates/calendarconfig/index.scss
+++ b/src/templates/calendarconfig/index.scss
@@ -85,10 +85,6 @@
}
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.config-button {
min-width: 65px;
}
diff --git a/src/templates/calendarconfig/tabcomponent/index.jsx b/src/templates/calendarconfig/tabcomponent/index.jsx
index 68ee2df..42ad0cf 100644
--- a/src/templates/calendarconfig/tabcomponent/index.jsx
+++ b/src/templates/calendarconfig/tabcomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal } from 'antd'
+import { Modal } from 'antd'
+import { EditOutlined, CloseOutlined, PlusOutlined } from '@ant-design/icons'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -88,15 +89,15 @@
<div className="model-calendar-tab">
{config.tab ? <div className="tab-control">
<span onDoubleClick={this.props.setSubConfig}>{config.tab.label}</span>
- <Icon type="edit" onClick={this.handleTab} />
- <Icon type="close" onClick={this.closeTab} />
- </div> : <Icon title="娣诲姞鏍囩" type="plus" onClick={this.handleTab} />}
+ <EditOutlined onClick={this.handleTab} />
+ <CloseOutlined onClick={this.closeTab} />
+ </div> : <PlusOutlined title="娣诲姞鏍囩" onClick={this.handleTab} />}
{/* 璁剧疆鍏ㄥ眬閰嶇疆鍙婂垪琛ㄦ暟鎹簮 */}
<Modal
wrapClassName="model-calendar-tab-modal"
title={dict['model.edit']}
visible={visible}
- width={900}
+ width={700}
maskClosable={false}
onCancel={() => { this.setState({ visible: false })}}
onOk={this.tabSave}
diff --git a/src/templates/calendarconfig/tabcomponent/index.scss b/src/templates/calendarconfig/tabcomponent/index.scss
index 7658ec6..9bb7caf 100644
--- a/src/templates/calendarconfig/tabcomponent/index.scss
+++ b/src/templates/calendarconfig/tabcomponent/index.scss
@@ -16,7 +16,7 @@
left: 0px;
top: 0px;
- span {
+ span:not(.anticon) {
display: inline-block;
white-space: nowrap;
font-size: 16px;
diff --git a/src/templates/calendarconfig/tabcomponent/tabform/index.jsx b/src/templates/calendarconfig/tabcomponent/tabform/index.jsx
index a02f6a5..b91c74c 100644
--- a/src/templates/calendarconfig/tabcomponent/tabform/index.jsx
+++ b/src/templates/calendarconfig/tabcomponent/tabform/index.jsx
@@ -1,6 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, Icon, Tooltip, Radio, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Select, Tooltip, Radio } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import './index.scss'
@@ -22,8 +24,6 @@
*/
UNSAFE_componentWillMount () {
const { formlist } = this.props
-
- // let type = formlist.filter(cell => cell.key === 'type')[0].initVal
let _tabs = this.props.tabs.filter(tab => tab.type === 'SubTable')
@@ -104,7 +104,7 @@
<Form.Item label={
item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -122,28 +122,6 @@
...rules
]
})(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.handleSubmit} />)}
- </Form.Item>
- </Col>
- )
- } else if (item.type === 'number') {
- fields.push(
- <Col span={24} key={index}>
- <Form.Item label={
- item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
- }
- ]
- })(<InputNumber disabled={item.readonly} min={item.min} max={item.max} precision={0} />)}
</Form.Item>
</Col>
)
@@ -167,34 +145,8 @@
>
{item.options.map((option, i) =>
<Select.Option id={'mk' + i} title={option.text} key={'mk' + i} value={option.value}>
- {item.key === 'icon' && i !== 0 ? <Icon type={option.text} /> : option.text}
+ {option.text}
</Select.Option>
- )}
- </Select>
- )}
- </Form.Item>
- </Col>
- )
- } else if (item.type === 'mutilselect') {
- fields.push(
- <Col span={24} key={index}>
- <Form.Item label={
- item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal
- })(
- <Select
- mode="multiple"
- style={{ width: '100%' }}
- placeholder=""
- >
- {item.options.map((option, index) =>
- <Select.Option id={option.uuid} title={option.label} key={index} value={option.uuid}>{option.label}</Select.Option>
)}
</Select>
)}
@@ -206,7 +158,7 @@
<Col span={24} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -269,7 +221,7 @@
}
}
return (
- <Form {...formItemLayout} className="model-tab-form">
+ <Form {...formItemLayout} style={{minHeight: '180px'}}>
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/templates/calendarconfig/tabcomponent/tabform/index.scss b/src/templates/calendarconfig/tabcomponent/tabform/index.scss
index d9327f1..e69de29 100644
--- a/src/templates/calendarconfig/tabcomponent/tabform/index.scss
+++ b/src/templates/calendarconfig/tabcomponent/tabform/index.scss
@@ -1,16 +0,0 @@
-.model-tab-form {
- min-height: 180px;
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- .ant-input-number-input:read-only {
- color: red;
- :hover {
- border-color: #d9d9d9;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 037c3d6..7ae69ce 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -4,7 +4,8 @@
import { is, fromJS } from 'immutable'
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
-import { Button, Card, Modal, Collapse, notification, Spin, Icon, Switch, Tooltip, Col } from 'antd'
+import { Button, Card, Modal, Collapse, notification, Spin, Switch, Tooltip, Col } from 'antd'
+import { QuestionCircleOutlined, RedoOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -1199,7 +1200,7 @@
{confActions.length > 0 ?
<p className="config-btn-title">
<Tooltip placement="topLeft" title="鐐瑰嚮鎸夐挳锛屽彲瀹屾垚鎴栨煡鐪嬫寜閽厤缃俊鎭��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip"/>
</Tooltip>
{this.state.dict['header.menu.action.configurable']}
</p> : null
@@ -1233,7 +1234,7 @@
{configTabs.length > 0 ?
<p className="config-btn-title">
<Tooltip placement="topLeft" title="鐐瑰嚮鎸夐挳锛屽彲瀹屾垚鎴栨煡鐪嬫爣绛鹃厤缃俊鎭��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip"/>
</Tooltip>
{this.state.dict['header.menu.tab.configurable']}
</p> : null
@@ -1257,7 +1258,7 @@
<Card title={
<div>
{this.state.dict['header.menu.page.configurable']}
- <Icon type="redo" style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={() => this.reloadTab(true)} />
+ <RedoOutlined style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={() => this.reloadTab(true)} />
</div>
} bordered={false} extra={
<div>
diff --git a/src/templates/comtableconfig/index.scss b/src/templates/comtableconfig/index.scss
index a3e3eba..70828ad 100644
--- a/src/templates/comtableconfig/index.scss
+++ b/src/templates/comtableconfig/index.scss
@@ -105,10 +105,6 @@
}
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.config-button {
min-width: 65px;
}
diff --git a/src/templates/formtabconfig/actionform/index.jsx b/src/templates/formtabconfig/actionform/index.jsx
index 6fd1b18..11f8243 100644
--- a/src/templates/formtabconfig/actionform/index.jsx
+++ b/src/templates/formtabconfig/actionform/index.jsx
@@ -1,6 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { btnIcons, btnClasses, formRule } from '@/utils/option.js'
// import Utils from '@/utils/utils.js'
import './index.scss'
@@ -21,9 +23,6 @@
openType: null, // 鎵撳紑鏂瑰紡
interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
insertUpdateOptions: [{
- value: '',
- text: this.props.dict['model.empty']
- }, {
value: 'insert',
text: this.props.dict['header.form.action.insert']
}, {
@@ -46,6 +45,19 @@
}, {
value: 'refresh',
text: this.props.dict['header.form.refresh']
+ }],
+ interTypeOptions: [{
+ value: 'system',
+ text: this.props.dict['model.interface.system']
+ }, {
+ value: 'inner',
+ text: this.props.dict['model.interface.inner']
+ }, {
+ value: 'outer',
+ text: this.props.dict['model.interface.outer']
+ }, {
+ value: 'custom',
+ text: '鑷畾涔�'
}]
}
@@ -58,7 +70,9 @@
if (form.key === 'intertype') {
_intertype = form.initVal
if (card.btnType !== 'confirm') {
- form.options = form.options.filter(op => op.value !== 'system')
+ form.options = this.state.interTypeOptions.filter(op => op.value !== 'system')
+ } else {
+ form.options = this.state.interTypeOptions
}
}
})
@@ -231,7 +245,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -253,7 +267,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -268,7 +282,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -302,7 +316,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/templates/formtabconfig/actionform/index.scss b/src/templates/formtabconfig/actionform/index.scss
index 2e104bd..969304f 100644
--- a/src/templates/formtabconfig/actionform/index.scss
+++ b/src/templates/formtabconfig/actionform/index.scss
@@ -12,14 +12,6 @@
width: 86%;
}
}
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.with-button {
.ant-form-item-control-wrapper {
padding-right: 63px;
diff --git a/src/templates/formtabconfig/groupform/index.jsx b/src/templates/formtabconfig/groupform/index.jsx
index 821b0cc..8668b3a 100644
--- a/src/templates/formtabconfig/groupform/index.jsx
+++ b/src/templates/formtabconfig/groupform/index.jsx
@@ -4,7 +4,7 @@
import { formRule } from '@/utils/option.js'
import TransferForm from '../transferform'
// import Utils from '@/utils/utils.js'
-import './index.scss'
+// import './index.scss'
class GroupForm extends Component {
static propTpyes = {
@@ -92,7 +92,7 @@
}
}
return (
- <Form {...formItemLayout} className="ant-advanced-search-form modal-setting-form">
+ <Form {...formItemLayout}>
<Row gutter={24}>
<Col span={12}>
<Form.Item label="鍒嗙粍鍚嶇О">
diff --git a/src/templates/formtabconfig/groupform/index.scss b/src/templates/formtabconfig/groupform/index.scss
index 091801f..e69de29 100644
--- a/src/templates/formtabconfig/groupform/index.scss
+++ b/src/templates/formtabconfig/groupform/index.scss
@@ -1,13 +0,0 @@
-.ant-advanced-search-form.modal-setting-form {
- .textarea {
- .ant-form-item-label {
- width: 16.3%;
- }
- .ant-form-item-control-wrapper {
- width: 83.33333333%;
- }
- }
- .ant-input-number {
- width: 100%;
- }
-}
\ No newline at end of file
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index ae594a5..9fce9dc 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -5,7 +5,8 @@
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
import moment from 'moment'
-import { Button, Card, Modal, Collapse, notification, Spin, Select, List, Icon, Empty, Switch, Tooltip } from 'antd'
+import { Button, Card, Modal, Collapse, notification, Spin, Select, List, Empty, Switch, Tooltip } from 'antd'
+import { QuestionCircleOutlined, CloseOutlined, RedoOutlined, SettingOutlined, PlusOutlined, DeleteOutlined, EditOutlined, SnippetsOutlined } from '@ant-design/icons'
import Api from '@/api'
import zhCN from '@/locales/zh-CN/model.js'
@@ -1791,7 +1792,7 @@
<div className="ant-col ant-form-item-label">
<label>
<Tooltip placement="topLeft" title="姝ゅ鍙互娣诲姞閰嶇疆鐩稿叧鐨勫父鐢ㄨ〃锛屽湪娣诲姞鎼滅储鏉′欢鍜屾樉绀哄垪鏃讹紝鍙�氳繃宸ュ叿鏍忎腑鐨勬坊鍔犳寜閽紝鎵归噺娣诲姞琛ㄦ牸鐩稿叧瀛楁銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{this.state.dict['header.menu.table.add']}
</Tooltip>
</label>
@@ -1820,7 +1821,7 @@
dataSource={this.state.selectedTables}
renderItem={(item, index) => <List.Item key={index} title={item.Remark + ' (' + item.TbName + ')'}>
{item.Remark + ' (' + item.TbName + ')'}
- <Icon type="close" onClick={() => this.deleteTable(item)}/>
+ <CloseOutlined onClick={() => this.deleteTable(item)}/>
<div className="bottom-mask"></div>
</List.Item>}
/>}
@@ -1852,7 +1853,7 @@
{configTabs.length > 0 ?
<p className="config-btn-title">
<Tooltip placement="topLeft" title="鐐瑰嚮鎸夐挳锛屽彲瀹屾垚鎴栨煡鐪嬫爣绛鹃厤缃俊鎭��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
</Tooltip>
{this.state.dict['header.menu.tab.configurable']}
</p> : null
@@ -1876,7 +1877,7 @@
<Card title={
<div>
{this.state.dict['header.menu.page.configurable']}
- <Icon type="redo" style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={this.reloadTab} />
+ <RedoOutlined style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={this.reloadTab} />
</div>
} bordered={false} extra={
<div>
@@ -1885,9 +1886,9 @@
<Button onClick={this.cancelConfig}>{this.state.dict['model.back']}</Button>
</div>
} style={{ width: '100%' }}>
- <Icon type="setting" onClick={this.changeSetting} />
+ <SettingOutlined onClick={this.changeSetting} />
<Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃悳绱€�嬩腑锛岄�夋嫨瀵瑰簲鎼滅储妗嗘嫋鑷虫澶勬坊鍔狅紱鎴栫偣鍑绘寜閽�婃坊鍔犳悳绱㈡潯浠躲�嬫壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined style={{position: 'relative', color: '#c49f47', left: '5px', top: '20px'}} />
</Tooltip>
<Collapse
activeKey={config.groups.map(group => group.uuid)}
@@ -1896,21 +1897,16 @@
{config.groups.map((group, index) => (
<Panel showArrow={false} header={group.label} key={group.uuid} extra={(
<span>
- {index === _length - 1 ? <Icon
- type="plus"
+ {index === _length - 1 ? <PlusOutlined
onClick={() => { this.handleGroup()}}
/> : null}
- {_length > 1 && index !== _length - 1 ? <Icon
- type="delete"
+ {_length > 1 && index !== _length - 1 ? <DeleteOutlined
onClick={() => { this.closeGroup(group) }}
/> : null}
- <Icon
- type="edit"
- onClick={() => { this.handleGroup(group) }}
- />
+ <EditOutlined onClick={() => { this.handleGroup(group) }}/>
</span>
)}>
- {group.isDefault ? <Icon type="snippets" title={this.state.dict['header.form.paste']} onClick={() => {this.setState({pasteVisible: true})}} /> : null}
+ {group.isDefault ? <SnippetsOutlined title={this.state.dict['header.form.paste']} onClick={() => {this.setState({pasteVisible: true})}} /> : null}
<DragElement
type="search"
groupId={group.uuid}
@@ -1926,7 +1922,7 @@
</Collapse>
<div className="action-list">
<Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃寜閽�嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬寜閽嫋鑷虫澶勬坊鍔狅紝濡傞�夋嫨鎸夐挳绫诲瀷涓鸿〃鍗曘�佹柊鏍囩椤电瓑鍚湁閰嶇疆椤甸潰鐨勬寜閽紝鍙湪宸︿晶宸ュ叿鏍�-鎸夐挳-鍙厤缃寜閽锛岀偣鍑绘寜閽畬鎴愮浉鍏抽厤缃�傛敞锛氬綋璁剧疆鎸夐挳鏄剧ず浣嶇疆涓鸿〃鏍兼椂锛屾樉绀哄垪浼氬鍔犳搷浣滃垪銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined style={{position: 'absolute', color: '#c49f47', left: '5px', top: '5px'}} />
</Tooltip>
<DragElement
type="action"
@@ -1971,7 +1967,7 @@
<Modal
title={this.state.dict['model.action'] + '-' + this.state.dict['model.edit']}
visible={modaltype === 'actionEdit'}
- width={700}
+ width={900}
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
diff --git a/src/templates/formtabconfig/index.scss b/src/templates/formtabconfig/index.scss
index a05ad70..88fd0ed 100644
--- a/src/templates/formtabconfig/index.scss
+++ b/src/templates/formtabconfig/index.scss
@@ -95,10 +95,6 @@
}
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.config-button {
min-width: 65px;
}
@@ -151,11 +147,6 @@
.ant-card-body {
position: relative;
padding: 0 0 40px;
- >.anticon-question-circle {
- position: relative;
- left: 5px;
- top: 20px;
- }
> .anticon-setting {
position: absolute;
@@ -229,7 +220,6 @@
.ant-form-item-control-wrapper {
position: relative;
.ant-input-number {
- width: 100%;
margin-top: 4px;
}
.ant-select {
@@ -307,10 +297,6 @@
}
}
}
- .anticon-question-circle {
- position: absolute;
- left: 5px;
- }
}
.tab-list {
position: relative;
@@ -341,11 +327,6 @@
width: 100%;
}
}
- }
- > .anticon-question-circle {
- position: absolute;
- left: 5px;
- top: 20px;
}
> .anticon-plus {
position: absolute;
@@ -390,12 +371,6 @@
margin-right: 50px;
}
}
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -15px;
- top: 5px;
}
}
.setting {
diff --git a/src/templates/formtabconfig/settingform/index.jsx b/src/templates/formtabconfig/settingform/index.jsx
index 1c1cdfe..3d916d5 100644
--- a/src/templates/formtabconfig/settingform/index.jsx
+++ b/src/templates/formtabconfig/settingform/index.jsx
@@ -1,6 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Select, Tooltip, Icon, notification, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Select, Tooltip, notification, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import './index.scss'
@@ -281,7 +283,7 @@
{datatype === 'query' && interType !== 'outer' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" overlayClassName="middle" title={`鍙嚜瀹氫箟鏁版嵁澶勭悊鍑芥暟锛屽嚱鏁板悕绉伴渶浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鏈缃椂浼氳皟鐢ㄧ郴缁熷嚱鏁帮紝浣跨敤绯荤粺鍑芥暟闇�瀹屽杽鏁版嵁婧愩�俙}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{dict['header.form.innerFunc']}
</Tooltip>
}>
@@ -302,7 +304,7 @@
{datatype === 'query' && interType !== 'outer' ? <Col span={24}>
<Form.Item help={'鏁版嵁ID锛�' + menu.MenuID} label={
<Tooltip placement="topLeft" title="浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愶紝鑷畾涔夊嚱鏁版椂锛屽彲蹇界暐銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{'鏁版嵁婧�'}
</Tooltip>
} className="textarea">
diff --git a/src/templates/formtabconfig/settingform/index.scss b/src/templates/formtabconfig/settingform/index.scss
index 82ff4b9..bf9fa12 100644
--- a/src/templates/formtabconfig/settingform/index.scss
+++ b/src/templates/formtabconfig/settingform/index.scss
@@ -7,11 +7,4 @@
width: 83.33333333%;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- }
}
\ No newline at end of file
diff --git a/src/templates/menuconfig/editfirstmenu/menuform/index.scss b/src/templates/menuconfig/editfirstmenu/menuform/index.scss
index 838b936..9914d8e 100644
--- a/src/templates/menuconfig/editfirstmenu/menuform/index.scss
+++ b/src/templates/menuconfig/editfirstmenu/menuform/index.scss
@@ -15,6 +15,3 @@
.ant-advanced-search-form {
position: relative;
}
-.ant-advanced-search-form .ant-input-number {
- width: 100%;
-}
\ No newline at end of file
diff --git a/src/templates/menuconfig/menuform/index.scss b/src/templates/menuconfig/menuform/index.scss
index 838b936..9914d8e 100644
--- a/src/templates/menuconfig/menuform/index.scss
+++ b/src/templates/menuconfig/menuform/index.scss
@@ -15,6 +15,3 @@
.ant-advanced-search-form {
position: relative;
}
-.ant-advanced-search-form .ant-input-number {
- width: 100%;
-}
\ No newline at end of file
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index f2dfa6a..0b25add 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -1,6 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Select, DatePicker, Input, InputNumber, Button, Popover, Switch, Radio, Checkbox, Form } from 'antd'
+import { Select, DatePicker, Input, InputNumber, Button, Popover, Switch, Radio, Checkbox, Form } from 'antd'
+import { QuestionCircleOutlined, UploadOutlined, EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
@@ -84,7 +85,7 @@
} else if (card.type === 'brafteditor') {
formItem = (<Editor />)
} else if (card.type === 'fileupload') {
- formItem = (<Button style={{marginTop: '3px'}}><Icon type="upload" /> 鐐瑰嚮涓婁紶 </Button>)
+ formItem = (<Button style={{marginTop: '3px'}}><UploadOutlined /> 鐐瑰嚮涓婁紶 </Button>)
} else if (card.type === 'funcvar') {
formItem = (<Input style={{marginTop: '4px'}} value={card.linkfield} />)
} else if (card.type === 'linkMain') {
@@ -121,7 +122,7 @@
let _label = card.label
if (card.tooltip) {
- _label = <span><Icon type="question-circle" />{card.label}</span>
+ _label = <span><QuestionCircleOutlined className="mk-form-tip" />{card.label}</span>
}
if (card.type === 'brafteditor' && card.hidelabel === 'true') {
_label = null
@@ -130,9 +131,9 @@
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" type="edit" onClick={edit} />
- <Icon className="copy" type="copy" onClick={copy} />
- <Icon className="close" type="close" onClick={close} />
+ <EditOutlined className="edit" onClick={edit} />
+ <CopyOutlined className="copy" onClick={copy} />
+ <CloseOutlined className="close" onClick={close} />
</div>
} trigger="hover">
<div className="page-card" style={{ opacity: opacity}}>
diff --git a/src/templates/modalconfig/dragelement/index.scss b/src/templates/modalconfig/dragelement/index.scss
index e810030..82c2213 100644
--- a/src/templates/modalconfig/dragelement/index.scss
+++ b/src/templates/modalconfig/dragelement/index.scss
@@ -51,11 +51,6 @@
text-overflow: ellipsis;
white-space: nowrap;
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- line-height: 40px;
- }
}
.ant-form-item-control-wrapper {
position: relative;
@@ -88,7 +83,6 @@
margin-top: 4px;
}
.ant-input-number {
- width: 100%;
margin-top: 4px;
}
.color-sketch-block {
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index 9eea507..d2eea85 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -1,9 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, InputNumber, Select, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, Radio, InputNumber, Select, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import StyleInput from '@/menu/stylecontroller/styleInput'
-import './index.scss'
+// import './index.scss'
class SettingForm extends Component {
static propTpyes = {
@@ -79,7 +81,7 @@
}
return (
- <Form {...formItemLayout} className="ant-advanced-search-form modal-setting-form">
+ <Form {...formItemLayout}>
<Row gutter={24}>
<Col span={12}>
<Form.Item label="鏍囬">
@@ -104,7 +106,7 @@
{appType === 'mob' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="瀹藉害灏忎簬100鏃朵负鐧惧垎鐜囷紝澶т簬100鏃朵负缁濆鍊笺��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
瀹藉害
</Tooltip>
}>
@@ -135,7 +137,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鎵ц澶辫触鏃堕渶瑕佽仛鐒︾殑琛ㄥ崟銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
澶辫触鐒︾偣
</Tooltip>
}>
@@ -195,7 +197,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="闇�瑕侀�氳繃鏁版嵁婧愭煡璇㈢殑閫夐」锛屾槸鍚︿娇鐢ㄧ紦瀛樸��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
閫夐」鏌ヨ
</Tooltip>
}>
@@ -212,7 +214,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鎵撳嵃鎸夐挳涓棤鏁堛��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏄剧ず鏂瑰紡
</Tooltip>
}>
diff --git a/src/templates/modalconfig/settingform/index.scss b/src/templates/modalconfig/settingform/index.scss
index 9a74987..e69de29 100644
--- a/src/templates/modalconfig/settingform/index.scss
+++ b/src/templates/modalconfig/settingform/index.scss
@@ -1,18 +0,0 @@
-.ant-advanced-search-form.modal-setting-form {
- .textarea {
- .ant-form-item-label {
- width: 16.3%;
- }
- .ant-form-item-control-wrapper {
- width: 83.33333333%;
- }
- }
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
-}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 460a648..8f1d740 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -2,8 +2,9 @@
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
-import { btnIcons, btnClasses, formRule } from '@/utils/option.js'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+import { btnIcons, btnClasses, formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import './index.scss'
@@ -541,7 +542,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -563,7 +564,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -584,7 +585,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -619,7 +620,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -666,7 +667,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.scss b/src/templates/sharecomponent/actioncomponent/actionform/index.scss
index 653ac93..fab019a 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.scss
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.scss
@@ -18,14 +18,6 @@
margin-right: 4px;
}
}
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.with-button {
.ant-form-item-control-wrapper {
padding-right: 63px;
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index e3edc42..abfa8a0 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Tooltip, Modal, notification, Button } from 'antd'
+import { Tooltip, Modal, notification, Button } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -856,7 +857,7 @@
return (
<div className="model-table-action-list" style={config.charts.length > 1 ? {paddingTop: 25} : null}>
<Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.action.guide']}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined style={{color: '#c49f47', position: 'absolute', left: '5px', top: '5px'}} />
</Tooltip>
<DragElement
list={actionlist}
diff --git a/src/templates/sharecomponent/actioncomponent/index.scss b/src/templates/sharecomponent/actioncomponent/index.scss
index 93cc1b7..6a0e1f5 100644
--- a/src/templates/sharecomponent/actioncomponent/index.scss
+++ b/src/templates/sharecomponent/actioncomponent/index.scss
@@ -2,13 +2,6 @@
position: relative;
padding: 15px 25px 15px;
min-height: 65px;
-
- .anticon-question-circle {
- color: #c49f47;
- position: absolute;
- left: 5px;
- top: 5px;
- }
> .ant-row {
min-height: 65px;
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index ef53c38..1389b88 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Button, notification, Modal, Icon, Tooltip, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -288,7 +289,7 @@
<Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
<Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎵ц浣嶇疆
</Tooltip>
}>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 3701e1d..1fef86d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -2,6 +2,7 @@
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
import { Form, Tabs, Row, Col, Input, Button, Table, Popconfirm, Icon, Tooltip, notification, Modal, message, InputNumber, Radio, Typography } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -817,7 +818,7 @@
<Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title="蹇界暐棣栬鏃讹紝浼氭牎楠宔xcel涓〃澶村悕绉颁笌excel鍒楄缃槸鍚︿竴鑷淬��">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
蹇界暐琛�
</Tooltip>
}>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.scss b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.scss
index 6394765..0b2c26b 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.scss
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.scss
@@ -9,9 +9,6 @@
word-wrap: break-word;
word-break: break-word;
}
- .ant-input-number {
- width: 100%;
- }
.count-tip {
position: absolute;
top: 0px;
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.scss b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.scss
index 94b67c9..d44185c 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.scss
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.scss
@@ -9,9 +9,6 @@
word-wrap: break-word;
word-break: break-word;
}
- .ant-input-number {
- width: 100%;
- }
.count-tip {
position: absolute;
top: 0px;
diff --git a/src/templates/sharecomponent/cardcomponent/carddetailform/index.jsx b/src/templates/sharecomponent/cardcomponent/carddetailform/index.jsx
index 2601a4b..0a141c1 100644
--- a/src/templates/sharecomponent/cardcomponent/carddetailform/index.jsx
+++ b/src/templates/sharecomponent/cardcomponent/carddetailform/index.jsx
@@ -1,9 +1,10 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
-import './index.scss'
+// import './index.scss'
class MainSearch extends Component {
static propTpyes = {
@@ -116,7 +117,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -141,7 +142,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -199,7 +200,7 @@
}
]
})(
- <Radio.Group disabled={item.readonly} onChange={(e) => {this.typeChange(item.key, e.target.value)}}>
+ <Radio.Group style={{whiteSpace: 'nowrap'}} disabled={item.readonly} onChange={(e) => {this.typeChange(item.key, e.target.value)}}>
{
item.options.map(option => {
return (
@@ -291,7 +292,7 @@
}
}
return (
- <Form {...formItemLayout} className="card-detail-edit-form" id="card-detail-edit-form">
+ <Form {...formItemLayout} style={{minHeight: '190px'}} id="card-detail-edit-form">
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/templates/sharecomponent/cardcomponent/carddetailform/index.scss b/src/templates/sharecomponent/cardcomponent/carddetailform/index.scss
index 24d7c01..e69de29 100644
--- a/src/templates/sharecomponent/cardcomponent/carddetailform/index.scss
+++ b/src/templates/sharecomponent/cardcomponent/carddetailform/index.scss
@@ -1,16 +0,0 @@
-.card-detail-edit-form {
- min-height: 190px;
- .ant-form-item {
- .ant-input-number {
- width: 100%;
- }
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-radio-group {
- white-space: nowrap;
- }
-}
diff --git a/src/templates/sharecomponent/chartcomponent/chartcompile/index.jsx b/src/templates/sharecomponent/chartcomponent/chartcompile/index.jsx
index 234bc0c..92dcaab 100644
--- a/src/templates/sharecomponent/chartcomponent/chartcompile/index.jsx
+++ b/src/templates/sharecomponent/chartcomponent/chartcompile/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Drawer, Form, Button, Col, Row, Select, Icon, Radio, Tooltip, Input, InputNumber, Cascader } from 'antd'
+import { Drawer, Form, Button, Col, Row, Select, Radio, Tooltip, Input, InputNumber, Cascader } from 'antd'
+import { QuestionCircleOutlined, RightOutlined, EditOutlined, LeftOutlined } from '@ant-design/icons'
import { getChartOptionForm } from '@/templates/zshare/formconfig'
import { minkeColorSystem, colorTransform } from '@/utils/option.js'
@@ -129,7 +130,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -150,7 +151,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -171,7 +172,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -200,7 +201,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -494,7 +495,7 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" onClick={this.showDrawer} />
+ <EditOutlined onClick={this.showDrawer} />
<Drawer
title="鍥捐〃缂栬緫"
className="chart-drawer-form"
@@ -506,13 +507,13 @@
{view !== 'custom' ? <Form {...formItemLayout} className="base-setting">
<Row gutter={16}>{this.getFields()}</Row>
{datatype === 'query' ? <Row gutter={16}>
- <Button onClick={this.changeView} style={{border: 0, boxShadow: 'unset',float: 'right', color: '#1890ff', marginRight: 12, cursor: 'pointer'}}>鑷畾涔夎缃�<Icon style={{marginLeft: 5}} type="right" /></Button>
+ <Button onClick={this.changeView} style={{border: 0, boxShadow: 'unset',float: 'right', color: '#1890ff', marginRight: 12, cursor: 'pointer'}}>鑷畾涔夎缃�<RightOutlined style={{marginLeft: 5}} /></Button>
</Row> : null}
</Form> : null}
{view === 'custom' ? <Form {...formItemLayout} id="chart-custom-drawer-form" className="mingke-table">
<Row gutter={16} style={{minHeight: 'calc(100vh - 180px)'}}>{this.getCustomFields()}</Row>
<Row gutter={16}>
- <Button onClick={this.changeView} style={{border: 0, boxShadow: 'unset', color: '#1890ff', marginRight: 12, cursor: 'pointer'}}><Icon style={{marginRight: 5}} type="left" />鍩烘湰璁剧疆</Button>
+ <Button onClick={this.changeView} style={{border: 0, boxShadow: 'unset', color: '#1890ff', marginRight: 12, cursor: 'pointer'}}><LeftOutlined style={{marginRight: 5}} />鍩烘湰璁剧疆</Button>
</Row>
</Form> : null}
<div
diff --git a/src/templates/sharecomponent/chartcomponent/chartcompile/index.scss b/src/templates/sharecomponent/chartcomponent/chartcompile/index.scss
index 77a5f4e..bf74e45 100644
--- a/src/templates/sharecomponent/chartcomponent/chartcompile/index.scss
+++ b/src/templates/sharecomponent/chartcomponent/chartcompile/index.scss
@@ -14,14 +14,6 @@
.ant-drawer-body {
max-height: calc(100vh - 60px);
overflow-y: auto;
-
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- }
}
.ant-drawer-body::-webkit-scrollbar {
width: 7px;
diff --git a/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx b/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx
index 86b99e9..eb1f155 100644
--- a/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx
+++ b/src/templates/sharecomponent/chartgroupcomponent/chartform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import line1 from '@/assets/img/line1.png'
@@ -298,7 +299,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -323,7 +324,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -344,7 +345,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -379,7 +380,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -410,7 +411,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/templates/sharecomponent/chartgroupcomponent/chartform/index.scss b/src/templates/sharecomponent/chartgroupcomponent/chartform/index.scss
index 0f531dd..823824f 100644
--- a/src/templates/sharecomponent/chartgroupcomponent/chartform/index.scss
+++ b/src/templates/sharecomponent/chartgroupcomponent/chartform/index.scss
@@ -1,15 +1,5 @@
.chart-edit-form {
min-height: 190px;
- .ant-form-item {
- .ant-input-number {
- width: 100%;
- }
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
.chart-model-image {
.ant-col-6 {
min-height: 110px;
diff --git a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
index 2729c01..5a7f9b8 100644
--- a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
@@ -1,9 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, InputNumber, Select, Radio, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, InputNumber, Select, Radio, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import TransferForm from '@/templates/zshare/transferform'
-import './index.scss'
+// import './index.scss'
class MainSearch extends Component {
static propTpyes = {
@@ -75,7 +77,7 @@
}
}
return (
- <Form {...formItemLayout} className="commontable-cospan-column-form" id="columncolspan">
+ <Form {...formItemLayout} style={{minHeight: '190px'}} id="columncolspan">
<Row gutter={24}>
<Col span={12}>
<Form.Item label={this.props.dict['model.name']}>
@@ -144,7 +146,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="閫夋嫨鏄剧ず鍒嗙粍锛岃〃鏍间細灞曞紑娣诲姞鍒嗙粍鐨勫瓙鍒楋紝姝ゆ椂鎺掑垪鏂瑰紡浼氬け鏁堛��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏄剧ず鍒嗙粍
</Tooltip>
}>
diff --git a/src/templates/sharecomponent/columncomponent/colspanform/index.scss b/src/templates/sharecomponent/columncomponent/colspanform/index.scss
index d39b484..e69de29 100644
--- a/src/templates/sharecomponent/columncomponent/colspanform/index.scss
+++ b/src/templates/sharecomponent/columncomponent/colspanform/index.scss
@@ -1,13 +0,0 @@
-.commontable-cospan-column-form {
- min-height: 190px;
- .ant-form-item {
- .ant-input-number {
- width: 100%;
- }
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
-}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/columncomponent/columnform/index.jsx b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
index 5efbdd6..2991a73 100644
--- a/src/templates/sharecomponent/columncomponent/columnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/columnform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Icon, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import './index.scss'
@@ -160,7 +161,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -182,7 +183,7 @@
<Col span={24} key={index} className="textarea">
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -203,7 +204,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -254,7 +255,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/templates/sharecomponent/columncomponent/columnform/index.scss b/src/templates/sharecomponent/columncomponent/columnform/index.scss
index e450762..0b02ab2 100644
--- a/src/templates/sharecomponent/columncomponent/columnform/index.scss
+++ b/src/templates/sharecomponent/columncomponent/columnform/index.scss
@@ -1,15 +1,6 @@
.commontable-column-form {
min-height: 190px;
- .ant-form-item {
- .ant-input-number {
- width: 100%;
- }
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
+
.ant-cascader-menus {
padding: 5px 0px;
.ant-cascader-menu:last-child {
diff --git a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
index ccbb363..17b5968 100644
--- a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Select, InputNumber, Radio } from 'antd'
import { formRule } from '@/utils/option.js'
-import './index.scss'
+// import './index.scss'
class MainSearch extends Component {
static propTpyes = {
@@ -208,7 +208,7 @@
}
}
return (
- <Form {...formItemLayout} className="commontable-gridbtn-column-form" id="gridbtncolumnwinter">
+ <Form {...formItemLayout} style={{minHeight: '190px'}} id="gridbtncolumnwinter">
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/templates/sharecomponent/columncomponent/gridbtnform/index.scss b/src/templates/sharecomponent/columncomponent/gridbtnform/index.scss
index abb563c..e69de29 100644
--- a/src/templates/sharecomponent/columncomponent/gridbtnform/index.scss
+++ b/src/templates/sharecomponent/columncomponent/gridbtnform/index.scss
@@ -1,8 +0,0 @@
-.commontable-gridbtn-column-form {
- min-height: 190px;
- .ant-form-item {
- .ant-input-number {
- width: 100%;
- }
- }
-}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index 63a0a8d..357dfd8 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Tooltip, Modal, notification, Switch, message } from 'antd'
+import { Tooltip, Modal, notification, Switch, message } from 'antd'
+import { QuestionCircleOutlined, CopyOutlined } from '@ant-design/icons'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -493,10 +494,10 @@
return (
<div className="model-table-column-list">
<Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.column.guide']}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined style={{color: '#c49f47', position: 'relative', left: '-15px', top: '5px'}} />
</Tooltip>
{columnlist && columnlist.length > 0 ?
- <Icon className="column-copy" title="copy" type="copy" onClick={this.copycolumn} /> : null
+ <CopyOutlined className="column-copy" title="copy" onClick={this.copycolumn} /> : null
}
<Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={this.onFieldChange} />
<DragElement
diff --git a/src/templates/sharecomponent/columncomponent/index.scss b/src/templates/sharecomponent/columncomponent/index.scss
index 73abbcf..d2ea50c 100644
--- a/src/templates/sharecomponent/columncomponent/index.scss
+++ b/src/templates/sharecomponent/columncomponent/index.scss
@@ -2,12 +2,6 @@
position: relative;
padding: 0px 20px 100px;
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -15px;
- top: 5px;
- }
.ant-switch {
position: absolute;
right: 20px;
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/index.scss b/src/templates/sharecomponent/columncomponent/markcolumn/index.scss
index 3502583..3d35325 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/index.scss
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/index.scss
@@ -1,15 +1,7 @@
#mark-column-box-modal {
- .ant-form-item-label .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
table tr td {
word-wrap: break-word;
word-break: break-word;
- }
- .ant-input-number {
- width: 100%;
}
.mingke-table .ant-empty {
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
index 4fbbbac..5785dd4 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Button, Input, Radio, Icon, Cascader, Tooltip } from 'antd'
+import { Form, Row, Col, Select, Button, Input, Radio, Icon, Cascader } from 'antd'
import { minkeColorSystem, minkeIconSystem } from '@/utils/option.js'
import './index.scss'
@@ -187,7 +187,7 @@
<Form {...formItemLayout} id="model-mark-form-box" className="mingke-table">
<Row gutter={24}>
<Col span={6}>
- <Form.Item label={'瀛楁'}>
+ <Form.Item label="瀛楁">
{getFieldDecorator('field', {
initialValue: originField.field,
rules: [
@@ -210,7 +210,7 @@
</Form.Item>
</Col>
<Col span={6}>
- <Form.Item label={'瀵规瘮绫诲瀷'}>
+ <Form.Item label="瀵规瘮绫诲瀷">
{getFieldDecorator('contrastType', {
initialValue: 'static'
})(
@@ -222,7 +222,7 @@
</Form.Item>
</Col>
<Col span={6}>
- <Form.Item label={'瀵规瘮鏂瑰紡'}>
+ <Form.Item label="瀵规瘮鏂瑰紡">
{getFieldDecorator('match', {
initialValue: '=',
rules: [
@@ -243,14 +243,14 @@
</Form.Item>
</Col>
{contrastType === 'static' ? <Col span={6}>
- <Form.Item label={'瀵规瘮鍊�'}>
+ <Form.Item label="瀵规瘮鍊�">
{getFieldDecorator('contrastValue', {
initialValue: ''
})(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
{contrastType === 'dynamic' ? <Col span={6}>
- <Form.Item label={'瀵规瘮瀛楁'}>
+ <Form.Item label="瀵规瘮瀛楁">
{getFieldDecorator('contrastField', {
initialValue: '',
rules: [
@@ -272,12 +272,7 @@
</Form.Item>
</Col> : null}
<Col span={6}>
- <Form.Item label={
- <Tooltip placement="topLeft" title="鍗＄墖绫诲瀷锛屽湪鍗＄墖鍥捐〃涓捣鏁�">
- <Icon type="question-circle" />
- {'鏍囪'}
- </Tooltip>
- }>
+ <Form.Item label="鏍囪鏂瑰紡">
{getFieldDecorator('signType', {
initialValue: 'background',
rules: [
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 73cae07..5179021 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Tooltip, Modal, notification, Switch } from 'antd'
+import { Tooltip, Modal, notification, Switch } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -336,7 +337,7 @@
return (
<div className={'model-table-search-list length' + searchlist.length}>
<Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.search.guide']}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined style={{color: '#c49f47', position: 'relative', left: '-15px', top: '5px'}} />
</Tooltip>
<FieldsComponent config={{uuid: config.uuid, search: searchlist}} type="search" />
<Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={showField} onChange={this.onFieldChange} />
diff --git a/src/templates/sharecomponent/searchcomponent/index.scss b/src/templates/sharecomponent/searchcomponent/index.scss
index 9ab67a9..e8da957 100644
--- a/src/templates/sharecomponent/searchcomponent/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/index.scss
@@ -7,12 +7,6 @@
.quickly-add {
display: none;
}
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -15px;
- top: 5px;
- }
>.ant-switch {
position: absolute;
z-index: 1;
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 88f8bfc..db164c5 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -2,6 +2,8 @@
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber, Checkbox, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { dateOptions, matchReg, formRule } from '@/utils/option.js'
import EditTable from '../searcheditable'
import Utils from '@/utils/utils.js'
@@ -417,7 +419,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -439,7 +441,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -492,7 +494,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.scss b/src/templates/sharecomponent/searchcomponent/searchform/index.scss
index 56d3f89..4624854 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.scss
@@ -16,14 +16,6 @@
height: 150px;
}
}
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-checkbox-group {
.ant-checkbox-group-item {
.ant-checkbox + span {
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss b/src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss
index 1722c65..420b3ef 100644
--- a/src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss
@@ -30,9 +30,6 @@
z-index: 2;
}
.verify-form {
- .ant-input-number {
- width: 100%;
- }
.sql {
.ant-col-sm-8 {
width: 10.5%;
@@ -64,10 +61,6 @@
}
.add {
padding-top: 4px;
- }
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
}
}
.custom-table .ant-empty {
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
index 0c63b49..36a31c8 100644
--- a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, notification, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, notification, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -214,7 +215,7 @@
{interType === 'inner' ? <Col span={8}>
<Form.Item label={tooltip ?
<Tooltip placement="topLeft" title={tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍐呴儴鍑芥暟
</Tooltip> : '鍐呴儴鍑芥暟'
}>
@@ -250,7 +251,7 @@
{interType === 'system' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
<Form.Item labelCol={{xs: { span: 24 }, sm: { span: 2 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 22 }} } label={
<Tooltip placement="topLeft" title={'浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\''}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏁版嵁婧�
</Tooltip>
}>
@@ -262,7 +263,7 @@
{interType === 'system' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏌ヨ鏃讹紝鎼滅储鏉′欢浠here鏉′欢鎷兼帴杩涘叆sql锛岀粺璁℃椂锛屽皢鏁版嵁婧愪腑浠モ�淍+鎼滅储瀛楁+@鈥濈殑鍐呭锛屼互鎼滅储鏉′欢涓殑鍊艰繘琛屾浛鎹㈠悗锛屾彁浜ゆ煡璇紝娉細鏌ヨ绫诲瀷浠呭湪浣跨敤绯荤粺鍑芥暟鏃舵湁鏁堛��'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏌ヨ绫诲瀷
</Tooltip>
}>
@@ -315,7 +316,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
楂樼骇鎼滅储
</Tooltip>
}>
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss
index 68adfba..c7c4f3f 100644
--- a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss
@@ -13,10 +13,6 @@
height: 150px;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
.ant-radio-group {
white-space: nowrap;
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 80be5e8..1ad7820 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, notification, Select, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, notification, Select, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -297,7 +298,7 @@
{interType === 'custom' && procMode === 'inner' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={funcTooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍓嶇疆鍑芥暟
</Tooltip>
}>
@@ -333,7 +334,7 @@
{interType === 'outer' || interType === 'custom' ? <Col className="data-source" span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="姝ｅ紡绯荤粺鎵�浣跨敤鐨勭殑鎺ュ彛鍦板潃銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
姝ｅ紡鍦板潃
</Tooltip>
}>
@@ -379,7 +380,7 @@
{interType === 'inner' || (interType === 'custom' && requestMode === 'inner') ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={funcTooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍐呴儴鍑芥暟
</Tooltip>
}>
@@ -418,7 +419,7 @@
{interType === 'system' || (interType === 'custom' && requestMode === 'system') ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
<Form.Item help={'鏁版嵁ID锛�' + menu.MenuID} labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} } label={
<Tooltip placement="topLeft" title={`浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� ''銆� @$ -> */ 鎴� ''锛涙煡璇㈡浛鎹㈢ $select@ -> /* 鎴� ''銆� @select$ -> */ 鎴� ''锛涚粺璁℃浛鎹㈢ $sum@ -> /* 鎴� ''銆� @sum$ -> */ 鎴� ''銆俙}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏁版嵁婧�
</Tooltip>
}>
@@ -430,7 +431,7 @@
{interType === 'system' || (interType === 'custom' && requestMode === 'system') ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏌ヨ鏃讹紝鎼滅储鏉′欢浠here鏉′欢鎷兼帴杩涘叆sql锛岀粺璁℃椂锛屽皢鏁版嵁婧愪腑浠モ�淍+鎼滅储瀛楁+@鈥濈殑鍐呭锛屼互鎼滅储鏉′欢涓殑鍊艰繘琛屾浛鎹㈠悗锛屾彁浜ゆ煡璇紝娉細鏌ヨ绫诲瀷浠呭湪浣跨敤绯荤粺鍑芥暟鏃舵湁鏁堛��'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏌ヨ绫诲瀷
</Tooltip>
}>
@@ -518,7 +519,7 @@
{interType === 'custom' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鍚屾鎵ц锛氬閮ㄦ帴鍙ｈ皟鐢ㄦ垚鍔熷悗鍐嶈姹傛暟鎹紱寮傛鎵ц锛氬閮ㄦ帴鍙ｈ皟鐢ㄤ笌璇锋眰鏁版嵁鍚屾椂杩涜銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎵ц鏂瑰紡
</Tooltip>
}>
@@ -534,7 +535,7 @@
{interType === 'custom' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'濡傛灉鑷畾涔夋帴鍙ｄ笉鏀寔璺ㄥ煙璇锋眰锛屼細閫氳繃褰撳墠绯荤粺杞彂銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
璺ㄥ煙璇锋眰
</Tooltip>
}>
@@ -594,7 +595,7 @@
{config.Template === 'CommonTable' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鍚湁鍚堝苟鍒楁垨琛ㄦ牸鍑虹幇妯悜婊氬姩鏃朵細鏄剧ず寮傚父锛岃鎱庣敤锛�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
琛ㄥご鍥哄畾
</Tooltip>
}>
@@ -621,7 +622,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'琛ㄦ牸鐨勫唴杈硅窛锛屼粠澶у埌灏忎緷娆￠�掑噺銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
琛ㄦ牸澶у皬
</Tooltip>
}>
@@ -650,7 +651,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤鎬ラ�熸ā寮忔椂锛岃〃鏍间腑鐨勬爣璁般�佸弻鍑讳簨浠躲�佹牸寮忓寲銆佽鍚堝苟銆佸墠缂�銆佸悗缂�銆佸瓧娈甸�忚绛夋晥鏋滃皢鏃犳晥锛屼笖鏁版嵁閮戒細浠ユ枃鏈牸寮忔樉绀恒��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
妯″紡
</Tooltip>
}>
@@ -666,7 +667,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鏁版嵁鍔犺浇鏃讹紝鏄惁鏄剧ず鍔犺浇涓殑閬僵銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
閬僵
</Tooltip>
}>
@@ -682,7 +683,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄦ悳绱㈡潯浠跺瓨鍦ㄦ椂锛屾槸鍚︽樉绀烘悳绱㈠拰閲嶇疆鎸夐挳銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎼滅储鎸夐挳
</Tooltip>
}>
@@ -698,7 +699,7 @@
{tableType !== '' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄥ惎鐢ㄦ棤浜哄�煎畧鍔熻兘鏃舵棤鏁堛��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
棣栬閫変腑
</Tooltip>
}>
@@ -715,7 +716,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="閫夋嫨鍒嗛〉鏃舵湁鏁堬紝榛樿涓�10鏉°��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
姣忛〉鏁伴噺
</Tooltip>
}>
@@ -727,7 +728,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
楂樼骇鎼滅储
</Tooltip>
}>
@@ -739,7 +740,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍙屽嚮琛ㄦ牸涓锛岃Е鍙戠殑鎸夐挳銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍙屽嚮浜嬩欢
</Tooltip>
}>
@@ -757,7 +758,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="绌哄�兼椂楂樺害鑷�傚簲銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
table楂樺害
</Tooltip>
}>
@@ -769,7 +770,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="榛樿鍊紃gba(0, 0, 0, 0.65)">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
瀛椾綋棰滆壊
</Tooltip>
}>
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.scss b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.scss
index 969eb89..c432f3e 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.scss
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.scss
@@ -13,13 +13,6 @@
height: 150px;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- }
}
.color-sketch-block {
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.scss b/src/templates/sharecomponent/settingcomponent/settingform/index.scss
index 765f750..2166d9b 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.scss
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.scss
@@ -21,10 +21,6 @@
width: 83.33333333%;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.text-area {
.CodeMirror {
height: 150px;
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index d6aca93..abb58fe 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Icon, Tooltip, Select, List, notification } from 'antd'
+import { Tooltip, Select, List, notification } from 'antd'
+import { QuestionCircleOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -275,7 +276,7 @@
<div className="ant-col ant-form-item-label">
<label>
<Tooltip placement="topLeft" title={dict['model.tooltip.table.guide']}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{dict['header.menu.table.add']}
</Tooltip>
</label>
@@ -304,7 +305,7 @@
dataSource={selectedTables}
renderItem={(item, index) => <List.Item key={index} title={item.Remark + ' (' + item.TbName + ')'}>
{item.Remark + ' (' + item.TbName + ')'}
- <Icon type="close" onClick={() => this.deleteTable(item)}/>
+ <CloseOutlined onClick={() => this.deleteTable(item)}/>
<div className="bottom-mask"></div>
</List.Item>}
/>}
diff --git a/src/templates/sharecomponent/tablecomponent/index.scss b/src/templates/sharecomponent/tablecomponent/index.scss
index fa82d90..aa254b7 100644
--- a/src/templates/sharecomponent/tablecomponent/index.scss
+++ b/src/templates/sharecomponent/tablecomponent/index.scss
@@ -4,8 +4,4 @@
opacity: 0.4!important;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/tabscomponent/index.jsx b/src/templates/sharecomponent/tabscomponent/index.jsx
index b3dff40..3db153a 100644
--- a/src/templates/sharecomponent/tabscomponent/index.jsx
+++ b/src/templates/sharecomponent/tabscomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Tooltip, Modal, notification } from 'antd'
+import { Tooltip, Modal, notification } from 'antd'
+import { QuestionCircleOutlined, ArrowDownOutlined, ArrowUpOutlined, PlusOutlined, DeleteOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
@@ -392,14 +393,14 @@
return (
<div key={index} className="tab-line-list">
{index === 0 ? <Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.tabs.guide']}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined style={{color: '#c49f47', position: 'absolute', left: '5px', top: '20px'}} />
</Tooltip> : null}
{index !== (tabgroups.length - 1) ?
- <Icon type="arrow-down" onClick={() => {this.handleGroup(index, 'down')}} /> : null
+ <ArrowDownOutlined onClick={() => {this.handleGroup(index, 'down')}} /> : null
}
- {index !== 0 ? <Icon type="arrow-up" onClick={() => {this.handleGroup(index, 'up')}} /> : null}
- {index === 0 ? <Icon type="plus" onClick={this.addTabGroup} /> : null}
- {index !== 0 ? <Icon type="delete" onClick={() => {this.delTabGroup(group)}} /> : null}
+ {index !== 0 ? <ArrowUpOutlined onClick={() => {this.handleGroup(index, 'up')}} /> : null}
+ {index === 0 ? <PlusOutlined onClick={this.addTabGroup} /> : null}
+ {index !== 0 ? <DeleteOutlined onClick={() => {this.delTabGroup(group)}} /> : null}
<TabDragElement
list={group.sublist}
handleList={(list, newcard) => this.handleList(list, newcard, group.uuid)}
diff --git a/src/templates/sharecomponent/tabscomponent/index.scss b/src/templates/sharecomponent/tabscomponent/index.scss
index 05e02d0..0356feb 100644
--- a/src/templates/sharecomponent/tabscomponent/index.scss
+++ b/src/templates/sharecomponent/tabscomponent/index.scss
@@ -30,12 +30,6 @@
}
}
}
- > .anticon-question-circle {
- color: #c49f47;
- position: absolute;
- left: 5px;
- top: 20px;
- }
> .anticon-plus {
position: absolute;
font-size: 18px;
diff --git a/src/templates/sharecomponent/tabscomponent/tabform/index.jsx b/src/templates/sharecomponent/tabscomponent/tabform/index.jsx
index ba87b46..267c67c 100644
--- a/src/templates/sharecomponent/tabscomponent/tabform/index.jsx
+++ b/src/templates/sharecomponent/tabscomponent/tabform/index.jsx
@@ -1,10 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Select, Icon, Tooltip, Radio, InputNumber, notification } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
-import './index.scss'
-
+// import './index.scss'
class MainTab extends Component {
static propTpyes = {
@@ -125,7 +126,7 @@
<Form.Item label={
item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -152,7 +153,7 @@
<Form.Item label={
item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -164,7 +165,7 @@
message: this.props.dict['form.required.input'] + item.label + '!'
}
]
- })(<InputNumber disabled={item.readonly} min={item.min} max={item.max} precision={0} />)}
+ })(<InputNumber min={item.min} max={item.max} precision={0} />)}
</Form.Item>
</Col>
)
@@ -202,7 +203,7 @@
<Form.Item label={
item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -227,7 +228,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -303,7 +304,7 @@
}
}
return (
- <Form {...formItemLayout} className="model-tab-form">
+ <Form {...formItemLayout} style={{minHeight: '180px'}}>
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/templates/sharecomponent/tabscomponent/tabform/index.scss b/src/templates/sharecomponent/tabscomponent/tabform/index.scss
index d9327f1..e69de29 100644
--- a/src/templates/sharecomponent/tabscomponent/tabform/index.scss
+++ b/src/templates/sharecomponent/tabscomponent/tabform/index.scss
@@ -1,16 +0,0 @@
-.model-tab-form {
- min-height: 180px;
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- .ant-input-number-input:read-only {
- color: red;
- :hover {
- border-color: #d9d9d9;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/treesettingcomponent/index.scss b/src/templates/sharecomponent/treesettingcomponent/index.scss
index 2875bc1..1a2db19 100644
--- a/src/templates/sharecomponent/treesettingcomponent/index.scss
+++ b/src/templates/sharecomponent/treesettingcomponent/index.scss
@@ -36,8 +36,5 @@
.ant-empty-normal {
margin: 5px 0px;
}
- .ant-input-number {
- width: 100%;
- }
}
}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx
index 208815c..0bf23eb 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, notification, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, notification, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -263,7 +264,7 @@
{interType === 'inner' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={funcTooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍐呴儴鍑芥暟
</Tooltip>
}>
@@ -315,7 +316,7 @@
{interType === 'system' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
<Form.Item help={'鏁版嵁ID锛�' + menu.MenuID} labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} } label={
<Tooltip placement="topLeft" title={'浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\''}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏁版嵁婧�
</Tooltip>
}>
@@ -327,7 +328,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏁版嵁鍊煎瓧娈点��'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
Value
</Tooltip>
}>
@@ -352,7 +353,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏄剧ず鏂囧瓧瀛楁銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
Label
</Tooltip>
}>
@@ -377,7 +378,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鐖剁骇瀛楁銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
Parent
</Tooltip>
}>
@@ -419,7 +420,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鐖剁骇瀛楁鍊间笌椤剁骇鏍囪瘑鐩稿悓鏃讹紝瑙嗕负椤剁骇鑺傜偣銆�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
椤剁骇鏍囪瘑
</Tooltip>
}>
@@ -437,7 +438,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒楋紝鏍戝舰姣斾緥鍙缃负2-12锛堟渶澶�50%锛�'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
瀹藉害
</Tooltip>
}>
diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.scss b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.scss
index a6d2df7..aeabe5f 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.scss
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.scss
@@ -13,10 +13,5 @@
height: 150px;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
-
}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/index.scss b/src/templates/sharecomponent/treesettingcomponent/settingform/index.scss
index e8742ec..f2570ad 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/index.scss
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/index.scss
@@ -11,10 +11,6 @@
height: 150px;
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
.count-tip {
position: absolute;
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index c561696..beed453 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -4,7 +4,8 @@
import { is, fromJS } from 'immutable'
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
-import { Button, Card, Modal, Collapse, notification, Spin, Icon, Switch, Tooltip, Col } from 'antd'
+import { Button, Card, Modal, Collapse, notification, Spin, Switch, Tooltip, Col } from 'antd'
+import { QuestionCircleOutlined, RedoOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -1017,7 +1018,7 @@
{confActions.length > 0 ?
<p className="config-btn-title">
<Tooltip placement="topLeft" title="鐐瑰嚮鎸夐挳锛屽彲瀹屾垚鎴栨煡鐪嬫寜閽厤缃俊鎭��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
</Tooltip>
{this.state.dict['header.menu.action.configurable']}
</p> : null
@@ -1051,7 +1052,7 @@
<Card title={
<div>
鏍囩锛堝瓙琛級椤甸潰閰嶇疆
- <Icon type="redo" style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={() => this.reloadTab(true)} />
+ <RedoOutlined style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={() => this.reloadTab(true)} />
</div>
} bordered={false} extra={
<div>
diff --git a/src/templates/subtableconfig/index.scss b/src/templates/subtableconfig/index.scss
index 2012d7c..f17d953 100644
--- a/src/templates/subtableconfig/index.scss
+++ b/src/templates/subtableconfig/index.scss
@@ -94,10 +94,6 @@
}
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.config-button {
min-width: 65px;
}
@@ -177,12 +173,6 @@
top: 10px;
}
}
- // .anticon-question-circle {
- // color: #c49f47;
- // position: relative;
- // left: -15px;
- // top: 5px;
- // }
}
.setting {
overflow-y: scroll;
diff --git a/src/templates/treepageconfig/index.jsx b/src/templates/treepageconfig/index.jsx
index d1aa9bd..814810f 100644
--- a/src/templates/treepageconfig/index.jsx
+++ b/src/templates/treepageconfig/index.jsx
@@ -4,7 +4,8 @@
import { is, fromJS } from 'immutable'
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
-import { Button, Card, Modal, Collapse, notification, Spin, Icon, Switch, Tooltip, Row, Col, Tree } from 'antd'
+import { Button, Card, Modal, Collapse, notification, Spin, Switch, Tooltip, Row, Col, Tree } from 'antd'
+import { QuestionCircleOutlined, RedoOutlined, SearchOutlined, FileOutlined, FolderOpenOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -681,7 +682,7 @@
{configTabs.length > 0 ?
<p className="config-btn-title">
<Tooltip placement="topLeft" title="鐐瑰嚮鎸夐挳锛屽彲瀹屾垚鎴栨煡鐪嬫爣绛鹃厤缃俊鎭��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
</Tooltip>
{this.state.dict['header.menu.tab.configurable']}
</p> : null
@@ -705,7 +706,7 @@
<Card title={
<div>
{this.state.dict['header.menu.page.configurable']}
- <Icon type="redo" style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={() => this.reloadTab(true)} />
+ <RedoOutlined style={{marginLeft: '10px'}} title="鍒锋柊鏍囩鍒楄〃" onClick={() => this.reloadTab(true)} />
</div>
} bordered={false} extra={
<div>
@@ -726,7 +727,7 @@
title={
<span className="tree-title">
<span className="title">{config.setting.title}</span>
- {config.setting.searchable !== 'false' ? <span className="ant-input-search ant-input-affix-wrapper"><span className="ant-input-suffix"><Icon type="search" /></span></span> : null}
+ {config.setting.searchable !== 'false' ? <span className="ant-input-search ant-input-affix-wrapper"><span className="ant-input-suffix"><SearchOutlined /></span></span> : null}
</span>
}
bordered={false}
@@ -738,13 +739,13 @@
showIcon={config.setting.showIcon === 'true'}
showLine={config.setting.showLine === 'true'}
>
- <TreeNode icon={<Icon type="folder-open" />} title="parent 0" key="0-0">
- <TreeNode icon={<Icon type="file" />} title="leaf 0-0" key="0-0-0" isLeaf />
- <TreeNode icon={<Icon type="file" />} title="leaf 0-1" key="0-0-1" isLeaf />
+ <TreeNode icon={<FolderOpenOutlined />} title="parent 0" key="0-0">
+ <TreeNode icon={<FileOutlined />} title="leaf 0-0" key="0-0-0" isLeaf />
+ <TreeNode icon={<FileOutlined />} title="leaf 0-1" key="0-0-1" isLeaf />
</TreeNode>
- <TreeNode icon={<Icon type="folder-open" />} title="parent 1" key="0-1">
- <TreeNode icon={<Icon type="file" />} title="leaf 1-0" key="0-1-0" isLeaf />
- <TreeNode icon={<Icon type="file" />} title="leaf 1-1" key="0-1-1" isLeaf />
+ <TreeNode icon={<FolderOpenOutlined />} title="parent 1" key="0-1">
+ <TreeNode icon={<FileOutlined />} title="leaf 1-0" key="0-1-0" isLeaf />
+ <TreeNode icon={<FileOutlined />} title="leaf 1-1" key="0-1-1" isLeaf />
</TreeNode>
</Tree>
</div>
diff --git a/src/templates/treepageconfig/index.scss b/src/templates/treepageconfig/index.scss
index bf89c4a..7f5f634 100644
--- a/src/templates/treepageconfig/index.scss
+++ b/src/templates/treepageconfig/index.scss
@@ -85,10 +85,6 @@
}
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.config-button {
min-width: 65px;
}
@@ -212,7 +208,7 @@
.model-table-tab-list .tab-line-list {
padding-top: 0px;
> .anticon-question-circle {
- top: 10px;
+ top: 10px!important;
}
> .anticon-plus {
top: 15px;
diff --git a/src/templates/zshare/createinterface/mutilform/index.jsx b/src/templates/zshare/createinterface/mutilform/index.jsx
index 9d53447..918e31e 100644
--- a/src/templates/zshare/createinterface/mutilform/index.jsx
+++ b/src/templates/zshare/createinterface/mutilform/index.jsx
@@ -1,7 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Select, Tooltip, Icon } from 'antd'
-import './index.scss'
+import { Form, Row, Col, Input, Radio, Select, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
+// import './index.scss'
class MainSearch extends Component {
static propTpyes = {
@@ -34,7 +36,7 @@
<Col span={24} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -80,7 +82,7 @@
<Col span={24} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -133,7 +135,7 @@
}
}
return (
- <Form {...formItemLayout} className="create-Interface-setting-form">
+ <Form {...formItemLayout}>
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/templates/zshare/createinterface/mutilform/index.scss b/src/templates/zshare/createinterface/mutilform/index.scss
index f809f4d..e69de29 100644
--- a/src/templates/zshare/createinterface/mutilform/index.scss
+++ b/src/templates/zshare/createinterface/mutilform/index.scss
@@ -1,6 +0,0 @@
-.create-Interface-setting-form {
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
-}
\ No newline at end of file
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index ab6eb9b..a210a4b 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -2,6 +2,8 @@
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
import { Form, Row, Col, Input, Select, Icon, Radio, notification, InputNumber, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import { dateOptions } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
@@ -476,7 +478,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -499,7 +501,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -520,7 +522,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -542,7 +544,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -576,7 +578,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -602,7 +604,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -647,7 +649,7 @@
<Col span={24} key={index}>
<Form.Item className="text-msg" label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/templates/zshare/modalform/index.scss b/src/templates/zshare/modalform/index.scss
index 672e7e4..7e46fda 100644
--- a/src/templates/zshare/modalform/index.scss
+++ b/src/templates/zshare/modalform/index.scss
@@ -23,15 +23,8 @@
width: 84%;
}
}
- .ant-form-item-label .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.ant-radio-group {
white-space: nowrap;
- }
- .ant-input-number {
- width: 100%;
}
.color-form-item {
.ant-form-item-control {
diff --git a/src/templates/zshare/unattended/settingform/index.jsx b/src/templates/zshare/unattended/settingform/index.jsx
index 2d44742..b8b2e47 100644
--- a/src/templates/zshare/unattended/settingform/index.jsx
+++ b/src/templates/zshare/unattended/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Tooltip, Icon, Select, Radio, InputNumber } from 'antd'
+import { Form, Row, Col, Tooltip, Select, Radio, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
// import './index.scss'
@@ -62,7 +63,7 @@
{enable === 'true' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鐢ㄤ簬鑷姩鎵ц鐨勬寜閽��">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎸夐挳
</Tooltip>
}>
@@ -84,7 +85,7 @@
{enable === 'true' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鎸夐挳鎵ц鎴愬姛锛屽悗缁殑澶勭悊鏂瑰紡銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎴愬姛鍚�
</Tooltip>
}>
@@ -101,7 +102,7 @@
{enable === 'true' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鎸夐挳鎵ц澶辫触鏃讹紝鍚庣画鐨勫鐞嗘柟寮忋��">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
澶辫触鍚�
</Tooltip>
}>
@@ -119,7 +120,7 @@
{enable === 'true' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鐩搁偦涓ゆ潯鏁版嵁锛屾墽琛屾椂鐨勯棿闅旀椂闂达紝鏈�灏忎负1s銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏁版嵁闂撮殧(s)
</Tooltip>
}>
diff --git a/src/templates/zshare/verifycard/billcodeform/index.jsx b/src/templates/zshare/verifycard/billcodeform/index.jsx
index a885185..8b6a946 100644
--- a/src/templates/zshare/verifycard/billcodeform/index.jsx
+++ b/src/templates/zshare/verifycard/billcodeform/index.jsx
@@ -1,7 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Select, Button, InputNumber, Input, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Select, Button, InputNumber, Input, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
import './index.scss'
@@ -351,8 +353,8 @@
{TypeCharOne === 'Lp' ? <Col span={7}>
<Form.Item label={
<Tooltip placement="topLeft" title="璇ユ爣璇嗙敤浜庣敓鎴愯鍙疯鍒�">
- <Icon type="question-circle" />
- {'鏍囪瘑'}
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鏍囪瘑
</Tooltip>
}>
{getFieldDecorator('mark', {
diff --git a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
index bed203c..0b5316b 100644
--- a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
+++ b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Button, notification, Modal, Tooltip, Icon, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -240,7 +241,7 @@
<Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
<Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎵ц浣嶇疆
</Tooltip>
}>
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 1b758d4..2bf77c8 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Button, notification, Modal, Tooltip, Icon, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -252,7 +253,7 @@
<Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
<Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎵ц浣嶇疆
</Tooltip>
}>
@@ -293,7 +294,7 @@
<Col span={24} className="sql">
<Form.Item label={
<Tooltip placement="topLeft" title={'鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> \'\'銆� @check$ -> \'\'锛孍rrorCode绛変簬C鏃� $check@ -> /*銆� @check$ -> */'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
sql
</Tooltip>
}>
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 2db3ea3..5bc26a1 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Row, Col, Radio, Button, Select, Popconfirm, Icon, notification, Modal, message, InputNumber, Tooltip, Typography } from 'antd'
+import { Form, Tabs, Row, Col, Radio, Button, Select, Popconfirm, notification, Modal, message, InputNumber, Tooltip, Typography } from 'antd'
+import { QuestionCircleOutlined, CheckCircleOutlined, StopOutlined, EditOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -98,13 +99,13 @@
(
<div>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px', color: '#ff4d4f'}} />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px', color: '#52c41a'}}/>
</div>
)
}
@@ -134,13 +135,13 @@
(
<div>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px', color: '#ff4d4f'}} />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px', color: '#52c41a'}}/>
</div>
)
},
@@ -208,13 +209,13 @@
(
<div>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px', color: '#ff4d4f'}} />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px', color: '#52c41a'}}/>
</div>
)
}
@@ -260,13 +261,13 @@
(
<div>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px', color: '#ff4d4f'}} />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px', color: '#52c41a'}}/>
</div>
)
},
@@ -277,14 +278,14 @@
dataIndex: 'operation',
render: (text, record) =>
(<div style={{textAlign: 'center'}}>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'customverify')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'customverify')} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'customverify')} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'customverify')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record, 'customverify')
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -329,13 +330,13 @@
(
<div>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px', color: '#ff4d4f'}} />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px', color: '#52c41a'}}/>
</div>
)
},
@@ -346,14 +347,14 @@
dataIndex: 'operation',
render: (text, record) =>
(<div style={{textAlign: 'center'}}>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record, 'scripts')
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -396,13 +397,13 @@
(
<div>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px', color: '#ff4d4f'}} />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px', color: '#52c41a'}}/>
</div>
)
},
@@ -413,14 +414,14 @@
dataIndex: 'operation',
render: (text, record) =>
(<div style={{textAlign: 'center'}}>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'cbscripts')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'cbscripts')} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'cbscripts')} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'cbscripts')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record, 'cbscripts')
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -497,13 +498,13 @@
(
<div>
{this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <StopOutlined style={{marginLeft: '5px', color: '#ff4d4f'}} />
</div>
) :
(
<div>
{this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <CheckCircleOutlined style={{marginLeft: '5px', color: '#52c41a'}}/>
</div>
)
},
@@ -514,14 +515,14 @@
dataIndex: 'operation',
render: (text, record) =>
(<div style={{textAlign: 'center'}}>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'ordercode')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'ordercode')} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'ordercode')} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'ordercode')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record, 'ordercode')
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -1426,7 +1427,7 @@
{this.props.card.sqlType !== 'custom' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title={'榛樿sql鎵ц椤哄簭涓鸿嚜瀹氫箟鑴氭湰涔嬪墠'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
榛樿sql
</Tooltip>
}>
@@ -1458,7 +1459,7 @@
{verify.accountdate === 'true' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title={'楠岃瘉鏃ユ湡涓虹┖鏃讹紝榛樿涓哄綋澶┿��'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
楠岃瘉鏃ユ湡
</Tooltip>
}>
@@ -1482,7 +1483,7 @@
<Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title={'閫夋嫨鍙戦�佺煭淇℃椂锛岄渶瀹屽杽鐭俊璁剧疆銆�'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍙戦�佺煭淇�
</Tooltip>
}>
@@ -1506,7 +1507,7 @@
{verify.noteEnable === 'true' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title={'瀹炴椂鍙戦�佹渶澶氬悓鏃跺彂閫�5涓敤鎴凤紝瀹氭椂鍙戦�佹渶澶氬悓鏃跺彂閫�100涓敤鎴枫��'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍙戦�佹柟寮�
</Tooltip>
}>
diff --git a/src/templates/zshare/verifycard/index.scss b/src/templates/zshare/verifycard/index.scss
index a5f843a..9fc9d9e 100644
--- a/src/templates/zshare/verifycard/index.scss
+++ b/src/templates/zshare/verifycard/index.scss
@@ -16,9 +16,6 @@
font-size: 12px;
}
.verify-form {
- .ant-input-number {
- width: 100%;
- }
.sql {
.ant-col-sm-8 {
width: 10.5%;
@@ -57,10 +54,6 @@
.mk-green {
margin-bottom: 15px;
}
- }
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
}
}
.custom-table .ant-empty {
diff --git a/src/views/appcheck/index.jsx b/src/views/appcheck/index.jsx
index 4343b23..7317ebb 100644
--- a/src/views/appcheck/index.jsx
+++ b/src/views/appcheck/index.jsx
@@ -1,5 +1,6 @@
import React, {Component} from 'react'
-import { Spin, notification, Table, ConfigProvider, Typography, Row, Col, Tooltip, Icon } from 'antd'
+import { Spin, notification, Table, ConfigProvider, Typography, Row, Col, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import enUS from 'antd/es/locale/en_US'
import zhCN from 'antd/es/locale/zh_CN'
@@ -211,7 +212,7 @@
<div className="app-item">
{binding ? <div className="label">
<Tooltip placement="topLeft" title="寰俊鍏紬鍙风櫥褰曟椂锛岀郴缁熺敤鎴蜂笌寰俊鐢ㄦ埛鐨勭粦瀹氭柟寮忋��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐢ㄦ埛缁戝畾:
</Tooltip>
</div> : null}
diff --git a/src/views/appcheck/index.scss b/src/views/appcheck/index.scss
index d6372c4..0b78ef2 100644
--- a/src/views/appcheck/index.scss
+++ b/src/views/appcheck/index.scss
@@ -65,10 +65,6 @@
width: 40%;
text-align: right;
color: rgba(0, 0, 0, 0.65);
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
.content {
width: 60%;
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index acb086b..3f34590 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import { fromJS } from 'immutable'
-import { Spin, notification, Input, Button, Table, Modal, ConfigProvider, Typography, Row, Col, Tooltip, Icon } from 'antd'
+import { Spin, notification, Input, Button, Table, Modal, ConfigProvider, Typography, Row, Col, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import md5 from 'md5'
import enUS from 'antd/es/locale/en_US'
@@ -1076,7 +1077,7 @@
<div className="app-item">
{binding ? <div className="label">
<Tooltip placement="topLeft" title="寰俊鍏紬鍙风櫥褰曟椂锛岀郴缁熺敤鎴蜂笌寰俊鐢ㄦ埛鐨勭粦瀹氭柟寮忋��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐢ㄦ埛缁戝畾:
</Tooltip>
</div> : null}
diff --git a/src/views/appmanage/index.scss b/src/views/appmanage/index.scss
index ca21047..2594659 100644
--- a/src/views/appmanage/index.scss
+++ b/src/views/appmanage/index.scss
@@ -85,10 +85,6 @@
width: 40%;
text-align: right;
color: rgba(0, 0, 0, 0.65);
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
}
.content {
width: 60%;
diff --git a/src/views/appmanage/scriptform/index.jsx b/src/views/appmanage/scriptform/index.jsx
index 5ed14e9..39bd2ee 100644
--- a/src/views/appmanage/scriptform/index.jsx
+++ b/src/views/appmanage/scriptform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, notification, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, Select, notification, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -161,7 +162,7 @@
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="1銆佸垵娆″崌绾ф垨搴旂敤鍩烘湰淇℃伅淇敼鏃讹紝璇烽鍏堟坊鍔犲簲鐢紙鍩烘湰淇℃伅锛夛紱2銆佸瓙搴旂敤鏁翠綋鍗囩骇鏃讹紝璇锋坊鍔犲瓙搴旂敤锛堝崌绾у唴瀹瑰寘鎷〉闈㈠強鏉冮檺鏍戯級锛�3銆佸崟涓〉闈㈠崌绾ф椂锛岃娣诲姞椤甸潰锛�4銆佹秹鍙婃潈闄愭洿鏂版椂锛岃娣诲姞鏉冮檺鏍�">
- <Icon style={{color: '#c49f47', marginRight: '5px'}} type="question-circle" />绫诲瀷
+ <QuestionCircleOutlined className="mk-form-tip" />绫诲瀷
</Tooltip>
}>
{getFieldDecorator('VType', {
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 00ddbb5..a25aa9e 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Radio, Input, Tooltip, Icon, notification, InputNumber, Checkbox } from 'antd'
+import { Form, Row, Col, Select, Radio, Input, Tooltip, notification, InputNumber, Checkbox } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -158,7 +159,7 @@
{typename !== 'pc' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤鍏紬鍙锋巿鏉冪櫥褰曟椂锛屾槸鍚﹂渶瑕佺粦瀹氱敤鎴枫��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐢ㄦ埛缁戝畾
</Tooltip>
}>
@@ -175,7 +176,7 @@
{typename !== 'pc' && user_binding.includes('sms_vcode') ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鐭俊妯℃澘鍙湪绠＄悊绯荤粺 HS-濂囦簯鐭俊妯℃澘 澶勬坊鍔犮��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐭俊妯℃澘
</Tooltip>
}>
@@ -213,7 +214,7 @@
{typename !== 'pc' && user_binding.length > 0 ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤寰俊鎺堟潈鐧诲綍鏃讹紝缁戝畾鐢ㄦ埛椤甸潰鐨勭増鏉冨０鏄庯紝娉細鍙坊鍔爃tml鏍囩銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐗堟潈
</Tooltip>
}>
@@ -225,7 +226,7 @@
{typename !== 'pc' && user_binding.length > 0 ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤寰俊鎺堟潈鐧诲綍鏃讹紝缁戝畾鐢ㄦ埛椤甸潰鐨凩OGO銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
LOGO
</Tooltip>
}>
@@ -239,7 +240,7 @@
{typename !== 'pc' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄤ娇鐢ㄦ槑绉戜簯APP鏃讹紝椤甸潰鐨勫垏鎹㈡ā寮�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
搴旂敤妯″紡
</Tooltip>
}>
@@ -256,7 +257,7 @@
{typename !== 'pc' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄤ娇鐢ㄦ槑绉戜簯APP鏃讹紝涓斿湪app妯″紡涓棤鏁�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
寤惰繜鍔犺浇(ms)
</Tooltip>
}>
@@ -268,7 +269,7 @@
{typename !== 'pc' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄤ娇鐢ㄦ槑绉戜簯APP鏃讹紝鐘舵�佹爮鐨勫瓧浣撻鑹层��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐘舵�佹爮
</Tooltip>
}>
diff --git a/src/views/appmanage/submutilform/index.scss b/src/views/appmanage/submutilform/index.scss
index 92b60f8..4adee58 100644
--- a/src/views/appmanage/submutilform/index.scss
+++ b/src/views/appmanage/submutilform/index.scss
@@ -1,10 +1,6 @@
.sub-app-edit-form {
padding: 0px 24px 20px;
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
.mk-source-wrap {
.ant-radio-button-wrapper:last-child {
display: none;
@@ -12,9 +8,6 @@
.ant-radio-button-wrapper:not(:first-child) {
border-radius: 0 4px 4px 0;
}
- }
- .ant-input-number {
- width: 100%;
}
.ant-form-item-control {
height: 40px;
diff --git a/src/views/menudesign/homeform/index.jsx b/src/views/menudesign/homeform/index.jsx
index 121644e..db119a5 100644
--- a/src/views/menudesign/homeform/index.jsx
+++ b/src/views/menudesign/homeform/index.jsx
@@ -1,10 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Radio, Icon, Tooltip, InputNumber, notification } from 'antd'
+import { Form, Row, Col, Radio, Tooltip, InputNumber, notification } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import Api from '@/api'
import options from '@/store/options.js'
-import './index.scss'
+// import './index.scss'
class CustomMenuForm extends Component {
static propTpyes = {
@@ -125,12 +126,12 @@
}
return (
- <Form {...formItemLayout} className="custom-menu-form">
+ <Form {...formItemLayout}>
<Row>
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="瀵逛簬涓嶇粡甯告�у彉鍔ㄧ殑淇℃伅锛岀紦瀛樻暟鎹湁鍔╀簬鎻愰珮鏌ヨ鏁堢巼銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
缂撳瓨鏁版嵁
</Tooltip>
}>
diff --git a/src/views/menudesign/homeform/index.scss b/src/views/menudesign/homeform/index.scss
index 71a1a33..e69de29 100644
--- a/src/views/menudesign/homeform/index.scss
+++ b/src/views/menudesign/homeform/index.scss
@@ -1,10 +0,0 @@
-.custom-menu-form {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
-}
\ No newline at end of file
diff --git a/src/views/menudesign/menuform/index.jsx b/src/views/menudesign/menuform/index.jsx
index 2e62681..0b3fbbd 100644
--- a/src/views/menudesign/menuform/index.jsx
+++ b/src/views/menudesign/menuform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, notification, Radio, Icon, Tooltip, InputNumber, Switch } from 'antd'
+import { Form, Row, Col, Input, Select, notification, Radio, Tooltip, InputNumber, Switch } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import Api from '@/api'
import options from '@/store/options.js'
@@ -291,7 +292,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="瀵逛簬涓嶇粡甯告�у彉鍔ㄧ殑淇℃伅锛岀紦瀛樻暟鎹湁鍔╀簬鎻愰珮鏌ヨ鏁堢巼銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
缂撳瓨鏁版嵁
</Tooltip>
}>
@@ -308,7 +309,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="璺宠繃鏉冮檺楠岃瘉鏃讹紝椤甸潰涓粍浠跺強鎸夐挳涓嶅湪杩涜鏉冮檺鎺у埗銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏉冮檺楠岃瘉
</Tooltip>
}>
diff --git a/src/views/menudesign/menuform/index.scss b/src/views/menudesign/menuform/index.scss
index fb20291..fa61282 100644
--- a/src/views/menudesign/menuform/index.scss
+++ b/src/views/menudesign/menuform/index.scss
@@ -1,12 +1,4 @@
.custom-menu-form {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-form-item {
height: 50px;
.ant-form-explain {
diff --git a/src/views/menudesign/printmenuform/index.jsx b/src/views/menudesign/printmenuform/index.jsx
index b9204e6..12514d8 100644
--- a/src/views/menudesign/printmenuform/index.jsx
+++ b/src/views/menudesign/printmenuform/index.jsx
@@ -1,8 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, InputNumber, Select, Radio, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, InputNumber, Select, Radio, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
-import './index.scss'
+// import './index.scss'
class MainSearch extends Component {
static propTpyes = {
@@ -126,7 +127,7 @@
}
return (
- <Form {...formItemLayout} className="print-menu-form">
+ <Form {...formItemLayout}>
<Row>
<Col span={24}>
<Form.Item label="鎵撳嵃灏哄">
@@ -219,7 +220,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="閽堝涓嶈鍒欑焊寮狅紝鍙嚜瀹氫箟璁剧疆鎵撳嵃楂樺害鍜屽搴︼紝娉細鍚屾椂璁剧疆鎵撳嵃瀹藉害鍜岄珮搴﹀悗鏂瑰彲鐢熸晥銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鑷畾涔�
</Tooltip>
}>
diff --git a/src/views/menudesign/printmenuform/index.scss b/src/views/menudesign/printmenuform/index.scss
index 0295f37..e69de29 100644
--- a/src/views/menudesign/printmenuform/index.scss
+++ b/src/views/menudesign/printmenuform/index.scss
@@ -1,10 +0,0 @@
-.print-menu-form {
- .ant-input-number {
- width: 100%;
- }
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
-}
\ No newline at end of file
diff --git a/src/views/mobdesign/menuform/index.jsx b/src/views/mobdesign/menuform/index.jsx
index fbd2a07..97f4805 100644
--- a/src/views/mobdesign/menuform/index.jsx
+++ b/src/views/mobdesign/menuform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Icon, Tooltip, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -105,7 +106,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="瀵逛簬涓嶇粡甯告�у彉鍔ㄧ殑淇℃伅锛岀紦瀛樻暟鎹湁鍔╀簬鎻愰珮鏌ヨ鏁堢巼銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
缂撳瓨鏁版嵁
</Tooltip>
}>
@@ -122,7 +123,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="璺宠繃鏉冮檺楠岃瘉鏃讹紝椤甸潰涓粍浠跺強鎸夐挳涓嶅湪杩涜鏉冮檺鎺у埗銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏉冮檺楠岃瘉
</Tooltip>
}>
@@ -139,7 +140,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤鐧诲綍楠岃瘉鍚庯紝鐢ㄦ埛蹇呴』鐧诲綍绯荤粺鍚庢墠鍙互璁块棶锛屾敞锛氬惈鏈夌櫥褰曠粍浠剁殑椤甸潰涓棤鏁堛��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐧诲綍楠岃瘉
</Tooltip>
}>
@@ -183,7 +184,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄦ槑绉戜簯APP涓湁鏁堛��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
骞垮憡椤�
</Tooltip>
}>
@@ -209,7 +210,7 @@
<Col span={24}>
<Form.Item className="status-bar" label={
<Tooltip placement="topLeft" title="鍦ㄦ槑绉戜簯APP涓紝鐘舵�佹爮鐨勮儗鏅壊銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐘舵�佹爮
</Tooltip>
}>
diff --git a/src/views/mobdesign/menuform/index.scss b/src/views/mobdesign/menuform/index.scss
index 8556632..6bfb57a 100644
--- a/src/views/mobdesign/menuform/index.scss
+++ b/src/views/mobdesign/menuform/index.scss
@@ -1,12 +1,4 @@
.custom-menu-form {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-form-item {
height: 50px;
.ant-form-explain {
diff --git a/src/views/pcdesign/menuform/index.jsx b/src/views/pcdesign/menuform/index.jsx
index 7a4c855..4c05fd5 100644
--- a/src/views/pcdesign/menuform/index.jsx
+++ b/src/views/pcdesign/menuform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Icon, Tooltip, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, InputNumber } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -94,7 +95,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="瀵逛簬涓嶇粡甯告�у彉鍔ㄧ殑淇℃伅锛岀紦瀛樻暟鎹湁鍔╀簬鎻愰珮鏌ヨ鏁堢巼銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
缂撳瓨鏁版嵁
</Tooltip>
}>
@@ -111,7 +112,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="璺宠繃鏉冮檺楠岃瘉鏃讹紝椤甸潰涓粍浠跺強鎸夐挳涓嶅湪杩涜鏉冮檺鎺у埗銆�">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鏉冮檺楠岃瘉
</Tooltip>
}>
@@ -128,7 +129,7 @@
<Col span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="浣跨敤鐧诲綍楠岃瘉鍚庯紝鐢ㄦ埛蹇呴』鐧诲綍绯荤粺鍚庢墠鍙互璁块棶锛屾敞锛氬惈鏈夌櫥褰曠粍浠剁殑椤甸潰涓棤鏁堛��">
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
鐧诲綍楠岃瘉
</Tooltip>
}>
diff --git a/src/views/pcdesign/menuform/index.scss b/src/views/pcdesign/menuform/index.scss
index fb20291..fa61282 100644
--- a/src/views/pcdesign/menuform/index.scss
+++ b/src/views/pcdesign/menuform/index.scss
@@ -1,12 +1,4 @@
.custom-menu-form {
- .anticon-question-circle {
- color: #c49f47;
- position: relative;
- left: -3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-form-item {
height: 50px;
.ant-form-explain {
diff --git a/src/views/printTemplate/mutilform/index.jsx b/src/views/printTemplate/mutilform/index.jsx
index 120c3fd..4824e2b 100644
--- a/src/views/printTemplate/mutilform/index.jsx
+++ b/src/views/printTemplate/mutilform/index.jsx
@@ -1,9 +1,10 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Input, InputNumber, Select, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, InputNumber, Select, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
import { formRule } from '@/utils/option.js'
-// import FileUpload from '@/tabviews/zshare/fileupload'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -230,7 +231,7 @@
<Col span={24} key={index}>
<Form.Item label={
item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -253,7 +254,7 @@
<Col span={24} key={index}>
<Form.Item label={
item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
diff --git a/src/views/printTemplate/mutilform/index.scss b/src/views/printTemplate/mutilform/index.scss
index 006a247..5a3036a 100644
--- a/src/views/printTemplate/mutilform/index.scss
+++ b/src/views/printTemplate/mutilform/index.scss
@@ -31,13 +31,6 @@
}
}
}
- .anticon-question-circle {
- color: #c49f47;
- margin-right: 3px;
- }
- .ant-input-number {
- width: 100%;
- }
.ant-form-explain {
overflow:hidden;
text-overflow:ellipsis;
--
Gitblit v1.8.0