Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/components/FileBoxAD/index.tsx

@@ -98,7 +98,7 @@ function FlieBox(props: Props) {
     const Menu = useCallback((props: { isItem?: boolean }) => {
         if (props.isItem && isAll) {
             return <ul style={{ top: xy?.y, left: xy?.x }} className={style.menu} >
-                {isAll || num === 100 && <li onClick={allFile}>全选/反选</li>}
+                {(isAll || num === 100) && <li onClick={allFile}>全选/反选</li>}
                 {mediaType === 'PAGE' && !rightClickPup.folder ? <>
                     {/* <li onClick={() => { setPage && setPage(1, rightClickPup.id) }}>查看</li> */}
                     <li onClick={() => { setPage && setPage(2, rightClickPup.id) }}>复制</li>
@@ -116,7 +116,7 @@ function FlieBox(props: Props) {
             </ul>
         }
         return <ul style={{ top: xy?.y, left: xy?.x }} className={style.menu}>
-            {isAll || num === 100 && <li onClick={allFile}>全选/反选</li>}
+            {(isAll || num === 100) && <li onClick={allFile}>全选/反选</li>}
             {//防止K图文无限嵌套创建判断
                 (isAll !== false) && <li onClick={() => { set({ fileVisible: true }) }}>新建文件夹</li> //: <li>此处无法新建操作</li>
             }

src/pages/launchSystemNew/material/cloud/index.tsx

@@ -54,7 +54,7 @@ function Cloud() {
                             <TabPane tab={'个人本地'} key={1} />
                             <TabPane tab={'公共本地'} key={0} />
                         </Tabs>
-                        <FlieBox setPage={(type, data) => {
+                        <FlieBox isAll={true} setPage={(type, data) => {
                             setId(data || 0)
                             if (type === 0 || type === 2) {
                                 setVisible(true)