@ecolovo/uniapp-components 2.0.7 → 2.0.9

package/components/badge/badge.vue

@@ -16,7 +16,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { badgeProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -47,7 +47,7 @@ type _Props = {
 const props = withDefaults(defineProps<_Props>(), {
 	value: 0,
 	max: 99,
-	...badgeProps,
+	...EC_DEFAULT_PROPS.badge,
 });
 
 const showValue = computed(() => {

package/components/badge/types.d.ts

@@ -2,5 +2,3 @@ export type ConfigurableBadgeProps = {
     /** 最大显示值，超出时会在后面添加一个“+” */
     max?: number;
 };
-export declare let badgeProps: ConfigurableBadgeProps;
-export declare const setDefaultBadgeProps: (props?: ConfigurableBadgeProps) => void;

package/components/badge/types.js

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

package/components/badge/types.ts

@@ -2,9 +2,3 @@ export type ConfigurableBadgeProps = {
 	/** 最大显示值，超出时会在后面添加一个“+” */
 	max?: number;
 };
-
-export let badgeProps: ConfigurableBadgeProps = {};
-
-export const setDefaultBadgeProps = (props: ConfigurableBadgeProps = {}) => {
-	badgeProps = props;
-};

package/components/button/button.vue

@@ -77,8 +77,8 @@
 <script lang="ts" setup>
 import { computed, ref, useCssModule } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { buttonProps } from './types';
 
 defineOptions({
 	options: {
@@ -149,7 +149,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	showLoading: undefined,
 	small: false,
 	large: false,
-	...buttonProps,
+	...EC_DEFAULT_PROPS.button,
 });
 
 const emit = defineEmits<{

package/components/button/types.d.ts

@@ -16,5 +16,3 @@ export type ConfigurableButtonProps = {
     /** 大尺寸 */
     large?: boolean;
 };
-export declare let buttonProps: ConfigurableButtonProps;
-export declare const setDefaultButtonProps: (props?: ConfigurableButtonProps) => void;

package/components/button/types.js

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

package/components/button/types.ts

@@ -16,9 +16,3 @@ export type ConfigurableButtonProps = {
 	/** 大尺寸 */
 	large?: boolean;
 };
-
-export let buttonProps: ConfigurableButtonProps = {};
-
-export const setDefaultButtonProps = (props: ConfigurableButtonProps = {}) => {
-	buttonProps = props;
-};

package/components/checkbox/checkbox.vue

@@ -20,7 +20,7 @@ import { computed, inject, ref } from 'vue';
 import type { ComputedRef, Ref } from 'vue';
 import IconCpn from '../icon/icon.vue';
 import useClassNames from '../../composable/component-name';
-import { checkboxProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -79,7 +79,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	icon: undefined,
 	checkedIcon: '',
 	uncheckedIcon: '',
-	...checkboxProps,
+	...EC_DEFAULT_PROPS.checkbox,
 });
 
 const emit = defineEmits<{

package/components/checkbox/types.d.ts

@@ -6,5 +6,3 @@ export type ConfigurableCheckboxProps = {
     /** 未选中时的图标 */
     uncheckedIcon?: string;
 };
-export declare let checkboxProps: ConfigurableCheckboxProps;
-export declare const setDefaultCheckboxProps: (props?: ConfigurableCheckboxProps) => void;

package/components/checkbox/types.js

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

package/components/checkbox/types.ts

@@ -6,11 +6,3 @@ export type ConfigurableCheckboxProps = {
 	/** 未选中时的图标 */
 	uncheckedIcon?: string;
 };
-
-export let checkboxProps: ConfigurableCheckboxProps = {};
-
-export const setDefaultCheckboxProps = (
-	props: ConfigurableCheckboxProps = {}
-) => {
-	checkboxProps = props;
-};

package/components/checkbox-group/checkbox-group.vue

@@ -7,7 +7,7 @@
 <script lang="ts" setup>
 import { computed, provide, ref, watch } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { checkboxGroupProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -37,7 +37,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	icon: true,
 	checkedIcon: '',
 	uncheckedIcon: '',
-	...checkboxGroupProps,
+	...EC_DEFAULT_PROPS.checkboxGroup,
 });
 
 const emit = defineEmits<{

package/components/checkbox-group/types.d.ts

@@ -6,5 +6,3 @@ export type ConfigurableCheckboxGroupProps = {
     /** 未选中时的图标 */
     uncheckedIcon?: string;
 };
-export declare let checkboxGroupProps: ConfigurableCheckboxGroupProps;
-export declare const setDefaultCheckboxGroupProps: (props?: ConfigurableCheckboxGroupProps) => void;

package/components/checkbox-group/types.js

@@ -1,8 +1 @@
-export let checkboxGroupProps = {
-    icon: true,
-    checkedIcon: '',
-    uncheckedIcon: '',
-};
-export const setDefaultCheckboxGroupProps = (props = {}) => {
-    checkboxGroupProps = props;
-};
+export {};

package/components/checkbox-group/types.ts

@@ -6,15 +6,3 @@ export type ConfigurableCheckboxGroupProps = {
 	/** 未选中时的图标 */
 	uncheckedIcon?: string;
 };
-
-export let checkboxGroupProps: ConfigurableCheckboxGroupProps = {
-	icon: true,
-	checkedIcon: '',
-	uncheckedIcon: '',
-};
-
-export const setDefaultCheckboxGroupProps = (
-	props: ConfigurableCheckboxGroupProps = {}
-) => {
-	checkboxGroupProps = props;
-};

package/components/checkbox-group2/checkbox-group2.vue

@@ -28,8 +28,8 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import Checkbox2Cpn from './checkbox2.vue';
-import { checkboxGroupProps } from '../checkbox-group/types';
 
 defineOptions({
 	options: {
@@ -68,7 +68,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	icon: true,
 	checkedIcon: undefined,
 	uncheckedIcon: undefined,
-	...checkboxGroupProps,
+	...EC_DEFAULT_PROPS.checkboxGroup,
 });
 
 const emit = defineEmits<{

package/components/date-picker/date-picker.vue

@@ -70,12 +70,12 @@
 
 <script lang="ts" setup>
 import { computed, inject, ref } from 'vue';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import useClassNames from '../../composable/component-name';
 import { formatDate, toDate } from '../../utils/date';
 import PopupCpn from '../popup/popup.vue';
 import SelectorCpn from '../selector/selector.vue';
 import DatePickerViewCpn from './date-picker-view.vue';
-import { datePickerProps } from './types';
 
 defineOptions({
 	options: {
@@ -120,7 +120,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	timeAppend: '',
 	min: '',
 	max: '',
-	...datePickerProps,
+	...EC_DEFAULT_PROPS.datePicker,
 });
 
 const emit = defineEmits<{

package/components/date-picker/types.d.ts

@@ -8,5 +8,3 @@ export type ConfigurableDatePickerProps = {
     /** 在选择的日期后面拼接时间字符串，如果传入的是数组，会分别对应添加到范围日期值后 */
     timeAppend?: string | (() => string[]);
 };
-export declare let datePickerProps: ConfigurableDatePickerProps;
-export declare const setDefaultDatePickerProps: (props?: ConfigurableDatePickerProps) => void;

package/components/date-picker/types.js

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

package/components/date-picker/types.ts

@@ -8,11 +8,3 @@ export type ConfigurableDatePickerProps = {
 	/** 在选择的日期后面拼接时间字符串，如果传入的是数组，会分别对应添加到范围日期值后 */
 	timeAppend?: string | (() => string[]);
 };
-
-export let datePickerProps: ConfigurableDatePickerProps = {};
-
-export const setDefaultDatePickerProps = (
-	props: ConfigurableDatePickerProps = {}
-) => {
-	datePickerProps = props;
-};

package/components/dialog/dialog.vue

@@ -37,8 +37,8 @@ import { ref, computed, useSlots } from 'vue';
 import useClassNames from '../../composable/component-name';
 import PopoverMaskCpn from '../popover/popover-mask.vue';
 import DialogContentCpn from './dialog-content.vue';
-import { dialogProps } from './types';
 import { useAwaitableDialog, useModelValue } from '../../composable';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -105,7 +105,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	confirm: '确认',
 	closeOnConfirm: true,
 	async: false,
-	...dialogProps,
+	...EC_DEFAULT_PROPS.dialog,
 });
 
 const emit = defineEmits<{

package/components/dialog/types.d.ts

@@ -16,5 +16,3 @@ export type ConfigurableDialogProps = {
     /** 点击确认按钮时是否自动关闭对话框 */
     closeOnConfirm?: boolean;
 };
-export declare let dialogProps: ConfigurableDialogProps;
-export declare const setDefaultDialogProps: (props?: ConfigurableDialogProps) => void;

package/components/dialog/types.js

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

package/components/dialog/types.ts

@@ -16,9 +16,3 @@ export type ConfigurableDialogProps = {
 	/** 点击确认按钮时是否自动关闭对话框 */
 	closeOnConfirm?: boolean;
 };
-
-export let dialogProps: ConfigurableDialogProps = {};
-
-export const setDefaultDialogProps = (props: ConfigurableDialogProps = {}) => {
-	dialogProps = props;
-};

package/components/dropdown/dropdown.vue

@@ -28,8 +28,8 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { dropdownProps } from './types';
 
 defineOptions({
 	options: {
@@ -59,7 +59,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	align: '',
 	multiple: true,
 	formatter: null,
-	...dropdownProps,
+	...EC_DEFAULT_PROPS.dropdown,
 });
 
 /** 是否选择了值 */

package/components/dropdown/types.d.ts

@@ -6,5 +6,3 @@ export type ConfigurableDropdownProps = {
     /** 展示值格式化函数 */
     formatter?: ((val: unknown) => string) | null;
 };
-export declare let dropdownProps: ConfigurableDropdownProps;
-export declare const setDefaultDropdownProps: (props?: ConfigurableDropdownProps) => void;

package/components/dropdown/types.js

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

package/components/dropdown/types.ts

@@ -6,11 +6,3 @@ export type ConfigurableDropdownProps = {
 	/** 展示值格式化函数 */
 	formatter?: ((val: unknown) => string) | null;
 };
-
-export let dropdownProps: ConfigurableDropdownProps = {};
-
-export const setDefaultDropdownProps = (
-	props: ConfigurableDropdownProps = {}
-) => {
-	dropdownProps = props;
-};

package/components/empty/empty.vue

@@ -42,7 +42,7 @@
 import useClassNames from '../../composable/component-name';
 import IconCpn from '../icon/icon.vue';
 import emptyImage from '../../resources/image/empty.svg';
-import { emptyProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -72,7 +72,7 @@ withDefaults(defineProps<_Props>(), {
 	loading: false,
 	loadingImage: '',
 	loadingText: '数据加载中',
-	...emptyProps,
+	...EC_DEFAULT_PROPS.empty,
 });
 </script>
 

package/components/empty/types.d.ts

@@ -8,5 +8,3 @@ export type ConfigurableEmptyProps = {
     /** 加载中文本 */
     loadingText?: string;
 };
-export declare let emptyProps: ConfigurableEmptyProps;
-export declare const setDefaultEmptyProps: (props?: ConfigurableEmptyProps) => void;

package/components/empty/types.js

@@ -1,9 +1 @@
-export let emptyProps = {
-    image: '',
-    text: '暂无数据',
-    loadingImage: '',
-    loadingText: '数据加载中',
-};
-export const setDefaultEmptyProps = (props = {}) => {
-    emptyProps = props;
-};
+export {};

package/components/empty/types.ts

@@ -8,14 +8,3 @@ export type ConfigurableEmptyProps = {
 	/** 加载中文本 */
 	loadingText?: string;
 };
-
-export let emptyProps: ConfigurableEmptyProps = {
-	image: '',
-	text: '暂无数据',
-	loadingImage: '',
-	loadingText: '数据加载中',
-};
-
-export const setDefaultEmptyProps = (props: ConfigurableEmptyProps = {}) => {
-	emptyProps = props;
-};

package/components/flex/flex.vue

@@ -7,7 +7,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { flexProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -43,7 +43,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	align: 'center',
 	wrap: false,
 	gap: '0px',
-	...flexProps,
+	...EC_DEFAULT_PROPS.flex,
 });
 
 const gapValue = computed(() => {

package/components/flex/types.d.ts

@@ -8,5 +8,3 @@ export type ConfigurableFlexProps = {
     /** 间距 */
     gap?: string | number | (() => (string | number)[]);
 };
-export declare let flexProps: ConfigurableFlexProps;
-export declare const setDefaultFlexProps: (props?: ConfigurableFlexProps) => void;

package/components/flex/types.js

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

package/components/flex/types.ts

@@ -14,9 +14,3 @@ export type ConfigurableFlexProps = {
 	/** 间距 */
 	gap?: string | number | (() => (string | number)[]);
 };
-
-export let flexProps: ConfigurableFlexProps = {};
-
-export const setDefaultFlexProps = (props: ConfigurableFlexProps = {}) => {
-	flexProps = props;
-};

package/components/form/form.vue

@@ -7,7 +7,7 @@
 <script lang="ts" setup>
 import { computed, provide } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { formProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -28,7 +28,7 @@ type _Props = {
 const props = withDefaults(defineProps<_Props>(), {
 	readonly: false,
 	type: 'line',
-	...formProps,
+	...EC_DEFAULT_PROPS.form,
 });
 
 provide(

package/components/form/types.d.ts

@@ -2,5 +2,3 @@ export type ConfigurableFormProps = {
     /** 表单显示类型 */
     type?: 'line' | 'next' | 'block';
 };
-export declare let formProps: ConfigurableFormProps;
-export declare const setDefaultFormProps: (props?: ConfigurableFormProps) => void;

package/components/form/types.js

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

package/components/form/types.ts

@@ -2,9 +2,3 @@ export type ConfigurableFormProps = {
 	/** 表单显示类型 */
 	type?: 'line' | 'next' | 'block';
 };
-
-export let formProps: ConfigurableFormProps = {};
-
-export const setDefaultFormProps = (props: ConfigurableFormProps = {}) => {
-	formProps = props;
-};

package/components/form-item/form-item.vue

@@ -31,7 +31,7 @@
 import { computed, inject } from 'vue';
 import type { ComputedRef } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { formItemProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -58,7 +58,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	subLabel: '',
 	required: false,
 	type: undefined,
-	...formItemProps,
+	...EC_DEFAULT_PROPS.formItem,
 });
 
 /** 表单是否只读 */

package/components/form-item/types.d.ts

@@ -2,5 +2,3 @@ export type ConfigurableFormItemProps = {
     /** 表单显示类型 */
     type?: 'line' | 'next' | 'block';
 };
-export declare let formItemProps: ConfigurableFormItemProps;
-export declare const setDefaultFormItemProps: (props?: ConfigurableFormItemProps) => void;

package/components/form-item/types.js

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

package/components/form-item/types.ts

@@ -2,11 +2,3 @@ export type ConfigurableFormItemProps = {
 	/** 表单显示类型 */
 	type?: 'line' | 'next' | 'block';
 };
-
-export let formItemProps: ConfigurableFormItemProps = {};
-
-export const setDefaultFormItemProps = (
-	props: ConfigurableFormItemProps = {}
-) => {
-	formItemProps = props;
-};

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: {

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;
-};