@oiij/naive-ui 0.0.59 → 0.0.61

package/dist/composables/_helper.cjs

@@ -0,0 +1,29 @@
+const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+let colord = require("colord");
+colord = require_rolldown_runtime.__toESM(colord);
+
+//#region src/composables/_helper.ts
+function getStatusColor(color) {
+	if (!color) return void 0;
+	const baseColor = (0, colord.colord)(color);
+	if (!baseColor.isValid()) return void 0;
+	return {
+		color,
+		hover: baseColor.lighten(.1).toHex(),
+		pressed: baseColor.darken(.1).toHex(),
+		suppl: baseColor.lighten(.1).toHex()
+	};
+}
+function getColors(colors) {
+	const { primary, info, success, warning, error } = colors ?? {};
+	return {
+		primary: getStatusColor(primary),
+		info: getStatusColor(info),
+		success: getStatusColor(success),
+		warning: getStatusColor(warning),
+		error: getStatusColor(error)
+	};
+}
+
+//#endregion
+exports.getColors = getColors;

package/dist/composables/_helper.d.cts

@@ -0,0 +1,10 @@
+//#region src/composables/_helper.d.ts
+type Colors = {
+  primary?: string;
+  info?: string;
+  success?: string;
+  warning?: string;
+  error?: string;
+};
+//#endregion
+export { Colors };

package/dist/composables/_helper.d.ts

@@ -0,0 +1,10 @@
+//#region src/composables/_helper.d.ts
+type Colors = {
+  primary?: string;
+  info?: string;
+  success?: string;
+  warning?: string;
+  error?: string;
+};
+//#endregion
+export { Colors };

package/dist/composables/_helper.js

@@ -0,0 +1,27 @@
+import { colord } from "colord";
+
+//#region src/composables/_helper.ts
+function getStatusColor(color) {
+	if (!color) return void 0;
+	const baseColor = colord(color);
+	if (!baseColor.isValid()) return void 0;
+	return {
+		color,
+		hover: baseColor.lighten(.1).toHex(),
+		pressed: baseColor.darken(.1).toHex(),
+		suppl: baseColor.lighten(.1).toHex()
+	};
+}
+function getColors(colors) {
+	const { primary, info, success, warning, error } = colors ?? {};
+	return {
+		primary: getStatusColor(primary),
+		info: getStatusColor(info),
+		success: getStatusColor(success),
+		warning: getStatusColor(warning),
+		error: getStatusColor(error)
+	};
+}
+
+//#endregion
+export { getColors };

package/dist/composables/useDataRequest.d.ts

@@ -1,5 +1,5 @@
 import * as _vueuse_core0 from "@vueuse/core";
-import * as vue1 from "vue";
+import * as vue0 from "vue";
 import { UseRequestOptions, UseRequestPlugin } from "vue-hooks-plus/es/useRequest/types";
 
 //#region src/composables/useDataRequest.d.ts
