From 60dee3dc4dc6869231d6adb0c94c47e36114ca91 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 四月 2022 09:11:34 +0800
Subject: [PATCH] 2022-04-21
---
src/mob/components/formdragelement/card.jsx | 2
src/mob/components/menubar/common-menubar/options.jsx | 5 +-
src/mob/components/menubar/normal-menubar/options.jsx | 5 +-
src/mob/components/menubar/normal-menubar/index.scss | 7 +++
src/views/pcdesign/index.jsx | 6 +-
src/mob/components/menubar/common-menubar/index.scss | 7 +++
src/tabviews/zshare/normalTable/index.jsx | 15 ++++++-
src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx | 1
src/templates/modalconfig/dragelement/card.jsx | 2
src/utils/option.js | 30 +++++++++++++-
src/views/design/sidemenu/config.jsx | 1
src/utils/utils.js | 27 +++++++------
12 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index 85ab729..4c35773 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -214,7 +214,7 @@
{formItem}
<div></div>
{showField && card.field ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
- {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.linkField ? <span style={{color: '#1890ff'}}>{`锛堝叧鑱�${card.linkField}锛塦}</span> : ''}{card.supField ? <span style={{color: '#8E44AD'}}>{`锛堜笂绾�${card.supField}锛塦}</span> : ''}
+ {card.field}{card.hidden === 'true' || card.type === 'funcvar' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.linkField ? <span style={{color: '#1890ff'}}>{`锛堝叧鑱�${card.linkField}锛塦}</span> : ''}{card.supField ? <span style={{color: '#8E44AD'}}>{`锛堜笂绾�${card.supField}锛塦}</span> : ''}
</div> : ''}
</Form.Item>
</div>
diff --git a/src/mob/components/menubar/common-menubar/index.scss b/src/mob/components/menubar/common-menubar/index.scss
index 042afc5..d28f371 100644
--- a/src/mob/components/menubar/common-menubar/index.scss
+++ b/src/mob/components/menubar/common-menubar/index.scss
@@ -50,6 +50,13 @@
}
}
}
+ .flex-layout {
+ display: flex;
+ >.ant-col {
+ flex: 1;
+ width: 5%;
+ }
+ }
.menu-item {
overflow: hidden;
diff --git a/src/mob/components/menubar/common-menubar/options.jsx b/src/mob/components/menubar/common-menubar/options.jsx
index 65029fe..114ec44 100644
--- a/src/mob/components/menubar/common-menubar/options.jsx
+++ b/src/mob/components/menubar/common-menubar/options.jsx
@@ -59,8 +59,9 @@
initval: wrap.layout || 'grid',
required: false,
options: [
- {value: 'grid', label: '鏍呮牸甯冨眬'},
- {value: 'vertical', label: '涓婁笅甯冨眬'},
+ {value: 'grid', label: '鏍呮牸'},
+ {value: 'vertical', label: '涓婁笅'},
+ {value: 'flex', label: '寮规��'},
],
controlFields: [
{field: 'menuWidth', values: ['grid']},
diff --git a/src/mob/components/menubar/normal-menubar/index.scss b/src/mob/components/menubar/normal-menubar/index.scss
index f5e0186..8732c16 100644
--- a/src/mob/components/menubar/normal-menubar/index.scss
+++ b/src/mob/components/menubar/normal-menubar/index.scss
@@ -50,6 +50,13 @@
}
}
}
+ .flex-layout {
+ display: flex;
+ >.ant-col {
+ flex: 1;
+ width: 5%;
+ }
+ }
.menu-item {
overflow: hidden;
diff --git a/src/mob/components/menubar/normal-menubar/options.jsx b/src/mob/components/menubar/normal-menubar/options.jsx
index fc8d7f2..0cdd7bc 100644
--- a/src/mob/components/menubar/normal-menubar/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/options.jsx
@@ -48,8 +48,9 @@
initval: wrap.layout || 'grid',
required: false,
options: [
- {value: 'grid', label: '鏍呮牸甯冨眬'},
- {value: 'vertical', label: '涓婁笅甯冨眬'},
+ {value: 'grid', label: '鏍呮牸'},
+ {value: 'vertical', label: '涓婁笅'},
+ {value: 'flex', label: '寮规��'},
]
},
{
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index ee502f0..123c966 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -115,8 +115,17 @@
}
}
- columns.forEach((item, index) => {
- if (item.hidden === true || item.Hide === 'true') return
+ columns.forEach(item => {
+ if (item.hidden === true || item.Hide === 'true') {
+ if (item.marks) { // 鎻愬彇琛屾爣璁�
+ item.marks.forEach(mark => {
+ if (mark.signType !== 'line') return
+
+ lineMarks.push(mark)
+ })
+ }
+ return
+ }
let cell = null
if (item.type === 'colspan') {
@@ -235,7 +244,7 @@
pageOptions.push(size)
pageOptions = pageOptions.sort((a, b) => a - b)
}
-
+
this.setState({
pageOptions,
columns: _columns,
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 01ad1e7..bbd5db0 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -172,7 +172,7 @@
{formItem}
<div></div>
{showField ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
- {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.linkField ? <span style={{color: '#1890ff'}}>{`锛堝叧鑱�${card.linkField}锛塦}</span> : ''}{card.supField ? <span style={{color: '#8E44AD'}}>{`锛堜笂绾�${card.supField}锛塦}</span> : ''}
+ {card.field}{card.hidden === 'true' || card.type === 'funcvar' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.linkField ? <span style={{color: '#1890ff'}}>{`锛堝叧鑱�${card.linkField}锛塦}</span> : ''}{card.supField ? <span style={{color: '#8E44AD'}}>{`锛堜笂绾�${card.supField}锛塦}</span> : ''}
</div> : ''}
</Form.Item>}
</div>
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
index 91ff3d3..41c0125 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
@@ -53,6 +53,7 @@
<div className="ant-table-column-fields">
<span className="ant-table-column-title">{card.type === 'colspan' ? card.subfield : card.field}</span>
{card.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
+ {['text', 'number'].includes(card.type) && card.marks && card.marks.length ? <AntDesignOutlined style={{marginLeft: '5px', color: 'purple', fontSize: '12px'}}/> : null}
</div> : null
}
</span>
diff --git a/src/utils/option.js b/src/utils/option.js
index 3a2d801..58196a7 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -196,6 +196,18 @@
}, {
value: '=',
text: '='
+ }, {
+ value: '>',
+ text: '>'
+ }, {
+ value: '<',
+ text: '<'
+ }, {
+ value: '>=',
+ text: '>='
+ }, {
+ value: '<=',
+ text: '<='
}],
multiselect: [{
value: 'like',
@@ -205,14 +217,26 @@
text: 'not like'
}],
select: [{
- value: '=',
- text: '='
- }, {
value: 'like',
text: 'like'
}, {
value: 'not like',
text: 'not like'
+ }, {
+ value: '=',
+ text: '='
+ }, {
+ value: '>',
+ text: '>'
+ }, {
+ value: '<',
+ text: '<'
+ }, {
+ value: '>=',
+ text: '>='
+ }, {
+ value: '<=',
+ text: '<='
}],
date: [{
value: '>=',
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6e6596a..91cd72f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -507,20 +507,23 @@
static joinMainSearchkey (searches) {
if (!searches || searches.length === 0) return ''
- let searchText = ''
+ let searchText = []
searches.forEach(item => {
if (item.forbid || !item.value) return
- searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
- let str = item.match === '=' ? '' : '%'
+ let str = item.match === 'like' || item.match === 'not like' ? '%' : ''
let fields = item.key.split(',').map(field => {
return field + ' ' + item.match + ' \'' + str + item.value + str + '\''
})
- searchText += '(' + fields.join(' OR ') + ')'
+ searchText.push('(' + fields.join(' OR ') + ')')
+ } else if (item.type === 'checkcard') {
+ let str = item.match === 'like' || item.match === 'not like' ? '%' : ''
+
+ searchText.push('(' + item.key + ' ' + item.match + ' \'' + str + item.value + str + '\')')
} else if (item.type === 'multi') {
- searchText += `'${item.value}' ${item.match} '%'+${item.key}+'%'`
+ searchText.push(`('${item.value}' ${item.match} '%'+${item.key}+'%')`)
} else if (item.type === 'date') {
let _val = item.value
let timetail = ''
@@ -544,17 +547,17 @@
timetail = '.000'
}
- searchText += '(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')'
+ searchText.push('(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')')
} else if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'daterange') {
let val = item.value.split(',')
let _startval = ''
@@ -574,17 +577,17 @@
_endval = val[1] + '.000'
}
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText += '(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')'
+ searchText.push('(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')')
} else {
- searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
+ searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
}
})
- return searchText
+ return searchText.join(' AND ')
}
/**
diff --git a/src/views/design/sidemenu/config.jsx b/src/views/design/sidemenu/config.jsx
index a9c12b3..40e4bf2 100644
--- a/src/views/design/sidemenu/config.jsx
+++ b/src/views/design/sidemenu/config.jsx
@@ -212,6 +212,7 @@
PageParam: {Icon: 'folder'},
children: [{
src: '',
+ systems: ['production', 'local', 'SSO', 'cloud'],
PageParam: {OpenType: 'newtab', Template: 'ManageTable'},
type: 'ManageTable',
MenuID: '1577972969199lei1g0qkvlh4tkc908m',
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 0e2fecd..b71d127 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -246,7 +246,7 @@
return
}
- let homeId = MenuID || ''
+ let homeId = ''
let appViewList = []
if (res.data && res.data.length > 0) {
appViewList = res.data
@@ -258,7 +258,7 @@
}
if (!homeId) {
- homeId = Utils.getuuid()
+ homeId = MenuID || Utils.getuuid()
let param = {
func: 's_kei_link_keyids_addupt',
@@ -297,7 +297,7 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
- this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
+ this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: MenuID || homeId, type: 'view'}))))
}
})
}
--
Gitblit v1.8.0