fix: 修改图片库提交为nullbug，web配置配置变化、流程样式修改

src/components/Upload/index.tsx

@@ -245,7 +245,7 @@ class PicturesWall extends React.Component<PicturesWallType> {
     if (!isLt2M) {
       message.error('图片必须小于2MB!');
     }
-    return isJpgOrPng && isLt2M;
+    return isJpgOrPng && isLt2M || Upload.LIST_IGNORE;;
   };
 
   // componentDidMount() {

src/pages/bsmanager/base/tablemanager/components/Field/editor.jsx

@@ -104,9 +104,9 @@ const AddModal = props => {
               <Radio value="较小">较小(6)</Radio>
             </Radio.Group>
           </Item>
-          <Item label="模板" name="officeTmpl">
+          {/* <Item label="模板" name="officeTmpl">
             <Input placeholder="请输入模板" allowClear />
-          </Item>
+          </Item> */}
           <Item label="接口" name="interfaceText">
             <Input placeholder="请输入接口" allowClear />
           </Item>

src/pages/bsmanager/base/tablemanager/index.jsx

@@ -28,8 +28,10 @@ import {
   BorderInnerOutlined,
   DoubleLeftOutlined,
   DoubleRightOutlined,
-  TableOutlined,
+  MenuOutlined,
+  DatabaseOutlined,
 } from '@ant-design/icons';
+
 import PageContainer from '@/components/BasePageContainer';
 import {
   CM_Table_LoadTable,
@@ -390,7 +392,7 @@ const TableManager = props => {
             />
           </Tooltip>
           <Tooltip title="表配置">
-            <TableOutlined
+            <MenuOutlined
               onClick={() => {
                 setType('tableEdit');
                 setVisible(true);

src/pages/bsmanager/workOrder/workFlow/flow.jsx

@@ -302,7 +302,7 @@ const Flow = () => {
             pagination={{
               showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
               pageSizeOptions: [10, 20, 50, 100],
-              defaultPageSize: 10,
+              defaultPageSize: 20,
               showQuickJumper: true,
               showSizeChanger: true,
             }}

src/pages/bsmanager/workOrder/workFlow/flowNode/flowNode.jsx

@@ -95,10 +95,13 @@ const FlowNode = () => {
         dataIndex: 'name',
         width: 149,
         align: 'left',
+        ellipsis: {
+          showTitle: true,
+        },
         render: (text, record) => (
           <div
             style={{
-              paddingLeft: 60,
+              textAlign: 'center',
               color: record.colorType === 2 ? 'red' : '#000000D9',
             }}
           >
@@ -148,15 +151,15 @@ const FlowNode = () => {
           </Tooltip>
         ),
       },
-      {
-        title: '查看字段',
-        dataIndex: 'extendSeeFields',
-        align: 'center',
-        width: 80,
-        render: (text, record) => (
-          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
-        ),
-      },
+      // {
+      //   title: '查看字段',
+      //   dataIndex: 'extendSeeFields',
+      //   align: 'center',
+      //   width: 80,
+      //   render: (text, record) => (
+      //     <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
+      //   ),
+      // },
       {
         title: '字段',
         dataIndex: 'extendFields',
@@ -204,20 +207,20 @@ const FlowNode = () => {
           <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
         ),
       },
-      {
-        title: '退至',
-        dataIndex: 'extendRollbackNode',
-        align: 'center',
-        width: 80,
-        ellipsis: {
-          showTitle: true,
-        },
-        render: (text, record) => (
-          <Tooltip placement="topLeft" title={text}>
-            <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
-          </Tooltip>
-        ),
-      },
+      // {
+      //   title: '退至',
+      //   dataIndex: 'extendRollbackNode',
+      //   align: 'center',
+      //   width: 80,
+      //   ellipsis: {
+      //     showTitle: true,
+      //   },
+      //   render: (text, record) => (
+      //     <Tooltip placement="topLeft" title={text}>
+      //       <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
+      //     </Tooltip>
+      //   ),
+      // },
       {
         title: '平级移交',
         dataIndex: 'tranferable',
@@ -227,15 +230,15 @@ const FlowNode = () => {
           <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
         ),
       },
-      {
-        title: '显示事件信息',
-        dataIndex: 'eventInformation',
-        align: 'center',
-        width: 80,
-        render: (text, record) => (
-          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
-        ),
-      },
+      // {
+      //   title: '显示事件信息',
+      //   dataIndex: 'eventInformation',
+      //   align: 'center',
+      //   width: 80,
+      //   render: (text, record) => (
+      //     <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
+      //   ),
+      // },
       {
         title: '操作',
         align: 'center',
@@ -343,11 +346,11 @@ const FlowNode = () => {
       align: 'center',
       width: 150,
     },
-    {
-      title: '查看字段',
-      width: 80,
-      align: 'center',
-    },
+    // {
+    //   title: '查看字段',
+    //   width: 80,
+    //   align: 'center',
+    // },
     {
       title: '字段',
       align: 'center',
@@ -370,21 +373,21 @@ const FlowNode = () => {
       align: 'center',
       width: 80,
     },
+    // {
+    //   title: '退至',
+    //   align: 'center',
+    //   width: 80,
+    // },
     {
-      title: '退至',
-      align: 'center',
-      width: 80,
-    },
-    {
-      title: '评级移交',
-      align: 'center',
-      width: 80,
-    },
-    {
-      title: '显示事件信息',
+      title: '平级移交',
       align: 'center',
       width: 80,
     },
+    // {
+    //   title: '显示事件信息',
+    //   align: 'center',
+    //   width: 80,
+    // },
     {
       title: '操作',
       align: 'center',

src/pages/bsmanager/workOrder/workFlow/flowNode/flowNodeComponents/NodeEdit.jsx

@@ -425,7 +425,7 @@ const NodeEdit = props => {
             />
           </div>
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label={
             <div className={styles.formData_label}>
               {form.getFieldValue('OutSeeFields') ? (
@@ -451,7 +451,7 @@ const NodeEdit = props => {
               }}
             />
           </div>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="前端视图" name="WebPage">
           <Input placeholder="请配置前端视图" />
         </Form.Item>

src/pages/productCenter/webConfig/components/siteConfigDrawer.js

@@ -24,7 +24,7 @@ import Upload from '@/components/Upload';
 import styles from './siteConfigDrawer.less';
 const { Option } = Select;
 const plainOptions = ['搜索', '消息', '反馈'];
-const defaultCheckedList = ['搜索', '消息'];
+const defaultCheckedList = ['搜索', '消息', '反馈'];
 const colorList = [
   {
     key: '科技蓝',
@@ -36,6 +36,11 @@ const colorList = [
     color: '#009C73',
     headerColor: 'linear-gradient(0deg, #00845D 0%, #02BF87 100%)',
   },
+  {
+    key: '清澈蓝',
+    color: '#1890FF',
+    headerColor: '#1890FF',
+  },
 ];
 
 export default props => {

src/pages/productCenter/webConfig/index.jsx

@@ -219,7 +219,12 @@ const WebConfigPage = props => {
     if (isSite) {
       url = val;
     } else {
-      url = localStorage.getItem('pd2-baseUrl') ? localStorage.getItem('pd2-baseUrl') + val : val;
+      url =
+        localStorage.getItem('pd2-baseUrl') &&
+        localStorage.getItem('pd2-baseUrl') != 'null' &&
+        localStorage.getItem('pd2-baseUrl') != 'undefined'
+          ? localStorage.getItem('pd2-baseUrl') + val
+          : val;
     }
     return url;
   };

src/routes/config.js

@@ -127,7 +127,7 @@ export default {
           routes: [
             {
               path: '/authority/user',
-              name: '机构管理',
+              name: '用户管理',
               component: UserManage,
             },
             {