@whitesev/pops 1.5.1 → 1.5.3

package/dist/index.umd.js

@@ -2961,8 +2961,6 @@
             deviation = Number.isNaN(deviation) ? 1 : deviation;
             // 最大值2147483647
             let maxZIndex = Math.pow(2, 31) - 1;
-            // 比较值2000000000
-            let maxZIndexCompare = 2 * Math.pow(10, 9);
             // 当前页面最大的z-index
             let zIndex = 0;
             // 当前的最大z-index的元素，调试使用
@@ -2985,11 +2983,13 @@
                 }
             });
             zIndex += deviation;
+            // 用于比较的值2000000000，大于该值就取该值
+            let maxZIndexCompare = 2 * Math.pow(10, 9);
             if (zIndex >= maxZIndexCompare) {
                 // 最好不要超过最大值
                 zIndex = maxZIndex;
             }
-            return { zIndex: maxZIndex, animElement: maxZIndexNode };
+            return { zIndex: zIndex, animElement: maxZIndexNode };
         },
         /**
          * 获取CSS Rule
@@ -5943,7 +5943,7 @@
                             <div class="text-ellip content flex-a-i-center">
                                 <span>文件名</span>
                                 <div class="pops-folder-list-table__sort" data-sort="fileName">
-                                <div class="pops-folder-icon-arrow">
+                                <div class="pops-folder-icon-arrow" data-sort="按文件名排序">
                                     <svg
                                     viewBox="0 0 1024 1024"
                                     xmlns="http://www.w3.org/2000/svg">
@@ -5962,7 +5962,7 @@
                             <div class="text-ellip content flex-a-i-center">
                                 <span>修改时间</span>
                                 <div class="pops-folder-list-table__sort" data-sort="latestTime">
-                                <div class="pops-folder-icon-arrow">
+                                <div class="pops-folder-icon-arrow" title="按修改时间排序">
                                     <svg
                                     viewBox="0 0 1024 1024"
                                     xmlns="http://www.w3.org/2000/svg">
@@ -5981,7 +5981,7 @@
                             <div class="text-ellip content flex-a-i-center">
                                 <span>大小</span>
                                 <div class="pops-folder-list-table__sort" data-sort="fileSize">
-                                <div class="pops-folder-icon-arrow">
+                                <div class="pops-folder-icon-arrow" title="按大小排序">
                                     <svg
                                     viewBox="0 0 1024 1024"
                                     xmlns="http://www.w3.org/2000/svg">
@@ -6071,8 +6071,9 @@
              * @param fileName
              * @param latestTime
              * @param [fileSize="-"]
+             * @param isFolder
              */
