Commit 9664daf3 authored by 皮倩雯's avatar 皮倩雯

fix: '修改图片形态允许从相册选择存储位置'

parent 7a91a5ff
Pipeline #66013 waiting for manual action with stages
...@@ -281,7 +281,7 @@ const AddModal = props => { ...@@ -281,7 +281,7 @@ const AddModal = props => {
case '图片': case '图片':
case '可预览图片': case '可预览图片':
// data[0].Config = pramData.picture ? '拍照相册' : ''; // data[0].Config = pramData.picture ? '拍照相册' : '';
data[0].Preset = pramData.picture ? '拍照相册' : ''; data[0].Config = pramData.picture ? '拍照相册' : '';
data[0].ValidationRule = pramData.must ? 'required' : ''; data[0].ValidationRule = pramData.must ? 'required' : '';
break; break;
case '值选择器': case '值选择器':
...@@ -700,12 +700,12 @@ const AddModal = props => { ...@@ -700,12 +700,12 @@ const AddModal = props => {
break; break;
case '图片': case '图片':
// res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false); // res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false);
res[0].data.root.Preset === '拍照相册' ? (picture = true) : (picture = false); res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false);
res[0].data.root.ValidationRule === 'required' ? (must = true) : (must = false); res[0].data.root.ValidationRule === 'required' ? (must = true) : (must = false);
break; break;
case '可预览图片': case '可预览图片':
// res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false); // res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false);
res[0].data.root.Preset === '拍照相册' ? (picture = true) : (picture = false); res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false);
res[0].data.root.ValidationRule === 'required' ? (must = true) : (must = false); res[0].data.root.ValidationRule === 'required' ? (must = true) : (must = false);
break; break;
case '编码': case '编码':
...@@ -1151,7 +1151,7 @@ const AddModal = props => { ...@@ -1151,7 +1151,7 @@ const AddModal = props => {
// 清空表单数据 // 清空表单数据
let index = res[2].data.root.find(item => item.Name == res[0].data.root.ExceptionEvent); let index = res[2].data.root.find(item => item.Name == res[0].data.root.ExceptionEvent);
console.log(index); console.log(index);
getFieldData(index.TableName); // getFieldData(index.TableName);
} }
}); });
} }
...@@ -1765,7 +1765,7 @@ const AddModal = props => { ...@@ -1765,7 +1765,7 @@ const AddModal = props => {
case '图片': case '图片':
case '可预览图片': case '可预览图片':
// aa.Config === '拍照相册' ? (picture = true) : (picture = false); // aa.Config === '拍照相册' ? (picture = true) : (picture = false);
aa.Preset === '拍照相册' ? (picture = true) : (picture = false); aa.Config === '拍照相册' ? (picture = true) : (picture = false);
aa.ValidationRule === 'required' ? (must = true) : (must = false); aa.ValidationRule === 'required' ? (must = true) : (must = false);
break; break;
case '编码': case '编码':
...@@ -2251,7 +2251,7 @@ const AddModal = props => { ...@@ -2251,7 +2251,7 @@ const AddModal = props => {
case '图片': case '图片':
case '可预览图片': case '可预览图片':
// res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false); // res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false);
res[0].data.root.Preset === '拍照相册' ? (picture = true) : (picture = false); res[0].data.root.Config === '拍照相册' ? (picture = true) : (picture = false);
res[0].data.root.ValidationRule === 'required' ? (must = true) : (must = false); res[0].data.root.ValidationRule === 'required' ? (must = true) : (must = false);
break; break;
case '编码': case '编码':
...@@ -2717,7 +2717,7 @@ const AddModal = props => { ...@@ -2717,7 +2717,7 @@ const AddModal = props => {
case '图片': case '图片':
case '可预览图片': case '可预览图片':
// data[0].Config = pramData.picture ? '拍照相册' : ''; // data[0].Config = pramData.picture ? '拍照相册' : '';
data[0].Preset = pramData.picture ? '拍照相册' : ''; data[0].Config = pramData.picture ? '拍照相册' : '';
data[0].ValidationRule = pramData.must ? 'required' : ''; data[0].ValidationRule = pramData.must ? 'required' : '';
break; break;
case '搜索选择器': case '搜索选择器':
......
...@@ -778,9 +778,7 @@ const SiteManage = () => { ...@@ -778,9 +778,7 @@ const SiteManage = () => {
} }
}); });
let last = lastdata.filter(ele => ele.roleList.length > 0 || ele.child.length > 0); let last = lastdata.filter(ele => ele.roleList.length > 0 || ele.child.length > 0);
console.log(last);
let arr = transTree(JSON.parse(JSON.stringify(last)), value); let arr = transTree(JSON.parse(JSON.stringify(last)), value);
console.log(arr);
setTreeData(arr); setTreeData(arr);
} else { } else {
let arr = transTree(JSON.parse(JSON.stringify(keepTreeData)), ''); let arr = transTree(JSON.parse(JSON.stringify(keepTreeData)), '');
...@@ -802,6 +800,7 @@ const SiteManage = () => { ...@@ -802,6 +800,7 @@ const SiteManage = () => {
}); });
return treedata; return treedata;
}; };
return ( return (
<PageContainer> <PageContainer>
<div <div
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment