From 6b5cb9058495b03f0a3ad36e0169c1c2e5dbabc4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 四月 2023 16:55:57 +0800
Subject: [PATCH] 2023-04-27
---
src/mob/components/formdragelement/card.jsx | 2
src/templates/zshare/modalform/index.jsx | 50 ++++++++++++++++
src/tabviews/custom/components/card/cardcellList/index.jsx | 9 +++
src/templates/zshare/formconfig.jsx | 2
src/templates/modalconfig/dragelement/card.jsx | 2
src/templates/zshare/modalform/modaleditable/index.jsx | 84 ++++++++++++++--------------
6 files changed, 105 insertions(+), 44 deletions(-)
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index e019a9f..3fc1d10 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -247,7 +247,7 @@
{formItem}
<div></div>
{showField && card.field ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
- {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> : ''}
+ {card.field}{card.hidden === 'true' || card.type === 'funcvar' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.readin === 'false' ? '锛堟湭濉厖锛�' : ''}{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/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index fb48b4b..fe7a373 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -406,6 +406,9 @@
val = <Paragraph copyable={{ text: orival }}>{val}</Paragraph>
}
}
+ } else if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
}
let className = ''
@@ -485,6 +488,9 @@
} else {
val = `${card.prefix || ''}${val}${card.postfix || ''}`
}
+ } else if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
}
let className = ''
@@ -790,6 +796,9 @@
} else {
val = <>{card.prefix || ''}{val}{card.postfix || ''}</>
}
+ } else if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
}
let className = ''
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 84118ae..441de5b 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -185,7 +185,7 @@
{formItem}
<div></div>
{showField ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
- {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> : ''}
+ {card.field}{card.hidden === 'true' || card.type === 'funcvar' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.readin === 'false' ? '锛堟湭濉厖锛�' : ''}{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/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 60ea825..4c8a091 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3942,6 +3942,8 @@
options: [
{value: 'default', text: '榛樿'},
{value: 'board', text: '闈㈡澘'},
+ {value: 'board-block', text: '闈㈡澘2'},
+ {value: 'dropdown', text: '涓嬫媺妗�'},
],
forbid: appType !== 'mob'
},
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 043f984..05f4698 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -808,6 +808,52 @@
return fields
}
+ transfer = (options) => {
+ if (options.length === 0) return options
+
+ let isNumber = true
+ options.forEach(item => {
+ if (!/^([0-9]|[1-9]\d{0,2})$/.test(item.Value)) {
+ isNumber = false
+ }
+ })
+
+ if (isNumber) {
+ return options.map(item => {
+ item.Value = +item.Value
+ return item
+ })
+ } else {
+ return options.map(item => {
+ item.Value = item.Value + ''
+ return item
+ })
+ }
+ }
+
+ transferCard = (options) => {
+ if (options.length === 0) return options
+
+ let isNumber = true
+ options.forEach(item => {
+ if (!/^([0-9]|[1-9]\d{0,2})$/.test(item.$value)) {
+ isNumber = false
+ }
+ })
+
+ if (isNumber) {
+ return options.map(item => {
+ item.$value = +item.$value
+ return item
+ })
+ } else {
+ return options.map(item => {
+ item.$value = item.$value + ''
+ return item
+ })
+ }
+ }
+
handleConfirm = () => {
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
@@ -823,6 +869,8 @@
if (values.type === 'radio' && values.linkField) {
type = 'link'
}
+
+ values.options = this.transfer(values.options)
if (values.options.filter(op => op.Text === '').length > 0) {
notification.warning({
@@ -877,6 +925,8 @@
return m
})
+ values.options = this.transferCard(values.options)
+
let type = values.type
if (values.linkField) {
type = 'link'
diff --git a/src/templates/zshare/modalform/modaleditable/index.jsx b/src/templates/zshare/modalform/modaleditable/index.jsx
index 5e84435..053e370 100644
--- a/src/templates/zshare/modalform/modaleditable/index.jsx
+++ b/src/templates/zshare/modalform/modaleditable/index.jsx
@@ -140,51 +140,51 @@
})
}
- changeDatatype = (column) => {
- const { columns, dataSource } = this.state
- let value = column.datatype !== 'number' ? 'number' : 'string'
- let _data = dataSource.map(item => {
- let val = item[column.dataIndex]
- if (value === 'number') {
- val = parseFloat(val)
- if (isNaN(val)) {
- val = 0
- }
- } else {
- val = '' + val
- }
+ // changeDatatype = (column) => {
+ // const { columns, dataSource } = this.state
+ // let value = column.datatype !== 'number' ? 'number' : 'string'
+ // let _data = dataSource.map(item => {
+ // let val = item[column.dataIndex]
+ // if (value === 'number') {
+ // val = parseFloat(val)
+ // if (isNaN(val)) {
+ // val = 0
+ // }
+ // } else {
+ // val = '' + val
+ // }
- item[column.dataIndex] = val
+ // item[column.dataIndex] = val
- return item
- })
+ // return item
+ // })
- this.setState({
- dataSource: _data,
- columns: columns.map(col => {
- if (col.dataIndex === column.dataIndex) {
- col.datatype = value
- }
+ // this.setState({
+ // dataSource: _data,
+ // columns: columns.map(col => {
+ // if (col.dataIndex === column.dataIndex) {
+ // col.datatype = value
+ // }
- if (col.dataIndex !== 'operation') {
- col.title = <div>
- {col.$title}
- <Popconfirm
- title={`纭畾鍒囨崲涓�${col.datatype === 'number' ? '鏂囨湰' : '鏁板��'}鍚楋紵`}
- overlayClassName="popover-confirm"
- onConfirm={() => this.changeDatatype(col)
- }>
- <SwapOutlined style={{ color: col.datatype === 'number' ? '#1890ff' : ''}} />
- </Popconfirm>
- </div>
- }
+ // if (col.dataIndex !== 'operation') {
+ // col.title = <div>
+ // {col.$title}
+ // {/* <Popconfirm
+ // title={`纭畾鍒囨崲涓�${col.datatype === 'number' ? '鏂囨湰' : '鏁板��'}鍚楋紵`}
+ // overlayClassName="popover-confirm"
+ // onConfirm={() => this.changeDatatype(col)
+ // }>
+ // <SwapOutlined style={{ color: col.datatype === 'number' ? '#1890ff' : ''}} />
+ // </Popconfirm> */}
+ // </div>
+ // }
- return col
- })
- }, () => {
- this.props.onChange(_data)
- })
- }
+ // return col
+ // })
+ // }, () => {
+ // this.props.onChange(_data)
+ // })
+ // }
handleUpDown = (record, direction) => {
const { dataSource } = this.state
@@ -373,13 +373,13 @@
if (col.dataIndex !== 'operation') {
col.title = <div>
{col.$title}
- <Popconfirm
+ {/* <Popconfirm
title={`纭畾鍒囨崲涓�${col.datatype === 'number' ? '鏂囨湰' : '鏁板��'}鍚楋紵`}
overlayClassName="popover-confirm"
onConfirm={() => this.changeDatatype(col)
}>
<SwapOutlined style={{ color: col.datatype === 'number' ? '#1890ff' : ''}} />
- </Popconfirm>
+ </Popconfirm> */}
</div>
}
return col
--
Gitblit v1.8.0