zkqh-lagrange-utils 0.0.56 → 0.0.57

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "zkqh-lagrange-utils",
 	"private": false,
-	"version": "0.0.56",
+	"version": "0.0.57",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

package/src/service/export_plugin/PluginLocalExport.vue

@@ -3,9 +3,9 @@
 		v-if="usePlatformExport || usePluginExport"
 		class="plugin_local_export"
 		:class="{ _platform: usePlatformExport }">
-		<!-- 平台 / 应用小文件导出区（与插件目录区共用宿主外框） -->
+		<!-- 平台 / 应用小文件导出区 -->
 		<template v-if="usePlatformExport">
-			<span class="_ple_tip lc-fs-m">文件小于50MB，请直接导出！</span>
+			<span class="_ple_tip lc_fs_m">文件小于50MB，请直接导出！</span>
 			<span
 				class="_ple_action lc_btn_primary lc_btn_m"
 				@click="onPlatformExportClick">
@@ -15,10 +15,10 @@
 
 		<!-- 插件本地目录导出区 -->
 		<template v-if="usePluginExport">
-			<div class="_ple_label lc-fs-m">选择本地目录</div>
+			<div class="_ple_label lc_fs_m">选择本地目录</div>
 			<div
 				v-if="pluginReady && diskOverflow"
-				class="_ple_warn lc-fs-s">
+				class="_ple_warn lc_fs_s">
 				<i class="lc lc-warning-circle-outlined"></i>
 				<span>预估大小超出本地目录剩余空间，请更换目录或缩小导出范围</span>
 			</div>
@@ -62,24 +62,21 @@
 			:kind="kind"
 			:args="args"
 			:dirname="dirname"
-			:get-token="getToken"
-			:get-url="getUrl"
-			:validate-args="validateArgs"
 			@success="onTaskModalSuccess"
 			@close="showTaskModal = false" />
 	</div>
 </template>
 
 <script>
+/** 组件自带 token / 按钮 / 字号，不依赖宿主全局样式 */
+import "./internal/styles/plugin-local-export.less"
+import "zkqh-lagrange-utils/assets/font/iconfont-lc.css"
 import { defineComponent, ref, computed, toRefs, onMounted } from "vue"
 import PluginDirSelect from "./internal/plugin-dir-select.vue"
 import ExportTaskModal from "./internal/export-task-modal.vue"
 import { usePluginHealth } from "./hooks/use-plugin-health.js"
 import { isOverSizeLimit, isPreviewOverflowDisk } from "./utils/size.js"
 import { validateTimeRangeArgs } from "./utils/export-task.js"
