@oiij/naive-ui 0.0.69 → 0.0.71

package/dist/composables/{useDataRequest.d.ts → use-data-request.d.ts}

@@ -2,7 +2,7 @@ import * as _vueuse_core0 from "@vueuse/core";
 import * as vue0 from "vue";
 import { UseRequestOptions, UseRequestPlugin } from "vue-hooks-plus/es/useRequest/types";
 
-//#region src/composables/useDataRequest.d.ts
+//#region src/composables/use-data-request.d.ts
 type DataObject = Record<string, any>;
 type DataRequestFields = Record<string, string | undefined> & {
   page?: string;

package/dist/composables/{useDataRequest.js → use-data-request.js}

@@ -2,7 +2,7 @@ import { createEventHook } from "@vueuse/core";
 import { computed, ref } from "vue";
 import useRequest from "vue-hooks-plus/es/useRequest";
 
-//#region src/composables/useDataRequest.ts
+//#region src/composables/use-data-request.ts
 function useDataRequest(api, options) {
 	const { defaultParams, manual, fields, requestOptions, requestPlugins } = options ?? {};
 	const _fields = {

package/dist/composables/{useLoading.d.ts → use-loading.d.ts}

@@ -1,6 +1,6 @@
 import { LoadingProviderInst } from "../components/loading-provider/index.js";
 
-//#region src/composables/useLoading.d.ts
+//#region src/composables/use-loading.d.ts
 declare function useLoading(): LoadingProviderInst | undefined;
 //#endregion
 export { useLoading };

package/dist/composables/{useLoading.js → use-loading.js}

@@ -1,7 +1,7 @@
 import { loadingProviderInjectionKey } from "../components/loading-provider/index.js";
 import { inject } from "vue";
 
-//#region src/composables/useLoading.ts
+//#region src/composables/use-loading.ts
 function useLoading() {
 	return inject(loadingProviderInjectionKey);
 }

package/dist/composables/{useNaiveForm.d.ts → use-naive-form.d.ts}

@@ -1,11 +1,11 @@
-import { DataObject } from "./useDataRequest.js";
+import { DataObject } from "./use-data-request.js";
 import * as _vueuse_core3 from "@vueuse/core";
 import * as vue5 from "vue";
 import { Ref, TemplateRef } from "vue";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
 import { ValidateError } from "async-validator";
 
-//#region src/composables/useNaiveForm.d.ts
+//#region src/composables/use-naive-form.d.ts
 type NaiveFormClearRules = {
   string?: string | null;
   number?: number | null;

package/dist/composables/{useNaiveForm.js → use-naive-form.js}

@@ -2,7 +2,7 @@ import { createEventHook } from "@vueuse/core";
 import { reactive, ref, toRaw, toValue } from "vue";
 import { cloneDeep } from "es-toolkit/object";
 
-//#region src/composables/useNaiveForm.ts
+//#region src/composables/use-naive-form.ts
 function isObject(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }

package/dist/composables/use-naive-theme.d.ts

@@ -0,0 +1,51 @@
+import { Colors } from "./_helper.js";
+import { ComputedRef, Ref } from "vue";
+import { GlobalThemeOverrides, NDateLocale, zhCN } from "naive-ui";
+import * as naive_ui_es_themes_interface0 from "naive-ui/es/themes/interface";
+
+//#region src/composables/use-naive-theme.d.ts
+type Locales<T extends string = string> = Record<T, {
+  name: string;
+  dateLocale: NDateLocale;
+  locale: typeof zhCN;
+}>;
+type NaiveThemeOptions<T extends string> = {
+  language?: T | Ref<T>;
+  darkMode?: boolean | Ref<boolean>;
+  colors?: Colors;
+  globalThemeOverrides?: GlobalThemeOverrides;
+  locales?: Partial<Locales<T>>;
+  darkColors?: Colors | ((colors: Colors) => Colors);
+};
+declare function useNaiveTheme<T extends string>(options?: NaiveThemeOptions<T>): {
+  language: Ref<T, T>;
+  darkMode: Ref<boolean | undefined, boolean | undefined>;
+  theme: ComputedRef<naive_ui_es_themes_interface0.BuiltInGlobalTheme | undefined>;
+  colors: Ref<{
+    primary?: string | undefined;
+    info?: string | undefined;
+    success?: string | undefined;
+    warning?: string | undefined;
+    error?: string | undefined;
+  }, Colors | {
+    primary?: string | undefined;
+    info?: string | undefined;
+    success?: string | undefined;
+    warning?: string | undefined;
+    error?: string | undefined;
+  }>;
+  themeColors: ComputedRef<{
+    primary?: string | undefined;
+    info?: string | undefined;
+    success?: string | undefined;
+    warning?: string | undefined;
+    error?: string | undefined;
+  }>;
+  themeOverrides: ComputedRef<GlobalThemeOverrides>;
+  locales: Locales<T>;
+  locale: ComputedRef<Locales<T>[T]>;
+  setColor: (v: Partial<Colors>) => void;
+};
+type NaiveThemeReturns = ReturnType<typeof useNaiveTheme>;
+//#endregion
+export { NaiveThemeOptions, NaiveThemeReturns, useNaiveTheme };

package/dist/composables/use-naive-theme.js

@@ -0,0 +1,103 @@
+import { getColors, getDarkColors } from "./_helper.js";
+import { computed, ref, toValue, watchEffect } from "vue";
+import { darkTheme, dateEnUS, dateZhCN, enUS, zhCN } from "naive-ui";
+
+//#region src/composables/use-naive-theme.ts
+const naiveLocaleMap = {
+	"zh-CN": {
+		name: "简体中文",
+		dateLocale: dateZhCN,
+		locale: zhCN
+	},
+	"en-US": {
+		name: "English",
+		dateLocale: dateEnUS,
+		locale: enUS
+	}
+};
+function useNaiveTheme(options) {
+	const { language = "zh-CN", darkMode, colors, globalThemeOverrides, locales, darkColors } = options ?? {};
+	const languageRef = ref(toValue(language));
+	watchEffect(() => {
+		languageRef.value = toValue(language);
+	});
+	const darkModeRef = ref(toValue(darkMode));
+	watchEffect(() => {
+		darkModeRef.value = toValue(darkMode);
+	});
+	const { common, ...extra } = globalThemeOverrides ?? {};
+	const colorsRef = ref({ ...colors });
+	const themeColorsRef = computed(() => {
+		if (darkModeRef.value) {
+			if (typeof darkColors === "function") {
+				const darkColorsResult = darkColors(colorsRef.value);
+				return {
+					...colorsRef.value,
+					...darkColorsResult
+				};
+			}
+			if (typeof darkColors === "object") return {
+				...colorsRef.value,
+				...darkColors
+			};
+			return getDarkColors(colorsRef.value);
+		}
+		return colorsRef.value;
+	});
+	function setColor(v) {
+		colorsRef.value = {
+			...colorsRef.value,
+			...v
+		};
+	}
+	const theme = computed(() => {
+		return darkModeRef?.value ? darkTheme : void 0;
+	});
+	const themeOverrides = computed(() => {
+		const { primary, info, success, warning, error } = getColors(themeColorsRef.value);
+		return {
+			common: {
+				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
+			},
+			...extra
+		};
+	});
+	const _locales = {
+		...naiveLocaleMap,
+		...locales
+	};
+	return {
+		language: languageRef,
+		darkMode: darkModeRef,
+		theme,
+		colors: colorsRef,
+		themeColors: themeColorsRef,
+		themeOverrides,
+		locales: _locales,
+		locale: computed(() => _locales[languageRef.value] ?? naiveLocaleMap["zh-CN"]),
+		setColor
+	};
+}
+
+//#endregion
+export { useNaiveTheme };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./composables/useDataRequest.js";
-import { useLoading } from "./composables/useLoading.js";
-import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./composables/useNaiveForm.js";
-import { NaiveThemeReturns, useNaiveTheme } from "./composables/useNaiveTheme.js";
+import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./composables/use-data-request.js";
+import { useLoading } from "./composables/use-loading.js";
+import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./composables/use-naive-form.js";
+import { NaiveThemeOptions, NaiveThemeReturns, useNaiveTheme } from "./composables/use-naive-theme.js";
 import "./composables/index.js";
-export { DataObject, DataRequestFields, NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeReturns, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest, useLoading, useNaiveForm, useNaiveTheme };
+export { DataObject, DataRequestFields, NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeOptions, NaiveThemeReturns, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest, useLoading, useNaiveForm, useNaiveTheme };

package/dist/index.js

@@ -1,7 +1,6 @@
-import { useDataRequest } from "./composables/useDataRequest.js";
-import { useLoading } from "./composables/useLoading.js";
-import { useNaiveForm } from "./composables/useNaiveForm.js";
-import { useNaiveTheme } from "./composables/useNaiveTheme.js";
-import "./composables/index.js";
+import { useDataRequest } from "./composables/use-data-request.js";
+import { useLoading } from "./composables/use-loading.js";
+import { useNaiveForm } from "./composables/use-naive-form.js";
+import { useNaiveTheme } from "./composables/use-naive-theme.js";
 
 export { useDataRequest, useLoading, useNaiveForm, useNaiveTheme };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oiij/naive-ui",
   "type": "module",
-  "version": "0.0.69",
+  "version": "0.0.71",
   "description": "Some Composable Functions And Components for Vue 3",
   "author": "oiij",
   "license": "MIT",
@@ -45,9 +45,9 @@
     "vue": "^3.5.26",
     "vue-component-type-helpers": "^3.2.1",
     "vue-hooks-plus": "^2.4.1",
-    "@oiij/use": "0.0.32",
+    "@oiij/markdown-it": "0.0.10",
     "@oiij/css-render": "0.0.9",
-    "@oiij/markdown-it": "0.0.10"
+    "@oiij/use": "0.0.37"
   },
   "devDependencies": {
     "@types/prismjs": "^1.26.5",
@@ -60,9 +60,9 @@
     "vue": "^3.5.26",
     "vue-component-type-helpers": "^3.2.1",
     "vue-hooks-plus": "^2.4.1",
+    "@oiij/css-render": "0.0.9",
     "@oiij/markdown-it": "0.0.10",
-    "@oiij/use": "0.0.32",
-    "@oiij/css-render": "0.0.9"
+    "@oiij/use": "0.0.37"
   },
   "publishConfig": {
     "access": "public"

package/dist/components/_utils/index.js

@@ -1,2 +0,0 @@
-import { cssr, namespace, plugin } from "./cssr-bem.js";
-import { highlight } from "./prismjs.js";

package/dist/components/config-providers/index.js

@@ -1 +0,0 @@
-import ConfigProviders_default from "./ConfigProviders.js";

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

@@ -1 +0,0 @@
-import CopyButton_default from "./CopyButton.js";

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

@@ -1 +0,0 @@
-import DataTablePlus_default from "./DataTablePlus.js";

package/dist/components/index.js

@@ -1,28 +0,0 @@
-import BaseTransition_default from "./transition/BaseTransition.js";
-import "./transition/index.js";
-import LoadingProvider_default from "./loading-provider/LoadingProvider.js";
-import { loadingProviderInjectionKey } from "./loading-provider/index.js";
-import ConfigProviders_default from "./config-providers/ConfigProviders.js";
-import "./config-providers/index.js";
-import CopyButton_default from "./copy-button/CopyButton.js";
-import "./copy-button/index.js";
-import SearchInput_default from "./search-input/SearchInput.js";
-import "./search-input/index.js";
-import DataTablePlus_default from "./data-table-plus/DataTablePlus.js";
-import "./data-table-plus/index.js";
-import PresetInput_default from "./preset-input/PresetInput.js";
-import "./preset-input/index.js";
-import PresetForm_default from "./preset-form/PresetForm.js";
-import "./preset-form/index.js";
-import PresetPicker_default from "./preset-picker/PresetPicker.js";
-import "./preset-picker/index.js";
-import PresetSelect_default from "./preset-select/PresetSelect.js";
-import "./preset-select/index.js";
-import RemoteRequest_default from "./remote-request/RemoteRequest.js";
-import "./remote-request/index.js";
-import ToggleInput_default from "./toggle-input/ToggleInput.js";
-import "./toggle-input/index.js";
-import TooltipButton_default from "./tooltip-button/TooltipButton.js";
-import "./tooltip-button/index.js";
-import TypeWriter_default from "./type-writer/TypeWriter.js";
-import "./type-writer/index.js";

package/dist/components/preset-form/index.js

@@ -1 +0,0 @@
-import PresetForm_default from "./PresetForm.js";

package/dist/components/preset-input/index.js

@@ -1 +0,0 @@
-import PresetInput_default from "./PresetInput.js";

package/dist/components/preset-picker/index.js

@@ -1 +0,0 @@
-import PresetPicker_default from "./PresetPicker.js";

package/dist/components/preset-select/index.js

@@ -1 +0,0 @@
-import PresetSelect_default from "./PresetSelect.js";

package/dist/components/remote-request/index.js

@@ -1 +0,0 @@
-import RemoteRequest_default from "./RemoteRequest.js";

package/dist/components/search-input/index.js

@@ -1 +0,0 @@
-import SearchInput_default from "./SearchInput.js";

package/dist/components/toggle-input/index.js

@@ -1 +0,0 @@
-import ToggleInput_default from "./ToggleInput.js";

package/dist/components/tooltip-button/index.js

@@ -1 +0,0 @@
-import TooltipButton_default from "./TooltipButton.js";

package/dist/components/transition/index.js

@@ -1 +0,0 @@
-import BaseTransition_default from "./BaseTransition.js";

package/dist/components/type-writer/index.js

@@ -1 +0,0 @@
-import TypeWriter_default from "./TypeWriter.js";

package/dist/composables/index.js

@@ -1,4 +0,0 @@
-import { useDataRequest } from "./useDataRequest.js";
-import { useLoading } from "./useLoading.js";
-import { useNaiveForm } from "./useNaiveForm.js";
-import { useNaiveTheme } from "./useNaiveTheme.js";

package/dist/composables/useNaiveTheme.d.ts

@@ -1,165 +0,0 @@
-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
-type NaiveThemeOptions = {
-  language?: string | Ref<string>;
-  darkMode?: boolean | Ref<boolean>;
-  colors?: Colors;
-  globalThemeOverrides?: GlobalThemeOverrides;
-};
-declare function useNaiveTheme(options?: NaiveThemeOptions): {
-  language: Ref<string | undefined, string | undefined>;
-  darkMode: Ref<boolean | undefined, boolean | undefined>;
-  theme: ComputedRef<naive_ui_es_themes_interface0.BuiltInGlobalTheme | undefined>;
-  themeOverrides: ComputedRef<GlobalThemeOverrides>;
-  locale: ComputedRef<{
-    name: string;
-    global: {
-      undo: string;
-      redo: string;
-      confirm: string;
-      clear: string;
-    };
-    Popconfirm: {
-      positiveText: string;
-      negativeText: string;
-    };
-    Cascader: {
-      placeholder: string;
-      loading: string;
-      loadingRequiredMessage: (label: string) => string;
-    };
-    Time: {
-      dateFormat: string;
-      dateTimeFormat: string;
-    };
-    DatePicker: {
-      yearFormat: string;
-      monthFormat: string;
-      dayFormat: string;
-      yearTypeFormat: string;
-      monthTypeFormat: string;
-      dateFormat: string;
-      dateTimeFormat: string;
-      quarterFormat: string;
-      weekFormat: string;
-      clear: string;
-      now: string;
-      confirm: string;
-      selectTime: string;
-      selectDate: string;
-      datePlaceholder: string;
-      datetimePlaceholder: string;
-      monthPlaceholder: string;
-      yearPlaceholder: string;
-      quarterPlaceholder: string;
-      weekPlaceholder: string;
-      startDatePlaceholder: string;
-      endDatePlaceholder: string;
-      startDatetimePlaceholder: string;
-      endDatetimePlaceholder: string;
-      startMonthPlaceholder: string;
-      endMonthPlaceholder: string;
-      monthBeforeYear: boolean;
-      firstDayOfWeek: 0 | 1 | 2 | 3 | 4 | 5 | 6;
-      today: string;
-    };
-    DataTable: {
-      checkTableAll: string;
-      uncheckTableAll: string;
-      confirm: string;
-      clear: string;
-    };
-    LegacyTransfer: {
-      sourceTitle: string;
-      targetTitle: string;
-    };
-    Transfer: {
-      selectAll: string;
-      unselectAll: string;
-      clearAll: string;
-      total: (num: number) => string;
-      selected: (num: number) => string;
-    };
-    Empty: {
-      description: string;
-    };
-    Select: {
-      placeholder: string;
-    };
-    TimePicker: {
-      placeholder: string;
-      positiveText: string;
-      negativeText: string;
-      now: string;
-      clear: string;
-    };
-    Pagination: {
-      goto: string;
-      selectionSuffix: string;
-    };
-    DynamicTags: {
-      add: string;
-    };
-    Log: {
-      loading: string;
-    };
-    Input: {
-      placeholder: string;
-    };
-    InputNumber: {
-      placeholder: string;
-    };
-    DynamicInput: {
-      create: string;
-    };
-    ThemeEditor: {
-      title: string;
-      clearAllVars: string;
-      clearSearch: string;
-      filterCompName: string;
-      filterVarName: string;
-      import: string;
-      export: string;
-      restore: string;
-    };
-    Image: {
-      tipPrevious: string;
-      tipNext: string;
-      tipCounterclockwise: string;
-      tipClockwise: string;
-      tipZoomOut: string;
-      tipZoomIn: string;
-      tipDownload: string;
-      tipClose: string;
-      tipOriginalSize: string;
-    };
-    Heatmap: {
-      less: string;
-      more: string;
-      monthFormat: string;
-      weekdayFormat: string;
-    };
-  }>;
-  dateLocale: ComputedRef<NDateLocale>;
-  color: Ref<{
-    primary?: string | undefined;
-    info?: string | undefined;
-    success?: string | undefined;
-    warning?: string | undefined;
-    error?: string | undefined;
-  }, Colors | {
-    primary?: string | undefined;
-    info?: string | undefined;
-    success?: string | undefined;
-    warning?: string | undefined;
-    error?: string | undefined;
-  }>;
-  setColor: (v: Partial<Colors>) => void;
-};
-type NaiveThemeReturns = ReturnType<typeof useNaiveTheme>;
-//#endregion
-export { NaiveThemeReturns, useNaiveTheme };

package/dist/composables/useNaiveTheme.js

@@ -1,86 +0,0 @@
-import { getColors } from "./_helper.js";
-import { computed, ref, toValue, watchEffect } from "vue";
-import { darkTheme, dateEnUS, dateZhCN, enUS, zhCN } from "naive-ui";
-
-//#region src/composables/useNaiveTheme.ts
-const naiveLocaleMap = {
-	"zh-CN": {
-		name: "简体中文",
-		dateLocale: dateZhCN,
-		locale: zhCN
-	},
-	"en-US": {
-		name: "English",
-		dateLocale: dateEnUS,
-		locale: enUS
-	}
-};
-function useNaiveTheme(options) {
-	const { language, darkMode, colors, globalThemeOverrides } = options ?? {};
-	const languageRef = ref(toValue(language));
-	watchEffect(() => {
-		languageRef.value = toValue(language);
-	});
-	const darkModeRef = ref(toValue(darkMode));
-	watchEffect(() => {
-		darkModeRef.value = toValue(darkMode);
-	});
-	const { common, ...extra } = globalThemeOverrides ?? {};
-	const colorRef = ref({ ...colors });
-	function setColor(v) {
-		colorRef.value = {
-			...colorRef.value,
-			...v
-		};
-	}
-	return {
-		language: languageRef,
-		darkMode: darkModeRef,
-		theme: computed(() => {
-			return darkModeRef?.value ? darkTheme : void 0;
-		}),
-		themeOverrides: computed(() => {
-			const { primary, info, success, warning, error } = 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,
-					...common
-				},
-				...extra
-			};
-		}),
-		locale: computed(() => {
-			if (!languageRef?.value || !naiveLocaleMap[languageRef.value]) return naiveLocaleMap["zh-CN"].locale;
-			return naiveLocaleMap[languageRef.value].locale;
-		}),
-		dateLocale: computed(() => {
-			if (!languageRef?.value || !naiveLocaleMap[languageRef.value]) return naiveLocaleMap["zh-CN"].dateLocale;
-			return naiveLocaleMap[languageRef.value].dateLocale;
-		}),
-		color: colorRef,
-		setColor
-	};
-}
-
-//#endregion
-export { useNaiveTheme };