@ecolovo/uniapp-components 2.0.6 → 2.0.8

package/components/icon/icon.vue

@@ -13,10 +13,68 @@
 	</text>
 </template>
 
+<script lang="ts">
+import defaultIconFonts from '../../resources/iconfont/uniapp_ui_icon/iconfont.json';
+import { EC_USE_INNER_ICON, EC_ICON_FONT } from '../../configs/index';
+
+/** Icon */
+interface IconInfo {
+	/** 字体文件名 */
+	fontFamily: string;
+	/** 图标前缀 */
+	prefix: string;
+	/** 图标名称 */
+	name: string;
+}
+
+/** iconfont 图标 map */
+const iconMap: Map<string, IconInfo> = new Map();
+
+/**
+ * 添加单个图标
+ *
+ * @param fontFamily 字体文件名
+ * @param prefix 图标前缀
+ * @param name 图标名称
+ */
+function addIconToMap(fontFamily: string, prefix: string, name: string) {
+	if (iconMap.has(name)) {
+		// eslint-disable-next-line no-console
+		console.warn(
+			`图标库 "${fontFamily}" 中的图标 "${name}" 在图标库 "${
+				iconMap.get(name)!.fontFamily
+			}" 中已存在，新的图标将会覆盖已存在的同名图标`
+		);
+	}
+	iconMap.set(name, {
+		fontFamily,
+		prefix,
+		name,
+	});
+}
+
+/**
+ * 添加一组图标，传入 iconfont.json 文件内容
+ *
+ * @param iconJson iconfont.json 文件内容
+ */
+function addIcons(iconJson: IconFontJson) {
+	const fontFamily = iconJson.font_family;
+	const prefix = iconJson.css_prefix_text;
+	const glyphs = iconJson.glyphs;
+	glyphs.forEach((glyph) => {
+		addIconToMap(fontFamily, prefix, glyph.font_class);
+	});
+}
+
+// 添加内部图标库
+if (EC_USE_INNER_ICON) addIcons(defaultIconFonts);
+// 添加额外 IconFont
+EC_ICON_FONT.forEach(addIcons);
+</script>
 <script lang="ts" setup>
 import { computed } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { iconMap } from '../../configs';
 
 defineOptions({
 	options: {
@@ -86,7 +144,7 @@ const iconClass = computed(() =>
 		? [
 				iconEntry.value.fontFamily,
 				iconEntry.value.prefix + iconEntry.value.name,
-		  ]
+			]
 		: []
 );
 </script>

package/components/image/image.vue

@@ -13,7 +13,8 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { imageProps, type ImageProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
+import { type ImageProps } from './types';
 
 defineOptions({
 	options: {
@@ -39,7 +40,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	lazyLoad: false,
 	preview: false,
 	previewIndex: undefined,
-	...imageProps,
+	...EC_DEFAULT_PROPS.image,
 });
 
 const emit = defineEmits<{

package/components/image/types.d.ts

@@ -14,5 +14,3 @@ export type ConfigurableImageProps = {
     /** 图片显示模式 */
     mode?: UniApp.ImageMode;
 };
-export declare let imageProps: ConfigurableImageProps;
-export declare const setDefaultImageProps: (props?: ConfigurableImageProps) => void;

package/components/image/types.js

@@ -1,4 +1 @@
-export let imageProps = {};
-export const setDefaultImageProps = (props = {}) => {
-    imageProps = props;
-};
+export {};

package/components/image/types.ts

@@ -15,9 +15,3 @@ export type ConfigurableImageProps = {
 	/** 图片显示模式 */
 	mode?: UniApp.ImageMode;
 };
-
-export let imageProps: ConfigurableImageProps = {};
-
-export const setDefaultImageProps = (props: ConfigurableImageProps = {}) => {
-	imageProps = props;
-};

package/components/input/input.vue

@@ -38,8 +38,8 @@
 <script lang="ts" setup>
 import { computed, inject, ref } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { inputProps } from './types';
 
 defineOptions({
 	options: {
@@ -88,7 +88,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	maxlength: 140,
 	placeholder: '请输入',
 	useText: false,
-	...inputProps,
+	...EC_DEFAULT_PROPS.input,
 });
 
 defineEmits<{

package/components/input/password-input.vue

@@ -23,8 +23,8 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { passwordInputProps } from './types';
 
 defineOptions({
 	options: {
@@ -51,7 +51,7 @@ withDefaults(defineProps<_Props>(), {
 	disabled: false,
 	maxlength: 20,
 	placeholder: '请输入密码',
-	...passwordInputProps,
+	...EC_DEFAULT_PROPS.passwordInput,
 });
 
 defineEmits<{

package/components/input/types.d.ts

@@ -8,13 +8,9 @@ export type ConfigurableInputProps = {
     /** 当不聚焦时是否使用文本替换 input */
     useText?: boolean;
 };
-export declare let inputProps: ConfigurableInputProps;
-export declare const setDefaultInputProps: (props?: ConfigurableInputProps) => void;
 export type ConfigurablePasswordInputProps = {
     /** 最大输入长度 */
     maxlength?: number;
     /** 占位文本 */
     placeholder?: string;
 };
-export declare let passwordInputProps: ConfigurablePasswordInputProps;
-export declare const setDefaultPasswordInputProps: (props?: ConfigurablePasswordInputProps) => void;

package/components/input/types.js

@@ -1,8 +1 @@
-export let inputProps = {};
-export const setDefaultInputProps = (props = {}) => {
-    inputProps = props;
-};
-export let passwordInputProps = {};
-export const setDefaultPasswordInputProps = (props = {}) => {
-    passwordInputProps = props;
-};
+export {};

package/components/input/types.ts

@@ -9,23 +9,9 @@ export type ConfigurableInputProps = {
 	useText?: boolean;
 };
 
-export let inputProps: ConfigurableInputProps = {};
-
-export const setDefaultInputProps = (props: ConfigurableInputProps = {}) => {
-	inputProps = props;
-};
-
 export type ConfigurablePasswordInputProps = {
 	/** 最大输入长度 */
 	maxlength?: number;
 	/** 占位文本 */
 	placeholder?: string;
 };
-
-export let passwordInputProps: ConfigurablePasswordInputProps = {};
-
-export const setDefaultPasswordInputProps = (
-	props: ConfigurablePasswordInputProps = {}
-) => {
-	passwordInputProps = props;
-};

package/components/list-page/list-page.vue

@@ -33,10 +33,10 @@
 import { ref, useSlots } from 'vue';
 import type { PagingData } from '@ecolovo/utils';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import DataListCpn from '../data-list/data-list.vue';
 import EmptyCpn from '../empty/empty.vue';
 import PageCpn from '../page/page.vue';
-import { listPageProps } from './types';
 
 defineOptions({
 	options: {
@@ -82,7 +82,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	pagingData: null,
 	showLoadMore: true,
 	loading: false,
-	...listPageProps,
+	...EC_DEFAULT_PROPS.listPage,
 });
 
 const emit = defineEmits<{

package/components/list-page/types.d.ts

@@ -2,5 +2,3 @@ export type ConfigurableListPageProps = {
     /** 页面头部样式，主要用于控制导航栏字体颜色 */
     theme?: 'light' | 'dark';
 };
-export declare let listPageProps: ConfigurableListPageProps;
-export declare const setDefaultListPageProps: (props?: ConfigurableListPageProps) => void;

package/components/list-page/types.js

@@ -1,4 +1 @@
-export let listPageProps = {};
-export const setDefaultListPageProps = (props = {}) => {
-    listPageProps = props;
-};
+export {};

package/components/list-page/types.ts

@@ -2,11 +2,3 @@ export type ConfigurableListPageProps = {
 	/** 页面头部样式，主要用于控制导航栏字体颜色 */
 	theme?: 'light' | 'dark';
 };
-
-export let listPageProps: ConfigurableListPageProps = {};
-
-export const setDefaultListPageProps = (
-	props: ConfigurableListPageProps = {}
-) => {
-	listPageProps = props;
-};

package/components/load-more/load-more.vue

@@ -28,8 +28,8 @@ import {
 	useCssModule,
 } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { loadMoreProps } from './types';
 
 defineOptions({
 	options: {
@@ -57,7 +57,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	end: false,
 	endTitle: '没有更多了',
 	observe: true,
-	...loadMoreProps,
+	...EC_DEFAULT_PROPS.loadMore,
 });
 
 const emit = defineEmits<{

package/components/load-more/types.d.ts

@@ -2,5 +2,3 @@ export type ConfigurableLoadMoreProps = {
     /** 到最后一页时文本 */
     endTitle?: string;
 };
-export declare let loadMoreProps: ConfigurableLoadMoreProps;
-export declare const setDefaultLoadMoreProps: (props?: ConfigurableLoadMoreProps) => void;

package/components/load-more/types.js

@@ -1,4 +1 @@
-export let loadMoreProps = {};
-export const setDefaultLoadMoreProps = (props = {}) => {
-    loadMoreProps = props;
-};
+export {};

package/components/load-more/types.ts

@@ -2,11 +2,3 @@ export type ConfigurableLoadMoreProps = {
 	/** 到最后一页时文本 */
 	endTitle?: string;
 };
-
-export let loadMoreProps: ConfigurableLoadMoreProps = {};
-
-export const setDefaultLoadMoreProps = (
-	props: ConfigurableLoadMoreProps = {}
-) => {
-	loadMoreProps = props;
-};

package/components/loading/animations/loading-animation3.vue

@@ -43,27 +43,37 @@ const classNames = useClassNames('loading-animation3');
 		width: $main-size;
 		aspect-ratio: 1;
 		border-radius: 50%;
-		box-shadow: $left-x $translate-y 0 $size-s, 0 $translate-y 0 $size-s,
+		box-shadow:
+			$left-x $translate-y 0 $size-s,
+			0 $translate-y 0 $size-s,
 			$right-x $translate-y 0 $size-s;
 		translate: 0 (-1 * $translate-y);
 		animation: LoadingAnimation3--loading-dots 1.5s infinite linear;
 
 		@keyframes LoadingAnimation3--loading-dots {
 			15% {
-				box-shadow: $left-x $translate-y 0 $size-l,
-					0 $translate-y 0 $size-s, $right-x $translate-y 0 $size-s;
+				box-shadow:
+					$left-x $translate-y 0 $size-l,
+					0 $translate-y 0 $size-s,
+					$right-x $translate-y 0 $size-s;
 			}
 			30% {
-				box-shadow: $left-x $translate-y 0 $size-s,
-					0 $translate-y 0 $size-l, $right-x $translate-y 0 $size-s;
+				box-shadow:
+					$left-x $translate-y 0 $size-s,
+					0 $translate-y 0 $size-l,
+					$right-x $translate-y 0 $size-s;
 			}
 			45% {
-				box-shadow: $left-x $translate-y 0 $size-s,
-					0 $translate-y 0 $size-s, $right-x $translate-y 0 $size-l;
+				box-shadow:
+					$left-x $translate-y 0 $size-s,
+					0 $translate-y 0 $size-s,
+					$right-x $translate-y 0 $size-l;
 			}
 			60% {
-				box-shadow: $left-x $translate-y 0 $size-s,
-					0 $translate-y 0 $size-s, $right-x $translate-y 0 $size-s;
+				box-shadow:
+					$left-x $translate-y 0 $size-s,
+					0 $translate-y 0 $size-s,
+					$right-x $translate-y 0 $size-s;
 			}
 		}
 

package/components/loading/animations/loading-animation4.vue

@@ -30,7 +30,8 @@ const classNames = useClassNames('loading-animation4');
 		aspect-ratio: 1;
 		border-radius: 50%;
 		border: 0.1em solid currentcolor;
-		animation: spinner-1 0.8s infinite linear alternate,
+		animation:
+			spinner-1 0.8s infinite linear alternate,
 			spinner-2 1.6s infinite linear;
 
 		@keyframes spinner-1 {

package/components/loading/loading.vue

@@ -17,8 +17,8 @@
 
 <script lang="ts" setup>
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import LoadingAnimation3 from './animations/loading-animation3.vue';
-import { loadingProps } from './types';
 
 defineOptions({
 	options: {
@@ -36,7 +36,7 @@ type _Props = {
 
 withDefaults(defineProps<_Props>(), {
 	title: '加载中...',
-	...loadingProps,
+	...EC_DEFAULT_PROPS.loading,
 });
 </script>
 

package/components/loading/types.d.ts

@@ -2,5 +2,3 @@ export type ConfigurableLoadingProps = {
     /** 加载文本 */
     title?: string;
 };
-export declare let loadingProps: ConfigurableLoadingProps;
-export declare const setDefaultLoadingProps: (props?: ConfigurableLoadingProps) => void;

package/components/loading/types.js

@@ -1,4 +1 @@
-export let loadingProps = {};
-export const setDefaultLoadingProps = (props = {}) => {
-    loadingProps = props;
-};
+export {};

package/components/loading/types.ts

@@ -2,11 +2,3 @@ export type ConfigurableLoadingProps = {
 	/** 加载文本 */
 	title?: string;
 };
-
-export let loadingProps: ConfigurableLoadingProps = {};
-
-export const setDefaultLoadingProps = (
-	props: ConfigurableLoadingProps = {}
-) => {
-	loadingProps = props;
-};

package/components/message-box/message-box.vue

@@ -23,8 +23,8 @@ import { ref, useCssModule, watch } from 'vue';
 import useClassNames from '../../composable/component-name';
 import DialogCpn from '../dialog/dialog.vue';
 import type { MessageBoxOptions } from './message-box';
-import { messageBoxProps } from './types';
 import { useAwaitableDialog, useModelValue } from '../../composable';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -44,7 +44,7 @@ const props = withDefaults(defineProps<MessageBoxOptions>(), {
 	showClose: false,
 	cancel: false,
 	confirm: '好的',
-	...messageBoxProps,
+	...EC_DEFAULT_PROPS.messageBox,
 });
 
 const isShow_ = defineModel<boolean>();

package/components/message-box/types.d.ts

@@ -12,5 +12,3 @@ export type ConfigurableMessageBoxProps = {
     /** 确认按钮文本，为 falsy 时( false 或 '' )不显示 */
     confirm?: string | boolean;
 };
-export declare let messageBoxProps: ConfigurableMessageBoxProps;
-export declare const setDefaultMessageBoxProps: (props?: ConfigurableMessageBoxProps) => void;

package/components/message-box/types.js

@@ -1,4 +1 @@
-export let messageBoxProps = {};
-export const setDefaultMessageBoxProps = (props = {}) => {
-    messageBoxProps = props;
-};
+export {};

package/components/message-box/types.ts

@@ -12,11 +12,3 @@ export type ConfigurableMessageBoxProps = {
 	/** 确认按钮文本，为 falsy 时( false 或 '' )不显示 */
 	confirm?: string | boolean;
 };
-
-export let messageBoxProps: ConfigurableMessageBoxProps = {};
-
-export const setDefaultMessageBoxProps = (
-	props: ConfigurableMessageBoxProps = {}
-) => {
-	messageBoxProps = props;
-};

package/components/number-dialog/number-dialog.vue

@@ -105,7 +105,7 @@ import IconCpn from '../icon/icon.vue';
 import NumpadCpn from '../numpad/numpad.vue';
 import PopoverContentCpn from '../popover/popover-content.vue';
 import PopoverMaskCpn from '../popover/popover-mask.vue';
-import { numberDialogProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -150,7 +150,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	step: 1,
 	max: MAX,
 	min: MIN,
-	...numberDialogProps,
+	...EC_DEFAULT_PROPS.numberDialog,
 });
 
 const emit = defineEmits<{

package/components/number-dialog/types.d.ts

@@ -14,5 +14,3 @@ export type ConfigurableNumberDialogProps = {
     /** 最小值 */
     min?: number;
 };
-export declare let numberDialogProps: ConfigurableNumberDialogProps;
-export declare const setDefaultNumberDialogProps: (props?: ConfigurableNumberDialogProps) => void;

package/components/number-dialog/types.js

@@ -1,4 +1 @@
-export let numberDialogProps = {};
-export const setDefaultNumberDialogProps = (props = {}) => {
-    numberDialogProps = props;
-};
+export {};

package/components/number-dialog/types.ts

@@ -14,11 +14,3 @@ export type ConfigurableNumberDialogProps = {
 	/** 最小值 */
 	min?: number;
 };
-
-export let numberDialogProps: ConfigurableNumberDialogProps = {};
-
-export const setDefaultNumberDialogProps = (
-	props: ConfigurableNumberDialogProps = {}
-) => {
-	numberDialogProps = props;
-};

package/components/number-input/number-input.vue

@@ -79,8 +79,8 @@
 import { computed, inject, nextTick, ref, watch } from 'vue';
 import { round } from '@ecolovo/utils';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { numberInputProps } from './types';
 
 defineOptions({
 	options: {
@@ -132,7 +132,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	step: 1,
 	max: MAX,
 	min: MIN,
-	...numberInputProps,
+	...EC_DEFAULT_PROPS.numberInput,
 });
 
 const emit = defineEmits<{
@@ -295,8 +295,8 @@ const handleInput = (e: InputEvent) => {
 		const integerVal = integer
 			? Number(integer) || '0'
 			: decimal
-			? '0'
-			: '';
+				? '0'
+				: '';
 		value = signVal + integerVal + decimal;
 
 		_lastEditValue = value;

package/components/number-input/types.d.ts

@@ -16,5 +16,3 @@ export type ConfigurableNumberInputProps = {
     /** 最小值 */
     min?: number;
 };
-export declare let numberInputProps: ConfigurableNumberInputProps;
-export declare const setDefaultNumberInputProps: (props?: ConfigurableNumberInputProps) => void;

package/components/number-input/types.js

@@ -1,4 +1 @@
-export let numberInputProps = {};
-export const setDefaultNumberInputProps = (props = {}) => {
-    numberInputProps = props;
-};
+export {};

package/components/number-input/types.ts

@@ -16,11 +16,3 @@ export type ConfigurableNumberInputProps = {
 	/** 最小值 */
 	min?: number;
 };
-
-export let numberInputProps: ConfigurableNumberInputProps = {};
-
-export const setDefaultNumberInputProps = (
-	props: ConfigurableNumberInputProps = {}
-) => {
-	numberInputProps = props;
-};

package/components/numpad/numpad.vue

@@ -17,9 +17,9 @@
 import { computed } from 'vue';
 import { freezeDeep } from '../../utils/freezeDeep';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import ButtonCpn from '../button/button.vue';
 import IconCpn from '../icon/icon.vue';
-import { numpadProps } from './types';
 
 defineOptions({
 	options: {
@@ -76,7 +76,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	precision: 0,
 	max: MAX,
 	min: MIN,
-	...numpadProps,
+	...EC_DEFAULT_PROPS.numpad,
 });
 
 const emit = defineEmits<{

package/components/numpad/types.d.ts

@@ -6,5 +6,3 @@ export type ConfigurableNumpadProps = {
     /** 允许输入的最小值 */
     min?: number;
 };
-export declare let numpadProps: ConfigurableNumpadProps;
-export declare const setDefaultNumpadProps: (props?: ConfigurableNumpadProps) => void;

package/components/numpad/types.js

@@ -1,4 +1 @@
-export let numpadProps = {};
-export const setDefaultNumpadProps = (props = {}) => {
-    numpadProps = props;
-};
+export {};

package/components/numpad/types.ts

@@ -6,9 +6,3 @@ export type ConfigurableNumpadProps = {
 	/** 允许输入的最小值 */
 	min?: number;
 };
-
-export let numpadProps: ConfigurableNumpadProps = {};
-
-export const setDefaultNumpadProps = (props: ConfigurableNumpadProps = {}) => {
-	numpadProps = props;
-};

package/components/page/page-body.vue

@@ -261,7 +261,8 @@ defineExpose({
 	@extend %external-vars;
 
 	--header-placeholder-height: calc(
-		var(--page-header-bottom) + #{UTILS__VAR(page-header, extra-height, 0px)}
+		var(--page-header-bottom) +
+			#{UTILS__VAR(page-header, extra-height, 0px)}
 	);
 	--footer-placeholder-height: calc(
 		var(--safe-area-bottom) + #{UTILS__VAR(page-footer, height, 100rpx)}
@@ -311,7 +312,8 @@ defineExpose({
 	flex-direction: column;
 	.PageBody--scroll-body & {
 		padding-bottom: calc(
-			#{UTILS__LOCAL_VAR(padding-bottom, UTILS__LOCAL_VAR(padding))} + var(--bottom-safe-height)
+			#{UTILS__LOCAL_VAR(padding-bottom, UTILS__LOCAL_VAR(padding))} +
+				var(--bottom-safe-height)
 		);
 	}
 }