From c56dd9479e4c44af4b58c5a14c6f0f3f3cc20d85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 三月 2025 15:37:20 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/modalform/index.jsx | 89 +++++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 42 deletions(-)
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index de7bc87..63636ae 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -896,51 +896,51 @@
return fields
}
- transfer = (options) => {
- if (options.length === 0) return options
+ // transfer = (options) => {
+ // if (options.length === 0) return options
- let isNumber = true
- options.forEach(item => {
- if (!item.Value || isNaN(item.Value)) {
- isNumber = false
- }
- })
+ // let isNumber = true
+ // options.forEach(item => {
+ // if (!item.Value || isNaN(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
- })
- }
- }
+ // 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
+ // 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
- }
- })
+ // 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
- })
- }
- }
+ // if (isNumber) {
+ // return options.map(item => {
+ // item.$value = +item.$value
+ // return item
+ // })
+ // } else {
+ // return options.map(item => {
+ // item.$value = item.$value + ''
+ // return item
+ // })
+ // }
+ // }
handleConfirm = () => {
const { card, fields } = this.props
@@ -976,13 +976,17 @@
if (['multiselect', 'select', 'link', 'radio', 'checkbox'].includes(values.type)) {
if (values.resourceType === '0') {
values.options = values.options || []
+ values.options = values.options.map(item => {
+ item.Value = item.Value + ''
+ return item
+ })
values.dataSource = ''
let type = values.type
if (values.type === 'radio' && values.linkField) {
type = 'link'
}
- values.options = this.transfer(values.options)
+ // values.options = this.transfer(values.options)
if (values.options.filter(op => op.Text === '').length > 0) {
notification.warning({
@@ -1030,6 +1034,7 @@
let linkSubFields = values.linkSubField || []
values.options = values.options.map(m => {
m.ParentID = m.ParentID || ''
+ m.$value = m.$value + ''
linkSubFields.forEach(n => {
m[n] = m[n] || ''
@@ -1037,7 +1042,7 @@
return m
})
- values.options = this.transferCard(values.options)
+ // values.options = this.transferCard(values.options)
let type = values.type
if (values.linkField) {
--
Gitblit v1.8.0