-            function createFolderRowElement(fileName, latestTime = "-", fileSize = "-") {
+            function createFolderRowElement(fileName, latestTime = "-", fileSize = "-", isFolder = false) {
                 let origin_fileName = fileName;
                 let origin_latestTime = latestTime;
                 let origin_fileSize = fileSize;
@@ -6082,7 +6083,7 @@
                 let fileFormatSize = popsDOMUtils.createElement("td");
                 let fileType = "";
                 let fileIcon = Folder_ICON.folder;
-                if (arguments.length === 1) {
+                if (isFolder) {
                     /* 文件夹 */
                     latestTime = "";
                     fileSize = "";
@@ -6137,6 +6138,7 @@
                     fileName: origin_fileName,
                     latestTime: origin_latestTime,
                     fileSize: origin_fileSize,
+                    isFolder: isFolder,
                 };
                 fileNameElement["__value__"] = __value__;
                 fileTimeElement["__value__"] = __value__;
@@ -6155,7 +6157,7 @@
             /**
              * 创建移动端文件夹元素
              */
-            function createMobileFolderRowElement(fileName, latestTime = "-", fileSize = "-") {
+            function createMobileFolderRowElement(fileName, latestTime = "-", fileSize = "-", isFolder = false) {
                 let origin_fileName = fileName;
                 let origin_latestTime = latestTime;
                 let origin_fileSize = fileSize;
@@ -6163,7 +6165,7 @@
                 let fileNameElement = popsDOMUtils.createElement("td");
                 let fileType = "";
                 let fileIcon = Folder_ICON.folder;
-                if (arguments.length === 1) {
+                if (isFolder) {
                     /* 文件夹 */
                     latestTime = "";
                     fileSize = "";
@@ -6207,6 +6209,7 @@
                     fileName: origin_fileName,
                     latestTime: origin_latestTime,
                     fileSize: origin_fileSize,
+                    isFolder: isFolder,
                 };
                 fileNameElement["__value__"] = __value__;
                 folderELement["__value__"] = __value__;
@@ -6380,30 +6383,40 @@
             }
             /**
              * 对配置进行排序
-             * @param _config_
+             * @param folderDataConfigList
              * @param sortName 比较的属性，默认fileName
              * @param isDesc 是否降序，默认false（升序）
              */
-            function sortFolderConfig(_config_, sortName = "fileName", isDesc = false) {
-                _config_.sort((a, b) => {
-                    let beforeVal = a[sortName];
-                    let afterVal = b[sortName];
-                    if (sortName === "fileName") {
-                        /* 文件名，进行字符串转换 */
-                        beforeVal = beforeVal.toString();
-                        afterVal = afterVal.toString();
-                    }
-                    else if (sortName === "fileSize") {
-                        /* 文件大小，进行Float转换 */
-                        beforeVal = parseFloat(beforeVal);
-                        afterVal = parseFloat(afterVal);
-                    }
-                    else if (sortName === "latestTime") {
-                        /* 文件时间 */
-                        beforeVal = new Date(beforeVal).getTime();
-                        afterVal = new Date(afterVal).getTime();
-                    }
-                    if (typeof beforeVal === "string" && typeof afterVal === "string") {
+            function sortFolderConfig(folderDataConfigList, sortName = "fileName", isDesc = false) {
+                console.log(folderDataConfigList, sortName, isDesc);
+                if (sortName === "fileName") {
+                    // 如果是以文件名排序，文件夹优先放前面
+                    let onlyFolderDataConfigList = folderDataConfigList.filter((value) => {
+                        return value.isFolder;
+                    });
+                    let onlyFileDataConfigList = folderDataConfigList.filter((value) => {
+                        return !value.isFolder;
+                    });
+                    // 文件夹排序
+                    onlyFolderDataConfigList.sort((leftConfig, rightConfig) => {
+                        let beforeVal = leftConfig[sortName].toString();
+                        let afterVal = rightConfig[sortName].toString();
+                        let compareVal = beforeVal.localeCompare(afterVal);
+                        if (isDesc) {
+                            /* 降序 */
+                            if (compareVal > 0) {
+                                compareVal = -1;
+                            }
+                            else if (compareVal < 0) {
+                                compareVal = 1;
+                            }
+                        }
+                        return compareVal;
+                    });
+                    // 文件名排序
+                    onlyFileDataConfigList.sort((leftConfig, rightConfig) => {
+                        let beforeVal = leftConfig[sortName].toString();
+                        let afterVal = rightConfig[sortName].toString();
                         let compareVal = beforeVal.localeCompare(afterVal);
                         if (isDesc) {
                             /* 降序 */
@@ -6415,8 +6428,30 @@
                             }
                         }
                         return compareVal;
+                    });
+                    if (isDesc) {
+                        // 降序，文件夹在下面
+                        return [...onlyFileDataConfigList, ...onlyFolderDataConfigList];
                     }
                     else {
+                        // 升序，文件夹在上面
+                        return [...onlyFolderDataConfigList, ...onlyFileDataConfigList];
+                    }
+                }
+                else {
+                    folderDataConfigList.sort((beforeConfig, afterConfig) => {
+                        let beforeVal = beforeConfig[sortName];
+                        let afterVal = afterConfig[sortName];
+                        if (sortName === "fileSize") {
+                            /* 文件大小，进行Float转换 */
+                            beforeVal = parseFloat(beforeVal.toString());
+                            afterVal = parseFloat(afterVal.toString());
+                        }
+                        else if (sortName === "latestTime") {
+                            /* 文件时间 */
+                            beforeVal = new Date(beforeVal).getTime();
+                            afterVal = new Date(afterVal).getTime();
+                        }
                         if (beforeVal > afterVal) {
                             if (isDesc) {
                                 /* 降序 */
@@ -6438,9 +6473,9 @@
                         else {
                             return 0;
                         }
-                    }
-                });
-                return _config_;
+                    });
+                    return folderDataConfigList;
+                }
             }
             /**
              * 添加元素
@@ -6451,8 +6486,8 @@
                 _config_.forEach((item) => {
                     if (item["isFolder"]) {
                         let { folderELement, fileNameElement } = pops.isPhone()
-                            ? createMobileFolderRowElement(item["fileName"])
-                            : createFolderRowElement(item["fileName"]);
+                            ? createMobileFolderRowElement(item["fileName"], "", "", true)
+                            : createFolderRowElement(item["fileName"], "", "", true);
                         popsDOMUtils.on(fileNameElement, "click", (event) => {
                             refreshFolderInfoClickEvent(event, item);
                         });
@@ -6460,8 +6495,8 @@
                     }
                     else {
                         let { folderELement, fileNameElement } = pops.isPhone()
-                            ? createMobileFolderRowElement(item["fileName"], item["latestTime"], item["fileSize"])
-                            : createFolderRowElement(item["fileName"], item["latestTime"], item["fileSize"]);
+                            ? createMobileFolderRowElement(item["fileName"], item.latestTime, item.fileSize, false)
+                            : createFolderRowElement(item["fileName"], item.latestTime, item.fileSize, false);
                         setFileClickEvent(fileNameElement, item);
                         folderListBodyElement.appendChild(folderELement);
                     }
@@ -6498,7 +6533,6 @@
              * @param {PointerEvent} target
              * @param {HTMLElement} event
              * @param {string} sortName
-             * @returns
              */
             function arrowSortClickEvent(target, event, sortName) {
                 if (!event["notChangeSortRule"]) {
@@ -9952,7 +9986,7 @@
         /** 配置 */
         config = {
             /** 版本号 */
-            version: "2024.8.6",
+            version: "2024.9.9",
             cssText: {
                 /** 主CSS */
                 index: indexCSS,