zkqh-lagrange-utils 0.0.58 → 0.0.60

package/package.json

@@ -1,74 +1,74 @@
-{
-	"name": "zkqh-lagrange-utils",
-	"private": false,
-	"version": "0.0.58",
-	"type": "module",
-	"scripts": {
-		"dev": "vite",
-		"build": "vite build",
-		"gen-style": "node ./scripts/generate-naiveui-common-style.mjs"
-	},
-	"main": "dist/lagrange-utils.umd.cjs",
-	"module": "dist/lagrange-utils.js",
-	"sideEffects": [
-		"*.css"
-	],
-	"exports": {
-		".": {
-			"import": "./dist/lagrange-utils.js",
-			"require": "./dist/lagrange-utils.umd.cjs"
-		},
-		"./export_plugin": {
-			"import": "./src/service/export_plugin/index.js",
-			"default": "./src/service/export_plugin/index.js"
-		},
-		"./export_plugin/api": {
-			"import": "./src/service/export_plugin/api/index.js",
-			"default": "./src/service/export_plugin/api/index.js"
-		},
-		"./style.css": {
-			"default": "./dist/style.css"
-		},
-		"./assets/*": "./dist/assets/*",
-		"./assets/css/*": "./dist/assets/css/*",
-		"./assets/font/*": "./dist/assets/font/*",
-		"./assets/image/*": "./dist/assets/image/*",
-		"./postcss.config.js": {
-			"import": "./postcss.config.js",
-			"require": "./postcss.config.cjs",
-			"default": "./postcss.config.js"
-		}
-	},
-	"files": [
-		"dist",
-		"assets",
-		"src/service",
-		"postcss.config.js",
-		"postcss.config.cjs"
-	],
-	"dependencies": {
-		"autoprefixer": "^10.4.22",
-		"axios": "^1.18.1",
-		"postcss-pxtorem": "^6.1.0",
-		"vue": "^3.3.0"
-	},
-	"peerDependencies": {
-		"naive-ui": "^2.40.0",
-		"vue": "^3.3.0"
-	},
-	"peerDependenciesMeta": {
-		"naive-ui": {
-			"optional": true
-		}
-	},
-	"devDependencies": {
-		"@vitejs/plugin-vue": "^5.0.4",
-		"@vitejs/plugin-vue-jsx": "^3.0.2",
-		"less": "^4.4.2",
-		"naive-ui": "2.43.1",
-		"vite": "^5.4.10",
-		"vite-plugin-static-copy": "^0.17.0"
-	},
-	"author": "zkqh-ddh",
-	"license": "MIT"
-}
+{
+	"name": "zkqh-lagrange-utils",
+	"private": false,
+	"version": "0.0.60",
+	"type": "module",
+	"scripts": {
+		"dev": "vite",
+		"build": "vite build",
+		"gen-style": "node ./scripts/generate-naiveui-common-style.mjs"
+	},
+	"main": "dist/lagrange-utils.umd.cjs",
+	"module": "dist/lagrange-utils.js",
+	"sideEffects": [
+		"*.css"
+	],
+	"exports": {
+		".": {
+			"import": "./dist/lagrange-utils.js",
+			"require": "./dist/lagrange-utils.umd.cjs"
+		},
+		"./export_plugin": {
+			"import": "./src/service/export_plugin/index.js",
+			"default": "./src/service/export_plugin/index.js"
+		},
+		"./export_plugin/api": {
+			"import": "./src/service/export_plugin/api/index.js",
+			"default": "./src/service/export_plugin/api/index.js"
+		},
+		"./style.css": {
+			"default": "./dist/style.css"
+		},
+		"./assets/*": "./dist/assets/*",
+		"./assets/css/*": "./dist/assets/css/*",
+		"./assets/font/*": "./dist/assets/font/*",
+		"./assets/image/*": "./dist/assets/image/*",
+		"./postcss.config.js": {
+			"import": "./postcss.config.js",
+			"require": "./postcss.config.cjs",
+			"default": "./postcss.config.js"
+		}
+	},
+	"files": [
+		"dist",
+		"assets",
+		"src/service",
+		"postcss.config.js",
+		"postcss.config.cjs"
+	],
+	"dependencies": {
+		"autoprefixer": "^10.4.22",
+		"axios": "^1.18.1",
+		"postcss-pxtorem": "^6.1.0",
+		"vue": "^3.3.0"
+	},
+	"peerDependencies": {
+		"naive-ui": "^2.40.0",
+		"vue": "^3.3.0"
+	},
+	"peerDependenciesMeta": {
+		"naive-ui": {
+			"optional": true
+		}
+	},
+	"devDependencies": {
+		"@vitejs/plugin-vue": "^5.0.4",
+		"@vitejs/plugin-vue-jsx": "^3.0.2",
+		"less": "^4.4.2",
+		"naive-ui": "2.43.1",
+		"vite": "^5.4.10",
+		"vite-plugin-static-copy": "^0.17.0"
+	},
+	"author": "zkqh-ddh",
+	"license": "MIT"
+}

package/src/service/export_plugin/internal/plugin-dir-select.vue

