wui-components-v2 1.1.41 → 1.1.42

package/composables/useGlobalLoading.ts

@@ -8,8 +8,8 @@
  * 记得注释
  */
 import { defineStore } from 'pinia'
-import type { ToastOptions } from 'wot-design-uni/components/wd-toast/types'
-import { CommonUtil } from 'wot-design-uni'
+import type { ToastOptions } from '@wot-ui/ui/components/wd-toast/types'
+import { CommonUtil } from '@wot-ui/ui'
 import { getCurrentPath } from '../utils/index'
 
 interface GlobalLoading {

package/composables/useGlobalMessage.ts

@@ -1,11 +1,10 @@
 import { defineStore } from 'pinia'
-import type { MessageOptions, MessageResult } from 'wot-design-uni/components/wd-message-box/types'
-import { CommonUtil } from 'wot-design-uni'
+import { CommonUtil } from '@wot-ui/ui'
 import { getCurrentPath } from '../utils/index'
 
-export type GlobalMessageOptions = MessageOptions & {
-  success?: (res: MessageResult) => void
-  fail?: (res: MessageResult) => void
+export type GlobalMessageOptions = any & {
+  success?: (res: any) => void
+  fail?: (res: any) => void
 }
 
 interface GlobalMessage {
@@ -32,17 +31,17 @@ export const useGlobalMessage = defineStore('global-message', {
       }
     },
     alert(option: GlobalMessageOptions | string) {
-      const messageOptions = CommonUtil.deepMerge({ type: 'alert' }, CommonUtil.isString(option) ? { title: option } : option) as MessageOptions
+      const messageOptions = CommonUtil.deepMerge({ type: 'alert' }, CommonUtil.isString(option) ? { title: option } : option) as any
       messageOptions.showCancelButton = false
       this.show(messageOptions)
     },
     confirm(option: GlobalMessageOptions | string) {
-      const messageOptions = CommonUtil.deepMerge({ type: 'confirm' }, CommonUtil.isString(option) ? { title: option } : option) as MessageOptions
+      const messageOptions = CommonUtil.deepMerge({ type: 'confirm' }, CommonUtil.isString(option) ? { title: option } : option) as any
       messageOptions.showCancelButton = true
       this.show(messageOptions)
     },
     prompt(option: GlobalMessageOptions | string) {
-      const messageOptions = CommonUtil.deepMerge({ type: 'prompt' }, CommonUtil.isString(option) ? { title: option } : option) as MessageOptions
+      const messageOptions = CommonUtil.deepMerge({ type: 'prompt' }, CommonUtil.isString(option) ? { title: option } : option) as any
       messageOptions.showCancelButton = true
       this.show(messageOptions)
     },

package/composables/useGlobalToast.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
-import type { ToastOptions } from 'wot-design-uni/components/wd-toast/types'
-import { CommonUtil } from 'wot-design-uni'
+import type { ToastOptions } from '@wot-ui/ui/components/wd-toast/types'
+import { CommonUtil } from '@wot-ui/ui'
 import { getCurrentPath } from '../utils/index'
 
 interface GlobalToast {

package/composables/useLocale.ts

@@ -1,11 +1,11 @@
 import { computed, onBeforeMount } from 'vue'
-import { Locale } from 'wot-design-uni'
+import { Locale } from '@wot-ui/ui'
 // 引入英文语言包
-import enUS from 'wot-design-uni/locale/lang/en-US'
+import enUS from '@wot-ui/ui/locale/lang/en-US'
 // 引入中文语言包
-import zhCN from 'wot-design-uni/locale/lang/zh-CN'
+import zhCN from '@wot-ui/ui/locale/lang/zh-CN'
 // 引入阿拉伯语语言包
-import arSA from 'wot-design-uni/locale/lang/ar-SA'
+import arSA from '@wot-ui/ui/locale/lang/ar-SA'
 import { useManualThemeStore } from '../store/manualThemeStore'
 
 import { useLanguageStore } from '../store/language'
@@ -23,7 +23,7 @@ export function useLocale() {
   }
 
   // 系统语言切换
-  function changeSystemLocale() {
+  function changeSystemLocale() {
     switch (store.Locale.value) {
       case 'en-US':
         Locale.use('en-US', enUS)

package/composables/useMenus.ts

@@ -65,6 +65,7 @@ export function useMenus(props?: Props, pagingRef?: Ref<any>) {
     console.log(item.pageType)
     switch (item.pageType) {
       case '列表':
+        console.log(item, 'item      ')
         router.push(`/pages/list/index?sourceId=${item.id}&title=${item.title}`)
         return true
       case '树':

package/composables/useTabbar.ts

@@ -1,4 +1,4 @@
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 
 export interface TabbarItem {
   name: string
@@ -9,9 +9,8 @@ export interface TabbarItem {
   activeIcon?: string // 激活状态自定义图标路径
   inactiveIcon?: string // 未激活状态自定义图标路径
 }
-// const tabbarItems: TabbarItem[] = uni.getStorageSync('TABBARITEMS')
 export function useTabbar(tabbarItems: TabbarItem[]) {
-  const tabbarList = computed(() => tabbarItems)
+  const tabbarList = ref<TabbarItem[]>([...tabbarItems])
 
   const activeTabbar = computed(() => {
     const item = tabbarList.value.find(item => item.active)

package/index.d.ts

@@ -3,7 +3,7 @@
  */
 
 import type { App } from 'vue'
-import type { ConfigProviderThemeVars } from 'wot-design-uni'
+import type { ConfigProviderThemeVars } from '@wot-ui/ui'
 
 // 类型声明
 export interface ThemeColorOption {

package/index.ts

@@ -45,7 +45,7 @@ const coms: Array<{ name: string }> = [
   Wuilogin1,
   WuiMenus1,
   wuiSearchHistoryBabbar,
-  wuienumeSelectControl
+  wuienumeSelectControl,
 ]
 
 /**
@@ -74,7 +74,7 @@ export {
   iData, // PAD扫描
   // nfc, // nfc读取
   useLanguageStore, // 语言
-  
+
 }
 
 export default install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.41",
+  "version": "1.1.42",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",

package/store/language.ts

@@ -36,7 +36,7 @@ export const useLanguageStore = defineStore('language', () => {
 
       const data: LanguagePackage = response.value
       return data
-    }
+    }
     catch (error) {
       console.error(`Error loading language package for ${lang}:`, error)
       // 返回空对象，避免程序崩溃
@@ -49,24 +49,21 @@ export const useLanguageStore = defineStore('language', () => {
    */
   const loadLanguage = async (lang: string): Promise<void> => {
     console.log(`网络加载语言 ${lang}...`)
-    // if (loadedLanguages.value.includes(lang)) {
-    //   // 如果已加载过该语言，直接切换
-    //   currentLanguage.value = lang
-    //   return
-    // }
+    if (loadedLanguages.value.includes(lang)) {
+      currentLanguage.value = lang
+      return
+    }
 
     loading.value = true
     try {
       const langPack = await loadLanguageFromNetwork(lang)
 
-      // 更新语言包数据
       languagePackages.value[lang] = langPack
 
-      //   loadedLanguages.value.push(lang)
+      loadedLanguages.value.push(lang)
 
-      // 设置当前语言
       currentLanguage.value = lang
-    }
+    }
     finally {
       loading.value = false
     }
@@ -94,7 +91,7 @@ export const useLanguageStore = defineStore('language', () => {
         if (!loadedLanguages.value.includes(lang)) {
           loadedLanguages.value.push(lang)
         }
-      }
+      }
       else {
         console.error(`Failed to preload language ${languages[index]}:`, result.reason)
       }

package/store/manualThemeStore.ts

@@ -24,6 +24,7 @@ export const useManualThemeStore = defineStore('manualTheme', {
       darkColor2: '#e0e0e0',
       darkColor3: '#a0a0a0',
       colorTheme: themeColorOptions[0].primary,
+      colorPrimary: themeColorOptions[0].primary, // 添加主色调变量，用于 tabbar 等组件
     },
   }),
 
@@ -72,6 +73,7 @@ export const useManualThemeStore = defineStore('manualTheme', {
     setCurrentThemeColor(color: ThemeColorOption) {
       this.currentThemeColor = color
       this.themeVars.colorTheme = color.primary
+      this.themeVars.colorPrimary = color.primary // 同步更新主色调变量
     },
 
     /**

package/store/persist.ts

@@ -8,7 +8,7 @@
  * 记得注释
  */
 import type { PiniaPluginContext } from 'pinia'
-import { CommonUtil } from 'wot-design-uni'
+import { CommonUtil } from '@wot-ui/ui'
 
 function persist({ store }: PiniaPluginContext, excludedIds: string[]) {
   // 检查当前store的id是否在排除列表中

package/type.ts

@@ -58,6 +58,7 @@ export interface Config extends Groups {
   mainPicture?: Columns
   defaultCriteriaValue?: { [key: string]: string }
   split2TabCriterias?: Split2TabCriterias[]
+  extShowConfig?: { [key: string]: any }
 }
 
 // 列表数据

package/utils/control-type-supportor.ts

@@ -58,6 +58,7 @@ SupportInputTypes.add('float')
 SupportInputTypes.add('double')
 SupportInputTypes.add('int')
 SupportInputTypes.add('relselect')
+SupportInputTypes.add('relselect-extdis')
 SupportInputTypes.add('relselectvalue')// 弃用
 SupportInputTypes.add('entity-select-value')
 SupportInputTypes.add('refselect')
@@ -113,6 +114,9 @@ ControlTypeSupportor.isSupport = function (type: string): boolean {
   }
 }
 ControlTypeSupportor.getSupportControlType = function (fieldConfig: Fields): string {
+  if (!fieldConfig) {
+    return 'text'
+  }
   if (this.isSupport(fieldConfig.extControlType)) {
     return fieldConfig.extControlType
   }

package/utils/index.ts

@@ -955,3 +955,25 @@ export class RainbowColorGenerator {
     return this.lastColorHex
   }
 }
+/**
+ * 格式化手机号
+ * @param phone 手机号字符串
+ * @param mask 隐藏码，默认为****
+ * @returns 格式化后的手机号字符串
+ */
+export function formatPhone(phone: string, mask = '****') {
+  if (!phone) return '';
+
+  const cleanPhone = phone.replace(/\D/g, '');
+  const len = cleanPhone.length;
+
+  // 根据号码长度决定显示方式
+  if (len === 11) {
+    return cleanPhone.slice(0, 3) + mask + cleanPhone.slice(-4);
+  } else if (len === 8) {
+    // 座机号码等短号码
+    return cleanPhone.slice(0, 2) + mask + cleanPhone.slice(-2);
+  }
+
+  return phone;
+}