@whitesev/pops 1.5.2 → 1.5.3

package/dist/index.system.js

@@ -6070,8 +6070,9 @@ System.register('pops', [], (function (exports) {
                      * @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;
@@ -6081,7 +6082,7 @@ System.register('pops', [], (function (exports) {
                         let fileFormatSize = popsDOMUtils.createElement("td");
                         let fileType = "";
                         let fileIcon = Folder_ICON.folder;
-                        if (arguments.length === 1) {
+                        if (isFolder) {
                             /* 文件夹 */
                             latestTime = "";
                             fileSize = "";
@@ -6136,6 +6137,7 @@ System.register('pops', [], (function (exports) {
                             fileName: origin_fileName,
                             latestTime: origin_latestTime,
                             fileSize: origin_fileSize,
+                            isFolder: isFolder,
                         };
                         fileNameElement["__value__"] = __value__;
                         fileTimeElement["__value__"] = __value__;
@@ -6154,7 +6156,7 @@ System.register('pops', [], (function (exports) {
                     /**
                      * 创建移动端文件夹元素
                      */
-                    function createMobileFolderRowElement(fileName, latestTime = "-", fileSize = "-") {
+                    function createMobileFolderRowElement(fileName, latestTime = "-", fileSize = "-", isFolder = false) {
                         let origin_fileName = fileName;
                         let origin_latestTime = latestTime;
                         let origin_fileSize = fileSize;
@@ -6162,7 +6164,7 @@ System.register('pops', [], (function (exports) {
                         let fileNameElement = popsDOMUtils.createElement("td");
                         let fileType = "";
                         let fileIcon = Folder_ICON.folder;
-                        if (arguments.length === 1) {
+                        if (isFolder) {
                             /* 文件夹 */
                             latestTime = "";
                             fileSize = "";
@@ -6206,6 +6208,7 @@ System.register('pops', [], (function (exports) {
                             fileName: origin_fileName,
                             latestTime: origin_latestTime,
                             fileSize: origin_fileSize,
+                            isFolder: isFolder,
                         };
                         fileNameElement["__value__"] = __value__;
                         folderELement["__value__"] = __value__;
@@ -6379,30 +6382,40 @@ System.register('pops', [], (function (exports) {
                     }
                     /**
                      * 对配置进行排序
-                     * @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) {
                                     /* 降序 */
@@ -6414,8 +6427,30 @@ System.register('pops', [], (function (exports) {
                                     }
                                 }
                                 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) {
                                         /* 降序 */
@@ -6437,9 +6472,9 @@ System.register('pops', [], (function (exports) {
                                 else {
                                     return 0;
                                 }
-                            }
-                        });
-                        return _config_;
+                            });
+                            return folderDataConfigList;
+                        }
                     }
                     /**
                      * 添加元素
@@ -6450,8 +6485,8 @@ System.register('pops', [], (function (exports) {
                         _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);
                                 });
@@ -6459,8 +6494,8 @@ System.register('pops', [], (function (exports) {
                             }
                             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);
                             }
@@ -6497,7 +6532,6 @@ System.register('pops', [], (function (exports) {
                      * @param {PointerEvent} target
                      * @param {HTMLElement} event
                      * @param {string} sortName
-                     * @returns
                      */
                     function arrowSortClickEvent(target, event, sortName) {
                         if (!event["notChangeSortRule"]) {
@@ -9951,7 +9985,7 @@ System.register('pops', [], (function (exports) {
                 /** 配置 */
                 config = {
                     /** 版本号 */
-                    version: "2024.8.15",
+                    version: "2024.9.9",
                     cssText: {
                         /** 主CSS */
                         index: indexCSS,