Skip to content

C
CivManage
Commit 6d6071a0 authored by 邓超's avatar 邓超
Browse files
Options

Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

parents 6a3a8f8f db608237
Pipeline #38729 skipped with stages
        Show whitespace changes
        Inline Side-by-side
        Showing with 287 additions and 91 deletions
        .env
        View file @ 6d6071a0
        # PUBLIC_PATH = reactOMS, 默认转发 /cityinterface # PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
        PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.12.116:8015;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049 PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.19.105:8049;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049
        # PROXY=/Cityinterface:http://192.168.12.121:8082;/PandaOMS:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082 # PROXY=/Cityinterface:http://192.168.12.121:8082;/PandaOMS:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082
        # 可设置第二个代理，test为转发前缀，后面为代理转发的地址 # 可设置第二个代理，test为转发前缀，后面为代理转发的地址
        # PROXY2 = test : http://localhost:8006/ # PROXY2 = test : http://localhost:8006/
        ......
        src/pages/dataCenter/dictionary1/WebDic.js
        View file @ 6d6071a0
        ...@@ -53,7 +53,7 @@ const WebDic = () => { ...@@ -53,7 +53,7 @@ const WebDic = () => {
        const history = useHistory(); const history = useHistory();
        const [showSearchStyle, setShowSearchStyle] = useState(false); // 是否显示模糊查询样式 const [showSearchStyle, setShowSearchStyle] = useState(false); // 是否显示模糊查询样式
        const [orderTable, setOrderTable] = useState([]); const [orderTable, setOrderTable] = useState([]);
        const [flowIDs, setFlowIDs] = useState(''); const [orderTable1, setOrderTable1] = useState([]);
        const [fgg, setFgg] = useState(0); const [fgg, setFgg] = useState(0);
        const [InPutVisible, setInPutVisible] = useState(false); const [InPutVisible, setInPutVisible] = useState(false);
        ...@@ -319,24 +319,24 @@ const WebDic = () => { ...@@ -319,24 +319,24 @@ const WebDic = () => {
        }, [flag]); }, [flag]);
        const setOd = e =>{ const setOd = e => {
        setOrderTable(e) setOrderTable(e)
        setFgg(fgg+1) setFgg(fgg + 1)
        } }
        useEffect(() => { const setOd1 = e => {
        setOrderTable(() => { setOrderTable1(e)
        let table; setFgg(fgg + 1)
        console.log(data) }
        table = data.filter(item => item.nodeID !== -1);
        console.log(table)
        return table;
        });
        useEffect(() => {
        setOrderTable(data);
        setOrderTable1(subData);
        }, [fgg]); }, [fgg]);
        // 根据orderTable值改变flowIDs // 根据orderTable值改变flowIDs
        useEffect(() => { useEffect(() => {
        let ids = ''; let ids = '';
        console.log(orderTable)
        orderTable.forEach((item, index) => { orderTable.forEach((item, index) => {
        if (index === orderTable.length - 1) { if (index === orderTable.length - 1) {
        ids += `${item.nodeID}`; ids += `${item.nodeID}`;
        ...@@ -345,8 +345,34 @@ const WebDic = () => { ...@@ -345,8 +345,34 @@ const WebDic = () => {
        } }
        }); });
        console.log(ids) console.log(ids)
        setFlowIDs(ids); let bb = ids.split(",")
        console.log(bb)
        setLoading(true)
        DataDictionaryChangeOrder(bb).then(res => {
        setLoading(false)
        })
        }, [orderTable]); }, [orderTable]);
        useEffect(() => {
        let ids = '';
        console.log(orderTable1)
        if(orderTable1 != ''){
        orderTable1.forEach((item, index) => {
        if (index === orderTable1.length - 1) {
        ids += `${item.nodeID}`;
        } else {
        ids += `${item.nodeID},`;
        }
        });
        }
        console.log(ids)
        let bb = ids.split(",")
        console.log(bb)
        setIsloading(true)
        DataDictionaryChangeOrder(bb).then(res => {
        setIsloading(false)
        })
        }, [orderTable1]);
        // 根据父节点nodeID（即parentID）获取子节点数据，一级条目parentID = -1 // 根据父节点nodeID（即parentID）获取子节点数据，一级条目parentID = -1
        const getData = value => { const getData = value => {
        console.log(value); console.log(value);
        ...@@ -379,6 +405,7 @@ const WebDic = () => { ...@@ -379,6 +405,7 @@ const WebDic = () => {
        } else if (value) { } else if (value) {
        console.log(res); console.log(res);
        setSubData(res);//设置二级条目,res为空[]时也要设置 setSubData(res);//设置二级条目,res为空[]时也要设置
        setOd1(res)
        } }
        isLoadingShow(value, false) isLoadingShow(value, false)
        // } else { // } else {
        ...@@ -732,15 +759,18 @@ const WebDic = () => { ...@@ -732,15 +759,18 @@ const WebDic = () => {
        } }
        // 拖拽回调函数 // 拖拽回调函数
        const dragCallBack = data => { const dragCallBack = value => {
        console.log(data) console.log(value)
        if (data) { console.log(orderTable)
        setData(data); if (value) {
        setOrderTable(value)
        } }
        }; };
        const dragCallBack1 = data => { const dragCallBack1 = e => {
        if (data) { console.log(e)
        setSubData(data); console.log(orderTable1)
        if (e) {
        setOrderTable1(e);
        } }
        }; };
        ...@@ -780,7 +810,6 @@ const WebDic = () => { ...@@ -780,7 +810,6 @@ const WebDic = () => {
        rowKey={record => record.nodeID} rowKey={record => record.nodeID}
        columns={columns} columns={columns}
        dataSource={orderTable} dataSource={orderTable}
        // orderTable={orderTable}
        scroll={{ y: 'calc(100vh - 370px)' }} scroll={{ y: 'calc(100vh - 370px)' }}
        bordered bordered
        dragCallBack={dragCallBack} dragCallBack={dragCallBack}
        ...@@ -802,15 +831,13 @@ const WebDic = () => { ...@@ -802,15 +831,13 @@ const WebDic = () => {
        </div> </div>
        }} }}
        rowClassName={setRowClassName} rowClassName={setRowClassName}
        onRow={(record, index) => ({ onClick={record => {
        index,
        onClick: () => {
        getData(record.nodeID); getData(record.nodeID);
        setSelect(record); setSelect(record);
        setSelectColor(record); setSelectColor(record);
        setSelectID(record.nodeID); setSelectID(record.nodeID);
        }, }}
        })} ItemTypes='first'
        pagination={pagenation} pagination={pagenation}
        /> />
        </Col> </Col>
        ...@@ -819,21 +846,19 @@ const WebDic = () => { ...@@ -819,21 +846,19 @@ const WebDic = () => {
        <Spin spinning={isloading} tip="loading..."> <Spin spinning={isloading} tip="loading...">
        <DragTable <DragTable
        size="small" size="small"
        ItemTypes='second'
        bordered bordered
        rowKey={record => record.nodeID} rowKey={record => record.nodeID}
        columns={columns1} columns={columns1}
        dragCallBack={dragCallBack1} dragCallBack={dragCallBack1}
        className={styles.tab} className={styles.tab}
        dataSource={subData} dataSource={orderTable1}
        scroll={{ x: 'max-content', y: 'calc(100vh - 340px)' }} scroll={{ x: 'max-content', y: 'calc(100vh - 340px)' }}
        rowClassName={setRowClassName1} rowClassName={setRowClassName1}
        onRow={record => ({ onClick={record => {
        onClick: () => {
        setSelect(record); setSelect(record);
        setTwoSelectColor(record); setTwoSelectColor(record);
        // setSelectID(record.nodeID); }}
        },
        })}
        title={() => { title={() => {
        return <div> return <div>
        <span>二级条目</span> <span>二级条目</span>
        ......
        src/pages/platformCenter/messageManage/templateManage/TemplateManage.jsx
        View file @ 6d6071a0
        ...@@ -62,9 +62,11 @@ const TemplateManage = () => { ...@@ -62,9 +62,11 @@ const TemplateManage = () => {
        type: item.Type, type: item.Type,
        third_name: item.Name, third_name: item.Name,
        third_id: item.No, third_id: item.No,
        template_params: item.TDescription, template_params2: item.ParsingParams,//模板参数2.0
        analysis_params: item.ParsingRules, template_params1: item.TParameters,//模板参数1.0
        desc: item.ParsingDescription analysis_params: item.ParsingRules,//模板解析
        desc: item.ParsingDescription,//模板参数说明
        weixin: item.WorkWeiXinId//企业微信ID
        }) })
        }) })
        setData(list) setData(list)
        ...@@ -121,6 +123,12 @@ const TemplateManage = () => { ...@@ -121,6 +123,12 @@ const TemplateManage = () => {
        key: 'third_name', key: 'third_name',
        align: 'center', align: 'center',
        }, },
        {
        title: '企业微信ID',
        dataIndex: 'weixin',
        key: 'weixin',
        align: 'center',
        },
        { {
        title: '第三方模版编号', title: '第三方模版编号',
        dataIndex: 'third_id', dataIndex: 'third_id',
        ...@@ -128,9 +136,15 @@ const TemplateManage = () => { ...@@ -128,9 +136,15 @@ const TemplateManage = () => {
        align: 'center', align: 'center',
        }, },
        { {
        title: '模板参数', title: '模板参数1.0',
        dataIndex: 'template_params', dataIndex: 'template_params1',
        key: 'template_params', key: 'template_params1',
        align: 'center',
        },
        {
        title: '模板参数2.0',
        dataIndex: 'template_params2',
        key: 'template_params2',
        align: 'center', align: 'center',
        }, },
        { {
        ...@@ -140,7 +154,7 @@ const TemplateManage = () => { ...@@ -140,7 +154,7 @@ const TemplateManage = () => {
        align: 'center', align: 'center',
        }, },
        { {
        title: '解析参数', title: '解析规则',
        dataIndex: 'analysis_params', dataIndex: 'analysis_params',
        key: 'analysis_params', key: 'analysis_params',
        align: 'center', align: 'center',
        ...@@ -251,6 +265,29 @@ const TemplateManage = () => { ...@@ -251,6 +265,29 @@ const TemplateManage = () => {
        handleShowModal("editVisible", false) handleShowModal("editVisible", false)
        } }
        const onSubmit = (result) => { const onSubmit = (result) => {
        if(result.type == '企业微信'){
        UpdateMessageTemplate({
        Id: result.Id,
        Type: result.type,
        LikeName: result.name,
        Name: result.third_name,
        ParsingRules: result.analysis_params,
        ParsingDescription: result.desc,
        TParameters: result.params,
        ParsingParams: result.param1,
        WorkWeiXinId: result.weixin
        }).then(
        res => {
        if (res.code === 0) {
        message.success("模板保存成功！")
        handleShowModal("editVisible", false)
        setFlag(flag + 1)
        } else {
        message.warn("模板保存失败！")
        }
        }
        )
        }else{
        UpdateMessageTemplate({ UpdateMessageTemplate({
        Id: result.Id, Id: result.Id,
        Type: result.type, Type: result.type,
        ...@@ -259,7 +296,8 @@ const TemplateManage = () => { ...@@ -259,7 +296,8 @@ const TemplateManage = () => {
        No: result.third_id, No: result.third_id,
        ParsingRules: result.analysis_params, ParsingRules: result.analysis_params,
        ParsingDescription: result.desc, ParsingDescription: result.desc,
        TDescription: result.params TParameters: result.params,
        ParsingParams: result.param1,
        }).then( }).then(
        res => { res => {
        if (res.code === 0) { if (res.code === 0) {
        ...@@ -272,11 +310,34 @@ const TemplateManage = () => { ...@@ -272,11 +310,34 @@ const TemplateManage = () => {
        } }
        ) )
        } }
        }
        //新增 //新增
        const addModal = () => { const addModal = () => {
        handleShowModal("editVisible", false) handleShowModal("editVisible", false)
        } }
        const onAddSubmit = (result) => { const onAddSubmit = (result) => {
        if(result.type == '企业微信'){
        InsertMessageTemplate({
        Type: result.type,
        LikeName: result.name,
        Name: result.third_name,
        ParsingRules: result.analysis_params,
        ParsingDescription: result.desc,
        TParameters: result.params,
        ParsingParams: result.param1,
        WorkWeiXinId: result.weixin
        }).then(
        res => {
        if (res.code === 0) {
        message.success("模板添加成功！")
        handleShowModal("addVisible", false)
        setFlag(flag + 1)
        } else {
        message.warn("模板添加失败！")
        }
        }
        )
        }else{
        InsertMessageTemplate({ InsertMessageTemplate({
        Type: result.type, Type: result.type,
        LikeName: result.name, LikeName: result.name,
        ...@@ -284,7 +345,8 @@ const TemplateManage = () => { ...@@ -284,7 +345,8 @@ const TemplateManage = () => {
        No: result.third_id, No: result.third_id,
        ParsingRules: result.analysis_params, ParsingRules: result.analysis_params,
        ParsingDescription: result.desc, ParsingDescription: result.desc,
        TDescription: result.params TParameters: result.params,
        ParsingParams: result.param1,
        }).then( }).then(
        res => { res => {
        if (res.code === 0) { if (res.code === 0) {
        ...@@ -298,6 +360,8 @@ const TemplateManage = () => { ...@@ -298,6 +360,8 @@ const TemplateManage = () => {
        ) )
        } }
        }
        const pagenation = { const pagenation = {
        showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`, showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
        pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
        ......
        src/pages/platformCenter/messageManage/templateManage/components/AddModal.jsx
        View file @ 6d6071a0
        ...@@ -49,14 +49,22 @@ const AddModal = props => { ...@@ -49,14 +49,22 @@ const AddModal = props => {
        }; };
        const onChangeType = (value) => { const onChangeType = (value) => {
        setTemplateName(option.filter(item => item.Type === value)) setTemplateName(option.filter(item => item.Type === value))
        console.log(option.filter(item => item.Type === value))
        } }
        const onChangeType1 = (value) => {
        form.setFieldsValue({
        third_id: value
        })
        }
        return ( return (
        <SiteModal <SiteModal
        {...props} {...props}
        title="模板添加" title="模板添加"
        bodyStyle={{ width: '100%', minHeight: '100px' }} bodyStyle={{ width: '100%', minHeight: '100px' }}
        style={{ top: 200, borderRadius: '20px' }} style={{ top: 200, borderRadius: '20px' }}
        width="800px" width="820px"
        destroyOnClose destroyOnClose
        cancelText="取消" cancelText="取消"
        okText="确认" okText="确认"
        ...@@ -97,14 +105,18 @@ const AddModal = props => { ...@@ -97,14 +105,18 @@ const AddModal = props => {
        <Select style={{ width: '10rem' }} onChange={(value) => onChangeType(value)} > <Select style={{ width: '10rem' }} onChange={(value) => onChangeType(value)} >
        <Select.Option value="公众号">公众号</Select.Option> <Select.Option value="公众号">公众号</Select.Option>
        <Select.Option value="短信">短信</Select.Option> <Select.Option value="短信">短信</Select.Option>
        <Select.Option value="企业微信">企业微信</Select.Option>
        </Select> </Select>
        </Item> </Item>
        </div> </div>
        </Item> </Item>
        {form.getFieldsValue().type !== '企业微信' ?
        <>
        <Item <Item
        label="请输入第三方模板名称" label="请选择第三方模板名称"
        wrapperCol={{ span: 17 }} wrapperCol={{ span: 17 }}
        labelCol={{ span: 6 }} labelCol={{ span: 6 }}
        style={{ marginBottom: '0' }} style={{ marginBottom: '0' }}
        ...@@ -116,7 +128,7 @@ const AddModal = props => { ...@@ -116,7 +128,7 @@ const AddModal = props => {
        rules={[ rules={[
        { {
        required: true, required: true,
        message: '请输入第三方模板名称', message: '请选择第三方模板名称',
        }, },
        ]} ]}
        > >
        ...@@ -147,46 +159,82 @@ const AddModal = props => { ...@@ -147,46 +159,82 @@ const AddModal = props => {
        > >
        <Input disabled placeholder="请输入第三方模板编号" /> <Input disabled placeholder="请输入第三方模板编号" />
        </Item> </Item>
        </div></Item> </div>
        </Item>
        </> :
        <>
        <Item <Item
        label="模板参数" label="请选择第三方模板名称"
        wrapperCol={{ span: 17 }}
        labelCol={{ span: 6 }} labelCol={{ span: 6 }}
        name="params" style={{ marginBottom: '0' }}
        >
        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
        <Item
        label=""
        name="third_name"
        rules={[ rules={[
        { {
        required: true, required: true,
        message: '请输入模板参数', message: '请选择第三方模板名称',
        }, },
        ]} ]}
        > >
        <TextArea rows={4} style={{width:'96%'}} placeholder="first|Second|Third|Four" /> <Select style={{width:'12rem'}} onChange={(value) => onChangeType1(value)} placeholder="请选择模板名称" >
        <Select.Option value="普通文本">普通文本</Select.Option>
        <Select.Option value="文字卡片">文字卡片</Select.Option>
        <Select.Option value="图片消息">图片消息</Select.Option>
        <Select.Option value="图片">图片</Select.Option>
        </Select>
        </Item> </Item>
        <Item <Item
        label="参数说明" label="企业微信应用id"
        name="desc" labelCol={{ span: 11 }}
        labelCol={{ span: 6 }} name="weixin"
        rules={[ rules={[
        { {
        required: true, required: true,
        message: '请输入参数说明', message: '请输入企业微信号',
        }, },
        ]} ]}
        > >
        <TextArea style={{width:'96%'}} rows={4} placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息" /> <Input placeholder="请输入企业微信号" />
        </Item>
        </div>
        </Item>
        </>
        }
        <Item
        label="模板参数1.0"
        labelCol={{ span: 6 }}
        name="params"
        >
        <TextArea rows={2} style={{ width: '96%' }} placeholder="first|Second|Third|Four" />
        </Item>
        <Item
        label="模板参数2.0"
        labelCol={{ span: 6 }}
        name="param1"
        >
        <TextArea rows={2} style={{ width: '96%' }} placeholder="first|Second|Third|Four" />
        </Item>
        <Item
        label="参数说明"
        name="desc"
        labelCol={{ span: 6 }}
        >
        <TextArea style={{ width: '96%' }} rows={4} placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息" />
        </Item> </Item>
        <Item <Item
        label="参数解析" label="解析规则"
        name="analysis_params" name="analysis_params"
        labelCol={{ span: 6 }} labelCol={{ span: 6 }}
        rules={[
        {
        required: true,
        message: '请输入参数解析',
        },
        ]}
        > >
        <TextArea rows={4} style={{width:'96%'}} placeholder="param1|param2|param3|param4" /> <TextArea rows={2} style={{ width: '96%' }} placeholder="param1|param2|param3|param4" />
        </Item> </Item>
        </Form> </Form>
        </div> </div>
        ......
        src/pages/platformCenter/messageManage/templateManage/components/EditModal.jsx
        View file @ 6d6071a0
        ...@@ -6,15 +6,15 @@ import { Form, Input, notification, Select, Row, Col } from 'antd' ...@@ -6,15 +6,15 @@ import { Form, Input, notification, Select, Row, Col } from 'antd'
        const { Item } = Form; const { Item } = Form;
        const { TextArea } = Input; const { TextArea } = Input;
        const EditModal = props => { const EditModal = props => {
        const { option } = props; const { option, visible } = props;
        const [form] = Form.useForm(); const [form] = Form.useForm();
        const [templateName, setTemplateName] = useState([]); const [templateName, setTemplateName] = useState([]);
        const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
        const [flag, setFlag] = useState(0)
        const onSubmit = () => { const onSubmit = () => {
        form.submit() form.submit()
        } }
        const onSubmitSuccess = () => { const onSubmitSuccess = () => {
        const result = form.getFieldValue() const result = form.getFieldValue()
        ...@@ -22,18 +22,36 @@ const EditModal = props => { ...@@ -22,18 +22,36 @@ const EditModal = props => {
        } }
        useEffect(() => { useEffect(() => {
        // console.log(props)
        // if(props.template.type=='企业微信'){
        // form.setFieldsValue({type:'企业微信'})
        // }
        // let aa
        // if(props.template.third_id==null){
        // aa=props.template.weixin
        // }
        // if(props.template.weixin==null){
        // aa=props.template.third_id
        // }
        form.setFieldsValue({ form.setFieldsValue({
        name: props.template.name, name: props.template.name,
        type: props.template.type, type: props.template.type,
        third_name: props.template.third_name, third_name: props.template.third_name,
        third_id: props.template.third_id, third_id: props.template.third_id,
        params: props.template.template_params, weixin:props.template.weixin,
        params: props.template.template_params1,
        param1: props.template.template_params2,
        desc: props.template.desc, desc: props.template.desc,
        analysis_params: props.template.analysis_params, analysis_params: props.template.analysis_params,
        }) })
        console.log(form.getFieldsValue().type)
        if (option) { if (option) {
        setTemplateName(option.filter(item => item.Type === props.template.type)) setTemplateName(option.filter(item => item.Type === props.template.type))
        } }
        }, [props.template]) }, [props.template])
        const layout = { const layout = {
        ...@@ -47,7 +65,7 @@ const EditModal = props => { ...@@ -47,7 +65,7 @@ const EditModal = props => {
        }; };
        const onChangeType = (value) => { const onChangeType = (value) => {
        console.log(option.filter(item => item.Type === value),'123'); console.log(option.filter(item => item.Type === value), '123');
        setTemplateName(option.filter(item => item.Type === value)) setTemplateName(option.filter(item => item.Type === value))
        } }
        const onChange = (value, option) => { const onChange = (value, option) => {
        ...@@ -57,13 +75,20 @@ const EditModal = props => { ...@@ -57,13 +75,20 @@ const EditModal = props => {
        // setTemplateName(option.filter(item => item.Type === value)) // setTemplateName(option.filter(item => item.Type === value))
        }; };
        const onChangeType1 = (value) => {
        form.setFieldsValue({
        third_id: value
        })
        }
        return ( return (
        <SiteModal <SiteModal
        {...props} {...props}
        title="模板编辑" title="模板编辑"
        bodyStyle={{ width: '100%', minHeight: '100px' }} bodyStyle={{ width: '100%', minHeight: '100px' }}
        style={{ top: 200, borderRadius: '20px' }} style={{ top: 200, borderRadius: '20px' }}
        width="800px" width="820px"
        destroyOnClose destroyOnClose
        cancelText="取消" cancelText="取消"
        okText="确认" okText="确认"
        ...@@ -101,10 +126,51 @@ const EditModal = props => { ...@@ -101,10 +126,51 @@ const EditModal = props => {
        <Select onChange={(value) => onChangeType(value)}> <Select onChange={(value) => onChangeType(value)}>
        <Select.Option value="公众号">公众号</Select.Option> <Select.Option value="公众号">公众号</Select.Option>
        <Select.Option value="短信">短信</Select.Option> <Select.Option value="短信">短信</Select.Option>
        <Select.Option value="企业微信">企业微信</Select.Option>
        </Select> </Select>
        </Item> </Item>
        </Col> </Col>
        </Row> </Row>
        {form.getFieldsValue().type == '企业微信'||props.template.type=='企业微信' ?
        <>
        <Row gutter={24}>
        <Col span={11}>
        <Item
        label="第三方模板名称"
        name="third_name"
        rules={[
        {
        required: true,
        message: '请输入第三方模板名称',
        },
        ]}
        >
        <Select style={{ width: '11.5rem' }} onChange={(value) => onChangeType1(value)} placeholder="请选择模板名称" >
        <Select.Option value="普通文本">普通文本</Select.Option>
        <Select.Option value="文字卡片">文字卡片</Select.Option>
        <Select.Option value="图片消息">图片消息</Select.Option>
        <Select.Option value="图片">图片</Select.Option>
        </Select>
        </Item>
        </Col>
        <Col span={11}>
        <Item
        label="企业微信应用id"
        // labelCol={{ span: 11 }}
        name="weixin"
        rules={[
        {
        required: true,
        message: '请输入企业微信号',
        },
        ]}
        >
        <Input placeholder="请输入企业微信号" />
        </Item>
        </Col>
        </Row>
        </> :
        <>
        <Row gutter={24}> <Row gutter={24}>
        <Col span={11}> <Col span={11}>
        <Item <Item
        ...@@ -117,7 +183,6 @@ const EditModal = props => { ...@@ -117,7 +183,6 @@ const EditModal = props => {
        }, },
        ]} ]}
        > >
        {/* <Input placeholder="请输入模板名称" /> */}
        <Select <Select
        placeholder="请选择模板名称" placeholder="请选择模板名称"
        onChange={(value, option) => onChange(value, option)} onChange={(value, option) => onChange(value, option)}
        ...@@ -148,6 +213,9 @@ const EditModal = props => { ...@@ -148,6 +213,9 @@ const EditModal = props => {
        </Item> </Item>
        </Col> </Col>
        </Row> </Row>
        </>
        }
        <Row gutter={24}> <Row gutter={24}>
        <Col span={1}> <Col span={1}>
        <Item> <Item>
        ...@@ -156,18 +224,20 @@ const EditModal = props => { ...@@ -156,18 +224,20 @@ const EditModal = props => {
        </Col> </Col>
        <Col span={23}> <Col span={23}>
        <Item <Item
        label="模板参数" label="模板参数1.0"
        labelCol={{ span: 3 }}
        style={{ marginLeft: '1.4rem' }}
        name="params" name="params"
        >
        <TextArea rows={2} placeholder="first|Second|Third|Four" />
        </Item>
        <Item
        label="模板参数2.0"
        labelCol={{ span: 3 }} labelCol={{ span: 3 }}
        style={{ marginLeft: '1.4rem' }} style={{ marginLeft: '1.4rem' }}
        rules={[ name="param1"
        {
        required: true,
        message: '请输入模板参数',
        },
        ]}
        > >
        <TextArea rows={4} placeholder="first|Second|Third|Four" /> <TextArea rows={2} placeholder="first|Second|Third|Four" />
        </Item> </Item>
        </Col> </Col>
        </Row> </Row>
        ...@@ -183,12 +253,7 @@ const EditModal = props => { ...@@ -183,12 +253,7 @@ const EditModal = props => {
        labelCol={{ span: 3 }} labelCol={{ span: 3 }}
        style={{ marginLeft: '1.4rem' }} style={{ marginLeft: '1.4rem' }}
        name="desc" name="desc"
        rules={[
        {
        required: true,
        message: '请输入参数说明',
        },
        ]}
        > >
        <TextArea rows={4} placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息" /> <TextArea rows={4} placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息" />
        </Item> </Item>
        ...@@ -202,18 +267,12 @@ const EditModal = props => { ...@@ -202,18 +267,12 @@ const EditModal = props => {
        </Col> </Col>
        <Col span={23}> <Col span={23}>
        <Item <Item
        label="参数解析" label="解析规则"
        labelCol={{ span: 3 }} labelCol={{ span: 3 }}
        style={{ marginLeft: '1.4rem' }} style={{ marginLeft: '1.4rem' }}
        name="analysis_params" name="analysis_params"
        rules={[
        {
        required: true,
        message: '请输入参数解析',
        },
        ]}
        > >
        <TextArea rows={4} placeholder="param1|param2|param3|param4" /> <TextArea rows={2} placeholder="param1|param2|param3|param4" />
        </Item> </Item>
        </Col> </Col>
        </Row> </Row>
        ......
        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