From c7df940632b5f238f524da651fbf27a91ff6ad36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 26 十月 2020 16:54:46 +0800
Subject: [PATCH] 2020-10-26
---
src/views/menudesign/index.jsx | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 93c3398..a21d6c6 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -26,7 +26,8 @@
const MenuForm = asyncComponent(() => import('@/menu/menuform'))
const SourceWrap = asyncComponent(() => import('@/menu/modelsource'))
const MenuShell = asyncComponent(() => import('@/menu/menushell'))
-const Controller = asyncComponent(() => import('@/menu/bgcontroller'))
+const BgController = asyncComponent(() => import('@/menu/bgcontroller'))
+const PaddingController = asyncComponent(() => import('@/menu/padcontroller'))
const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
const ModalController = asyncComponent(() => import('@/menu/modalconfig/controller'))
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
@@ -235,7 +236,10 @@
MenuNo: MenuNo,
tables: [],
components: [],
- style: {backgroundColor: '#ffffff', backgroundImage: ''}
+ style: {
+ backgroundColor: '#ffffff', backgroundImage: '',
+ paddingTop: '16px', paddingBottom: '80px', paddingLeft: '16px', paddingRight: '16px'
+ }
}
} else {
config.uuid = MenuId
@@ -338,7 +342,10 @@
}
config.components.forEach(item => {
- if (!error && item.setting) {
+ if (error) return
+ if (item.subtype === 'propcard' && item.wrap.datatype === 'static') return
+
+ if (item.setting) {
if (item.setting.interType === 'system' && item.setting.execute !== 'false' && !item.setting.dataresource) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (item.setting.interType === 'system' && item.setting.execute === 'false' && item.scripts.length === 0) {
@@ -347,7 +354,7 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
}
}
- if (!error && (item.type === 'bar' || item.type === 'line' || item.type === 'pie')) {
+ if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
if (!item.plot.Xaxis) {
error = `缁勪欢銆�${item.name}銆嬪浘琛ㄥ瓧娈靛皻鏈缃紒`
}
@@ -422,7 +429,10 @@
<SourceWrap />
</Panel>
<Panel header={'鑳屾櫙'} key="background">
- {config ? <Controller config={config} updateConfig={this.updateConfig} /> : null}
+ {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
+ </Panel>
+ <Panel header={'鍐呰竟璺�'} key="padding">
+ {config ? <PaddingController config={config} updateConfig={this.updateConfig} /> : null}
</Panel>
</Collapse>
</div>
--
Gitblit v1.8.0