-/** 组件局部使用 lc iconfont（不依赖宿主全局引入） */
-import "zkqh-lagrange-utils/assets/font/iconfont-lc.css"
-import "./internal/styles/plugin-local-export.less"
 
 const DEFAULT_PREVIEW = {
 	show: false,
@@ -89,6 +86,7 @@ const DEFAULT_PREVIEW = {
 
 /**
  * 本地导出组合区：平台/应用小文件导出 + 插件目录导出 + 50MB 分流 + 任务弹窗
+ * token / url / 校验 / 安装包地址均内置，宿主无需传入
  */
 export default defineComponent({
 	name: "PluginLocalExport",
@@ -102,39 +100,19 @@ export default defineComponent({
 			type: Object,
 			default: () => ({ ...DEFAULT_PREVIEW }),
 		},
-		/** 插件安装包下载地址 */
-		downloadUrl: { type: String, default: "" },
-		/** 导出 kind（插件创建任务用） */
+		/** 导出 kind（插件 createExport 用） */
 		kind: { type: String, default: "event" },
-		/** 筛选参数（插件创建任务用） */
+		/** 筛选参数（插件 createExport 用） */
 		args: { type: Object, default: () => ({}) },
-		/**
-		 * 获取登录 token；不传则读 localStorage.token
-		 * @type {(() => string) | string}
-		 */
-		getToken: { type: [Function, String], default: null },
-		/**
-		 * 获取平台根 URL；不传则读 window.sys_con.baseURL
-		 * @type {(() => string) | string}
-		 */
-		getUrl: { type: [Function, String], default: null },
-		/**
-		 * 导出前校验 args；不传则校验时间范围
-		 * @type {(args: object) => boolean}
-		 */
-		validateArgs: { type: Function, default: null },
 	},
 	emits: ["success"],
 	setup(props, { emit }) {
-		const { previewInfo, downloadUrl, kind, args, getToken, getUrl, validateArgs } = toRefs(props)
+		const { previewInfo, kind, args } = toRefs(props)
 		const dirname = ref("")
 		const diskInfo = ref({ total_size: 0, used_size: 0 })
 		const showTaskModal = ref(false)
 
-		const health = usePluginHealth({
-			downloadUrl: () => downloadUrl.value,
-		})
-		const { pluginReady, checkHealth, triggerInstall } = health
+		const { pluginReady, checkHealth, triggerInstall } = usePluginHealth()
 
 		onMounted(() => {
 			checkHealth()
@@ -145,8 +123,6 @@ export default defineComponent({
 			...(previewInfo.value || {}),
 		}))
 
-		const resolveValidate = () => validateArgs.value || validateTimeRangeArgs
-
 		/**
 		 * 是否展示平台/应用导出区（≤50MB）
 		 */
@@ -205,7 +181,7 @@ export default defineComponent({
 		/** 平台/应用路径：确认后回调 */
 		const onPlatformExportClick = () => {
 			const exportArgs = { ...(args.value || {}) }
-			if (!resolveValidate()(exportArgs)) return
+			if (!validateTimeRangeArgs(exportArgs)) return
 
 			window.$dialog?.warning?.({
 				title: "确认导出",
@@ -222,7 +198,7 @@ export default defineComponent({
 		const onPluginExportClick = () => {
 			if (pluginExportDisabled.value) return
 			const exportArgs = { ...(args.value || {}) }
-			if (!resolveValidate()(exportArgs)) return
+			if (!validateTimeRangeArgs(exportArgs)) return
 			showTaskModal.value = true
 		}
 
@@ -236,9 +212,6 @@ export default defineComponent({
 			dirname,
 			kind,
 			args,
-			getToken,
-			getUrl,
-			validateArgs,
 			showTaskModal,
 			pluginReady,
 			usePlatformExport,

package/src/service/export_plugin/hooks/use-plugin-health.js

@@ -1,6 +1,7 @@
 import { ref, onBeforeUnmount, unref } from "vue"
 import { pluginApi } from "../api/plugin.js"
 import { PLUGIN_HEALTH_INTERVAL } from "../utils/size.js"
+import { getDefaultDownloadUrl } from "../utils/export-task.js"
 
 /**
  * 触发导出插件安装包下载
@@ -21,6 +22,7 @@ function _downloadPlugin(url = "") {
 
 /**
  * 导出插件 health：单次检测 + 安装后轮询，就绪后自动停止
+ * downloadUrl 可不传，默认当前域名 /plugins.main.exe
  * @param {{ interval?: number, downloadUrl?: string | import('vue').Ref<string> | (() => string) }} [options]
  * @returns {{
  *   pluginReady: import('vue').Ref<boolean>,
@@ -39,8 +41,9 @@ export function usePluginHealth(options = {}) {
 
 	const resolveDownloadUrl = () => {
 		const raw = options.downloadUrl
-		if (typeof raw === "function") return raw() || ""
-		return unref(raw) || ""
+		if (raw == null) return getDefaultDownloadUrl()
+		if (typeof raw === "function") return raw() || getDefaultDownloadUrl()
+		return unref(raw) || getDefaultDownloadUrl()
 	}
 
 	const stopPoll = () => {
@@ -81,8 +84,8 @@ export function usePluginHealth(options = {}) {
 	}
 
 	/**
-	 * 下载安装包并启动 health 轮询
-	 * @param {string} [url] 优先使用入参，否则取 options.downloadUrl
+	 * 下载安装包并启动 health 轮询（默认当前域名 /plugins.main.exe）
+	 * @param {string} [url] 优先使用入参，否则取 options.downloadUrl 或默认地址
 	 */
 	const triggerInstall = (url) => {
 		_downloadPlugin(url || resolveDownloadUrl())

package/src/service/export_plugin/index.js

@@ -3,8 +3,7 @@
  *
  * 对外：
  * - pluginApi：可独立引用
- * - PluginLocalExport：平台/插件导出区组合组件（含任务名称弹窗）
- * - ExportTaskModal：也可单独使用
+ * - PluginLocalExport：平台/插件导出区组合组件（任务名称弹窗内置，不对外）
  * - usePluginHealth：插件存活检测 / 安装轮询
  *
  * @example
@@ -13,6 +12,5 @@
 
 export { pluginApi } from "./api/plugin.js"
 export { default as PluginLocalExport } from "./PluginLocalExport.vue"
-export { default as ExportTaskModal } from "./internal/export-task-modal.vue"
 export { usePluginHealth } from "./hooks/use-plugin-health.js"
 export { default } from "./PluginLocalExport.vue"

package/src/service/export_plugin/internal/create-folder-modal.vue

@@ -8,7 +8,7 @@
 		:mask-closable="false"
 		@update:show="onShowUpdate"
 		@positive-click="onConfirm">
-		<div class="export_plugin_modals_hint lc-fs-s">将在以下目录下创建：{{ parentDisplay }}</div>
+		<div class="export_plugin_modals_hint lc_fs_s">将在以下目录下创建：{{ parentDisplay }}</div>
 		<n-input
 			v-model:value="folderName"
 			size="small"

package/src/service/export_plugin/internal/export-task-modal.vue

@@ -9,7 +9,7 @@
 		:loading="exporting"
 		@update:show="onShowUpdate"
 		@positive-click="onConfirm">
-		<div class="export_plugin_modals_hint lc-fs-s">请填写导出任务名称，任务可在「导出进度」中查看。</div>
+		<div class="export_plugin_modals_hint lc_fs_s">请填写导出任务名称，任务可在「导出进度」中查看。</div>
 		<n-input
 			v-model:value="taskName"
 			size="small"
@@ -31,7 +31,7 @@ import {
 import "./styles/export-plugin-modals.less"
 
 /**
- * 导出任务名称弹窗（创建插件导出作业）
+ * 导出任务名称弹窗（创建插件导出作业，token/url/校验内置）
  */
 export default defineComponent({
 	name: "ExportTaskModal",
@@ -42,37 +42,12 @@ export default defineComponent({
 		args: { type: Object, default: () => ({}) },
 		/** 本地导出目录 */
 		dirname: { type: String, default: "" },
-		/**
-		 * 获取登录 token；不传则读 localStorage.token
-		 * @type {(() => string) | string}
-		 */
-		getToken: { type: [Function, String], default: null },
-		/**
-		 * 获取平台根 URL；不传则读 window.sys_con.baseURL
-		 * @type {(() => string) | string}
-		 */
-		getUrl: { type: [Function, String], default: null },
-		/**
-		 * 导出前校验 args；不传则校验时间范围
-		 * @type {(args: object) => boolean}
-		 */
-		validateArgs: { type: Function, default: null },
 	},
 	emits: ["close", "success"],
 	setup(props, { emit }) {
 		const taskName = ref(buildTaskName())
 		const exporting = ref(false)
 
-		const resolveToken = () => {
-			if (props.getToken == null) return getDefaultToken()
-			return typeof props.getToken === "function" ? props.getToken() : String(props.getToken || "")
-		}
-
-		const resolveUrl = () => {
-			if (props.getUrl == null) return getDefaultUrl()
-			return typeof props.getUrl === "function" ? props.getUrl() : String(props.getUrl || "")
-		}
-
 		const close = () => {
 			emit("close")
 		}
@@ -88,11 +63,10 @@ export default defineComponent({
 		 */
 		const createExport = async (name) => {
 			const exportArgs = { ...(props.args || {}) }
-			const validate = props.validateArgs || validateTimeRangeArgs
-			if (!validate(exportArgs)) return false
+			if (!validateTimeRangeArgs(exportArgs)) return false
 
-			const token = resolveToken()
-			const url = resolveUrl()
+			const token = getDefaultToken()
+			const url = getDefaultUrl()
 			if (!token) {
 				window.$message?.error?.("登录态失效，请重新登录")
 				return false

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

@@ -25,7 +25,7 @@
 				<div class="__bar">
 					<span :style="{ width: `${usagePercent}%` }"></span>
 				</div>
-				<span class="lc-fs-s">{{ diskUsageText }}</span>
+				<span class="lc_fs_s">{{ diskUsageText }}</span>
 			</div>
 		</template>
 		<CreateFolderModal

package/src/service/export_plugin/internal/styles/base.less

@@ -0,0 +1,11 @@
+/* export_plugin 自带 token / 按钮类，不依赖宿主注入全局样式 */
+@import "zkqh-lagrange-utils/assets/css/common/color.less";
+@import "zkqh-lagrange-utils/assets/css/common/button.less";
+
+.lc_fs_s {
+	font-size: @lc_font_size_s;
+}
+
+.lc_fs_m {
+	font-size: @lc_font_size_m;
+}

package/src/service/export_plugin/internal/styles/plugin-local-export.less

@@ -1,3 +1,5 @@
+@import "./base.less";
+
 .plugin_local_export {
 	margin-top: 24px;
 
@@ -44,7 +46,6 @@
 		margin-left: auto;
 	}
 
-	/* ≤50MB：仅布局，外框/背景与目录区由宿主同一套包裹 */
 	&._platform {
 		position: relative;
 		display: flex;

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

@@ -1,5 +1,5 @@
 /**
- * 默认读取平台登录 token（可被 props.getToken 覆盖）
+ * 默认读取平台登录 token
  * @returns {string}
  */
 export const getDefaultToken = () => {
@@ -13,7 +13,7 @@ export const getDefaultToken = () => {
 }
 
 /**
- * 默认平台根地址（可被 props.getUrl 覆盖）
+ * 默认平台根地址（当前页 origin，或 sys_con.baseURL）
  * @returns {string}
  */
 export const getDefaultUrl = () => {
@@ -23,6 +23,15 @@ export const getDefaultUrl = () => {
 	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