@@ -4,12 +4,14 @@
 			:key="treeSelectKey"
 			:value="treeSelectValue"
 			size="small"
-			placeholder="请选择本地目录"
+			:placeholder="initLoading ? '目录加载中…' : '请选择本地目录'"
 			:consistent-menu-width="false"
 			show-path
 			separator="/"
 			filterable
 			clearable
+			:loading="initLoading"
+			:disabled="initLoading"
 			:options="treeOptions"
 			:expanded-keys="expandedKeys"
 			:menu-props="{ class: 'plugin_dir_select_tree' }"
@@ -17,7 +19,13 @@
 			:on-load="onLoadTreeNode"
 			@update:expanded-keys="onExpandedKeysUpdate"
 			@update:value="onDirChange" />
-		<template v-if="diskUsageText">
+		<span
+			v-if="initLoading"
+			class="_pds_loading lc_fs_s">
+			<n-spin :size="14" />
+			加载目录中…
+		</span>
+		<template v-else-if="diskUsageText">
 			<span class="_pds_folder_icon">
 				<i class="lc lc-tuxing1"></i>
 			</span>
@@ -71,6 +79,7 @@ export default defineComponent({
 		const expandedKeys = ref([])
 		const treeSelectKey = ref(0)
 		const defaultDisk = ref({})
+		const initLoading = ref(true)
 
 		const treeSelectValue = computed(() => toTreeKey(modelValue.value))
 
@@ -86,17 +95,22 @@ export default defineComponent({
 			return Math.min(100, (used / total) * 100)
 		})
 
-		const emitDiskInfo = () => {
+		const setDirname = (path) => {
+			emit("update:modelValue", path ? normalizeDir(path) : "")
+		}
+
+		/**
+		 * 更新右侧占用；传空则清空
+		 * @param {object | null} disk
+		 */
+		const applyDisk = (disk) => {
+			defaultDisk.value = disk || {}
 			emit("update:diskInfo", {
 				total_size: defaultDisk.value?.total_size || 0,
 				used_size: defaultDisk.value?.used_size || 0,
 			})
 		}
 
-		const setDirname = (path) => {
-			emit("update:modelValue", path)
-		}
-
 		/** 打开新建文件夹弹窗 */
 		const openCreateFolder = (parentPath, e) => {
 			e?.stopPropagation?.()
@@ -144,8 +158,8 @@ export default defineComponent({
 		}
 
 		/**
-		 * 按路径切分并行 listdir，再挂到树上，保证深层路径可回显
-		 * @param {string} targetPath 默认目录
+		 * 按路径展开目录树，保证深层路径可回显
+		 * @param {string} targetPath
 		 */
 		const hydrateTreePath = async (targetPath) => {
 			const targetKey = toTreeKey(targetPath)
@@ -223,20 +237,20 @@ export default defineComponent({
 			await hydrateTreePath(newPath)
 		}
 
-		const loadDefault = async () => {
+		/**
+		 * @returns {Promise<{ root: string, disk: object } | null>}
+		 */
+		const fetchDefault = async () => {
 			try {
 				const res = await pluginApi.getDefaultDir()
 				if (res.code === 200 && res.data) {
-					defaultDisk.value = res.data
 					const root = normalizeDir(res.data.root || "")
-					setDirname(root)
-					emitDiskInfo()
-					return root
+					return root ? { root, disk: res.data } : null
 				}
 			} catch (e) {
 				console.error(e)
 			}
-			return ""
+			return null
 		}
 
 		const loadDisks = async () => {
@@ -248,17 +262,51 @@ export default defineComponent({
 						key: toTreeKey(disk.path) || disk.path,
 						isLeaf: false,
 					}))
+					return
 				}
 			} catch (e) {
-				treeOptions.value = []
+				console.error(e)
 			}
+			treeOptions.value = []
 		}
 
+		/**
+		 * 并行拉默认目录与磁盘列表；有默认目录则先反填，再展开树
+		 */
 		const initDirectory = async () => {
-			await loadDisks()
-			const root = await loadDefault()
-			if (root) {
-				await hydrateTreePath(root)
+			initLoading.value = true
+			try {
+				const [info] = await Promise.all([fetchDefault(), loadDisks()])
+				if (!info) {
+					setDirname("")
+					applyDisk(null)
+					return
+				}
+				setDirname(info.root)
+				applyDisk(info.disk)
+				await hydrateTreePath(info.root)
+			} finally {
+				initLoading.value = false
+			}
+		}
+
+		/**
+		 * 写入默认目录并刷新占用；path 为空表示清空
+		 * @param {string} path
+		 */
+		const syncDefaultDir = async (path) => {
+			const next = path ? normalizeDir(path) : ""
+			setDirname(next)
+			try {
+				await pluginApi.setDefaultDir(next)
+				if (!next) {
+					applyDisk(null)
+					return
+				}
+				const info = await fetchDefault()
+				applyDisk(info?.disk || null)
+			} catch (e) {
+				console.error(e)
 			}
 		}
 
@@ -271,18 +319,7 @@ export default defineComponent({
 		}
 
 		const onDirChange = async (path) => {
-			if (!path) {
-				setDirname("")
-				return
-			}
-			const next = normalizeDir(path)
-			setDirname(next)
-			try {
-				await pluginApi.setDefaultDir(next)
-				await loadDefault()
-			} catch (e) {
-				console.error(e)
-			}
+			await syncDefaultDir(path || "")
 		}
 
 		/**
@@ -290,7 +327,7 @@ export default defineComponent({
 		 */
 		const onFolderCreated = async ({ parentDir, newPath }) => {
 			await refreshTreeAfterCreate(parentDir, newPath)
-			await onDirChange(toTreeKey(newPath))
+			await syncDefaultDir(toTreeKey(newPath) || newPath)
 		}
 
 		initDirectory()
@@ -302,6 +339,7 @@ export default defineComponent({
 			expandedKeys,
 			treeSelectKey,
 			treeSelectValue,
+			initLoading,
 			diskUsageText,
 			usagePercent,
 			renderTreeLabel,

package/src/service/export_plugin/internal/styles/plugin-dir-select.less

@@ -10,6 +10,14 @@
 		flex-shrink: 0;
 	}
 
+	._pds_loading {
+		display: inline-flex;
+		align-items: center;
+		gap: 6px;
+		color: var(--lc_text_color_secondary);
+		flex-shrink: 0;
+	}
+
 	._pds_folder_icon {
 		display: inline-flex;
 		align-items: center;

package/src/service/export_plugin/utils/export-task.js

@@ -1,58 +1,58 @@
-/**
- * 默认读取平台登录 token
- * @returns {string}
- */
-export const getDefaultToken = () => {
-	try {
-		const token = localStorage.getItem("token")
-		if (!token) return ""
-		return JSON.parse(token)?.access_token || ""
-	} catch {
-		return ""
-	}
-}
-
-/**
- * 默认平台根地址（当前页 origin，或 sys_con.baseURL）
- * @returns {string}
- */
-export const getDefaultUrl = () => {
-	const base =
-		(typeof window !== "undefined" && window.sys_con?.baseURL) ||
-		`${location.protocol}//${location.host}`
-	return String(base).replace(/\/$/, "")
-}
-
-/**
- * 默认插件安装包地址：当前域名端口 + /plugins/main.exe（对应前端 public/plugins/main.exe）
- * @returns {string}
- */
-export const getDefaultDownloadUrl = () => {
-	if (typeof window === "undefined" || !window.location) return "/plugins/main.exe"
-	return `${window.location.origin}/plugins/main.exe`
-}
-
-/**
- * 默认校验：导出 args 需含完整时间范围
- * @param {Record<string, any>} args
- * @returns {boolean}
- */
-export const validateTimeRangeArgs = (args = {}) => {
-	if (!(args.start_time && args.end_time)) {
-		window.$message?.warning?.("请选择发生时间")
-		return false
-	}
-	return true
-}
-
-/**
- * 生成导出默认名称：导出数据_<年><月><日>
- * @returns {string}
- */
-export const buildTaskName = () => {
-	const d = new Date()
-	const y = d.getFullYear()
-	const m = String(d.getMonth() + 1).padStart(2, "0")
-	const day = String(d.getDate()).padStart(2, "0")
-	return `导出数据_${y}${m}${day}`
-}
+/**
+ * 默认读取平台登录 token
+ * @returns {string}
+ */
+export const getDefaultToken = () => {
+	try {
+		const token = localStorage.getItem("token")
+		if (!token) return ""
+		return JSON.parse(token)?.access_token || ""
+	} catch {
+		return ""
+	}
+}
+
+/**
+ * 默认平台根地址（当前页 origin，或 sys_con.baseURL）
+ * @returns {string}
+ */
+export const getDefaultUrl = () => {
+	const base =
+		(typeof window !== "undefined" && window.sys_con?.baseURL) ||
+		`${location.protocol}//${location.host}`
+	return String(base).replace(/\/$/, "")
+}
+
+/**
+ * 默认插件安装包地址：当前域名端口 + /plugins.main.exe（由 nginx 代理到前端 dist）
+ * @returns {string}
+ */
+export const getDefaultDownloadUrl = () => {
+	if (typeof window === "undefined" || !window.location) return "/plugins/main.exe"
+	return `${window.location.origin}/plugins/main.exe`
+}
+
+/**
+ * 默认校验：导出 args 需含完整时间范围
+ * @param {Record<string, any>} args
+ * @returns {boolean}
+ */
+export const validateTimeRangeArgs = (args = {}) => {
+	if (!(args.start_time && args.end_time)) {
+		window.$message?.warning?.("请选择发生时间")
+		return false
+	}
+	return true
+}
+
+/**
+ * 生成导出默认名称：导出数据_<年><月><日>
+ * @returns {string}
+ */
+export const buildTaskName = () => {
+	const d = new Date()
+	const y = d.getFullYear()
+	const m = String(d.getMonth() + 1).padStart(2, "0")
+	const day = String(d.getDate()).padStart(2, "0")
+	return `导出数据_${y}${m}${day}`
+}