From 52d2bcad2ad696e1293d3ae53f0d927bee3b7f78 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 05 一月 2024 11:47:32 +0800
Subject: [PATCH] 2024-01-05
---
src/menu/components/tree/antd-tree/options.jsx | 4 +-
src/menu/components/share/markcomponent/index.jsx | 7 +++
src/menu/components/share/colsControl/index.scss | 14 +++++++
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 12 ++---
src/menu/components/share/markcomponent/index.scss | 14 +++++++
src/views/menudesign/homeform/index.jsx | 13 ++++++
src/menu/components/share/colsControl/index.jsx | 8 +++
7 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 6e42aff..1a96928 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -159,17 +159,15 @@
if (this.record.eleType === 'number') {
_options.push('decimal', 'format')
}
- } else if (this.record.eleType === 'picture') {
- _options.push('url')
- if (this.record.noValue === 'show') {
- _options.push('lostTip')
- }
- } else if (this.record.eleType === 'video') {
+ } else if (this.record.eleType === 'picture' || this.record.eleType === 'video') {
_options.push('url')
} else {
_options.push('value')
}
- if (this.record.eleType === 'video' && this.record.posterType) {
+
+ if (this.record.eleType === 'picture' && this.record.noValue === 'show') {
+ _options.push('lostTip')
+ } else if (this.record.eleType === 'video' && this.record.posterType) {
if (this.record.posterType === 'dynamic') {
_options.push('posterField')
} else {
diff --git a/src/menu/components/share/colsControl/index.jsx b/src/menu/components/share/colsControl/index.jsx
index 8b0ec42..f7967b9 100644
--- a/src/menu/components/share/colsControl/index.jsx
+++ b/src/menu/components/share/colsControl/index.jsx
@@ -272,10 +272,16 @@
}
render() {
+ const { config } = this.props
const { colsCtrls, columns, visible, cols, searches } = this.state
+ let className = ''
+ if (config.colsCtrls && config.colsCtrls.length) {
+ className = 'cols-ctrls'
+ }
+
return (
- <div style={{display: 'inline-block'}}>
+ <div style={{display: 'inline-block'}} className={className}>
<ApartmentOutlined style={{color: '#13c2c2'}} title="鏄剧ず鍒楁帶鍒�" onClick={this.resetMark} />
<Modal
wrapClassName="column-control-modal-wrap"
diff --git a/src/menu/components/share/colsControl/index.scss b/src/menu/components/share/colsControl/index.scss
index ae2b530..6d2bbed 100644
--- a/src/menu/components/share/colsControl/index.scss
+++ b/src/menu/components/share/colsControl/index.scss
@@ -27,4 +27,18 @@
background: rgba(0, 0, 0, 0);
}
}
+}
+.cols-ctrls {
+ position: relative;
+}
+.cols-ctrls::after {
+ content: ' ';
+ display: block;
+ position: absolute;
+ top: 0;
+ right: 7px;
+ width: 4px;
+ height: 4px;
+ border-radius: 4px;
+ background-color: red;
}
\ No newline at end of file
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index a88f98e..7185bea 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -414,8 +414,13 @@
render() {
const { marks, markColumns, visible, options, signs } = this.state
+ let className = ''
+ if (this.props.type === 'line' && this.props.marks.length) {
+ className = 'mk-line-marks'
+ }
+
return (
- <div style={{display: 'inline-block'}}>
+ <div style={{display: 'inline-block'}} className={className}>
<AntDesignOutlined className="profile" title="鏍囪" onClick={this.resetMark} />
<Modal
wrapClassName="mark-modal-wrap"
diff --git a/src/menu/components/share/markcomponent/index.scss b/src/menu/components/share/markcomponent/index.scss
index e92c10a..c4663e0 100644
--- a/src/menu/components/share/markcomponent/index.scss
+++ b/src/menu/components/share/markcomponent/index.scss
@@ -22,4 +22,18 @@
background: rgba(0, 0, 0, 0);
}
}
+}
+.mk-line-marks {
+ position: relative;
+}
+.mk-line-marks::after {
+ content: ' ';
+ display: block;
+ position: absolute;
+ top: 0;
+ right: 7px;
+ width: 4px;
+ height: 4px;
+ border-radius: 4px;
+ background-color: red;
}
\ No newline at end of file
diff --git a/src/menu/components/tree/antd-tree/options.jsx b/src/menu/components/tree/antd-tree/options.jsx
index d7e9f39..d8b6a7e 100644
--- a/src/menu/components/tree/antd-tree/options.jsx
+++ b/src/menu/components/tree/antd-tree/options.jsx
@@ -129,10 +129,10 @@
initval: wrap.permission || 'false',
required: false,
options: [
- {value: 'true', label: '鍚敤'},
+ {value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !appType || ispop
+ forbid: ispop
},
{
type: 'radio',
diff --git a/src/views/menudesign/homeform/index.jsx b/src/views/menudesign/homeform/index.jsx
index 427ff91..354951b 100644
--- a/src/views/menudesign/homeform/index.jsx
+++ b/src/views/menudesign/homeform/index.jsx
@@ -126,6 +126,19 @@
<Row>
<Col span={24}>
<Form.Item label={
+ <Tooltip placement="topLeft" title="棣栭〉涓嶈繘琛屾潈闄愭帶鍒躲��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鏉冮檺楠岃瘉
+ </Tooltip>
+ }>
+ <Radio.Group value={'false'} disabled={true}>
+ <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" />
鏈湴缂撳瓨
--
Gitblit v1.8.0