From d2009f9859906999750ce90b69c4521397359c0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 10 七月 2024 14:53:07 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 8 +++++++-
src/menu/components/card/cardcellcomponent/dragaction/index.scss | 21 +++++++++++++++++++++
src/views/mobdesign/index.scss | 4 ----
src/views/pcdesign/index.scss | 3 ---
src/menu/components/card/cardcellcomponent/index.jsx | 7 +------
src/menu/stylecontroller/index.jsx | 7 ++++---
src/tabviews/custom/components/card/cardcellList/index.scss | 2 +-
src/menu/components/card/cardcellcomponent/index.scss | 2 +-
src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 2 +-
src/assets/css/main.scss | 1 +
10 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index d9a3e78..7f4eea2 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -322,6 +322,7 @@
}
.ant-modal-body::-webkit-scrollbar {
width: 7px;
+ height: 0;
}
.ant-modal-body::-webkit-scrollbar-thumb {
border-radius: 5px;
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index abe02a7..2bee5ee 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -248,6 +248,12 @@
mark = false
}
+ let className = 'ant-col card-cell ant-col-' + card.width
+
+ if (card.noValue === 'hide') {
+ className += ' no-value-hide'
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
@@ -258,7 +264,7 @@
{mark ? <MarkColumn field={card.field || ''} columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null }
</div>
} trigger="hover">
- <div ref={node => drag(drop(node))} style={_style_} className={'ant-col card-cell ant-col-' + card.width}>
+ <div ref={node => drag(drop(node))} style={_style_} className={className}>
<div style={_style} onClick={clickComponent} onDoubleClick={() => able && editCard(id)} id={card.uuid}>
{getContent()}
</div>
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.scss b/src/menu/components/card/cardcellcomponent/dragaction/index.scss
index 289da39..deb7cf3 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/index.scss
+++ b/src/menu/components/card/cardcellcomponent/dragaction/index.scss
@@ -240,4 +240,25 @@
left: 0px;
}
}
+ .no-value-hide >div::before {
+ content: '*';
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ font-size: 18px;
+ color: orange;
+ line-height: 1;
+ height: 8px;
+ opacity: 0;
+ }
+ .no-value-hide:hover >div::before {
+ opacity: 1;
+ }
+}
+td:hover {
+ .card-detail-row {
+ .no-value-hide >div::before {
+ opacity: 1;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 693f87a..5f5bbbf 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -256,14 +256,9 @@
} else if (_card.eleType === 'button') { // 鎷嗗垎style
_card.style = fromJS(style).toJS()
- if (style.float === 'center') {
- delete _card.style.float
- } else if (style.float) {
+ if (style.float) {
_card.wrapStyle = {textAlign: style.float}
delete _card.style.float
- }
- if (style.textAlign === 'center') {
- delete _card.style.textAlign
}
if (style.minHeight === '28px') {
delete _card.style.minHeight
diff --git a/src/menu/components/card/cardcellcomponent/index.scss b/src/menu/components/card/cardcellcomponent/index.scss
index 7006456..52f4628 100644
--- a/src/menu/components/card/cardcellcomponent/index.scss
+++ b/src/menu/components/card/cardcellcomponent/index.scss
@@ -19,7 +19,7 @@
background-position: center center;
height: auto;
min-height: 28px;
- text-align: inherit;
+ // text-align: inherit;
border-width: 0;
padding: 0;
overflow: hidden;
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index c5ed9e0..850eafb 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import { is, fromJS } from 'immutable'
-import { Collapse, Form, Col, InputNumber, Input, Select, Radio, Drawer, Button, message, Checkbox } from 'antd'
+import { Collapse, Form, Col, InputNumber, Input, Select, Radio, Drawer, Button, message, Checkbox, Tooltip } from 'antd'
import {
ColumnHeightOutlined,
FontSizeOutlined,
@@ -30,7 +30,8 @@
SwapOutlined,
EnterOutlined,
DragOutlined,
- EyeOutlined
+ EyeOutlined,
+ QuestionCircleOutlined
} from '@ant-design/icons'
import MKEmitter from '@/utils/events.js'
@@ -1050,7 +1051,7 @@
</Form.Item>
</Col>
</Panel> : null}
- {options.includes('float') ? <Panel header="瀵归綈鏂瑰紡" key="float">
+ {options.includes('float') ? <Panel header={<Tooltip placement="topLeft" title="鎸夐挳鐩稿浜庢爡鏍肩殑浣嶇疆锛屾敞锛氳缃搴︽椂鏈夋晥銆�">瀵归綈鏂瑰紡<QuestionCircleOutlined style={{marginLeft: '3px'}} /></Tooltip>} key="float">
<Col span={24}>
<Form.Item
colon={false}
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 3454eb1..76ad886 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -165,7 +165,7 @@
)}
</Form.Item>
</Col> : null}
- {property === 'menu' && copyMenu ? <Col span={12}>
+ {property === 'menu' && copyMenu ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="澶嶅埗鑿滃崟鏃讹紝鏄惁娓呯┖鍘熼〉闈腑鐨勫叧鑱旇彍鍗曘��">
<QuestionCircleOutlined className="mk-form-tip" />
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index e5cfb31..b513a12 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -117,7 +117,7 @@
min-height: 28px;
padding: 0;
overflow: hidden;
- text-align: inherit;
+ // text-align: inherit;
}
.ant-checkbox-wrapper:not(.square) {
.ant-checkbox-inner, .ant-checkbox-checked::after {
diff --git a/src/views/mobdesign/index.scss b/src/views/mobdesign/index.scss
index 3753c8f..4845fb3 100644
--- a/src/views/mobdesign/index.scss
+++ b/src/views/mobdesign/index.scss
@@ -332,7 +332,3 @@
body {
overflow-y: hidden;
}
-
-.user-component-wrap {
- display: none!important;
-}
\ No newline at end of file
diff --git a/src/views/pcdesign/index.scss b/src/views/pcdesign/index.scss
index bb683f2..0d2b917 100644
--- a/src/views/pcdesign/index.scss
+++ b/src/views/pcdesign/index.scss
@@ -274,6 +274,3 @@
body {
overflow-y: hidden;
}
-.user-component-wrap {
- display: none!important;
-}
\ No newline at end of file
--
Gitblit v1.8.0