@ecolovo/uniapp-components 2.0.7 → 2.0.9

package/components/popup/popup.vue

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

package/components/popup/types.d.ts

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

package/components/popup/types.js

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

package/components/popup/types.ts

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

package/components/price/price.vue

@@ -31,8 +31,8 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import { formatPrice } from '../../utils/price';
-import { priceProps } from './types';
 
 defineOptions({
 	options: {
@@ -59,7 +59,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	prefixUnit: false,
 	showSymbol: false,
 	alwaysShowDecimal: true,
-	...priceProps,
+	...EC_DEFAULT_PROPS.price,
 });
 
 /** 格式化后的价格 */

package/components/price/types.d.ts

@@ -6,5 +6,3 @@ export type ConfigurablePriceProps = {
     /** 是否始终显示小数 */
     alwaysShowDecimal?: boolean;
 };
-export declare let priceProps: ConfigurablePriceProps;
-export declare const setDefaultPriceProps: (props?: ConfigurablePriceProps) => void;

package/components/price/types.js

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

package/components/price/types.ts

@@ -6,9 +6,3 @@ export type ConfigurablePriceProps = {
 	/** 是否始终显示小数 */
 	alwaysShowDecimal?: boolean;
 };
-
-export let priceProps: ConfigurablePriceProps = {};
-
-export const setDefaultPriceProps = (props: ConfigurablePriceProps = {}) => {
-	priceProps = props;
-};

package/components/search/search.vue

@@ -51,9 +51,9 @@
 import { computed, ref } from 'vue';
 import { debounce as debounceFn } from 'lodash-es';
 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 { searchProps } from './types';
 
 defineOptions({
 	options: {
@@ -92,7 +92,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	disabled: false,
 	readonly: false,
 	cancelButton: false,
-	...searchProps,
+	...EC_DEFAULT_PROPS.search,
 });
 
 const emit = defineEmits<{

package/components/search/types.d.ts

@@ -10,5 +10,3 @@ export type ConfigurableSearchProps = {
     /** 是否显示取消按钮 */
     cancelButton?: boolean;
 };
-export declare let searchProps: ConfigurableSearchProps;
-export declare const setDefaultSearchProps: (props?: ConfigurableSearchProps) => void;

package/components/search/types.js

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

package/components/search/types.ts

@@ -10,9 +10,3 @@ export type ConfigurableSearchProps = {
 	/** 是否显示取消按钮 */
 	cancelButton?: boolean;
 };
-
-export let searchProps: ConfigurableSearchProps = {};
-
-export const setDefaultSearchProps = (props: ConfigurableSearchProps = {}) => {
-	searchProps = props;
-};

package/components/searching/searching.vue

@@ -12,8 +12,8 @@
 
 <script lang="ts" setup>
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { searchingProps } from './types';
 
 defineOptions({
 	options: {
@@ -34,7 +34,7 @@ type _Props = {
 withDefaults(defineProps<_Props>(), {
 	image: '',
 	text: '数据加载中',
-	...searchingProps,
+	...EC_DEFAULT_PROPS.searching,
 });
 </script>
 

package/components/searching/types.d.ts

@@ -4,5 +4,3 @@ export type ConfigurableSearchingProps = {
     /** 文本 */
     text?: string;
 };
-export declare let searchingProps: ConfigurableSearchingProps;
-export declare const setDefaultSearchingProps: (props?: ConfigurableSearchingProps) => void;

package/components/searching/types.js

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

package/components/searching/types.ts

@@ -4,11 +4,3 @@ export type ConfigurableSearchingProps = {
 	/** 文本 */
 	text?: string;
 };
-
-export let searchingProps: ConfigurableSearchingProps = {};
-
-export const setDefaultSearchingProps = (
-	props: ConfigurableSearchingProps = {}
-) => {
-	searchingProps = props;
-};

package/components/switch/switch.vue

@@ -24,8 +24,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 { switchProps } from './types';
 
 defineOptions({
 	options: {
@@ -58,7 +58,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	valueOff: false,
 	disabled: false,
 	readonly: false,
-	...switchProps,
+	...EC_DEFAULT_PROPS.switch,
 });
 
 const emit = defineEmits<{

package/components/switch/types.d.ts

@@ -4,5 +4,3 @@ export type ConfigurableSwitchProps = {
     /** 关闭状态的值 */
     valueOff?: boolean | number | string;
 };
-export declare let switchProps: ConfigurableSwitchProps;
-export declare const setDefaultSwitchProps: (props?: ConfigurableSwitchProps) => void;

package/components/switch/types.js

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

package/components/switch/types.ts

@@ -4,9 +4,3 @@ export type ConfigurableSwitchProps = {
 	/** 关闭状态的值 */
 	valueOff?: boolean | number | string;
 };
-
-export let switchProps: ConfigurableSwitchProps = {};
-
-export const setDefaultSwitchProps = (props: ConfigurableSwitchProps = {}) => {
-	switchProps = props;
-};

package/components/tab/tab.vue

@@ -47,7 +47,7 @@ import {
 	watch,
 } from 'vue';
 import useClassNames from '../../composable/component-name';
-import { tabProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -85,7 +85,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	tabs: () => [],
 	evenly: true,
 	indicator: true,
-	...tabProps,
+	...EC_DEFAULT_PROPS.tab,
 });
 
 const emit = defineEmits<{

package/components/tab/types.d.ts

@@ -4,5 +4,3 @@ export type ConfigurableTabProps = {
     /** 是否显示指示器 */
     indicator?: boolean;
 };
-export declare let tabProps: ConfigurableTabProps;
-export declare const setDefaultTabProps: (props?: ConfigurableTabProps) => void;

package/components/tab/types.js

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

package/components/tab/types.ts

@@ -4,9 +4,3 @@ export type ConfigurableTabProps = {
 	/** 是否显示指示器 */
 	indicator?: boolean;
 };
-
-export let tabProps: ConfigurableTabProps = {};
-
-export const setDefaultTabProps = (props: ConfigurableTabProps = {}) => {
-	tabProps = props;
-};

package/components/textarea/textarea.vue

@@ -73,8 +73,8 @@ import {
 	watch,
 } from 'vue';
 import useClassNames from '../../composable/component-name';
+import { EC_DEFAULT_PROPS } from '../../configs';
 import IconCpn from '../icon/icon.vue';
-import { textareaProps } from './types';
 
 defineOptions({
 	options: {
@@ -114,7 +114,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	autoHeight: true,
 	readonly: false,
 	fold: true,
-	...textareaProps,
+	...EC_DEFAULT_PROPS.textarea,
 });
 
 const emit = defineEmits<{

package/components/textarea/types.d.ts

@@ -8,5 +8,3 @@ export type ConfigurableTextareaProps = {
     /** 当只读时，如果文字过多，是否折叠 */
     fold?: boolean;
 };
-export declare let textareaProps: ConfigurableTextareaProps;
-export declare const setDefaultTextareaProps: (props?: ConfigurableTextareaProps) => void;

package/components/textarea/types.js

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

package/components/textarea/types.ts

@@ -8,11 +8,3 @@ export type ConfigurableTextareaProps = {
 	/** 当只读时，如果文字过多，是否折叠 */
 	fold?: boolean;
 };
-
-export let textareaProps: ConfigurableTextareaProps = {};
-
-export const setDefaultTextareaProps = (
-	props: ConfigurableTextareaProps = {}
-) => {
-	textareaProps = props;
-};

package/components/upload/media-upload.vue

@@ -83,8 +83,9 @@ import AspectCpn from '../aspect/aspect.vue';
 import IconCpn from '../icon/icon.vue';
 import ImageCpn from '../image/image.vue';
 import LoadingCpn from '../loading/animations/loading-animation4.vue';
-import { useUpload } from './composable.js';
-import { type CommonProps, mediaUploadProps } from './types.js';
+import { useUpload } from './composable';
+import { type CommonProps } from './types';
+import { EC_DEFAULT_PROPS } from '../../configs';
 
 defineOptions({
 	options: {
@@ -117,7 +118,7 @@ const props = withDefaults(defineProps<_Props>(), {
 	source: 'album',
 	columns: 4,
 	width: undefined,
-	...mediaUploadProps,
+	...EC_DEFAULT_PROPS.mediaUpload,
 });
 
 const emit = defineEmits<{

package/components/upload/types.d.ts

@@ -25,5 +25,3 @@ export type ConfigurableMediaUploadProps = {
     /** 自动上传文件 */
     autoUpload?: boolean;
 };
-export declare let mediaUploadProps: ConfigurableMediaUploadProps;
-export declare const setDefaultMediaUploadProps: (props?: ConfigurableMediaUploadProps) => void;

package/components/upload/types.js

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

package/components/upload/types.ts

@@ -28,11 +28,3 @@ export type ConfigurableMediaUploadProps = {
 	/** 自动上传文件 */
 	autoUpload?: boolean;
 };
-
-export let mediaUploadProps: ConfigurableMediaUploadProps = {};
-
-export const setDefaultMediaUploadProps = (
-	props: ConfigurableMediaUploadProps = {}
-) => {
-	mediaUploadProps = props;
-};

package/composable/component-name.js

@@ -1,5 +1,5 @@
 import { kebabCase, pascalCase } from 'case-anything';
-import { componentPrefix } from '../configs';
+import { EC_COMPONENT_PREFIX } from '../configs';
 /**
  * 给组件添加基本类名
  *
@@ -9,7 +9,7 @@ import { componentPrefix } from '../configs';
  * @param componentName 组件名称
  */
 const useClassNames = (componentName) => {
-    const pascalCaseClass = pascalCase(componentPrefix) + pascalCase(componentName);
+    const pascalCaseClass = pascalCase(EC_COMPONENT_PREFIX) + pascalCase(componentName);
     const kebabCaseClass = kebabCase(pascalCaseClass);
     return [pascalCaseClass, kebabCaseClass];
 };

package/composable/component-name.ts

@@ -1,5 +1,5 @@
 import { kebabCase, pascalCase } from 'case-anything';
-import { componentPrefix } from '../configs';
+import { EC_COMPONENT_PREFIX } from '../configs';
 
 /**
  * 给组件添加基本类名
@@ -11,7 +11,7 @@ import { componentPrefix } from '../configs';
  */
 const useClassNames = (componentName: string): [string, string] => {
 	const pascalCaseClass =
-		pascalCase(componentPrefix) + pascalCase(componentName);
+		pascalCase(EC_COMPONENT_PREFIX) + pascalCase(componentName);
 	const kebabCaseClass = kebabCase(pascalCaseClass);
 	return [pascalCaseClass, kebabCaseClass];
 };

package/composable/message-box.d.ts

@@ -44,9 +44,9 @@ declare const useMessageBoxComponent: (messageBoxRef?: Ref<InstanceType<typeof M
  *
  * @param isInPage 是否在 Page 中使用，当为 `true` 时，须将返回的 `pageRef` 绑定到 `Page` 组件上
  */
-declare function useMessageBox(isInPage: true): UseMessageBoxReturn & {
+declare function useMessageBox(isInPage: true, pageRef?: Ref<InstanceType<typeof Page> | undefined>): UseMessageBoxReturn & {
     /** page 组件实例 */
-    pageRef: Ref<InstanceType<typeof Page>>;
+    pageRef: Ref<InstanceType<typeof Page> | undefined>;
 };
 declare function useMessageBox(isInPage?: false): UseMessageBoxReturn;
 export { useMessageBox, useMessageBoxComponent };

package/composable/message-box.js

@@ -43,7 +43,7 @@ const useMessageBoxComponent = (messageBoxRef) => {
         showMessageBox,
     };
 };
-function useMessageBox(isInPage = false) {
+function useMessageBox(isInPage = false, pageRef) {
     if (!isInPage) {
         const pageMessageBoxRef = inject('ecolovo/page/messageBoxRef');
         if (!pageMessageBoxRef) {
@@ -51,18 +51,18 @@ function useMessageBox(isInPage = false) {
         }
         return useMessageBoxComponent(pageMessageBoxRef);
     }
-    const pageRef = ref();
+    const _pageRef = ref(pageRef);
     const show = async (options) => {
-        await pageRef.value?.show(options);
+        await _pageRef.value?.show(options);
     };
     const showConfirm = async (options) => {
-        await pageRef.value?.showConfirm(options);
+        await _pageRef.value?.showConfirm(options);
     };
     const showMessageBox = async (options) => {
-        await pageRef.value?.showMessageBox(options);
+        await _pageRef.value?.showMessageBox(options);
     };
     return {
-        pageRef,
+        pageRef: _pageRef,
         show,
         showConfirm,
         showMessageBox,

package/composable/message-box.ts

@@ -122,12 +122,18 @@ const useMessageBoxComponent = (
  *
  * @param isInPage 是否在 Page 中使用，当为 `true` 时，须将返回的 `pageRef` 绑定到 `Page` 组件上
  */
-function useMessageBox(isInPage: true): UseMessageBoxReturn & {
+function useMessageBox(
+	isInPage: true,
+	pageRef?: Ref<InstanceType<typeof Page> | undefined>
+): UseMessageBoxReturn & {
 	/** page 组件实例 */
-	pageRef: Ref<InstanceType<typeof Page>>;
+	pageRef: Ref<InstanceType<typeof Page> | undefined>;
 };
 function useMessageBox(isInPage?: false): UseMessageBoxReturn;
-function useMessageBox(isInPage: boolean = false) {
+function useMessageBox(
+	isInPage: boolean = false,
+	pageRef?: Ref<InstanceType<typeof Page> | undefined>
+) {
 	if (!isInPage) {
 		const pageMessageBoxRef = inject<Ref<InstanceType<typeof MessageBox>>>(
 			'ecolovo/page/messageBoxRef'
@@ -138,22 +144,22 @@ function useMessageBox(isInPage: boolean = false) {
 		return useMessageBoxComponent(pageMessageBoxRef);
 	}
 
-	const pageRef = ref<InstanceType<typeof Page>>();
+	const _pageRef = ref(pageRef) as Ref<InstanceType<typeof Page> | undefined>;
 
 	const show: MessageBoxShowCustomFunc = async (options) => {
-		await pageRef.value?.show(options);
+		await _pageRef.value?.show(options);
 	};
 
 	const showConfirm: MessageBoxShowConfirmFunc = async (options) => {
-		await pageRef.value?.showConfirm(options);
+		await _pageRef.value?.showConfirm(options);
 	};
 
 	const showMessageBox: MessageBoxShowMessageBoxFunc = async (options) => {
-		await pageRef.value?.showMessageBox(options);
+		await _pageRef.value?.showMessageBox(options);
 	};
 
 	return {
-		pageRef,
+		pageRef: _pageRef,
 		show,
 		showConfirm,
 		showMessageBox,

package/composable/page.js

@@ -1,5 +1,5 @@
 import { computed, onMounted, ref } from 'vue';
-import { tabbarList } from '../configs';
+import { EC_TABBAR_LIST } from '../configs';
 /** 当前页面路由 */
 const useCurrentPageRoute = () => {
     /** 当前页面栈 */
@@ -9,7 +9,7 @@ const useCurrentPageRoute = () => {
         return currentPages.value.slice(-1)[0]?.route || '';
     });
     /** 当前页面是否是 tabbar 页面，需配置 tabbarList */
-    const isTabbarPage = computed(() => tabbarList.findIndex((item) => item.pagePath === currentPageRoute.value) >= 0);
+    const isTabbarPage = computed(() => EC_TABBAR_LIST.findIndex((item) => item.pagePath === currentPageRoute.value) >= 0);
     onMounted(() => {
         currentPages.value = getCurrentPages() || [];
     });

package/composable/page.ts

@@ -1,5 +1,5 @@
 import { computed, onMounted, ref } from 'vue';
-import { tabbarList } from '../configs';
+import { EC_TABBAR_LIST } from '../configs';
 
 /** 当前页面路由 */
 const useCurrentPageRoute = () => {
@@ -12,7 +12,7 @@ const useCurrentPageRoute = () => {
 	/** 当前页面是否是 tabbar 页面，需配置 tabbarList */
 	const isTabbarPage = computed(
 		() =>
-			tabbarList.findIndex(
+			EC_TABBAR_LIST.findIndex(
 				(item) => item.pagePath === currentPageRoute.value
 			) >= 0
 	);

package/configs/index.d.ts

@@ -1,49 +1,13 @@
 import type { TabBarItem } from '@ecolovo/utils';
 /** 组件前缀 */
-declare let componentPrefix: string;
+export declare const EC_COMPONENT_PREFIX = "app";
 /** 首页路径 */
-declare let homePath: string;
+export declare const EC_HOME_PATH = "/pages/index/index";
+/** iconFont json 文件列表 */
+export declare const EC_ICON_FONT: IconFontJson[];
+/** 是否使用内部 iconFont */
+export declare const EC_USE_INNER_ICON = true;
 /** tabbar 列表 */
-declare let tabbarList: TabBarItem[];
-/**
- * 设置组件前缀
- *
- * @param prefix 组件前缀
- */
-declare function setComponentPrefix(prefix?: string): void;
-/**
- * 设置首页路径
- *
- * @param path 首页路径
- */
-declare function setHomePath(path?: string): void;
-/**
- * 设置 tabbar 列表
- *
- * @param list tabbar 列表
- */
-declare function setTabbarList(list?: TabBarItem[]): void;
-interface IconInfo {
-    /** 字体文件名 */
-    fontFamily: string;
-    /** 图标前缀 */
-    prefix: string;
-    /** 图标名称 */
-    name: string;
-}
-/** iconfont 图标 map */
-declare const iconMap: Map<string, IconInfo>;
-export interface IconFontJson {
-    font_family: string;
-    css_prefix_text: string;
-    glyphs: {
-        font_class: string;
-    }[];
-}
-/**
- * 添加一组图标，传入 iconfont.json 文件内容
- *
- * @param iconJson iconfont.json 文件内容
- */
-declare function addIcons(iconJson: IconFontJson): void;
-export { componentPrefix, homePath, tabbarList, setComponentPrefix, setHomePath, setTabbarList, iconMap, addIcons, };
+export declare const EC_TABBAR_LIST: TabBarItem[];
+/** 组件默认属性配置 */
+export declare const EC_DEFAULT_PROPS: ComponentsProps;