Merge remote-tracking branch 'origin/devlop' into develop

src/pages/categoryManage/category/index.scss

@@ -20,8 +20,9 @@
 
 .table-option-wrap {
   display: flex;
-  justify-content: flex-end;
+  justify-content: center;
   flex-wrap: wrap;
+  align-items: center;
 }
 .share-code {
   text-align: center;

src/pages/categoryManage/category/index.tsx

@@ -54,7 +54,7 @@ const Category: FC = (props: any) => {
       title: '分类名称',
       dataIndex: 'classifyName',
       key: 'classifyName',
-      // align: "center",
+      align: 'center',
       width: '12%',
       editable: true,
       ellipsis: true,
@@ -89,7 +89,7 @@ const Category: FC = (props: any) => {
         return record.icon ? (
           <img
             src={record.icon}
-            style={{ width: '50px', height: '50px' }}
+            style={{ width: '25px', height: '25px' }}
             onClick={() => imgClick(record.icon)}
           />
         ) : (
@@ -647,6 +647,7 @@ const Category: FC = (props: any) => {
             style={{ marginRight: '10px' }}
             onClick={() => addCayDailogShow()}
             icon={<PlusOutlined />}
+            disabled={tabList.length == 0}
           >
             新增分类
           </Button>
@@ -683,7 +684,7 @@ const Category: FC = (props: any) => {
       >
         <Form form={form} component={false}>
           <Table
-            size='small'
+            size='large'
             columns={mergedColumns}
             dataSource={categoryList}
             rowSelection={rowSelection}

src/pages/categoryManage/directoryManage/components/addOrEditDec/index.tsx

@@ -140,7 +140,7 @@ const AddOrEditDec: React.FC<PropsType & selfPropsType> = ({
         )} */}
 
         <Form.Item label='目录名称' name='directoryName' rules={[{ required: true }]}>
-          <Input placeholder='请输入目录名称' allowClear={true}></Input>
+          <Input placeholder='请输入目录名称' allowClear={true} maxLength={20}></Input>
         </Form.Item>
         {form.getFieldValue('type') == '0' && (
           <Form.Item