Merge remote-tracking branch 'origin/master'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 2649e5ad3c824771147b13bd54dc5cdf12c22fb2
+  newTag: 323e0490a0e3b70df3f9c8826767e4179448f855

src/pages/categoryManage/category/index.tsx

@@ -129,7 +129,7 @@ const Category: FC = (props: any) => {
       render: (text: string, record: categoryEntity, index: number) => {
         return (
           <div className='table-option-wrap'>
-            {record.children?.length > 0 ? (
+            {record.level == 1 ? (
               <>
                 {btnAddChildCgy ? (
                   <Button
@@ -418,7 +418,7 @@ const Category: FC = (props: any) => {
   };
   // 新增子分类
   const sureAddChildrenCgy = (record: categoryEntity) => {
-    let pid: string | number = -1;
+    let pid: string | number;
     categoryList.map((item: categoryEntity) => {
       if (item.children && item.children.length != 0) {
         const bol: boolean = item.children.some(