Skip to content

C
CivManage
Commit 324a8005 authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

fix: '优化流程节点配置界面'

parent be33879e
Pipeline #63624 passed with stages
          Hide whitespace changes
          Inline Side-by-side
          Showing with 336 additions and 232 deletions
          src/assets/images/icons/开始节点.png 0 → 100644
          View file @ 324a8005
          This diff was suppressed by a .gitattributes entry.
          src/assets/images/icons/结束节点.png 0 → 100644
          View file @ 324a8005
          This diff was suppressed by a .gitattributes entry.
          src/pages/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
          View file @ 324a8005
          ...@@ -471,35 +471,41 @@ const AddModal = props => { ...@@ -471,35 +471,41 @@ const AddModal = props => {
          } }
          }; };
          const getData =()=>{ const getData = () => {
          let last = []; let last = [];
          let aa = []; // 固定分组数据 let aa = ['工单编号','事件编号']; // 固定分组数据
          keepTree.map((i,j)=>{ let kk = []
          if(i=='工单编号'||i=='事件编号'){ keepTree.map((i, j) => {
          aa.push(i) if (i != '工单编号' && i != '事件编号') {
          }else{ // let kk = {};
          let kk ={} // kk.name = i;
          kk.name = i // kk.ID = j + 1;
          kk.ID = j+1 // last.push(kk);
          last.push(kk) kk.push(i);
          } }
          }) });
          let bb ={}// 固定分组对象 let bb = {}; // 内置字段对象
          bb.name='固定分组'; bb.name = '内置字段';
          bb.ID=0; bb.ID = 0;
          bb.children=aa; bb.children = aa;
          console.log(bb); last.push(bb)
          let cc = []; let dd ={}; // 附加字段对象
          cc.push(bb) dd.name = '附加字段';
          console.log(cc.concat(last)) dd.ID = 1;
          if(aa.length>0){ dd.children = kk;
          setFeildValue(cc.concat(last)); last.push(dd)
          }else{ setFeildValue(last);
          setFeildValue(last);
          } // let cc = [];
          // cc.push(bb);
          // console.log(cc.concat(last));
          // if (aa.length > 0) {
          // setFeildValue(cc.concat(last));
          // } else {
          // setFeildValue(last);
          // }
          // 编辑时过滤下拉框初始数据 // 编辑时过滤下拉框初始数据
          };
          }
          useEffect(() => { useEffect(() => {
          if (isVisible) { if (isVisible) {
          ...@@ -1107,12 +1113,12 @@ const AddModal = props => { ...@@ -1107,12 +1113,12 @@ const AddModal = props => {
          }); });
          }; };
          const seach = e =>{ const seach = e => {
          let rueslt = keepStandingBook.find(i => i.name == e); let rueslt = keepStandingBook.find(i => i.name == e);
          getMapFelidValue(rueslt.tableName); getMapFelidValue(rueslt.tableName);
          formAdd.resetFields(); formAdd.resetFields();
          form.setFieldsValue({workOrder:'',eventOrder:''}) form.setFieldsValue({ workOrder: '', eventOrder: '' });
          } };
          const handleChange = value => { const handleChange = value => {
          form.setFieldsValue({ schemename: value }); form.setFieldsValue({ schemename: value });
          ...@@ -1438,7 +1444,7 @@ const AddModal = props => { ...@@ -1438,7 +1444,7 @@ const AddModal = props => {
          const onSelect = (i, e) => { const onSelect = (i, e) => {
          console.log(i); console.log(i);
          console.log(e); console.log(e);
          setMapFeildValue([]) setMapFeildValue([]);
          if (e.node.org.storeType && e.node.org.storeType == 'datetime') { if (e.node.org.storeType && e.node.org.storeType == 'datetime') {
          setCharacteristics1([ setCharacteristics1([
          { {
          ...@@ -2675,7 +2681,7 @@ const AddModal = props => { ...@@ -2675,7 +2681,7 @@ const AddModal = props => {
          eventOrder: '', eventOrder: '',
          configName: '', configName: '',
          }); });
          setVisibleChecked(true); // setVisibleChecked(true);
          setCse(''); setCse('');
          setPopeleShape(''); setPopeleShape('');
          setRadio(0); setRadio(0);
          ...@@ -3407,13 +3413,17 @@ const AddModal = props => { ...@@ -3407,13 +3413,17 @@ const AddModal = props => {
          labelCol={{ span: 4 }} labelCol={{ span: 4 }}
          rules={[{ required: true, message: '请选择台账名' }]} rules={[{ required: true, message: '请选择台账名' }]}
          > >
          <Select showSearch onChange={e=>seach(e)}> <Select
          placeholder="请选择台账名"
          showSearch
          onChange={e => seach(e)}
          >
          {keepStandingBook {keepStandingBook
          ? keepStandingBook.map((item, index) => ( ? keepStandingBook.map((item, index) => (
          <Option key={index} value={item.name}> <Option key={index} value={item.name}>
          {item.name} {item.name}
          </Option> </Option>
          )) ))
          : ''} : ''}
          </Select> </Select>
          </Item> </Item>
          ...@@ -3443,37 +3453,23 @@ const AddModal = props => { ...@@ -3443,37 +3453,23 @@ const AddModal = props => {
          rules={[{ required: true, message: '请输入字段名' }]} rules={[{ required: true, message: '请输入字段名' }]}
          style={{ marginBottom: 0 }} style={{ marginBottom: 0 }}
          > >
          {/* <Input placeholder="请输入字段名" style={{width:'208px'}}/> */} <TreeSelect
          {/* <Select
          placeholder="选择字段名"
          showSearch showSearch
          style={{ width: '208px' }} style={{ width: '208px' }}
          // value={treeSelectValue}
          dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
          placeholder="请选择字段名 "
          allowClear
          treeDefaultExpandAll
          showCheckedStrategy
          // onChange={treeSelectOnchange}
          > >
          {fieldValue {fieldValue ? (
          ? fieldValue.map((item, index) => ( fieldValue.map(i => mapTree1(i))
          <Option key={index} value={item}> ) : (
          {item} <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
          </Option> )}
          )) </TreeSelect>
          : ''}
          </Select> */}
          <TreeSelect
          showSearch
          style={{ width: '208px' }}
          // value={treeSelectValue}
          dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
          placeholder="请选择字段名 "
          allowClear
          treeDefaultExpandAll
          showCheckedStrategy
          // onChange={treeSelectOnchange}
          >
          {fieldValue ? (
          fieldValue.map(i => mapTree1(i))
          ) : (
          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
          )}
          </TreeSelect>
          </Item> </Item>
          </Col> </Col>
          <Col span={1} style={{ paddingTop: '3px' }}> <Col span={1} style={{ paddingTop: '3px' }}>
          ...@@ -3502,7 +3498,7 @@ const AddModal = props => { ...@@ -3502,7 +3498,7 @@ const AddModal = props => {
          {item.name} {item.name}
          </Option> </Option>
          </> </>
          )) ))
          : ''} : ''}
          </Select> </Select>
          </Item> </Item>
          ...@@ -3554,36 +3550,23 @@ const AddModal = props => { ...@@ -3554,36 +3550,23 @@ const AddModal = props => {
          }, },
          ]} ]}
          > >
          {/* <Select <TreeSelect
          placeholder="选择字段名"
          showSearch showSearch
          style={{ width: '208px', marginLeft: '98px' }} style={{ width: '208px', marginLeft: '98px' }}
          // value={treeSelectValue}
          dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
          placeholder="请选择字段名 "
          allowClear
          treeDefaultExpandAll
          showCheckedStrategy
          // onChange={treeSelectOnchange}
          > >
          {fieldValue {fieldValue ? (
          ? fieldValue.map((item, index) => ( fieldValue.map(i => mapTree1(i))
          <Option key={index} value={item}> ) : (
          {item} <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
          </Option> )}
          )) </TreeSelect>
          : ''}
          </Select> */}
          <TreeSelect
          showSearch
          style={{ width: '208px', marginLeft: '98px' }}
          // value={treeSelectValue}
          dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
          placeholder="请选择字段名 "
          allowClear
          treeDefaultExpandAll
          showCheckedStrategy
          // onChange={treeSelectOnchange}
          >
          {fieldValue ? (
          fieldValue.map(i => mapTree1(i))
          ) : (
          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
          )}
          </TreeSelect>
          </Form.Item> </Form.Item>
          {/* <SwapOutlined style={{marginLeft:'4px'}}/> */} {/* <SwapOutlined style={{marginLeft:'4px'}}/> */}
          <img src={logo} style={{ height: '24px' }} alt="" /> <img src={logo} style={{ height: '24px' }} alt="" />
          ...@@ -3606,7 +3589,7 @@ const AddModal = props => { ...@@ -3606,7 +3589,7 @@ const AddModal = props => {
          {item.name} {item.name}
          </Option> </Option>
          </> </>
          )) ))
          : ''} : ''}
          </Select> </Select>
          </Form.Item> </Form.Item>
          ...@@ -3676,10 +3659,10 @@ const AddModal = props => { ...@@ -3676,10 +3659,10 @@ const AddModal = props => {
          <Select showSearch style={{ width: '95%' }}> <Select showSearch style={{ width: '95%' }}>
          {keepStandingBook {keepStandingBook
          ? keepStandingBook.map((item, index) => ( ? keepStandingBook.map((item, index) => (
          <Option key={index} value={item.name}> <Option key={index} value={item.name}>
          {item.name} {item.name}
          </Option> </Option>
          )) ))
          : ''} : ''}
          </Select> </Select>
          </Item> </Item>
          ......
          src/pages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
          View file @ 324a8005
          ...@@ -717,7 +717,48 @@ const AddModal = props => { ...@@ -717,7 +717,48 @@ const AddModal = props => {
          </Item> </Item>
          </Col> </Col>
          <Col span={24}> <Col span={24}>
          <Item label="SQL过滤" name="filterCondition" labelCol={{ span: 5 }}> <Item
          label="SQL过滤"
          name="filterCondition"
          labelCol={{ span: 5 }}
          rules={[
          {
          validator: (rule, value) => {
          let aa = form.getFieldsValue().filterCondition;
          if (aa) {
          let bb = [];
          bb.push(aa.indexOf('+') != -1);
          bb.push(aa.indexOf('=') != -1);
          bb.push(aa.indexOf('-') != -1);
          bb.push(aa.indexOf('*') != -1);
          bb.push(aa.indexOf('/') != -1);
          bb.push(aa.indexOf('>') != -1);
          bb.push(aa.indexOf('<') != -1);
          bb.push(aa.indexOf('!=') != -1);
          bb.push(aa.indexOf('<=') != -1);
          bb.push(aa.indexOf('>-') != -1);
          // console.log(bb);
          let re = /[`~,.<>;:”“‘’\/\[\]\、{}()_@$%^，。；?]/;
          console.log(re.test(aa));
          if (aa.substring(0, 3) !== 'and' && aa.substring(0, 3) !== 'AND') {
          return Promise.reject('请以and开头');
          }
          if (bb.indexOf(true) == -1) {
          return Promise.reject(
          '支持英文模式下运算符（+、-、*、/、>、<、=、!=、<=、>=）',
          );
          }
          if (re.test(aa)) {
          return Promise.reject('禁止输入特殊字符');
          }
          return Promise.resolve();
          }
          return Promise.resolve();
          },
          },
          ]}
          >
          <TextArea placeholder="例如：and 泵房品牌='熊猫'" /> <TextArea placeholder="例如：and 泵房品牌='熊猫'" />
          </Item> </Item>
          </Col> </Col>
          ......
          src/pages/bsmanager/patrolMaintenance/patrolFeedback/AddModal.jsx
          View file @ 324a8005
          ...@@ -563,10 +563,7 @@ const AddModal = props => { ...@@ -563,10 +563,7 @@ const AddModal = props => {
          setKeepData(keep); setKeepData(keep);
          formAdd.resetFields(); formAdd.resetFields();
          } }
          console.log(e);
          console.log(keepAllData);
          let aa = keepAllData.find(i => i.name === e); let aa = keepAllData.find(i => i.name === e);
          console.log(aa);
          if (aa) { if (aa) {
          getReloadTableField(aa.tableName, i); // 找到关联事件对应事件表获取对应表的所有字段 getReloadTableField(aa.tableName, i); // 找到关联事件对应事件表获取对应表的所有字段
          } }
          ......
          src/pages/bsmanager/workOrder/workFlow/flowNode/flowNode.jsx
          View file @ 324a8005
          import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
          import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
          import { reloadFlowNodes, removeFlowNodeExtend } from '@/services/flow/flow'; import { reloadFlowNodes, removeFlowNodeExtend } from '@/services/flow/flow';
          import { Space, Table, Popconfirm, Tooltip, notification, message, Button, Spin } from 'antd'; import { Space, Table, Popconfirm, Tooltip, notification, message, Button, Spin, Tag } from 'antd';
          import { RollbackOutlined, EditTwoTone, ControlOutlined, DeleteOutlined } from '@ant-design/icons'; import { RollbackOutlined, EditTwoTone, ControlOutlined, DeleteOutlined } from '@ant-design/icons';
          import PageContainer from '@/components/BasePageContainer'; import PageContainer from '@/components/BasePageContainer';
          import NodeEdit from './flowNodeComponents/NodeEdit'; import NodeEdit from './flowNodeComponents/NodeEdit';
          import AuxiliaryView from './flowNodeComponents/AuxiliaryView'; import AuxiliaryView from './flowNodeComponents/AuxiliaryView';
          import styles from './flowNode.less'; import styles from './flowNode.less';
          import start from '@/assets/images/icons/开始节点.png';
          import end from '@/assets/images/icons/结束节点.png';
          const FlowNode = () => { const FlowNode = () => {
          const history = useHistory(); const history = useHistory();
          ...@@ -98,16 +100,58 @@ const FlowNode = () => { ...@@ -98,16 +100,58 @@ const FlowNode = () => {
          ellipsis: { ellipsis: {
          showTitle: true, showTitle: true,
          }, },
          render: (text, record) => ( render: (text, record) => {
          <div console.log(record);
          style={{ if (record.type == 1) {
          textAlign: 'center', return (
          color: record.colorType === 2 ? 'red' : '#000000D9', <div style={{ display: 'flex', justifyContent: 'center' }}>
          }} <img
          > src={start}
          {text} style={{ height: '18px', marginTop: '2px', marginRight: '5px' }}
          </div> alt=""
          ), />
          <div
          style={{
          color: record.colorType === 2 ? 'red' : '#000000D9',
          }}
          >
          {text}
          </div>
          </div>
          );
          }
          if (record.type == 2) {
          return (
          <div style={{ display: 'flex', justifyContent: 'center' }}>
          <img
          src={end}
          style={{ height: '18px', marginTop: '2px', marginRight: '5px' }}
          alt=""
          />
          <div
          style={{
          color: record.colorType === 2 ? 'red' : '#000000D9',
          }}
          >
          {text}
          </div>
          </div>
          );
          }
          if (record.type == 0) {
          return (
          <div
          style={{
          display: 'flex',
          justifyContent: 'center',
          color: record.colorType === 2 ? 'red' : '#000000D9',
          }}
          >
          {text}
          </div>
          );
          }
          },
          }, },
          { {
          title: '节点别名', title: '节点别名',
          ...@@ -194,18 +238,34 @@ const FlowNode = () => { ...@@ -194,18 +238,34 @@ const FlowNode = () => {
          dataIndex: 'extendEditableLater', dataIndex: 'extendEditableLater',
          align: 'center', align: 'center',
          width: 80, width: 80,
          render: (text, record) => ( render: (text, record) => {
          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span> if (record.colorType === 2) {
          ), return <span style={{ color: 'red' }}>{text}</span>;
          }
          if (text == '是') {
          return <Tag color="success">{text}</Tag>;
          }
          if (text == '否') {
          return <Tag color="processing">{text}</Tag>;
          }
          },
          }, },
          { {
          title: '可退', title: '可退',
          dataIndex: 'extendRollbackable', dataIndex: 'extendRollbackable',
          align: 'center', align: 'center',
          width: 80, width: 80,
          render: (text, record) => ( render: (text, record) => {
          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span> if (record.colorType === 2) {
          ), return <span style={{ color: 'red' }}>{text}</span>;
          }
          if (text == '是') {
          return <Tag color="success">{text}</Tag>;
          }
          if (text == '否') {
          return <Tag color="processing">{text}</Tag>;
          }
          },
          }, },
          // { // {
          // title: '退至', // title: '退至',
          ...@@ -226,9 +286,17 @@ const FlowNode = () => { ...@@ -226,9 +286,17 @@ const FlowNode = () => {
          dataIndex: 'tranferable', dataIndex: 'tranferable',
          align: 'center', align: 'center',
          width: 80, width: 80,
          render: (text, record) => ( render: (text, record) => {
          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span> if (record.colorType === 2) {
          ), return <span style={{ color: 'red' }}>{text}</span>;
          }
          if (text == '是') {
          return <Tag color="success">{text}</Tag>;
          }
          if (text == '否') {
          return <Tag color="processing">{text}</Tag>;
          }
          },
          }, },
          // { // {
          // title: '显示事件信息', // title: '显示事件信息',
          ......
          src/pages/bsmanager/workOrder/workFlow/flowNode/flowNodeComponents/NodeEdit.jsx
          View file @ 324a8005
          ...@@ -38,10 +38,10 @@ const NodeEdit = props => { ...@@ -38,10 +38,10 @@ const NodeEdit = props => {
          const [isDisable, setIsDisable] = useState(); // 允许回退是否可选择 const [isDisable, setIsDisable] = useState(); // 允许回退是否可选择
          const [filedData, setFiledData] = useState([]); // 已选字段列表 const [filedData, setFiledData] = useState([]); // 已选字段列表
          const [filedList, setFiledList] = useState([]); // 当前选择表的所有字段 const [filedList, setFiledList] = useState([]); // 当前选择表的所有字段
          const [visibleChecked, setVisibleChecked] = useState(false); const [visibleChecked, setVisibleChecked] = useState('');
          const [visibleChecked1, setVisibleChecked1] = useState(false); const [visibleChecked1, setVisibleChecked1] = useState('');
          const [visibleChecked2, setVisibleChecked2] = useState(true); const [visibleChecked2, setVisibleChecked2] = useState('');
          const [visibleChecked3, setVisibleChecked3] = useState(false); const [visibleChecked3, setVisibleChecked3] = useState('');
          const [autoClose, setAutoClose] = useState(false); const [autoClose, setAutoClose] = useState(false);
          const [transfer, setTransfer] = useState(false); const [transfer, setTransfer] = useState(false);
          ...@@ -374,6 +374,7 @@ const NodeEdit = props => { ...@@ -374,6 +374,7 @@ const NodeEdit = props => {
          console.log(e); console.log(e);
          setVisibleChecked3(e); setVisibleChecked3(e);
          }; };
          return ( return (
          <Drawer <Drawer
          title="流程节点配置" title="流程节点配置"
          ...@@ -482,7 +483,23 @@ const NodeEdit = props => { ...@@ -482,7 +483,23 @@ const NodeEdit = props => {
          <Option value={2}>一人接收，一人办理</Option> <Option value={2}>一人接收，一人办理</Option>
          </Select> </Select>
          </Form.Item> */} </Form.Item> */}
          <Form.Item label="转办" name="Transferable"> <Form.Item
          label={
          <div style={{ display: 'flex', alignItems: 'center' }}>
          {transfer ? (
          <>
          <Tooltip title="开始节点不允许转单">
          <InfoCircleOutlined style={{ color: '#1890ff', marginRight: '3px' }} />
          </Tooltip>
          <span>转单</span>
          </>
          ) : (
          <span>转单</span>
          )}
          </div>
          }
          name="Transferable"
          >
          <Switch <Switch
          checkedChildren="是" checkedChildren="是"
          unCheckedChildren="否" unCheckedChildren="否"
          ...@@ -490,10 +507,32 @@ const NodeEdit = props => { ...@@ -490,10 +507,32 @@ const NodeEdit = props => {
          onChange={change} onChange={change}
          disabled={transfer} disabled={transfer}
          /> />
          {/* <Radio.Group> </Form.Item>
          <Radio value="0">否</Radio>
          <Radio value="1">是</Radio> <Form.Item
          </Radio.Group> */} label={
          <div style={{ display: 'flex', alignItems: 'center' }}>
          {autoClose == false ? (
          <>
          <Tooltip title="结束节点可配置自动关单">
          <InfoCircleOutlined style={{ color: '#1890ff', marginRight: '3px' }} />
          </Tooltip>
          <span>自动关单</span>
          </>
          ) : (
          <span>自动关单</span>
          )}
          </div>
          }
          name="AutoClose"
          >
          <Switch
          checkedChildren="是"
          unCheckedChildren="否"
          checked={visibleChecked3}
          onChange={change3}
          disabled={!autoClose}
          />
          </Form.Item> </Form.Item>
          <Form.Item label="显示事件信息" name="EventsInformation"> <Form.Item label="显示事件信息" name="EventsInformation">
          ...@@ -520,16 +559,6 @@ const NodeEdit = props => { ...@@ -520,16 +559,6 @@ const NodeEdit = props => {
          <Radio value={1}>是</Radio> <Radio value={1}>是</Radio>
          </Radio.Group> */} </Radio.Group> */}
          </Form.Item> </Form.Item>
          {autoClose && (
          <Form.Item label="自动关单" name="AutoClose">
          <Switch
          checkedChildren="是"
          unCheckedChildren="否"
          checked={visibleChecked3}
          onChange={change3}
          />
          </Form.Item>
          )}
          <Form.Item <Form.Item
          label={ label={
          ......
          src/pages/productCenter/mobileConfig/menuconfig/AddForm.jsx
          View file @ 324a8005
          ...@@ -22,7 +22,7 @@ const AddForm = props => { ...@@ -22,7 +22,7 @@ const AddForm = props => {
          console.log(nodeObj, 'nodeObj'); console.log(nodeObj, 'nodeObj');
          const layout = { const layout = {
          layout: 'horizontal', layout: 'horizontal',
          labelCol: { span: 4, offset: 1 }, labelCol: { span: 5, offset: 1 },
          wrapperCol: { span: 16 }, wrapperCol: { span: 16 },
          }; };
          const submit = () => { const submit = () => {
          ...@@ -66,7 +66,7 @@ const AddForm = props => { ...@@ -66,7 +66,7 @@ const AddForm = props => {
          </Item> </Item>
          {addType === 1 && ( {addType === 1 && (
          <Item <Item
          label="在线图标" label="选中图标"
          name="imageUrl" name="imageUrl"
          rules={[ rules={[
          { {
          ...@@ -80,7 +80,7 @@ const AddForm = props => { ...@@ -80,7 +80,7 @@ const AddForm = props => {
          )} )}
          {addType === 1 && ( {addType === 1 && (
          <Item <Item
          label="离线图标" label="未选中图标"
          name="offlineImgUrl" name="offlineImgUrl"
          rules={[ rules={[
          { {
          ...@@ -143,7 +143,7 @@ const AddForm = props => { ...@@ -143,7 +143,7 @@ const AddForm = props => {
          </Item> </Item>
          {addType === 3 && ( {addType === 3 && (
          <Item <Item
          label="在线图标" label="选中图标"
          name="imageUrl" name="imageUrl"
          rules={[ rules={[
          { {
          ...@@ -157,7 +157,7 @@ const AddForm = props => { ...@@ -157,7 +157,7 @@ const AddForm = props => {
          )} )}
          {addType === 3 && ( {addType === 3 && (
          <Item <Item
          label="离线图标" label="未选中图标"
          name="offlineImgUrl" name="offlineImgUrl"
          rules={[ rules={[
          { {
          ......
          src/pages/productCenter/mobileConfig/menuconfig/editForm.jsx
          View file @ 324a8005
          ...@@ -19,7 +19,7 @@ const EditForm = props => { ...@@ -19,7 +19,7 @@ const EditForm = props => {
          const layout = { const layout = {
          layout: 'horizontal', layout: 'horizontal',
          labelCol: { span: 2, offset: 0 }, labelCol: { span: 2, offset: 0 },
          wrapperCol: { span: 20 }, wrapperCol: { span: 21 },
          }; };
          // 回显表单 // 回显表单
          useEffect(() => { useEffect(() => {
          ...@@ -28,7 +28,6 @@ const EditForm = props => { ...@@ -28,7 +28,6 @@ const EditForm = props => {
          setPlainOptions(inf); setPlainOptions(inf);
          }, [info]); }, [info]);
          useEffect(() => { useEffect(() => {
          console.log(info);
          if (nodeType === 1 || nodeType === 2) { if (nodeType === 1 || nodeType === 2) {
          let arr = Object.keys(form.getFieldsValue()); let arr = Object.keys(form.getFieldsValue());
          let obj = {}; let obj = {};
          ...@@ -91,14 +90,10 @@ const EditForm = props => { ...@@ -91,14 +90,10 @@ const EditForm = props => {
          const submit = () => { const submit = () => {
          if (nodeType === 1 || nodeType === 2) { if (nodeType === 1 || nodeType === 2) {
          let obj = form.getFieldsValue(); let obj = form.getFieldsValue();
          console.log(obj, '1,2');
          submitCallback(obj); submitCallback(obj);
          } }
          if (nodeType === 3 || nodeType === 4) { if (nodeType === 3 || nodeType === 4) {
          let obj = otherForm.getFieldsValue(); let obj = otherForm.getFieldsValue();
          console.log(obj, '3,4');
          console.log(obj);
          console.log(plainOptions);
          let data = []; let data = [];
          plainOptions.map(item => { plainOptions.map(item => {
          item.checkedList.forEach(i => { item.checkedList.forEach(i => {
          ...@@ -118,7 +113,6 @@ const EditForm = props => { ...@@ -118,7 +113,6 @@ const EditForm = props => {
          }; };
          // 添加功能路劲参数 // 添加功能路劲参数
          const addParama = () => { const addParama = () => {
          console.log(otherForm.getFieldValue('pageUrl'));
          if (!otherForm.getFieldValue('pageUrl')) { if (!otherForm.getFieldValue('pageUrl')) {
          notification.error({ message: '提示', duration: 3, description: '请先填写功能路径' }); notification.error({ message: '提示', duration: 3, description: '请先填写功能路径' });
          return; return;
          ...@@ -265,7 +259,7 @@ const EditForm = props => { ...@@ -265,7 +259,7 @@ const EditForm = props => {
          return ( return (
          <div className={classnames({ [styles.divbox]: true })}> <div className={classnames({ [styles.divbox]: true })}>
          {(nodeType === 1 || nodeType === 2) && ( {(nodeType === 1 || nodeType === 2) && (
          <Form form={form} name="editGroup" onFinish={onFinish}> <Form form={form} name="editGroup" onFinish={onFinish} {...layout}>
          <Item <Item
          label="菜单组名称" label="菜单组名称"
          name="menuName" name="menuName"
          ...@@ -278,13 +272,12 @@ const EditForm = props => { ...@@ -278,13 +272,12 @@ const EditForm = props => {
          > >
          <Input placeholder="请输入菜单组名称" style={{ width: '100%' }} /> <Input placeholder="请输入菜单组名称" style={{ width: '100%' }} />
          </Item> </Item>
          <Item label="菜单组别名" name="shortName" style={{ marginLeft: '11px' }}> <Item label="菜单组别名" name="shortName">
          <Input placeholder="请输入菜单组别名" style={{ width: '100%' }} /> <Input placeholder="请输入菜单组别名" style={{ width: '100%' }} />
          </Item> </Item>
          {nodeType === 1 && ( {nodeType === 1 && (
          <Item <Item
          style={{ marginLeft: '14px' }} label="选中图标"
          label="在线图标"
          name="imageUrl" name="imageUrl"
          rules={[ rules={[
          { {
          ...@@ -298,8 +291,7 @@ const EditForm = props => { ...@@ -298,8 +291,7 @@ const EditForm = props => {
          )} )}
          {nodeType === 1 && ( {nodeType === 1 && (
          <Item <Item
          style={{ marginLeft: '14px' }} label="未选中图标"
          label="离线图标"
          name="offlineImgUrl" name="offlineImgUrl"
          rules={[ rules={[
          { {
          ...@@ -326,7 +318,7 @@ const EditForm = props => { ...@@ -326,7 +318,7 @@ const EditForm = props => {
          <PicturesWall picType="androidMenu" style={{ width: '100%' }} /> <PicturesWall picType="androidMenu" style={{ width: '100%' }} />
          </Item> </Item>
          )} )}
          <Item label="功能参数" name="funParam" style={{ marginLeft: '26px' }}> <Item label="功能参数" name="funParam">
          <Input style={{ width: '100%' }} /> <Input style={{ width: '100%' }} />
          </Item> </Item>
          <Item wrapperCol={{ offset: 10 }} style={{ marginTop: '40px' }}> <Item wrapperCol={{ offset: 10 }} style={{ marginTop: '40px' }}>
          ...@@ -338,7 +330,7 @@ const EditForm = props => { ...@@ -338,7 +330,7 @@ const EditForm = props => {
          )} )}
          {(nodeType === 3 || nodeType === 4) && ( {(nodeType === 3 || nodeType === 4) && (
          <Form form={otherForm} name="editMenu" onFinish={onFinish}> <Form form={otherForm} name="editMenu" onFinish={onFinish} {...layout}>
          <Item <Item
          label="菜单名称" label="菜单名称"
          name="menuName" name="menuName"
          ...@@ -351,12 +343,12 @@ const EditForm = props => { ...@@ -351,12 +343,12 @@ const EditForm = props => {
          > >
          <Input style={{ width: '100%' }} /> <Input style={{ width: '100%' }} />
          </Item> </Item>
          <Item label="菜单别名" name="shortName" style={{ marginLeft: '11px' }}> <Item label="菜单别名" name="shortName">
          <Input style={{ width: '100%' }} /> <Input style={{ width: '100%' }} />
          </Item> </Item>
          {nodeType === 3 && ( {nodeType === 3 && (
          <Item <Item
          label="在线图标" label="选中图标"
          name="imageUrl" name="imageUrl"
          rules={[ rules={[
          { {
          ...@@ -370,7 +362,7 @@ const EditForm = props => { ...@@ -370,7 +362,7 @@ const EditForm = props => {
          )} )}
          {nodeType === 3 && ( {nodeType === 3 && (
          <Item <Item
          label="离线图标" label="未选中图标"
          name="offlineImgUrl" name="offlineImgUrl"
          rules={[ rules={[
          { {
          ...@@ -413,7 +405,7 @@ const EditForm = props => { ...@@ -413,7 +405,7 @@ const EditForm = props => {
          <Button onClick={addParama}>参数管理</Button> <Button onClick={addParama}>参数管理</Button>
          </div> </div>
          </Item> </Item>
          <Item label="功能参数" name="funParam" style={{ marginLeft: '11px' }}> <Item label="功能参数" name="funParam">
          <Input style={{ width: '100%' }} /> <Input style={{ width: '100%' }} />
          </Item> </Item>
          {/* <CheckList {/* <CheckList
          ...@@ -437,74 +429,68 @@ const EditForm = props => { ...@@ -437,74 +429,68 @@ const EditForm = props => {
          </Checkbox> </Checkbox>
          </div> </div>
          {plainOptions && plainOptions.length > 0 ? ( {plainOptions && plainOptions.length > 0 ? (
          plainOptions.map((item, index) => { plainOptions.map((item, index) => (
          return ( <div
          <div className={classnames({
          className={classnames({ [styles.divBox]: item.groupName.length > 0,
          [styles.divBox]: item.groupName.length > 0, })}
          })} >
          > <div style={{ marginTop: '-12px' }}>
          <div style={{ marginTop: '-12px' }}> {item.groupName.length == 0 ? (
          {item.groupName.length == 0 ? ( <span style={{ marginLeft: '15px', marginTop: '0px' }} />
          <span style={{ marginLeft: '15px', marginTop: '0px' }} /> ) : (
          ) : ( <Checkbox
          <Checkbox onChange={e => {
          onChange={e => { selectChange(e, index, item);
          selectChange(e, index, item); }}
          }} checked={item.isChecked}
          checked={item.isChecked} indeterminate={indeterminate[index]}
          indeterminate={indeterminate[index]} >
          > <span style={{ fontWeight: 'bold', fontSize: '15px' }}>
          <span style={{ fontWeight: 'bold', fontSize: '15px' }}> {item.groupName}
          {item.groupName} </span>
          </span> </Checkbox>
          </Checkbox> )}
          )}
          </div>
          <div style={{ marginLeft: '0px', marginTop: '5px' }}>
          {item.groupName.length == 0 ? (
          <>
          <Row>
          {item.list.map((val, i) => {
          return (
          <Col span={4} style={{ marginBottom: '10px' }}>
          <Checkbox
          onChange={e => {
          handleChecked(e, index, item, i);
          }}
          checked={val.related}
          >
          {val.relatedRoleName}
          </Checkbox>
          </Col>
          );
          })}
          </Row>
          </>
          ) : (
          <>
          <Row>
          {item.list.map((val, i) => {
          return (
          <Col span={4}>
          <Checkbox
          onChange={e => {
          handleChecked(e, index, item, i);
          }}
          checked={val.related}
          >
          {val.relatedRoleName}
          </Checkbox>
          </Col>
          );
          })}
          </Row>
          </>
          )}
          </div>
          </div> </div>
          ); <div style={{ marginLeft: '0px', marginTop: '5px' }}>
          }) {item.groupName.length == 0 ? (
          <>
          <Row>
          {item.list.map((val, i) => (
          <Col span={4} style={{ marginBottom: '10px' }}>
          <Checkbox
          onChange={e => {
          handleChecked(e, index, item, i);
          }}
          checked={val.related}
          >
          {val.relatedRoleName}
          </Checkbox>
          </Col>
          ))}
          </Row>
          </>
          ) : (
          <>
          <Row>
          {item.list.map((val, i) => (
          <Col span={4}>
          <Checkbox
          onChange={e => {
          handleChecked(e, index, item, i);
          }}
          checked={val.related}
          >
          {val.relatedRoleName}
          </Checkbox>
          </Col>
          ))}
          </Row>
          </>
          )}
          </div>
          </div>
          ))
          ) : ( ) : (
          <span /> <span />
          )} )}
          ......
          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