From a898abd9e42a4b428d6daf1d34fa400ed18e8689 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 十一月 2022 17:35:34 +0800
Subject: [PATCH] 2022-11-23
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 12 ++++++
src/views/design/index.jsx | 3 +
src/tabviews/custom/components/card/cardcellList/index.jsx | 2 +
src/menu/components/table/base-table/columns/editColumn/index.jsx | 2
src/tabviews/custom/components/iframe/index.scss | 2 -
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 2
src/menu/components/table/base-table/columns/editColumn/formconfig.jsx | 12 ++++++
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 4 ++
src/menu/components/card/cardcellcomponent/formconfig.jsx | 12 ++++++
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 2
src/views/systemfunc/index.jsx | 4 ++
src/tabviews/custom/components/share/normalTable/index.jsx | 2
src/views/billprint/index.jsx | 4 +-
src/views/design/sidemenu/thdmenuplus/index.jsx | 6 +-
14 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index f9657cf..66b04b5 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -125,6 +125,10 @@
_imagestyle.paddingTop = '100%'
}
+ if (card.backgroundSize) {
+ _imagestyle.backgroundSize = card.backgroundSize
+ }
+
return (
<div className="ant-mk-picture" style={_imagestyle}></div>
)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index a85f253..b720973 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -17,7 +17,7 @@
sequence: ['eleType', 'width'],
text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'anchors', 'noValue', 'bgImage', 'fixStyle', 'copyable'],
number: ['eleType', 'datatype', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle'],
- picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
+ picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'backgroundSize', 'maxWidth', 'link', 'noValue'],
video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'startTime', 'noValue', 'posterType'],
icon: ['eleType', 'datatype', 'width', 'tooltip'],
slider: ['eleType', 'datatype', 'width', 'color', 'maxValue', 'showInfo', 'showType', 'strokeWidth', 'strokeLinecap', 'trailColor'],
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 0475028..35cb31d 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -440,6 +440,18 @@
]
},
{
+ type: 'radio',
+ key: 'backgroundSize',
+ label: '鍥惧儚澶у皬',
+ initVal: card.backgroundSize || 'cover',
+ required: false,
+ options: [
+ { value: 'cover', text: '瑕嗙洊' },
+ { value: 'contain', text: '鍖呭惈' },
+ { value: 'auto', text: '鑷�傚簲' },
+ ]
+ },
+ {
type: 'number',
key: 'maxWidth',
min: 10,
diff --git a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
index b195aa8..29bf27a 100644
--- a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
@@ -328,6 +328,18 @@
},
{
type: 'radio',
+ key: 'backgroundSize',
+ label: '鍥惧儚澶у皬',
+ initVal: card.backgroundSize || 'cover',
+ required: false,
+ options: [
+ { value: 'cover', text: '瑕嗙洊' },
+ { value: 'contain', text: '鍖呭惈' },
+ { value: 'auto', text: '鑷�傚簲' },
+ ]
+ },
+ {
+ type: 'radio',
key: 'scale',
label: '鐐瑰嚮缂╂斁',
initVal: card.scale || 'true',
diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx
index 67cb0aa..aa252c7 100644
--- a/src/menu/components/table/base-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx
@@ -14,7 +14,7 @@
number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum', 'rowspan'],
link: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'joint', 'Width', 'fieldlength', 'blacklist', 'nameField'],
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'prefix', 'postfix', 'blacklist'],
- picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'scale', 'lenWidRadio', 'span'],
+ picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'scale', 'lenWidRadio', 'backgroundSize', 'span'],
video: ['label', 'field', 'type', 'Align', 'Hide', 'startTime', 'Width', 'fieldlength', 'blacklist', 'aspectRatio'],
colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'],
custom: ['label', 'type', 'Align', 'Hide', 'Width', 'blacklist'],
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index b4c2f4f..f1ff2b1 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -332,6 +332,18 @@
},
{
type: 'radio',
+ key: 'backgroundSize',
+ label: '鍥惧儚澶у皬',
+ initVal: card.backgroundSize || 'cover',
+ required: false,
+ options: [
+ { value: 'cover', text: '瑕嗙洊' },
+ { value: 'contain', text: '鍖呭惈' },
+ { value: 'auto', text: '鑷�傚簲' },
+ ]
+ },
+ {
+ type: 'radio',
key: 'scale',
label: '鐐瑰嚮缂╂斁',
initVal: card.scale || 'true',
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 a186e6e..0639e7d 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -14,7 +14,7 @@
number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum', 'rowspan'],
link: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'joint', 'Width', 'blacklist', 'nameField'],
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'blacklist'],
- picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'blacklist', 'scale', 'lenWidRadio', 'span'],
+ picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'blacklist', 'scale', 'lenWidRadio', 'backgroundSize', 'span'],
video: ['label', 'field', 'type', 'Align', 'Hide', 'startTime', 'Width', 'blacklist', 'aspectRatio'],
colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'],
custom: ['label', 'type', 'Align', 'Hide', 'Width', 'blacklist'],
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index a0eb57b..a7a0f74 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -562,6 +562,8 @@
} else {
_imagestyle.paddingTop = '100%'
}
+
+ _imagestyle.backgroundSize = card.backgroundSize || 'cover'
if (card.link) {
_style.cursor = 'pointer'
diff --git a/src/tabviews/custom/components/iframe/index.scss b/src/tabviews/custom/components/iframe/index.scss
index c46589b..9ca59f4 100644
--- a/src/tabviews/custom/components/iframe/index.scss
+++ b/src/tabviews/custom/components/iframe/index.scss
@@ -21,13 +21,11 @@
text-decoration: inherit;
font-weight: inherit;
font-style: inherit;
- float: left;
line-height: inherit;
margin-left: 10px;
position: relative;
z-index: 1;
min-height: 45px;
- min-width: 30px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 147ae63..34e9aad 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -255,7 +255,7 @@
<div>
{photos.map((url, i) => (
<Col key={i} span={col.span || 24}>
- <MkPicture style={{paddingTop}} scale={scale} url={url} urls={photos}/>
+ <MkPicture style={{paddingTop, backgroundSize: col.backgroundSize || 'cover'}} scale={scale} url={url} urls={photos}/>
</Col>
))}
</div>
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 50c3261..bc5c29d 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -841,13 +841,13 @@
} else if (item.type === 'timeline') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <TimeLine config={item} initdata={item.data}/>
+ <TimeLine config={item} initdata={item.data} mainSearch={[]}/>
</Col>
)
} else if (item.type === 'antvG6') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <AntvG6 config={item} initdata={item.data}/>
+ <AntvG6 config={item} initdata={item.data} mainSearch={[]}/>
</Col>
)
} else {
diff --git a/src/views/design/index.jsx b/src/views/design/index.jsx
index 83e0c4d..01b330d 100644
--- a/src/views/design/index.jsx
+++ b/src/views/design/index.jsx
@@ -13,6 +13,9 @@
class Design extends Component {
componentDidMount() {
+ window.debugger = false
+ window.GLOB.breakpoint = false
+ sessionStorage.removeItem('breakpoint')
setGLOBFuncs()
}
diff --git a/src/views/design/sidemenu/thdmenuplus/index.jsx b/src/views/design/sidemenu/thdmenuplus/index.jsx
index 3f03d93..c7e9792 100644
--- a/src/views/design/sidemenu/thdmenuplus/index.jsx
+++ b/src/views/design/sidemenu/thdmenuplus/index.jsx
@@ -50,7 +50,7 @@
let { sysTemplates } = this.state
let memberLevel = Utils.getMemberLevel()
const illust = { // 妯℃澘鍥剧墖锛岀敤浜庡凡浣跨敤妯℃澘
- CommonTable: mainsubtable,
+ BaseTable: mainsubtable,
TreePage: treepage,
CalendarPage: calendar,
CustomPage: customImg
@@ -60,7 +60,7 @@
let _templates = []
res.UserTemp.forEach(temp => {
- if (!['CommonTable', 'TreePage', 'CalendarPage', 'CustomPage'].includes(temp.Template)) {
+ if (!['BaseTable', 'CustomPage'].includes(temp.Template)) {
return
} else if (temp.Template === 'CustomPage' && memberLevel < 20) {
temp.disabled = true
@@ -184,7 +184,7 @@
loading: true
})
- if (sysMenu.Template === 'CustomPage' && sysMenu.copyId) {
+ if ((sysMenu.Template === 'CustomPage' || sysMenu.Template === 'BaseTable') && sysMenu.copyId) {
this.copyMenu(param, sysMenu.copyId)
} else {
Api.getSystemConfig(param).then(response => {
diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index 1a9abe7..6fd02fb 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -17,6 +17,10 @@
sessionStorage.setItem('isEditState', 'true')
window.GLOB.mkHS = true
+ // HS涓嬩笉鍙紑鍚柇鐐硅皟璇�
+ window.GLOB.breakpoint = false
+ sessionStorage.removeItem('breakpoint')
+
Object.defineProperty(window, 'debugger', {
writable: false,
value: false
--
Gitblit v1.8.0