fix: block file tree (#3336)

umijs · Sep 29, 2019 · fb4fa14 · fb4fa14
1 parent bcf1d45
commit fb4fa14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/packages/umi-build-dev/src/plugins/commands/block/data.d.ts b/packages/umi-build-dev/src/plugins/commands/block/data.d.ts
@@ -1,5 +1,5 @@
 export interface Block {
-  url?: string;
+  url: string;
   name?: string;
   description?: string;
   img?: string;

diff --git a/packages/umi-build-dev/src/plugins/commands/block/ui/server/util/index.ts b/packages/umi-build-dev/src/plugins/commands/block/ui/server/util/index.ts
@@ -2,9 +2,8 @@ import fs from 'fs';
 import chalk from 'chalk';
 import { join } from 'path';
 import { winPath } from 'umi-utils';
-import { getBlockListFromGit } from '../../../util';
 import { fetchBlockList } from '../../util';
-import { BlockData, Resource } from '../../../data.d';
+import { Resource } from '../../../data.d';
 
 export interface TreeData {
   title: string;
@@ -61,7 +60,7 @@ export const getFilesTreeData = (
     .map((fileName: string) => {
       const status = fs.statSync(join(path, fileName));
       const isDirectory = status.isDirectory();
-      // 是文件夹 并且不已 . 开头, 且最深三层
+      // 是文件夹 并且不已 . 开头, 且最深五层
       if (fileName.indexOf('.') !== 0 && depth < 5) {
         if (
           !isDirectory &&
@@ -75,15 +74,13 @@ export const getFilesTreeData = (
         const absPath = winPath(join(path, fileName));
         const absPagePath = winPath(join(parentPath, fileName));
         const children = isDirectory ? getFilesTreeData(absPath, absPagePath, depth + 1) : [];
-        if (children && children.length > 0) {
-          return {
-            key: absPagePath,
-            title: fileName,
-            value: absPagePath,
-            children,
-          };
-        }
-        return { title: fileName, value: absPagePath, key: absPagePath };
+        return {
+          selectable: !isDirectory,
+          key: absPagePath,
+          title: fileName,
+          value: absPagePath,
+          children,
+        };
       }
       return undefined;
     })

diff --git a/packages/umi-build-dev/src/plugins/commands/block/ui/ui/CustomTreeSelect/index.tsx b/packages/umi-build-dev/src/plugins/commands/block/ui/ui/CustomTreeSelect/index.tsx
@@ -34,9 +34,6 @@ const CustomTreeSelect: React.FC<CustomTreeSelectProps> = props => {
         label: realValue,
       }}
       onSelect={(_, node) => {
-        if (onlySelectLeaf && node.children && (node.children as any[]).length > 0) {
-          return;
-        }
         if (onlySelectLeaf) {
           propOnChange(node.value as string);
           return;