From 4d13944afeb0e095dfedaf820a192f844f5f541a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十月 2021 12:11:01 +0800
Subject: [PATCH] 2021-10-15
---
src/templates/sharecomponent/fieldscomponent/index.jsx | 2 +-
src/menu/components/card/data-card/options.jsx | 4 ++--
src/menu/components/group/paste/index.jsx | 2 +-
src/menu/components/share/actioncomponent/formconfig.jsx | 4 ++--
src/menu/components/table/normal-table/index.jsx | 4 ++--
src/pc/menushell/card.jsx | 3 +++
src/views/mobdesign/index.jsx | 2 +-
src/menu/components/tabs/paste/index.jsx | 2 +-
src/pc/menushell/index.jsx | 1 +
src/templates/sharecomponent/searchcomponent/index.jsx | 2 ++
10 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index f86434a..6907ff4 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -186,8 +186,8 @@
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岃繑鍥炰笂涓�鐣岄潰銆�',
required: false,
options: [
- {value: 'true', label: '鍔ㄦ��'},
- {value: 'false', label: '闈欐��'},
+ {value: 'true', label: '鏄�'},
+ {value: 'false', label: '鍚�'},
],
forbid: subtype !== 'propcard' || appType !== 'mob'
},
diff --git a/src/menu/components/group/paste/index.jsx b/src/menu/components/group/paste/index.jsx
index e17c39f..4bc2a2d 100644
--- a/src/menu/components/group/paste/index.jsx
+++ b/src/menu/components/group/paste/index.jsx
@@ -23,7 +23,7 @@
}
pasteSubmit = () => {
- let options = ['datacard', 'propcard', 'balcony', 'stepform', 'tabform', 'normaltable', 'tablecard', 'line', 'bar', 'pie', 'dashboard', 'scatter']
+ let options = ['datacard', 'propcard', 'balcony', 'stepform', 'tabform', 'normaltable', 'tablecard', 'line', 'bar', 'pie', 'dashboard', 'scatter', 'chart']
let types = {
login: '鐧诲綍',
navbar: '瀵艰埅鏍�',
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 00361d1..f7ff1d8 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -385,8 +385,8 @@
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
}, {
- value: 'closetab',
- text: '鍏抽棴鏍囩'
+ value: !appType ? 'closetab' : 'goback',
+ text: !appType ? '鍏抽棴鏍囩' : '杩斿洖锛堜笂涓�涓〉闈級'
},
...refresh]
},
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 030ba32..fe363e0 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -55,8 +55,8 @@
dataName: card.dataName || '',
width: card.width || 24,
search: [
- { origin: true, uuid: Utils.getuuid(), label: 'label', type: 'text', match: 'like' },
- { origin: true, uuid: Utils.getuuid(), label: 'label', type: 'select', match: 'equal' }
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text', match: 'like' },
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'select', match: 'equal' }
],
action: [
{ origin: true, uuid: Utils.getuuid(), label: '娣诲姞', intertype: 'system', OpenType: 'pop', execSuccess: 'grid', icon: 'plus', class: 'green', style: {color: 'rgb(255, 255, 255)', background: 'rgb(38, 194, 129)', marginRight: '15px'} },
diff --git a/src/menu/components/tabs/paste/index.jsx b/src/menu/components/tabs/paste/index.jsx
index 9f0d0d1..4c5dde6 100644
--- a/src/menu/components/tabs/paste/index.jsx
+++ b/src/menu/components/tabs/paste/index.jsx
@@ -72,7 +72,7 @@
pasteSubmit = () => {
const { Tab } = this.props
- let options = ['tabs', 'group', 'datacard', 'propcard', 'balcony', 'normaltable', 'mainsearch', 'stepform', 'tabform', 'tablecard', 'line', 'bar', 'pie', 'dashboard', 'scatter']
+ let options = ['tabs', 'group', 'datacard', 'propcard', 'balcony', 'normaltable', 'mainsearch', 'stepform', 'tabform', 'tablecard', 'line', 'bar', 'pie', 'dashboard', 'scatter', 'chart']
let types = {
login: '鐧诲綍',
navbar: '瀵艰埅鏍�',
diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index 45a2108..5078340 100644
--- a/src/pc/menushell/card.jsx
+++ b/src/pc/menushell/card.jsx
@@ -26,6 +26,7 @@
const CarouselDataCard = asyncComponent(() => import('@/menu/components/carousel/data-card'))
const CarouselPropCard = asyncComponent(() => import('@/menu/components/carousel/prop-card'))
const Balcony = asyncComponent(() => import('@/menu/components/card/balcony'))
+const CustomChart = asyncComponent(() => import('@/menu/components/chart/chart-custom'))
const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
const originalIndex = findCard(id).index
@@ -121,6 +122,8 @@
return (<NormalLogin card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'balcony') {
return (<Balcony card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'chart') {
+ return (<CustomChart card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx
index 6143786..f0b6c0c 100644
--- a/src/pc/menushell/index.jsx
+++ b/src/pc/menushell/index.jsx
@@ -105,6 +105,7 @@
let name = ''
let names = {
bar: '鏌辩姸鍥�',
+ chart: '鍥捐〃',
line: '鎶樼嚎鍥�',
tabs: '鏍囩缁�',
pie: '楗煎浘',
diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 8ae766f..74c72a4 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -49,7 +49,7 @@
if (type === 'search') {
// 娣诲姞鎼滅储鏉′欢锛屽瓧娈甸泦涓瓨鍦ㄦ悳绱㈡潯浠跺瓧娈碉紝浣跨敤鎼滅储鏉′欢瀵硅薄鏇挎崲瀛楁闆嗭紝璁剧疆鏁版嵁绫诲瀷
config.search.forEach(item => {
- if (columns.has(item.field.toLowerCase())) {
+ if (item.field && columns.has(item.field.toLowerCase())) {
let _datatype = columns.get(item.field.toLowerCase()).datatype
columns.set(item.field.toLowerCase(), {...item, origin: true, datatype: _datatype})
}
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 8545707..73cae07 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -77,6 +77,8 @@
})
} else if (type === 'multil') {
let list = [...searchlist, ...item]
+ list = list.filter(item => !item.origin) // 鍘婚櫎绯荤粺椤�
+
this.setState({
searchlist: list
}, () => {
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 19b9f5e..92afeab 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1143,7 +1143,7 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
- } else if (!item.setting.supModule) {
+ } else if (!item.setting.supModule && item.type !== 'navbar') {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
--
Gitblit v1.8.0