@whitesev/pops 1.5.2 → 1.5.3

package/dist/index.esm.js

@@ -6065,8 +6065,9 @@ class PopsFolder {
          * @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;
@@ -6076,7 +6077,7 @@ class PopsFolder {
             let fileFormatSize = popsDOMUtils.createElement("td");
             let fileType = "";
             let fileIcon = Folder_ICON.folder;
-            if (arguments.length === 1) {
+            if (isFolder) {
                 /* 文件夹 */
                 latestTime = "";
                 fileSize = "";
@@ -6131,6 +6132,7 @@ class PopsFolder {
                 fileName: origin_fileName,
                 latestTime: origin_latestTime,
                 fileSize: origin_fileSize,
+                isFolder: isFolder,
             };
             fileNameElement["__value__"] = __value__;
             fileTimeElement["__value__"] = __value__;
@@ -6149,7 +6151,7 @@ class PopsFolder {
         /**
          * 创建移动端文件夹元素
          */
-        function createMobileFolderRowElement(fileName, latestTime = "-", fileSize = "-") {
+        function createMobileFolderRowElement(fileName, latestTime = "-", fileSize = "-", isFolder = false) {
             let origin_fileName = fileName;
             let origin_latestTime = latestTime;
             let origin_fileSize = fileSize;
@@ -6157,7 +6159,7 @@ class PopsFolder {
             let fileNameElement = popsDOMUtils.createElement("td");
             let fileType = "";
             let fileIcon = Folder_ICON.folder;
-            if (arguments.length === 1) {
+            if (isFolder) {
                 /* 文件夹 */
                 latestTime = "";
                 fileSize = "";
@@ -6201,6 +6203,7 @@ class PopsFolder {
                 fileName: origin_fileName,
                 latestTime: origin_latestTime,
                 fileSize: origin_fileSize,
+                isFolder: isFolder,
             };
             fileNameElement["__value__"] = __value__;
             folderELement["__value__"] = __value__;
@@ -6374,30 +6377,40 @@ class PopsFolder {
         }
         /**
          * 对配置进行排序
-         * @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) {
                         /* 降序 */
@@ -6409,8 +6422,30 @@ class PopsFolder {
                         }
                     }
                     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) {
                             /* 降序 */
@@ -6432,9 +6467,9 @@ class PopsFolder {
                     else {
                         return 0;
                     }
-                }
-            });
-            return _config_;
+                });
+                return folderDataConfigList;
+            }
         }
         /**
          * 添加元素
@@ -6445,8 +6480,8 @@ class PopsFolder {
             _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);
                     });
@@ -6454,8 +6489,8 @@ class PopsFolder {
                 }
                 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);
                 }
@@ -6492,7 +6527,6 @@ class PopsFolder {
          * @param {PointerEvent} target
          * @param {HTMLElement} event
          * @param {string} sortName
-         * @returns
          */
         function arrowSortClickEvent(target, event, sortName) {
             if (!event["notChangeSortRule"]) {
@@ -9946,7 +9980,7 @@ class Pops {
     /** 配置 */
     config = {
         /** 版本号 */
-        version: "2024.8.15",
+        version: "2024.9.9",
         cssText: {
             /** 主CSS */
             index: indexCSS,