@oiij/naive-ui 0.0.75 → 0.0.77

package/README.md

@@ -60,7 +60,7 @@ yarn add @oiij/naive-ui
 ```vue
 <script setup>
 import type { RouteRecordRaw } from 'vue-router'
-import { useAutoMenu } from '@oiij/naive-ui'
+import { useNaiveMenu } from '@oiij/naive-ui'
 
 // 模拟路由配置
 const routes: RouteRecordRaw[] = [
@@ -80,7 +80,7 @@ const routes: RouteRecordRaw[] = [
   }
 ]
 
-const { menuOptions } = useAutoMenu(routes)
+const { menuOptions } = useNaiveMenu(routes)
 </script>
 
 <template>
@@ -94,7 +94,7 @@ const { menuOptions } = useAutoMenu(routes)
 
 ### 组合式 API
 
-- **use-auto-menu** 📋: 自动菜单生成
+- **use-naive-menu** 📋: 自动菜单生成
 - **use-data-request** 📡: 数据请求管理
 - **use-loading** ⏳: 加载状态管理
 - **use-naive-form** 📝: 表单管理

package/dist/components/config-providers/ConfigProviders.vue.d.ts

@@ -1,12 +1,12 @@
 import { ConfigProvidersProps } from "./index.js";
-import * as vue25 from "vue";
+import * as vue23 from "vue";
 
 //#region src/components/config-providers/ConfigProviders.vue.d.ts
 declare var __VLS_44: {};
 type __VLS_Slots = {} & {
   default?: (props: typeof __VLS_44) => any;
 };
-declare const __VLS_base: vue25.DefineComponent<ConfigProvidersProps, {}, {}, {}, {}, vue25.ComponentOptionsMixin, vue25.ComponentOptionsMixin, {}, string, vue25.PublicProps, Readonly<ConfigProvidersProps> & Readonly<{}>, {}, {}, {}, {}, string, vue25.ComponentProvideOptions, false, {}, any>;
+declare const __VLS_base: vue23.DefineComponent<ConfigProvidersProps, {}, {}, {}, {}, vue23.ComponentOptionsMixin, vue23.ComponentOptionsMixin, {}, string, vue23.PublicProps, Readonly<ConfigProvidersProps> & Readonly<{}>, {}, {}, {}, {}, string, vue23.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/config-providers/index.d.ts

@@ -6,23 +6,32 @@ import { _default } from "./ConfigProviders.vue.js";
 import { ConfigProviderProps, DialogProviderInst, DialogProviderProps, LoadingBarProviderInst, LoadingBarProviderProps, MessageProviderInst, MessageProviderProps, ModalProviderInst, ModalProviderProps, NotificationProviderInst, NotificationProviderProps } from "naive-ui";
 
 //#region src/components/config-providers/index.d.ts
+/**
+ * 配置提供者组件属性
+ */
 type ConfigProvidersProps = {
-  globalStyle?: boolean;
-  configProviderProps?: ConfigProviderProps & ClassStyle;
-  loadingBarProviderProps?: LoadingBarProviderProps & ClassStyle;
-  loadingProviderProps?: LoadingProviderProps & ClassStyle;
-  dialogProviderProps?: DialogProviderProps & ClassStyle;
-  modalProviderProps?: ModalProviderProps & ClassStyle;
-  notificationProviderProps?: NotificationProviderProps & ClassStyle;
+  /** 是否应用全局样式 */globalStyle?: boolean; /** 配置提供者属性 */
+  configProviderProps?: ConfigProviderProps & ClassStyle; /** 加载条提供者属性 */
+  loadingBarProviderProps?: LoadingBarProviderProps & ClassStyle; /** 加载提供者属性 */
+  loadingProviderProps?: LoadingProviderProps & ClassStyle; /** 对话框提供者属性 */
+  dialogProviderProps?: DialogProviderProps & ClassStyle; /** 模态框提供者属性 */
+  modalProviderProps?: ModalProviderProps & ClassStyle; /** 通知提供者属性 */
+  notificationProviderProps?: NotificationProviderProps & ClassStyle; /** 消息提供者属性 */
   messageProviderProps?: MessageProviderProps & ClassStyle;
 };
 declare global {
   interface Window {
+    /** 对话框实例 */
     $dialog: DialogProviderInst;
+    /** 加载实例 */
     $loading: ReturnType<typeof useLoading>;
+    /** 加载条实例 */
     $loadingBar: LoadingBarProviderInst;
+    /** 消息实例 */
     $message: MessageProviderInst;
+    /** 模态框实例 */
     $modal: ModalProviderInst;
+    /** 通知实例 */
     $notification: NotificationProviderInst;
   }
 }

package/dist/components/copy-button/CopyButton.js

@@ -1,6 +1,6 @@
 import MageCopyFill_default from "../icons/MageCopyFill.js";
-import { createBlock, createElementVNode, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeProps, openBlock, renderSlot, toDisplayString, unref, watch, withCtx } from "vue";
 import { useClipboard } from "@vueuse/core";
+import { createBlock, createElementVNode, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeProps, openBlock, renderSlot, toDisplayString, unref, watch, withCtx } from "vue";
 import { NButton, NTooltip } from "naive-ui";
 
 //#region src/components/copy-button/CopyButton.vue
@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		watch(copied, () => {
 			if (copied.value) emit("copied", __props.value);
 		});
-		function onClick(ev) {
+		function handleClick(ev) {
 			ev.preventDefault();
 			copy();
 		}
@@ -30,7 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			return openBlock(), createBlock(unref(NTooltip), normalizeProps(guardReactiveProps(__props.tooltipProps)), {
 				trigger: withCtx(() => [createElementVNode("div", {
 					style: { cursor: "pointer" },
-					onClick
+					onClick: handleClick
 				}, [renderSlot(_ctx.$slots, "default", {}, () => [createVNode(unref(NButton), mergeProps({
 					quaternary: "",
 					size: "tiny"

package/dist/components/copy-button/CopyButton.vue.d.ts

@@ -1,5 +1,5 @@
 import { CopyButtonProps } from "./index.js";
-import * as vue44 from "vue";
+import * as vue35 from "vue";
 
 //#region src/components/copy-button/CopyButton.vue.d.ts
 declare var __VLS_9: {}, __VLS_18: {}, __VLS_25: {};
@@ -10,11 +10,11 @@ type __VLS_Slots = {} & {
 } & {
   tooltip?: (props: typeof __VLS_25) => any;
 };
-declare const __VLS_base: vue44.DefineComponent<CopyButtonProps, {}, {}, {}, {}, vue44.ComponentOptionsMixin, vue44.ComponentOptionsMixin, {} & {
+declare const __VLS_base: vue35.DefineComponent<CopyButtonProps, {}, {}, {}, {}, vue35.ComponentOptionsMixin, vue35.ComponentOptionsMixin, {} & {
   copied: (v: string | undefined) => any;
-}, string, vue44.PublicProps, Readonly<CopyButtonProps> & Readonly<{
+}, string, vue35.PublicProps, Readonly<CopyButtonProps> & Readonly<{
   onCopied?: ((v: string | undefined) => any) | undefined;
-}>, {}, {}, {}, {}, string, vue44.ComponentProvideOptions, false, {}, any>;
+}>, {}, {}, {}, {}, string, vue35.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/copy-button/index.d.ts

@@ -4,10 +4,13 @@ import { UseClipboardOptions } from "@vueuse/core";
 import { ButtonProps, TooltipProps } from "naive-ui";
 
 //#region src/components/copy-button/index.d.ts
+/**
+ * 复制按钮组件属性
+ */
 type CopyButtonProps = {
-  value?: string;
-  config?: UseClipboardOptions<string | undefined>;
-  tooltipProps?: TooltipProps & ClassStyle;
+  /** 要复制的值 */value?: string; /** 剪贴板配置选项 */
+  config?: UseClipboardOptions<string | undefined>; /** 提示框属性 */
+  tooltipProps?: TooltipProps & ClassStyle; /** 按钮属性 */
   buttonProps?: ButtonProps & ClassStyle;
 };
 //#endregion

package/dist/components/data-table-plus/DataTablePlus.js

@@ -1,8 +1,7 @@
 import { useDataRequest } from "../../composables/use-data-request.js";
-import MageArrowUp_default from "../icons/MageArrowUp.js";
 import SearchInput_default from "../search-input/SearchInput.js";
-import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeProps, openBlock, reactive, ref, renderSlot, toDisplayString, toRaw, toValue, unref, useTemplateRef, withCtx } from "vue";
-import { NButton, NDataTable, NFlex, NPagination } from "naive-ui";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeProps, openBlock, reactive, ref, renderSlot, toDisplayString, toRaw, unref, useTemplateRef, watchEffect, withCtx } from "vue";
+import { NDataTable, NFlex, NPagination } from "naive-ui";
 
 //#region src/components/data-table-plus/DataTablePlus.vue
 const _hoisted_1 = { style: {
@@ -28,11 +27,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		requestOptions: {},
 		requestPlugins: {},
 		title: {},
-		scrollTop: { type: [
-			Number,
-			Boolean,
-			Object
-		] },
 		columns: {},
 		search: { type: [Object, Boolean] },
 		pagination: { type: [Object, Boolean] },
@@ -47,15 +41,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		"finally",
 		"clickRow",
 		"contextMenuRow",
-		"load",
-		"scroll",
-		"scrollBottom",
 		"update:checkedRowKeys",
-		"update:expandedRowKeys",
 		"update:filters",
 		"update:sorter",
 		"update:page",
-		"update:pageSize"
+		"update:pageSize",
+		"loadedRows"
 	],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const emit = __emit;
@@ -82,27 +73,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 				30
 			],
 			pageSlot: 5,
-			prefix: (info) => {
-				return `共${info.itemCount}条数据`;
-			},
+			prefix: (info) => `共${info.itemCount}条数据`,
 			...__props.pagination && typeof __props.pagination === "boolean" ? {} : __props.pagination
 		});
-		const scrollTopProps = { ...typeof __props.scrollTop === "boolean" ? {
-			top: 180,
-			buttonProps: void 0
-		} : typeof __props.scrollTop === "number" ? {
-			top: __props.scrollTop,
-			buttonProps: void 0
-		} : typeof __props.scrollTop === "object" ? {
-			top: __props.scrollTop.top ?? 180,
-			buttonProps: __props.scrollTop.buttonProps ?? {}
-		} : {
-			top: 180,
-			buttonProps: void 0
-		} };
 		const filtersRef = ref();
 		const sortersRef = ref();
-		const _dataCache = [];
 		const { loading, data, error, params, list, pagination: paginationRef, run, runAsync, refresh, refreshAsync, cancel, mutate, setParams, runParams, runParamsAsync, onBefore, onSuccess, onError, onFinally } = useDataRequest(__props.api, {
 			defaultParams: {
 				[_fields.search]: null,
@@ -118,7 +93,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		});
 		onSuccess((data, params) => {
 			emit("success", data, params);
-			onSuccessEffect(data, params);
+			updateColumnFiltersAndSorters();
 		});
 		onError((err, params) => {
 			emit("error", err, params);
@@ -126,47 +101,52 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		onFinally((params, data, err) => {
 			emit("finally", params, data, err);
 		});
+		function getRawList() {
+			return toRaw(list.value);
+		}
+		watchEffect(() => {
+			emit("loadedRows", getRawList());
+		});
 		const scrollX = computed(() => {
-			return __props.columns?.reduce((pre, cur) => {
-				return pre + Number(cur.width ?? 100);
-			}, 0);
+			function nanAble(val) {
+				return Number.isNaN(Number(val)) ? 0 : Number(val);
+			}
+			return __props.columns?.reduce((sum, column) => sum + nanAble(column.width ?? 100), 0) ?? 0;
 		});
-		function onSuccessEffect(data, _params) {
-			data[_fields.list]?.forEach((f) => {
-				if (!_dataCache.some((s) => s?.[_fields.rowKey] === f?.[_fields.rowKey])) _dataCache.push(f);
-			});
-			if (columnsReactive) {
-				for (const item of columnsReactive) if ("key" in item) {
-					if (filtersRef.value && item.key in filtersRef.value) {
-						const filterValues = filtersRef.value[item.key];
-						if (filterValues && "filter" in item && item.filter) if (item.filterMultiple) if (Array.isArray(filterValues)) item.filterOptionValues = filterValues;
-						else item.filterOptionValues = [filterValues];
-						else if (Array.isArray(filterValues)) item.filterOptionValue = filterValues[0];
-						else item.filterOptionValue = filterValues;
-					}
-					if ("sorter" in item) {
-						if (typeof item.sorter === "boolean") item.sortOrder = false;
-					}
-					if (sortersRef.value && item.key in sortersRef.value) {
-						const sorterValue = sortersRef.value[item.key];
-						if (sorterValue && "sorter" in item && item.sorter) item.sortOrder = sorterValue.order;
-					}
-				}
+		function isBaseColumnWithKey(column) {
+			return column && "key" in column;
+		}
+		function updateColumnFilters(column) {
+			if (!filtersRef.value || !isBaseColumnWithKey(column) || !("filter" in column) || !column.filter) return;
+			const filterValues = filtersRef.value[column.key];
+			if (!filterValues) return;
+			if (column.filterMultiple) column.filterOptionValues = Array.isArray(filterValues) ? filterValues : [filterValues];
+			else column.filterOptionValue = Array.isArray(filterValues) ? filterValues[0] : filterValues;
+		}
+		function updateColumnSorter(column) {
+			if (!sortersRef.value || !isBaseColumnWithKey(column) || !("sorter" in column) || !column.sorter) return;
+			const sorterValue = sortersRef.value[column.key];
+			if (sorterValue) column.sortOrder = sorterValue.order;
+		}
+		function updateColumnFiltersAndSorters() {
+			if (!columnsReactive) return;
+			for (const item of columnsReactive) {
+				if (!isBaseColumnWithKey(item)) continue;
+				if ("sorter" in item && typeof item.sorter === "boolean") item.sortOrder = false;
+				updateColumnFilters(item);
+				updateColumnSorter(item);
 			}
 		}
-		const _scrollTop = ref(0);
-		const vOn = {
-			onUpdatePage: (page) => {
+		const eventHandlers = {
+			handlePageUpdate: (page) => {
 				emit("update:page", page);
-				if (loading.value) return;
-				runParams({ [_fields.page]: page });
+				if (!loading.value) runParams({ [_fields.page]: page });
 			},
-			onUpdatePageSize: (pageSize) => {
+			handlePageSizeUpdate: (pageSize) => {
 				emit("update:pageSize", pageSize);
-				if (loading.value) return;
-				runParams({ [_fields.pageSize]: pageSize });
+				if (!loading.value) runParams({ [_fields.pageSize]: pageSize });
 			},
-			onUpdateFilters: (filters, initiatorColumn) => {
+			handleFiltersUpdate: (filters, initiatorColumn) => {
 				emit("update:filters", filters, initiatorColumn);
 				filtersRef.value = filters;
 				runParams({
@@ -174,10 +154,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 					...__props.columnsFilterOptions ? __props.columnsFilterOptions(filters) : { [_fields.filter]: filters }
 				});
 			},
-			onUpdateSorter: (options) => {
+			handleSorterUpdate: (options) => {
 				emit("update:sorter", options);
 				const sorter = {};
-				if (Array.isArray(options)) for (const item of options) sorter[item.columnKey] = item;
+				if (Array.isArray(options)) options.forEach((item) => {
+					sorter[item.columnKey] = item;
+				});
 				else if (options) sorter[options.columnKey] = options;
 				sortersRef.value = sorter;
 				runParams({
@@ -185,47 +167,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 					...__props.columnsSorterOptions ? __props.columnsSorterOptions(sorter) : { [_fields.sorter]: sorter }
 				});
 			},
-			onLoad: (row) => {
-				return emit("load", row);
-			},
-			onScroll: (ev) => {
-				if (__props.scrollTop && ev.target && "scrollTop" in ev.target && typeof ev.target.scrollTop === "number") _scrollTop.value = ev.target.scrollTop;
-				emit("scroll", ev);
-			},
-			onUpdateCheckedRowKeys: (keys, _rows, meta) => {
-				emit("update:checkedRowKeys", keys, keys.map((m) => _dataCache.find((f) => f?.[_fields.rowKey] === m)), {
-					row: toRaw(meta.row),
+			handleCheckedRowKeysUpdate: (keys, rows, meta) => {
+				emit("update:checkedRowKeys", keys, rows, {
+					row: meta.row,
 					action: meta.action
-				}, toRaw(list.value));
-			},
-			onUpdateExpandedRowKeys: (keys) => {
-				emit("update:expandedRowKeys", keys, toRaw(list.value));
+				}, getRawList());
 			}
 		};
 		function rowProps(row, index) {
+			const rawRow = toRaw(row);
+			const rawList = getRawList();
 			return {
 				onClick: (event) => {
-					emit("clickRow", toRaw(row), index, event, toRaw(list.value));
+					emit("clickRow", rawRow, index, event, rawList);
 				},
 				onContextmenu: (event) => {
-					emit("contextMenuRow", toRaw(row), index, event, toRaw(list.value));
+					emit("contextMenuRow", rawRow, index, event, rawList);
 				}
 			};
 		}
-		function onSearch(val) {
+		function handleSearch(val) {
 			if (loading.value) return;
 			runParams({
 				[_fields.page]: 1,
 				[_fields.search]: val
 			});
 		}
-		function handleScrollTop() {
-			dataTableInst.value?.scrollTo({
-				left: 0,
-				top: 0,
-				behavior: "smooth"
-			});
-		}
 		const expose = {
 			loading,
 			data,
@@ -253,15 +220,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		const templateBind = computed(() => {
 			return {
 				...expose,
-				loading: toValue(loading),
-				data: toValue(data),
-				error: toValue(error),
-				params: toValue(params),
-				list: toValue(list),
-				paginationRef: toValue(paginationRef),
-				filters: toValue(filtersRef),
-				sorters: toValue(sortersRef),
-				dataTableInst: toValue(dataTableInst)
+				loading: loading.value,
+				data: data.value,
+				error: error.value,
+				params: params.value,
+				list: list.value,
+				pagination: paginationRef.value,
+				filters: filtersRef.value,
+				sorters: sortersRef.value,
+				dataTableInst: dataTableInst.value
 			};
 		});
 		__expose(expose);
@@ -285,7 +252,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 								},
 								value: unref(params)?.[0]?.[_fields.search],
 								loading: unref(loading)
-							}, searchProps, { "onUpdate:value": _cache[0] || (_cache[0] = (val) => onSearch(val)) }), null, 16, ["value", "loading"])) : createCommentVNode("v-if", true),
+							}, searchProps, { "onUpdate:value": _cache[0] || (_cache[0] = (val) => handleSearch(val)) }), null, 16, ["value", "loading"])) : createCommentVNode("v-if", true),
 							renderSlot(_ctx.$slots, "header-extra", normalizeProps(guardReactiveProps(templateBind.value)))
 						]),
 						_: 3
@@ -308,12 +275,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 						data: unref(list),
 						"row-props": rowProps
 					}, __props.dataTableProps, {
-						"onUpdate:filters": vOn.onUpdateFilters,
-						"onUpdate:sorter": vOn.onUpdateSorter,
-						onLoad: vOn.onLoad,
-						onScroll: vOn.onScroll,
-						"onUpdate:checkedRowKeys": vOn.onUpdateCheckedRowKeys,
-						"onUpdate:expandedRowKeys": vOn.onUpdateExpandedRowKeys
+						"onUpdate:filters": eventHandlers.handleFiltersUpdate,
+						"onUpdate:sorter": eventHandlers.handleSorterUpdate,
+						"onUpdate:checkedRowKeys": eventHandlers.handleCheckedRowKeysUpdate
 					}), {
 						empty: withCtx(() => [renderSlot(_ctx.$slots, "empty", normalizeProps(guardReactiveProps(templateBind.value)))]),
 						loading: withCtx(() => [renderSlot(_ctx.$slots, "loading", normalizeProps(guardReactiveProps(templateBind.value)))]),
@@ -327,23 +291,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 						"data",
 						"onUpdate:filters",
 						"onUpdate:sorter",
-						"onLoad",
-						"onScroll",
-						"onUpdate:checkedRowKeys",
-						"onUpdate:expandedRowKeys"
-					]), __props.scrollTop && _scrollTop.value > scrollTopProps.top ? (openBlock(), createBlock(unref(NButton), mergeProps({
-						key: 0,
-						secondary: "",
-						circle: "",
-						style: {
-							position: "absolute",
-							right: "20px",
-							bottom: "20px"
-						}
-					}, scrollTopProps.buttonProps, { onClick: handleScrollTop }), {
-						icon: withCtx(() => [createVNode(MageArrowUp_default)]),
-						_: 1
-					}, 16)) : createCommentVNode("v-if", true)]),
+						"onUpdate:checkedRowKeys"
+					])]),
 					renderSlot(_ctx.$slots, "footer", normalizeProps(guardReactiveProps(templateBind.value)), () => [createVNode(unref(NFlex), null, {
 						default: withCtx(() => [renderSlot(_ctx.$slots, "footer-extra", normalizeProps(guardReactiveProps(templateBind.value))), __props.pagination ? (openBlock(), createBlock(unref(NPagination), mergeProps({
 							key: 0,
@@ -353,8 +302,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 							...paginationProps,
 							...unref(paginationRef)
 						}, {
-							"onUpdate:page": vOn.onUpdatePage,
-							"onUpdate:pageSize": vOn.onUpdatePageSize
+							"onUpdate:page": eventHandlers.handlePageUpdate,
+							"onUpdate:pageSize": eventHandlers.handlePageSizeUpdate
 						}), null, 16, [
 							"disabled",
 							"onUpdate:page",