@@ -24,12 +24,12 @@ type UseDataRequestPagination = {
   itemCount: number;
 };
 declare function useDataRequest<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject>(api: (...args: P[]) => Promise<D>, options?: UseDataRequestOptions<P, D>): {
-  loading: Readonly<vue1.Ref<boolean, boolean>>;
-  data: Readonly<vue1.Ref<D | undefined, D | undefined>>;
-  error: Readonly<vue1.Ref<Error | undefined, Error | undefined>>;
-  params: Readonly<vue1.Ref<[] | P[], [] | P[]>>;
-  list: vue1.ComputedRef<R[]>;
-  pagination: vue1.Ref<{
+  loading: Readonly<vue0.Ref<boolean, boolean>>;
+  data: Readonly<vue0.Ref<D | undefined, D | undefined>>;
+  error: Readonly<vue0.Ref<Error | undefined, Error | undefined>>;
+  params: Readonly<vue0.Ref<[] | P[], [] | P[]>>;
+  list: vue0.ComputedRef<R[]>;
+  pagination: vue0.Ref<{
     page: number;
     pageSize: number;
     itemCount: number;

package/dist/composables/useNaiveForm.cjs

@@ -3,6 +3,8 @@ let __vueuse_core = require("@vueuse/core");
 __vueuse_core = require_rolldown_runtime.__toESM(__vueuse_core);
 let vue = require("vue");
 vue = require_rolldown_runtime.__toESM(vue);
+let es_toolkit_object = require("es-toolkit/object");
+es_toolkit_object = require_rolldown_runtime.__toESM(es_toolkit_object);
 
 //#region src/composables/useNaiveForm.ts
 function isObject(value) {
@@ -34,7 +36,7 @@ function deepMerge(target = {}, source = {}) {
 }
 function useNaiveForm(value, options) {
 	const { rules, clearRules } = options ?? {};
-	const cacheValue = structuredClone((0, vue.toRaw)((0, vue.toValue)(value)));
+	const cacheValue = (0, es_toolkit_object.cloneDeep)((0, vue.toValue)(value));
 	const formValue = (0, vue.ref)((0, vue.toValue)(value ?? {}));
 	const formRules = (0, vue.ref)((0, vue.toValue)(rules) ?? {});
 	const formRef = (0, vue.ref)();
@@ -64,7 +66,7 @@ function useNaiveForm(value, options) {
 	}
 	function resetForm() {
 		clear();
-		const _cacheValue = structuredClone(cacheValue);
+		const _cacheValue = (0, es_toolkit_object.cloneDeep)(cacheValue);
 		deepMerge(formValue.value, _cacheValue);
 	}
 	function reset() {

package/dist/composables/useNaiveForm.d.ts

@@ -1,6 +1,6 @@
 import { DataObject } from "./useDataRequest.js";
-import * as _vueuse_core0 from "@vueuse/core";
-import * as vue0 from "vue";
+import * as _vueuse_core3 from "@vueuse/core";
+import * as vue5 from "vue";
 import { Ref } from "vue";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
 import { ValidateError } from "async-validator";
@@ -22,8 +22,8 @@ declare function useNaiveForm<T extends DataObject = DataObject>(value?: T | Ref
   formRules: Ref<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>, Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
   formProps: {
     ref: Ref<FormInst | undefined, FormInst | undefined>;
-    model: vue0.Reactive<T>;
-    rules: vue0.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
+    model: vue5.Reactive<T>;
+    rules: vue5.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
   };
   setValue: (_value: Partial<T>) => void;
   validate: () => Promise<{
@@ -33,7 +33,7 @@ declare function useNaiveForm<T extends DataObject = DataObject>(value?: T | Ref
   resetForm: () => void;
   reset: () => void;
   clear: () => void;
-  onValidated: _vueuse_core0.EventHookOn<[T]>;
+  onValidated: _vueuse_core3.EventHookOn<[T]>;
 };
 type NaiveFormReturns<T extends DataObject = DataObject> = ReturnType<typeof useNaiveForm<T>>;
 //#endregion

package/dist/composables/useNaiveForm.js

@@ -1,5 +1,6 @@
 import { createEventHook } from "@vueuse/core";
 import { reactive, ref, toRaw, toValue } from "vue";
+import { cloneDeep } from "es-toolkit/object";
 
 //#region src/composables/useNaiveForm.ts
 function isObject(value) {
@@ -31,7 +32,7 @@ function deepMerge(target = {}, source = {}) {
 }
 function useNaiveForm(value, options) {
 	const { rules, clearRules } = options ?? {};
-	const cacheValue = structuredClone(toRaw(toValue(value)));
+	const cacheValue = cloneDeep(toValue(value));
 	const formValue = ref(toValue(value ?? {}));
 	const formRules = ref(toValue(rules) ?? {});
 	const formRef = ref();
@@ -61,7 +62,7 @@ function useNaiveForm(value, options) {
 	}
 	function resetForm() {
 		clear();
-		const _cacheValue = structuredClone(cacheValue);
+		const _cacheValue = cloneDeep(cacheValue);
 		deepMerge(formValue.value, _cacheValue);
 	}
 	function reset() {

package/dist/composables/useNaiveTheme.cjs

@@ -1,20 +1,11 @@
 const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+const require__helper = require('./_helper.cjs');
 let vue = require("vue");
 vue = require_rolldown_runtime.__toESM(vue);
-let colord = require("colord");
-colord = require_rolldown_runtime.__toESM(colord);
 let naive_ui = require("naive-ui");
 naive_ui = require_rolldown_runtime.__toESM(naive_ui);
 
 //#region src/composables/useNaiveTheme.ts
-function getStatusColor(color = "#ff461f") {
-	return {
-		color,
-		hover: (0, colord.colord)(color).lighten(.1).toHex(),
-		pressed: (0, colord.colord)(color).darken(.1).toHex(),
-		suppl: (0, colord.colord)(color).lighten(.1).toHex()
-	};
-}
 const naiveLocaleMap = {
 	"zh-CN": {
 		name: "简体中文",
@@ -27,18 +18,8 @@ const naiveLocaleMap = {
 		locale: naive_ui.enUS
 	}
 };
-function getColors(color) {
-	const { primary, info, success, warning, error } = color;
-	return {
-		primary: getStatusColor(primary),
-		info: getStatusColor(info),
-		success: getStatusColor(success),
-		warning: getStatusColor(warning),
-		error: getStatusColor(error)
-	};
-}
 function useNaiveTheme(options) {
-	const { language, darkMode, color, globalThemeOverrides } = options ?? {};
+	const { language, darkMode, colors, globalThemeOverrides } = options ?? {};
 	const languageRef = (0, vue.ref)((0, vue.toValue)(language));
 	(0, vue.watchEffect)(() => {
 		languageRef.value = (0, vue.toValue)(language);
@@ -47,55 +28,44 @@ function useNaiveTheme(options) {
 	(0, vue.watchEffect)(() => {
 		darkModeRef.value = (0, vue.toValue)(darkMode);
 	});
-	const { common, Dialog,...extra } = globalThemeOverrides ?? {};
-	const colorRef = (0, vue.ref)({
-		primary: "#64748B",
-		info: "#06b6d4",
-		success: "#10b981",
-		warning: "#fbbf24",
-		error: "#f43f5e",
-		...color
-	});
+	const { common,...extra } = globalThemeOverrides ?? {};
+	const colorRef = (0, vue.ref)({ ...colors });
 	function setColor(v) {
-		colorRef.value = v;
+		colorRef.value = {
+			...colorRef.value,
+			...v
+		};
 	}
 	const theme = (0, vue.computed)(() => {
 		return darkModeRef?.value ? naive_ui.darkTheme : void 0;
 	});
 	const themeOverrides = (0, vue.computed)(() => {
-		const { primary, info, success, warning, error } = getColors(colorRef.value);
+		const { primary, info, success, warning, error } = require__helper.getColors(colorRef.value);
 		return {
 			common: {
 				bodyColor: darkModeRef?.value ? "#1f1f1f" : "#f5f5f5",
-				primaryColor: primary.color,
-				primaryColorHover: primary.hover,
-				primaryColorPressed: primary.pressed,
-				primaryColorSuppl: primary.suppl,
-				infoColor: info.color,
-				infoColorHover: info.hover,
-				infoColorPressed: info.pressed,
-				infoColorSuppl: info.suppl,
-				successColor: success.color,
-				successColorHover: success.hover,
-				successColorPressed: success.pressed,
-				successColorSuppl: success.suppl,
-				warningColor: warning.color,
-				warningColorHover: warning.hover,
-				warningColorPressed: warning.pressed,
-				warningColorSuppl: warning.suppl,
-				errorColor: error.color,
-				errorColorHover: error.hover,
-				errorColorPressed: error.pressed,
-				errorColorSuppl: error.suppl,
-				borderRadius: "6px",
+				primaryColor: primary?.color,
+				primaryColorHover: primary?.hover,
+				primaryColorPressed: primary?.pressed,
+				primaryColorSuppl: primary?.suppl,
+				infoColor: info?.color,
+				infoColorHover: info?.hover,
+				infoColorPressed: info?.pressed,
+				infoColorSuppl: info?.suppl,
+				successColor: success?.color,
+				successColorHover: success?.hover,
+				successColorPressed: success?.pressed,
+				successColorSuppl: success?.suppl,
+				warningColor: warning?.color,
+				warningColorHover: warning?.hover,
+				warningColorPressed: warning?.pressed,
+				warningColorSuppl: warning?.suppl,
+				errorColor: error?.color,
+				errorColorHover: error?.hover,
+				errorColorPressed: error?.pressed,
+				errorColorSuppl: error?.suppl,
 				...common
 			},
-			Dialog: {
-				borderRadius: "12px",
-				padding: "20px",
-				closeMargin: "20px 20px 0 0",
-				...Dialog
-			},
 			...extra
 		};
 	});

package/dist/composables/useNaiveTheme.d.cts

@@ -1,19 +1,13 @@
+import { Colors } from "./_helper.cjs";
 import { ComputedRef, Ref } from "vue";
 import { GlobalThemeOverrides, NDateLocale } from "naive-ui";
 import * as naive_ui_es_themes_interface0 from "naive-ui/es/themes/interface";
 
 //#region src/composables/useNaiveTheme.d.ts
-interface Color {
-  primary: string;
-  info: string;
-  success: string;
-  warning: string;
-  error: string;
-}
 interface NaiveThemeOptions {
   language?: string | Ref<string>;
   darkMode?: boolean | Ref<boolean>;
-  color?: Color;
+  colors?: Colors;
   globalThemeOverrides?: GlobalThemeOverrides;
 }
 declare function useNaiveTheme(options?: NaiveThemeOptions): {
@@ -152,19 +146,25 @@ declare function useNaiveTheme(options?: NaiveThemeOptions): {
   }>;
   dateLocale: ComputedRef<NDateLocale>;
   color: Ref<{
-    primary: string;
-    info: string;
-    success: string;
-    warning: string;
-    error: string;
-  }, Color | {
-    primary: string;
-    info: string;
-    success: string;
-    warning: string;
-    error: string;
+    primary?: string | undefined;
+    info?: string | undefined;
+    success?: string | undefined;
+    warning?: string | undefined;
+    error?: string | undefined;
+  }, {
+    primary?: string;
+    info?: string;
+    success?: string;
+    warning?: string;
+    error?: string;
+  } | {
+    primary?: string | undefined;
+    info?: string | undefined;
+    success?: string | undefined;
+    warning?: string | undefined;
+    error?: string | undefined;
   }>;
-  setColor: (v: Color) => void;
+  setColor: (v: Partial<Colors>) => void;
 };
 type NaiveThemeReturns = ReturnType<typeof useNaiveTheme>;
 //#endregion

package/dist/composables/useNaiveTheme.d.ts

@@ -1,19 +1,13 @@
+import { Colors } from "./_helper.js";
 import { ComputedRef, Ref } from "vue";
 import { GlobalThemeOverrides, NDateLocale } from "naive-ui";
 import * as naive_ui_es_themes_interface0 from "naive-ui/es/themes/interface";
 
 //#region src/composables/useNaiveTheme.d.ts
-interface Color {
-  primary: string;
-  info: string;
-  success: string;
-  warning: string;
-  error: string;
-}
 interface NaiveThemeOptions {
   language?: string | Ref<string>;
   darkMode?: boolean | Ref<boolean>;
-  color?: Color;
+  colors?: Colors;
   globalThemeOverrides?: GlobalThemeOverrides;
 }
 declare function useNaiveTheme(options?: NaiveThemeOptions): {
@@ -152,19 +146,25 @@ declare function useNaiveTheme(options?: NaiveThemeOptions): {
   }>;
   dateLocale: ComputedRef<NDateLocale>;
   color: Ref<{
-    primary: string;
-    info: string;
-    success: string;
-    warning: string;
-    error: string;
-  }, Color | {
-    primary: string;
-    info: string;
-    success: string;
-    warning: string;
-    error: string;
+    primary?: string | undefined;
+    info?: string | undefined;
+    success?: string | undefined;
+    warning?: string | undefined;
+    error?: string | undefined;
+  }, {
+    primary?: string;
+    info?: string;
+    success?: string;
+    warning?: string;
+    error?: string;
+  } | {
+    primary?: string | undefined;
+    info?: string | undefined;
+    success?: string | undefined;
+    warning?: string | undefined;
+    error?: string | undefined;
   }>;
-  setColor: (v: Color) => void;
+  setColor: (v: Partial<Colors>) => void;
 };
 type NaiveThemeReturns = ReturnType<typeof useNaiveTheme>;
 //#endregion

package/dist/composables/useNaiveTheme.js

@@ -1,16 +1,8 @@
+import { getColors } from "./_helper.js";
 import { computed, ref, toValue, watchEffect } from "vue";
-import { colord } from "colord";
 import { darkTheme, dateEnUS, dateZhCN, enUS, zhCN } from "naive-ui";
 
 //#region src/composables/useNaiveTheme.ts
-function getStatusColor(color = "#ff461f") {
-	return {
-		color,
-		hover: colord(color).lighten(.1).toHex(),
-		pressed: colord(color).darken(.1).toHex(),
-		suppl: colord(color).lighten(.1).toHex()
-	};
-}
 const naiveLocaleMap = {
 	"zh-CN": {
 		name: "简体中文",
@@ -23,18 +15,8 @@ const naiveLocaleMap = {
 		locale: enUS
 	}
 };
-function getColors(color) {
-	const { primary, info, success, warning, error } = color;
-	return {
-		primary: getStatusColor(primary),
-		info: getStatusColor(info),
-		success: getStatusColor(success),
-		warning: getStatusColor(warning),
-		error: getStatusColor(error)
-	};
-}
 function useNaiveTheme(options) {
-	const { language, darkMode, color, globalThemeOverrides } = options ?? {};
+	const { language, darkMode, colors, globalThemeOverrides } = options ?? {};
 	const languageRef = ref(toValue(language));
 	watchEffect(() => {
 		languageRef.value = toValue(language);
@@ -43,17 +25,13 @@ function useNaiveTheme(options) {
 	watchEffect(() => {
 		darkModeRef.value = toValue(darkMode);
 	});
-	const { common, Dialog,...extra } = globalThemeOverrides ?? {};
-	const colorRef = ref({
-		primary: "#64748B",
-		info: "#06b6d4",
-		success: "#10b981",
-		warning: "#fbbf24",
-		error: "#f43f5e",
-		...color
-	});
+	const { common,...extra } = globalThemeOverrides ?? {};
+	const colorRef = ref({ ...colors });
 	function setColor(v) {
-		colorRef.value = v;
+		colorRef.value = {
+			...colorRef.value,
+			...v
+		};
 	}
 	const theme = computed(() => {
 		return darkModeRef?.value ? darkTheme : void 0;
@@ -63,35 +41,28 @@ function useNaiveTheme(options) {
 		return {
 			common: {
 				bodyColor: darkModeRef?.value ? "#1f1f1f" : "#f5f5f5",
-				primaryColor: primary.color,
-				primaryColorHover: primary.hover,
-				primaryColorPressed: primary.pressed,
-				primaryColorSuppl: primary.suppl,
-				infoColor: info.color,
-				infoColorHover: info.hover,
-				infoColorPressed: info.pressed,
-				infoColorSuppl: info.suppl,
-				successColor: success.color,
-				successColorHover: success.hover,
-				successColorPressed: success.pressed,
-				successColorSuppl: success.suppl,
-				warningColor: warning.color,
-				warningColorHover: warning.hover,
-				warningColorPressed: warning.pressed,
-				warningColorSuppl: warning.suppl,
-				errorColor: error.color,
-				errorColorHover: error.hover,
-				errorColorPressed: error.pressed,
-				errorColorSuppl: error.suppl,
-				borderRadius: "6px",
+				primaryColor: primary?.color,
+				primaryColorHover: primary?.hover,
+				primaryColorPressed: primary?.pressed,
+				primaryColorSuppl: primary?.suppl,
+				infoColor: info?.color,
+				infoColorHover: info?.hover,
+				infoColorPressed: info?.pressed,
+				infoColorSuppl: info?.suppl,
+				successColor: success?.color,
+				successColorHover: success?.hover,
+				successColorPressed: success?.pressed,
+				successColorSuppl: success?.suppl,
+				warningColor: warning?.color,
+				warningColorHover: warning?.hover,
+				warningColorPressed: warning?.pressed,
+				warningColorSuppl: warning?.suppl,
+				errorColor: error?.color,
+				errorColorHover: error?.hover,
+				errorColorPressed: error?.pressed,
+				errorColorSuppl: error?.suppl,
 				...common
 			},
-			Dialog: {
-				borderRadius: "12px",
-				padding: "20px",
-				closeMargin: "20px 20px 0 0",
-				...Dialog
-			},
 			...extra
 		};
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oiij/naive-ui",
   "type": "module",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "description": "Some Composable Functions And Components for Vue 3",
   "author": "oiij",
   "license": "MIT",
@@ -41,27 +41,29 @@
     "@vueuse/core": "^13.9.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
+    "es-toolkit": "^1.39.10",
     "naive-ui": "^2.43.1",
     "prismjs": "^1.30.0",
     "vue": "^3.5.21",
     "vue-hooks-plus": "^2.4.1",
+    "@oiij/use": "0.0.24",
     "@oiij/css-render": "0.0.4",
-    "@oiij/markdown-it": "0.0.6",
-    "@oiij/use": "0.0.23"
+    "@oiij/markdown-it": "0.0.6"
   },
   "devDependencies": {
     "@types/prismjs": "^1.26.5",
     "@vueuse/core": "^13.9.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
+    "es-toolkit": "^1.39.10",
     "naive-ui": "^2.43.1",
     "prismjs": "^1.30.0",
     "vue": "^3.5.21",
     "vue-component-type-helpers": "^3.0.7",
     "vue-hooks-plus": "^2.4.1",
+    "@oiij/css-render": "0.0.4",
     "@oiij/markdown-it": "0.0.6",
-    "@oiij/use": "0.0.23",
-    "@oiij/css-render": "0.0.4"
+    "@oiij/use": "0.0.24"
   },
   "publishConfig": {
     "access": "public"