fix: 对运维平台进行优化，修改测试到的问题

79311bc5 · 邓超 · 6f3ea24c · 79311bc5 · 79311bc5 · 79311bc5
Commit 79311bc5 authored Oct 13, 2021 by 邓超
14 changed files
--- a/src/pages/database/ManagementDataBase.jsx
+++ b/src/pages/database/ManagementDataBase.jsx
@@ -9,6 +9,7 @@ import {
  notification,
  Spin,
 } from 'antd';
+import copy from 'copy-to-clipboard';
 import PageContainer from '@/components/BasePageContainer';
 import styles from './ManagementDataBase.less';
 import {
@@ -177,6 +178,22 @@ const ManagementDataBase = () => {
    // setContent(text);
    setContent(arr);
  };
+  // 复制SQL
+  const copySql = text => {
+    if (copy(text)) {
+      notification.success({
+        message: '提示',
+        duration: 3,
+        description: '复制成功',
+      });
+    } else {
+      notification.error({
+        message: '提示',
+        duration: 3,
+        description: '复制失败',
+      });
+    }
+  };
  const autoCheckColumns = [
    {
      title: '表名称',
@@ -212,6 +229,16 @@ const ManagementDataBase = () => {
      key: 'Message',
      ellipsis: true,
    },
+    {
+      title: 'SQL语句',
+      dataIndex: 'DiffSql',
+      key: 'DiffSql',
+      render: text => (
+        <Button size="small" type="primary" onClick={() => copySql(text)}>
+          复制SQL
+        </Button>
+      ),
+    },
  ];
  const logColumns = [
    {

--- a/src/pages/mobileConfig/menuconfig/miniMenu.jsx
+++ b/src/pages/mobileConfig/menuconfig/miniMenu.jsx
@@ -431,7 +431,7 @@ const MiniMenu = props => {

    dragMenu({
      menuID: obj.id,
-      newParentID: obj.parentId || -1,
+      newParentID: obj.parentId.toString() || '-1',
      menuList: String(arrList) || '',
      _version: 9999,
      _dc: Date.now(),

--- a/src/pages/platformCenter/bsmanager/tablemanager/components/Field/index.less
+++ b/src/pages/platformCenter/bsmanager/tablemanager/components/Field/index.less
@@ -6,7 +6,7 @@
    max-height: 20rem;
    overflow-y: scroll;
    .ant-card{
-        width: 80%;
+        width: 83%;
        margin-left: 4rem;
    }
    .ant-card-head-title{

--- a/src/pages/platformCenter/bsmanager/workFlow/flow.jsx
+++ b/src/pages/platformCenter/bsmanager/workFlow/flow.jsx
@@ -136,8 +136,9 @@ const Flow = () => {
      dataIndex: 'extendWebPage',
      align: 'center',
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(默认)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
      ),
    },
    {
@@ -145,8 +146,9 @@ const Flow = () => {
      dataIndex: 'extendMobilePage',
      align: 'center',
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(默认)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
      ),
    },
    {
@@ -155,8 +157,9 @@ const Flow = () => {
      align: 'center',
      width: 80,
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
      ),
    },
    {
@@ -164,8 +167,9 @@ const Flow = () => {
      dataIndex: 'flowEndBehavior',
      align: 'center',
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(不做处理)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
      ),
    },
    {
@@ -179,8 +183,7 @@ const Flow = () => {
      dataIndex: 'errorNodes',
      align: 'center',
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(无)' ? 'grey' : 'red' }}>{text}</span>
      ),
    },
    {
@@ -188,8 +191,9 @@ const Flow = () => {
      dataIndex: 'interfaceConfig',
      align: 'center',
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>
+          {text}
+        </span>
      ),
    },
    {

--- a/src/pages/platformCenter/bsmanager/workFlow/flowComponents/Timelimit.jsx
+++ b/src/pages/platformCenter/bsmanager/workFlow/flowComponents/Timelimit.jsx
@@ -82,45 +82,30 @@ const Timelimit = props => {
      title: '规则名称',
      dataIndex: 'Name',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
    },
    {
      title: '开始节点',
      dataIndex: 'StartNode',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
    },
    {
      title: '结束节点',
      dataIndex: 'EndNode',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
    },
    {
      title: '默认时限',
      dataIndex: 'TimeLimit',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
    },
    {
      title: '时限指派字段',
-      dataIndex: 'TimeLimitFieldHtml',
+      dataIndex: 'TimeLimitField',
      align: 'center',
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
+          {text}
+        </span>
      ),
    },
    {
@@ -128,8 +113,9 @@ const Timelimit = props => {
      dataIndex: 'TimeoutField',
      align: 'center',
      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
+        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
+          {text}
+        </span>
      ),
    },
    {

--- a/src/pages/platformCenter/bsmanager/workFlow/flowComponents/timelimitComponents/AddModal.jsx
+++ b/src/pages/platformCenter/bsmanager/workFlow/flowComponents/timelimitComponents/AddModal.jsx
@@ -230,8 +230,7 @@ const AddModal = props => {
          <Select>
            {timeLimitFlowNodes.map(item => (
              <Option value={item.Name} key={item.ID}>
-                {/* eslint-disable-next-line react/no-danger */}
-                <span dangerouslySetInnerHTML={{ __html: item.Name }} />
+                <span>{item.Name}</span>
              </Option>
            ))}
          </Select>
@@ -244,8 +243,7 @@ const AddModal = props => {
          <Select>
            {timeLimitFlowNodes.map(item => (
              <Option value={item.Name} key={item.ID}>
-                {/* eslint-disable-next-line react/no-danger */}
-                <span dangerouslySetInnerHTML={{ __html: item.Name }} />
+                <span>{item.Name}</span>
              </Option>
            ))}
          </Select>

--- a/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.jsx
+++ b/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.jsx
@@ -93,6 +93,17 @@ const FlowNode = () => {
    }
    setExpandedRowKeys(data);
  };
+  // 表格内文案样式
+  const textStyleOne = (text, record) => {
+    if (record.colorType === 2) {
+      return 'red';
+    }
+    if (text === '(未配置)') {
+      return 'grey';
+    }
+    return '000000D9';
+  };
+
  // 定义展开的表格
  const createUnfoldTable = itemTable => {
    const columns = [
@@ -101,12 +112,15 @@ const FlowNode = () => {
        dataIndex: 'name',
        width: 149,
        align: 'left',
-        render: text => (
+        render: (text, record) => (
          <div
-            style={{ paddingLeft: 60 }}
-            // eslint-disable-next-line react/no-danger
-            dangerouslySetInnerHTML={{ __html: text }}
-          />
+            style={{
+              paddingLeft: 60,
+              color: record.colorType === 2 ? 'red' : '#000000D9',
+            }}
+          >
+            {text}
+          </div>
        ),
      },
      {
@@ -114,19 +128,15 @@ const FlowNode = () => {
        dataIndex: 'aliasName',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
-        ),
+        render: text => <span>{text}</span>,
      },
      {
        title: '移交方式',
        dataIndex: 'extendHandover',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: textStyleOne(text, record) }}>{text}</span>
        ),
      },
      {
@@ -134,9 +144,8 @@ const FlowNode = () => {
        dataIndex: 'extendNodeType',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: textStyleOne(text, record) }}>{text}</span>
        ),
      },
      {
@@ -147,10 +156,9 @@ const FlowNode = () => {
        ellipsis: {
          showTitle: true,
        },
-        render: text => (
+        render: (text, record) => (
          <Tooltip placement="topLeft" title={text}>
-            {/* eslint-disable-next-line react/no-danger */}
-            <span dangerouslySetInnerHTML={{ __html: text }} />
+            <span style={{ color: textStyleOne(text, record) }}>{text}</span>
          </Tooltip>
        ),
      },
@@ -159,15 +167,21 @@ const FlowNode = () => {
        dataIndex: 'extendSeeFields',
        align: 'center',
        width: 80,
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
+        ),
      },
      {
        title: '字段',
        dataIndex: 'extendFields',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
        ),
      },

@@ -176,9 +190,10 @@ const FlowNode = () => {
        dataIndex: 'extendEditableLater',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
        ),
      },
      {
@@ -186,9 +201,10 @@ const FlowNode = () => {
        dataIndex: 'extendRollbackable',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
        ),
      },
      {
@@ -196,9 +212,10 @@ const FlowNode = () => {
        dataIndex: 'extendRollbackNode',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
        ),
      },
      {
@@ -206,9 +223,10 @@ const FlowNode = () => {
        dataIndex: 'tranferable',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
        ),
      },
      {
@@ -216,9 +234,10 @@ const FlowNode = () => {
        dataIndex: 'eventInformation',
        align: 'center',
        width: 80,
-        render: text => (
-          // eslint-disable-next-line react/no-danger
-          <span dangerouslySetInnerHTML={{ __html: text }} />
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>
+            {text}
+          </span>
        ),
      },
      {

--- a/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.less
+++ b/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.less
@@ -28,8 +28,11 @@

 // 编辑节点表单
 .formData {
-  height: 32rem;
+  height: calc(100vh - 162px);
  overflow-y: scroll;
+  .ant-radio-wrapper {
+    min-width: 130px;
+  }
  .filedListItem {
    display: flex;
    flex-wrap: nowrap;

--- a/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/AuxiliaryView.jsx
+++ b/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/AuxiliaryView.jsx
@@ -85,55 +85,67 @@ const AuxiliaryView = props => {
      title: '前端便签',
      dataIndex: 'WebLabel',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
    },
    {
      title: '前端视图',
      dataIndex: 'WebPage',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
    },
    {
      title: '前端参数',
      dataIndex: 'WebParam',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
    },
    {
      title: '手持标签',
      dataIndex: 'MobileLabel',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
    },
    {
      title: '手持视图',
      dataIndex: 'MobilePage',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
    },
    {
      title: '手持参数',
      dataIndex: 'MobileParam',
      align: 'center',
-      render: text => (
-        // eslint-disable-next-line react/no-danger
-        <span dangerouslySetInnerHTML={{ __html: text }} />
-      ),
+      render: text => {
+        if (text === '(未配置)' || text === '(无)') {
+          return <span style={{ color: 'grey' }}>{text}</span>;
+        }
+        return <span>{text}</span>;
+      },
    },
    {
      title: '操作',

--- a/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/NodeEdit.jsx
+++ b/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/NodeEdit.jsx
@@ -10,7 +10,6 @@ import {

 import {
  Form,
-  Modal,
  Input,
  Radio,
  Select,
@@ -18,6 +17,8 @@ import {
  Checkbox,
  Button,
  message,
+  Drawer,
+  Space,
 } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import Fieldselection from './nodeEditComponents/Fieldselection';
@@ -99,58 +100,47 @@ const NodeEdit = props => {
    loadEventFields({ eventTableName: value.TableName }).then(res => {
      if (res.code === 0) {
        let defaultCheckedList = value[val] ? value[val].split(',') : [];
-        // 处理数据为树形结构
-        let keylist = new Set();
-        let list = new Map();
-        res.data.forEach(item => {
-          keylist.add(item.group);
-          if (keylist.has(item.group)) {
-            let listItem = list.get(item.group);
-            // 存入check得选项，是否全选，选中的选项'
-            if (listItem) {
-              list.set(item.group, {
-                plainOptions: [...listItem.plainOptions, item.fieldName],
-                defaultCheckedList: [],
+        // 处理树形结构
+        let checkList = res.data.map(item => {
+          let plainOptions = [];
+          item.root.forEach(ele => {
+            plainOptions = [...plainOptions, ele.fieldName];
          });
-            } else {
-              list.set(item.group, {
-                plainOptions: [item.fieldName],
+          return {
+            groupName: item.groupName,
+            plainOptions,
            defaultCheckedList: [],
+          };
        });
-            }
-          }
-        });
-        let checkList = [...list];
        defaultCheckedList.forEach(item => {
          checkList.forEach(element => {
            // 当前得模块是否有当前字段
-            let indeterminate = element[1].plainOptions.some(
+            let indeterminate = element.plainOptions.some(
              checkName => checkName === item,
            );
            // 处理已选中的字段
            if (indeterminate) {
-              element[1].defaultCheckedList.push(item);
+              element.defaultCheckedList.push(item);
            }
            if (
-              element[1].defaultCheckedList.length > 0 &&
-              element[1].defaultCheckedList.length <
-                element[1].plainOptions.length
+              element.defaultCheckedList.length > 0 &&
+              element.defaultCheckedList.length < element.plainOptions.length
            ) {
-              element[1].indeterminate = true;
+              element.indeterminate = true;
            } else {
-              element[1].indeterminate = false;
+              element.indeterminate = false;
            }
            // 处理是否全选字段
            if (
-              element[1].defaultCheckedList.length ===
-              element[1].plainOptions.length
+              element.defaultCheckedList.length === element.plainOptions.length
            ) {
-              element[1].checkAll = true;
+              element.checkAll = true;
            } else {
-              element[1].checkAll = false;
+              element.checkAll = false;
            }
          });
        });
+        console.log(checkList, 'checkList');
        setFieldList(checkList);
        setTimeout(() => {
          setShowField(true);
@@ -215,14 +205,19 @@ const NodeEdit = props => {
    }
  };
  return (
-    <Modal
+    <Drawer
      title="流程节点配置"
+      width="500px"
+      onClose={handleCancel}
      visible={visible}
-      onOk={onFinish}
-      width="800px"
-      onCancel={handleCancel}
-      maskClosable={false}
-      centered
+      footer={
+        <Space>
+          <Button onClick={handleCancel}>取消</Button>
+          <Button onClick={onFinish} type="primary">
+            确定
+          </Button>
+        </Space>
+      }
    >
      <Form
        form={form}
@@ -329,13 +324,13 @@ const NodeEdit = props => {
            />
          </div>
        </Form.Item>
-        <Form.Item label="查看字段（工程模型）">
+        <Form.Item label="查看字段">
          <div className={styles.filedListItem}>
            <Form.Item
              name="SeeFields"
              style={{ marginBottom: 0, width: '100%' }}
            >
-              <Input placeholder="请选择查看字段" allowClear />
+              <Input placeholder="请选择查看字段（工程模型）" allowClear />
            </Form.Item>
            <Button
              type="dashed"
@@ -379,7 +374,7 @@ const NodeEdit = props => {
        fieldList={fieldList}
        onSubumit={val => setFiled(val)}
      />
-    </Modal>
+    </Drawer>
  );
 };
 export default NodeEdit;
--- a/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/nodeEditComponents/Fieldselection.jsx
+++ b/src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/nodeEditComponents/Fieldselection.jsx
@@ -19,7 +19,7 @@ const Fieldselection = props => {
      return;
    }
    checkList.forEach(element => {
-      arr = [...arr, ...element[1].defaultCheckedList];
+      arr = [...arr, ...element.defaultCheckedList];
    });
    setSelectList(arr);
    // 初始化拖拽
@@ -35,11 +35,11 @@ const Fieldselection = props => {
  const onChange = (list, index) => {
    setCheckList(value => {
      const chooseList = JSON.parse(JSON.stringify(value));
-      chooseList[index][1].defaultCheckedList = list;
-      chooseList[index][1].indeterminate =
-        !!list.length && list.length < chooseList[index][1].plainOptions.length;
-      chooseList[index][1].checkAll =
-        list.length === chooseList[index][1].plainOptions.length;
+      chooseList[index].defaultCheckedList = list;
+      chooseList[index].indeterminate =
+        !!list.length && list.length < chooseList[index].plainOptions.length;
+      chooseList[index].checkAll =
+        list.length === chooseList[index].plainOptions.length;
      return chooseList;
    });
  };
@@ -47,11 +47,11 @@ const Fieldselection = props => {
  const onCheckAllChange = (e, index) => {
    setCheckList(value => {
      const chooseList = JSON.parse(JSON.stringify(value));
-      chooseList[index][1].defaultCheckedList = e.target.checked
-        ? chooseList[index][1].plainOptions
+      chooseList[index].defaultCheckedList = e.target.checked
+        ? chooseList[index].plainOptions
        : [];
-      chooseList[index][1].indeterminate = false;
-      chooseList[index][1].checkAll = e.target.checked;
+      chooseList[index].indeterminate = false;
+      chooseList[index].checkAll = e.target.checked;
      return chooseList;
    });
  };
@@ -98,19 +98,21 @@ const Fieldselection = props => {
              <div className={styles.cardBox} key={index}>
                <div className={styles.title}>
                  <Divider orientation="left" className={styles.cardDivider}>
-                    <span style={{ marginRight: '10px' }}>{item[0]}</span>
+                    <span style={{ marginRight: '10px' }}>
+                      {item.groupName}
+                    </span>
                    <Checkbox
-                      indeterminate={item[1].indeterminate}
+                      indeterminate={item.indeterminate}
                      onChange={e => onCheckAllChange(e, index)}
-                      checked={item[1].checkAll}
+                      checked={item.checkAll}
                    />
                  </Divider>
                </div>
                <div className={styles.filedList}>
                  <CheckboxGroup
                    key={index}
-                    options={item[1].plainOptions}
-                    value={item[1].defaultCheckedList}
+                    options={item.plainOptions}
+                    value={item.defaultCheckedList}
                    onChange={list => onChange(list, index)}
                  />
                </div>

--- a/src/pages/platformCenter/filedConfig/fieldEditor.jsx
+++ b/src/pages/platformCenter/filedConfig/fieldEditor.jsx
--- a/src/pages/platformCenter/filedConfig/filedConfig.jsx
+++ b/src/pages/platformCenter/filedConfig/filedConfig.jsx
--- a/src/pages/userCenter/userManage/UserManage.js
+++ b/src/pages/userCenter/userManage/UserManage.js
@@ -107,6 +107,7 @@ const UserManage = () => {
  const [searchWord, setSearchWord] = useState(''); // 关键字
  const [currentSelectOrg, setCurrentSelectOrg] = useState('-1'); // 左侧机构树-选中组织,字符串类型默认全部机构'-1'，注意用户表中的OUID是数字
  const [currentSelectOldOrg, setCurrentSelectOldOrg] = useState([]); // 更改机构时的树-原先选中组织
+  const [showSearchStyle, setShowSearchStyle] = useState(false); // 是否显示模糊查询样式

  /** ***Modal弹框,是否可视**** */
  const [userVisible, setUserVisible] = useState(false); // 添加用户
@@ -143,7 +144,7 @@ const UserManage = () => {
  const [currentOrgArea, setCurrentOrgArea] = useState('');
  const [currentOrgDistinct, setCurrentOrgDistinct] = useState('');
  const [saveExtentFlag, setSaveExtentFlag] = useState(0);
-  const [filteredValue,setFilteredValue] =useState([]);
+  const [filteredValue, setFilteredValue] = useState([]);
  const { Search } = Input;
  const setRowClassName = record =>
    record.userID === selectColor.userID ? styles.clickRowStyle : '';
@@ -155,30 +156,14 @@ const UserManage = () => {
      key: 'loginName',
      width: 150,
      // fixed: 'left',
-      render: item => (
-        <div
-          ref={r => {
-            if (r) {
-              r.innerHTML = item;
-            }
-          }}
-        />
-      ),
+      render: item => searchStyle(item),
    },
    {
      title: '用户姓名',
      dataIndex: 'userName',
      key: 'userName',
      width: 150,
-      render: item => (
-        <div
-          ref={r => {
-            if (r) {
-              r.innerHTML = item;
-            }
-          }}
-        />
-      ),
+      render: item => searchStyle(item),
    },
    {
      title: '所在机构',
@@ -196,17 +181,9 @@ const UserManage = () => {
      key: 'phone',
      width: 150,
      ellipsis: true,
-      render: record => {
-        if (record) {
-          return (
-            <div
-              ref={r => {
-                if (r) {
-                  r.innerHTML = record;
-                }
-              }}
-            />
-          );
+      render: text => {
+        if (text) {
+          return searchStyle(text);
        }
        return <span>未绑定</span>;
      },
@@ -338,10 +315,7 @@ const UserManage = () => {
                <div style={{ width: '130px' }}>
                  <Form form={form}>
                    <Item>
-                      <Radio.Group
-                        value={selectValue}
-                        onChange={onTypeChange}
-                      >
+                      <Radio.Group value={selectValue} onChange={onTypeChange}>
                        <Space direction="vertical">
                          <Radio value={0}>访客</Radio>
                          <Radio value={1}>普通用户</Radio>
@@ -387,7 +361,19 @@ const UserManage = () => {
      ),
    },
  ];
-
+  // 模糊查询匹配的样式
+  const searchStyle = val => {
+    let n;
+    if (showSearchStyle) {
+      n = val.replace(
+        new RegExp(searchWord, 'g'),
+        `<span style='color:red'>${searchWord}</span>`,
+      );
+    } else {
+      n = val;
+    }
+    return <div dangerouslySetInnerHTML={{ __html: n }} />;
+  };
  // 获取搜索框的值
  const handleSearch = e => {
    setSearchWord(e.target.value);
@@ -419,7 +405,7 @@ const UserManage = () => {
          <span className={styles.titleText}>{org.text}</span>
          <span className={styles.tip}>
            <Tooltip title="" className={styles.fs}>
-              <Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate} >
+              <Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate}>
                <PlusOutlined
                  style={{ marginLeft: 20 }}
                  onClick={e => e.stopPropagation()}
@@ -472,7 +458,7 @@ const UserManage = () => {
      .then(newres => {
        if (newres.code === 0) {
          let res = newres.data;
-          console.log(res)
+          console.log(res);
          setTreeLoading(false);
          setTreeData(res);
          setTreeDataCopy(res);
@@ -511,8 +497,8 @@ const UserManage = () => {

  // 点击树节点，获取当前机构下所有用户
  const onSelect = (props, e) => {
-    console.log(e)
-    console.log(props)
+    console.log(e);
+    console.log(props);
    setTableLoading(true);
    if (e) {
      setOrgTitle(e.node.title.props.children[0].props.children);
@@ -533,6 +519,7 @@ const UserManage = () => {
      groupID: props[0],
    }).then(res => {
      if (res.code === 0) {
+        console.log(res);
        setCurrentOrgArea(res.data.MapRange);
        setCurrentOrgDistinct(res.data.AreeName);
      }
@@ -562,6 +549,7 @@ const UserManage = () => {
              item.key = index;
              return item;
            });
+            setShowSearchStyle(false);
            setTableData(table);
          } else {
            setTableLoading(false);
@@ -773,12 +761,12 @@ const UserManage = () => {
  const onTypeChange = value => {
    setSelctValue(value.target.value);
  };
-  const authUser = (record) => {
+  const authUser = record => {
    setCurrentUser(record);
-    console.log(selectValue)
+    console.log(selectValue);
    AddUserAuthSetting({
      userId: record.userID,
-      userLevel: selectValue 
+      userLevel: selectValue,
    }).then(res => {
      if (res.code === 0) {
        message.info('提交成功');
@@ -817,12 +805,14 @@ const UserManage = () => {
          setOrgTitle('全部机构搜索结果'); // 设置表头
          setCurrentSelectOrg('-1'); // 清空选中机构
          console.log(res.data);
+          setShowSearchStyle(true);
          setTableData(res.data);
          setTableLength(res.data.length);
        } else {
          notification.error({
-            message: '提交失败',
-            description: res.message,
+            message: '提示',
+            duration: 3,
+            description: res.msg,
          });
        }
      })
@@ -1137,7 +1127,7 @@ const UserManage = () => {
          let res = newres.data;
          setTreeLoading(false);
          setSearchWord('');
-          setFilteredValue([])
+          setFilteredValue([]);
          // 第一次加载，默认选择第一个组织
          onSelect([res[0].id], false);
        } else {
@@ -1154,9 +1144,9 @@ const UserManage = () => {
        message.error(err);
      });
  };
-  const onChangeInput = (filters) =>{
+  const onChangeInput = filters => {
    setFilteredValue(filters.OUName);
-  }
+  };

  // 更改机构范围
  const submitExtent = (extent, areaName) => {
@@ -1177,14 +1167,14 @@ const UserManage = () => {
    setEditOrgExtentVisible(false);
  };

-  const addChange =e=>{
-    console.log(e)
-    e.domEvent.stopPropagation()
-  }
+  const addChange = e => {
+    console.log(e);
+    e.domEvent.stopPropagation();
+  };
  /** ***操作按钮**** */
  // 机构操作
  const orgButtonMenu = (
-    <Menu onClick={e =>addChange(e)}>
+    <Menu onClick={e => addChange(e)}>
      <Menu.Item key="1" onClick={addUser} icon={<UserAddOutlined />}>
        添加用户
      </Menu.Item>
@@ -1194,7 +1184,7 @@ const UserManage = () => {
    </Menu>
  );
  const orgButtonMenu1 = (
-    <Menu onClick={e =>addChange(e)}>
+    <Menu onClick={e => addChange(e)}>
      <Menu.Item key="3" onClick={editOrg} icon={<EditOutlined />}>
        编辑当前机构
      </Menu.Item>
@@ -1231,7 +1221,7 @@ const UserManage = () => {
        {/* 左侧机构树 */}
        <Spin spinning={treeLoading} tip="loading...">
          <Card
-            style={{overflowY:'hidden'}}
+            style={{ overflowY: 'hidden' }}
            className={classnames({
              [styles.orgContainer]: true,
              [styles.orgContainerHide]: !treeVisible,
@@ -1242,7 +1232,7 @@ const UserManage = () => {
                style={{
                  fontSize: '15px ',
                  fontWeight: 'bold',
-                  marginLeft: '15px'
+                  marginLeft: '15px',
                }}
              >
                机构列表
@@ -1254,11 +1244,13 @@ const UserManage = () => {
                    color: '#1890FF',
                    fontSize: '25px',
                    verticalAlign: 'middle',
-                    marginLeft: '67%'
+                    marginLeft: '67%',
                  }}
                />
              </Tooltip>
-              <hr style={{ width: '95%', color: '#eeecec' ,marginLeft: '15px'}} />
+              <hr
+                style={{ width: '95%', color: '#eeecec', marginLeft: '15px' }}
+              />
              {treeData.length > 0 && (
                <Tree
                  showIcon="true"
@@ -1271,7 +1263,7 @@ const UserManage = () => {
                  onSelect={onSelect}
                  height={
                    treeData.length && treeData.length > 30
-                      ? treeData.length * 18+50
+                      ? treeData.length * 18 + 50
                      : 1000
                  }
                  treeData={treeData.map(t => mapTree(t))}