From 84921b459e113717734a20534f4266863727f89c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 29 七月 2023 15:54:34 +0800
Subject: [PATCH] 2023-07-29
---
src/tabviews/custom/index.jsx | 2 +-
src/tabviews/custom/index.scss | 9 +++++++++
src/views/pcdesign/menuform/index.jsx | 4 ++--
src/views/menudesign/homeform/index.jsx | 17 +++++++++++++++++
src/views/menudesign/menuform/index.jsx | 17 +++++++++++++++++
5 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index a94a759..df8dd2c 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -1525,7 +1525,7 @@
const { loadingview, viewlost, config, loading, shortcuts, BID } = this.state
return (
- <div className={`custom-page-wrap ${config && config.minWidth ? 'mk-scroll' : ''} ${loadingview || loading ? 'loading' : ''}`} id={this.state.ContainerId} style={config ? config.style : null}>
+ <div className={`custom-page-wrap ${config && config.minWidth ? 'mk-scroll' : ''} ${loadingview || loading ? 'loading' : ''} ${config && config.mask === 'false' ? 'mk-no-mask' : ''}`} id={this.state.ContainerId} style={config ? config.style : null}>
{(loadingview || (loading && !config.$cache)) ? <Spin className="view-spin" size="large" /> : null}
<Row id={config ? 'menu' + config.uuid : ''} style={config && config.minWidth ? {minWidth: config.minWidth} : null} className="component-wrap">{this.getComponents()}</Row>
{config && config.interfaces.length > 0 ? <MkInterfaces BID={BID} interfaces={config.interfaces}/> : null}
diff --git a/src/tabviews/custom/index.scss b/src/tabviews/custom/index.scss
index 2c2a5fe..19bb049 100644
--- a/src/tabviews/custom/index.scss
+++ b/src/tabviews/custom/index.scss
@@ -49,6 +49,15 @@
display: none;
}
}
+.custom-page-wrap.mk-no-mask {
+ .ant-spin-blur {
+ background: transparent!important;
+ opacity: 1;
+ }
+ .ant-spin-blur::after {
+ opacity: 0;
+ }
+}
.custom-page-wrap.mk-scroll {
height: calc(100vh - 93px);
overflow: auto;
diff --git a/src/views/menudesign/homeform/index.jsx b/src/views/menudesign/homeform/index.jsx
index 2b253e7..a758095 100644
--- a/src/views/menudesign/homeform/index.jsx
+++ b/src/views/menudesign/homeform/index.jsx
@@ -201,6 +201,23 @@
)}
</Form.Item>
</Col> : null}
+ <Col span={24}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鏁版嵁鍔犺浇鏃剁殑閬僵鏄惁鏄剧ず銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鍔犺浇閬僵
+ </Tooltip>
+ }>
+ {getFieldDecorator('mask', {
+ initialValue: config.mask || 'true'
+ })(
+ <Radio.Group onChange={(e) => {this.selectChange('mask', e.target.value)}}>
+ <Radio value="true">鏄剧ず</Radio>
+ <Radio value="false">闅愯棌</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
</Row>
</Form>
)
diff --git a/src/views/menudesign/menuform/index.jsx b/src/views/menudesign/menuform/index.jsx
index a1c9519..cf45cd9 100644
--- a/src/views/menudesign/menuform/index.jsx
+++ b/src/views/menudesign/menuform/index.jsx
@@ -398,6 +398,23 @@
</Col> : null}
<Col span={24}>
<Form.Item label={
+ <Tooltip placement="topLeft" title="鏁版嵁鍔犺浇鏃剁殑閬僵鏄惁鏄剧ず銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鍔犺浇閬僵
+ </Tooltip>
+ }>
+ {getFieldDecorator('mask', {
+ initialValue: config.mask || 'true'
+ })(
+ <Radio.Group onChange={(e) => {this.selectChange('mask', e.target.value)}}>
+ <Radio value="true">鏄剧ず</Radio>
+ <Radio value="false">闅愯棌</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item label={
<Tooltip placement="topLeft" title="濡傛灉椤甸潰鍐呭鍦ㄧ獥鍙ｄ腑鏃犳硶瀹屽叏灞曠ず锛屽彲璁剧疆鏈�灏忓搴︼紝瀹炵幇椤甸潰鐨勬í鍚戞粴鍔ㄣ��">
<QuestionCircleOutlined className="mk-form-tip" />
鏈�灏忓搴�
diff --git a/src/views/pcdesign/menuform/index.jsx b/src/views/pcdesign/menuform/index.jsx
index 6d39167..54bfde8 100644
--- a/src/views/pcdesign/menuform/index.jsx
+++ b/src/views/pcdesign/menuform/index.jsx
@@ -155,9 +155,9 @@
</Col>
<Col span={24}>
<Form.Item label={
- <Tooltip placement="topLeft" title="鏁版嵁鍔犺浇鏃剁殑閬僵鍜岀┖鏁版嵁鍥炬爣鏄惁鏄剧ず銆�">
+ <Tooltip placement="topLeft" title="鏁版嵁鍔犺浇鏃剁殑閬僵鏄惁鏄剧ず銆�">
<QuestionCircleOutlined className="mk-form-tip" />
- 鏁版嵁鎻愮ず
+ 鍔犺浇閬僵
</Tooltip>
}>
{getFieldDecorator('mask', {
--
Gitblit v1.8.0