@gingkoo/pandora-explorer 0.0.1-alpha.96 → 0.0.1-alpha.97

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-explorer v0.0.1-alpha.96
+ * @gingkoo/pandora-explorer v0.0.1-alpha.97
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import cx$1 from 'classnames';
@@ -5532,6 +5532,7 @@ function TableItem(props) {
     ischeck,
     onCheck,
     onMenuClick,
+    isdrag,
     rename,
     onRename,
     onSelect,
@@ -5549,6 +5550,7 @@ function TableItem(props) {
     }),
     "data-id": !disable ? id : null,
     "data-type": !disable ? props.type : null,
+    "data-isdrag": isdrag === false ? false : true,
     onContextMenu: e => {
       e.stopPropagation();
       e.preventDefault();
@@ -5951,7 +5953,7 @@ var Tree = /*#__PURE__*/forwardRef((props, _ref) => {
     return size > w ? size : Math.ceil(w);
   }, [width, _widht]);
   useEffect(() => {
-    let arr = cloneDeep(treeData);
+    let arr = cloneDeep(treeData) || [];
     arr = addLevel(arr, 0, type, filterData);
     setData(arr);
   }, [treeData, type, filterData]);
@@ -6843,7 +6845,7 @@ const SelectBox = props => {
    * @param isregion//是否过滤区域
    * @returns
    */
-  function isSelectTarget(e, checkType, status, isregion) {
+  function isSelectTarget(e, checkType, status, isregion, drag = true) {
     let idx = [];
     Array.from(document.querySelectorAll(selectClass)).filter(v => {
       if (v.contains(e.target)) {
@@ -6852,6 +6854,10 @@ const SelectBox = props => {
           dataDom = v.querySelector(dataClass);
         }
         let id = dataDom?.getAttribute('data-id');
+        if (drag) {
+          let isdrag = dataDom?.getAttribute('data-isdrag');
+          if (isdrag == 'false') return;
+        }
         if (checkType) {
           let type = dataDom?.getAttribute('data-type');
           if (type !== checkType) return;
@@ -6943,7 +6949,7 @@ const SelectBox = props => {
     });
     onMouseup?.(e);
     if (cur.current?.length) {
-      let target = isSelectTarget(e, 'folder', '', true);
+      let target = isSelectTarget(e, 'folder', '', true, false);
       if (target?.[0] && !checks?.includes(target?.[0])) {
         if (target?.[0] !== stageClickInfo.startkey) {
           props.onMoveFile(checks, target?.[0]);
@@ -6971,7 +6977,7 @@ const SelectBox = props => {
     }
   }
   /***************** 拖动  *****************/
-  //拖动文件
+  //拖动文件  (外部文件上传)
   const handleDragOver = e => {
     e?.preventDefault();
     const {
@@ -7092,7 +7098,7 @@ const SelectBox = props => {
       }
     });
     await Promise.all(promises);
-    let data = isSelectTarget(e, 'folder', '', true);
+    let data = isSelectTarget(e, 'folder', '', true, false);
     handleDragLeave();
     let key = null;
     if (typeof data?.[0] == 'string' && store?.dataMap?.[data?.[0]]) {
@@ -7142,7 +7148,7 @@ const SelectBox = props => {
     }
     setIsDragUpload(true);
   }
-  /***********  创建绘制页面   *************/
+  /***********  创建绘制页面 (拖动是执行样式)    *************/
   //创建文案
   function createText() {
     let _box = null;
@@ -7319,6 +7325,8 @@ const SelectBox = props => {
               let type = dataDom?.getAttribute('data-type');
               if (type !== checkType) return;
             }
+            let isdrag = dataDom?.getAttribute('data-isdrag');
+            if (isdrag == 'false') return;
             let id = dataDom?.getAttribute('data-id');
             if (id && !idx.includes(id)) {
               idx.push(id);
@@ -7910,7 +7918,7 @@ const SelectBox = props => {
           store: store,
           menu: menudata,
           loadMenu: v => {
-            let menu = loadMenu(v);
+            let menu = loadMenu?.(v);
             if (menu?.key == 'rename') return undefined;
             if (menu?.key == 'copy') return undefined;
             return menu;
@@ -9071,9 +9079,9 @@ const Layout = props => {
       poi: isNavtab ? [200] : [0, 'max'],
       fix: [true, false],
       rang: [10, 350],
-      children: [jsx(ExplorerMenu, {
+      children: [isNavtab ? jsx(ExplorerMenu, {
         ...props
-      }), jsxs("div", {
+      }) : jsx(Fragment, {}), jsxs("div", {
         className: 'frame-right',
         children: [isHeader && jsx("div", {
           className: 'frame-header',
@@ -9257,6 +9265,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     accept,
     selectedSuffix,
     multiple = true,
+    filelist,
     expandkey: _expandkey,
     createFile,
     onCopy,
@@ -9322,6 +9331,11 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     },
     createFolder: createFolder
   }));
+  useEffect(() => {
+    if (Array.isArray(filelist)) {
+      setCurList(filelist);
+    }
+  }, [filelist]);
   /* ************ 挂载监听  **************** */
   useEffect(() => {
     window.addEventListener('click', closeMenu);
@@ -9424,7 +9438,9 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
   }, [curlist, curSelectFile, curInfo]);
   //切换当前 文件目录时 需要清空的内容
   useEffect(() => {
+    if (!curInfo?.key) return;
     setExpandkey([]);
+    onExpand?.([]);
     setCurSelect(null);
     props?.onCheck?.([]);
   }, [curInfo?.key]);
@@ -9446,6 +9462,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
   }, [dataMap]);
   /* ************  加载更新数据   **************** */
   async function loadData(key, param, closeload = true) {
+    if (!props?.loadData) return;
     closeload && setLoading(ApiStatusEnum.LOADING);
     let data = (await props.loadData?.(key, param)) || {};
     if (data.status == 'Err') {
@@ -9657,7 +9674,8 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
       type: _type,
       title: _type == 'folder' ? '新建文件夹' : `新建文件.${suffix}`,
       create_file: true,
-      suffix: suffix
+      suffix: suffix,
+      parent: params
     });
     setCurList(list);
   }
@@ -9824,8 +9842,8 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
       if (curInfo || !isNavtab) {
         setLoading(ApiStatusEnum.LOADING);
         await createFile?.(value, param, info);
-        await loadData(curInfo?.key || '', null, false);
-        reloadNode(curInfo?.key || '', param);
+        await loadData?.(curInfo?.key || '', null, false);
+        // data && reloadNode(curInfo?.key || '', param);
         setLoading(ApiStatusEnum.READY);
       }
     } else {
@@ -9843,7 +9861,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
           });
         }
       } else {
-        curInfo?.key && loadData(curInfo?.key || '');
+        loadData(curInfo?.key || '');
         updata(key, {
           title: value
         });
@@ -9911,7 +9929,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
       totalNum,
       //icon
       getIcons: Icons,
-      loadMenu: props.loadMenu,
+      loadMenu: props?.loadMenu,
       uploadFile,
       createFolder,
       reloadNode,