Commit 32159aff authored by wenmo's avatar wenmo

[Fix-211][web]Fix to create form linkage

parent c73d67d1
...@@ -34,7 +34,6 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => { ...@@ -34,7 +34,6 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
} = props; } = props;
const onValuesChange = (change: any,all: any)=>{ const onValuesChange = (change: any,all: any)=>{
console.log(change);
setFormVals({...formVals,...change}); setFormVals({...formVals,...change});
}; };
...@@ -44,7 +43,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => { ...@@ -44,7 +43,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
handleSubmit(buildJSONData(formVals,fieldsValue)); handleSubmit(buildJSONData(formVals,fieldsValue));
}; };
const renderContent = () => { const renderContent = (vals) => {
return ( return (
<> <>
<Divider>微信企业号配置</Divider> <Divider>微信企业号配置</Divider>
...@@ -66,7 +65,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => { ...@@ -66,7 +65,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
<Radio value='群聊'>群聊</Radio> <Radio value='群聊'>群聊</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
{ (formVals.sendType == "群聊") && { (vals.sendType == "群聊") ?
<> <>
<Form.Item <Form.Item
name="webhook" name="webhook"
...@@ -86,9 +85,9 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => { ...@@ -86,9 +85,9 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
validateTrigger={['onChange', 'onBlur']} validateTrigger={['onChange', 'onBlur']}
label="@所有人"> label="@所有人">
<Switch checkedChildren="启用" unCheckedChildren="禁用" <Switch checkedChildren="启用" unCheckedChildren="禁用"
defaultChecked={formVals.isAtAll}/> defaultChecked={vals.isAtAll}/>
</Form.Item> </Form.Item>
{ ( !formVals.isAtAll )&& { ( !vals.isAtAll )&&
<Form.Item <Form.Item
name="users" name="users"
label="被@用户" label="被@用户"
...@@ -98,8 +97,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => { ...@@ -98,8 +97,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
</Form.Item> </Form.Item>
} }
</> </>
} :
{ (!formVals.sendType||formVals.sendType == "应用") &&
<> <>
<Form.Item <Form.Item
name="corpId" name="corpId"
...@@ -152,7 +150,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => { ...@@ -152,7 +150,7 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
name="enabled" name="enabled"
label="是否启用"> label="是否启用">
<Switch checkedChildren="启用" unCheckedChildren="禁用" <Switch checkedChildren="启用" unCheckedChildren="禁用"
defaultChecked={formVals.enabled}/> defaultChecked={vals.enabled}/>
</Form.Item> </Form.Item>
</> </>
); );
......
import {AlertInstanceTableListItem} from "@/pages/AlertInstance/data"; import {AlertInstanceTableListItem} from "@/pages/AlertInstance/data";
export const getJSONData = (values: AlertInstanceTableListItem) => { export const getJSONData = (values: AlertInstanceTableListItem) => {
if(!values||!values.params||values.params==''){ if(!values.params||values.params==''){
return {}; return values;
} }
let data = JSON.parse(values.params); let data = JSON.parse(values.params);
return {...data,...values}; return {...data,...values};
......
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