wui-components-v2 1.1.34 → 1.1.36

package/api/sys.ts

@@ -1,7 +1,7 @@
 import req from './core/index'
 // 获取语言包
-export function language(language:string): Promise<any> {
+export function language(language: string): Promise<any> {
   return req({
     url: `/v3/multilingual?language=${language}`,
   })
-}
+}

package/components/card-botom-buttons/card-botom-buttons.vue

@@ -197,7 +197,7 @@ function closeMoreButn() {
 }
 
 // 点击更多按钮
-function select({ item }) {
+function select({ item }: { item: any }) {
   message.confirm({
     msg: `确定${item.title}操作吗？`,
     title: '提示',
@@ -225,9 +225,16 @@ function select({ item }) {
         {{ subitem.title }}
       </wd-button>
     </view> -->
-    <wd-button v-if="morebutns.length > 0" size="small" type="info" @click="() => { showMoreButn = true }">
-      更多
-    </wd-button>
+    <view>
+      <wd-button v-if="morebutns.length > 3" size="small" type="info" @click="() => { showMoreButn = true }">
+        更多
+      </wd-button>
+      <view v-else>
+        <wd-button v-for="subitem in morebutns" :key="subitem.id" plain size="small" @click="() => { select({ item: subitem }) }">
+          {{ subitem.title }}
+        </wd-button>
+      </view>
+    </view>
 
     <wd-button v-if="props.item.buttons.includes('dtmplEdit')" size="small" @click="edit()">
       编辑
@@ -238,9 +245,9 @@ function select({ item }) {
     <wd-button v-if="props.item.buttons.includes('singleDelete')" size="small" type="error" @click="del()">
       删除
     </wd-button>
-    <ActionPopup
+    <ActionPopup
       v-model:show="actionItemShow" :enum-column="props.enumColumn" :zpaging="props.zpaging"
-      :field-group="actionItem" :code="props.code"
+      :field-group="actionItem" :code="props.code"
     />
     <!-- 更多按钮 -->
     <wd-action-sheet v-model="showMoreButn" :actions="morebutns" @close="closeMoreButn" @select="select" />

package/components/enume-select-control/enume-select-control.vue

@@ -0,0 +1,77 @@
+<script lang="ts" setup>
+import { ref ,defineProps,defineEmits,onMounted,computed} from 'vue'
+import { useEnums } from '../../composables/useEnumes'
+import type { Config, Entities, Enums } from '../../type'
+import {pageConfig } from '../../api/page'
+defineOptions({
+  name: 'EnumeSelectControl',
+})
+
+const props = defineProps<{
+  sourceId: string
+  id:string
+  label?:string
+  title?:string
+  modelValue:string
+  placeholder?:string
+  disabled?:boolean
+  required?:boolean
+  rules?:any
+  zIndex?:number
+  type:'checkbox'|'radio'
+}>()
+const emits=defineEmits(['update:modelValue'])
+
+const config=ref<Config>()
+const { enumColumn,getEnums }= useEnums({ config })
+async function getPageConfig() {
+  try {
+    const res = await pageConfig(props.sourceId)
+
+    if (res.ltmplConfig) {
+      config.value = res.ltmplConfig
+      getEnums()
+    }
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
+const comEnums=computed(()=>{
+    const mstrucId=config.value?.criterias?.find((item)=>item.sourceId===props.id)?.mstrucId
+  
+    if(mstrucId)return enumColumn.value[mstrucId]?.map((item)=>{
+        return {
+            id:item.id,
+            label:item.title,
+            value:`${item.id}@R@${item.value}`
+        }
+    })
+
+    return []
+    
+})
+
+onMounted(()=>{
+    getPageConfig()
+})
+
+const confirm=(event:any)=>{
+  emits('update:modelValue',event.value)
+}
+</script>
+
+<script lang="ts">
+export default {
+  options: {
+    virtualHost: true,
+    addGlobalClass: true,
+    styleIsolation: 'shared',
+  },
+}
+</script>
+
+<template>
+  <wd-select-picker :title="props.title" :placeholder="props.placeholder" :disabled="props.disabled" :required="props.required" :rules="props.rules" :zIndex="props.zIndex" :type="$props.type"  :modelValue="modelValue"  :label="props.label" @confirm="confirm" :columns="comEnums"></wd-select-picker>
+</template>

package/components/wui-details-page/wui-details-page.vue

@@ -36,6 +36,7 @@ const groups = ref<Groups>({
   relationNames: [],
   readOnly: false,
   displayConfig: [],
+
 })
 const loading = ref(false)
 // 折叠面板
@@ -133,7 +134,7 @@ async function getDetailData() {
             <view v-for="(field, subindex) in data.arrayMap[group.id]" :key="field.code">
               <foldCard :index="subindex" :enum-column="{}" :groups="group" :source-id="sourceId" :columns="group.fields" model="complex" :data="field">
                 <template #buttons>
-                  <CardBotomButtons :source-id="group.id" :item="groups" :code="field.code" :data="data" />
+                  <CardBotomButtons :primary-column="group.primaryColumn || { controlType: '', extControlType: '', sourceId: '', mstrucId: '' }" :source-id="group.id" :item="groups" :code="field.code" :data="data" />
                 </template>
               </foldCard>
             </view>
@@ -141,5 +142,6 @@ async function getDetailData() {
         </wd-collapse-item>
       </wd-collapse>
     </view>
+    <slot name="botombuttons" />
   </view>
 </template>

package/components/wui-list/wui-list.vue

@@ -1,23 +1,23 @@
 <script lang="ts" setup>
 import { defineOptions, defineProps, onMounted, onUnmounted, ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
-import { enums, listData, pageConfig, pageKey } from '../../api/page'
+import {listData, pageConfig, pageKey } from '../../api/page'
 import foldCard from '../fold-card/fold-card.vue'
-import type { Config, Entities, Enums } from '../../type'
+import type { Config, Entities } from '../../type'
 import Search from '../search/search.vue'
 import ListTopButtons from '../list-top-buttons/list-top-buttons.vue'
 import CardBotomButtons from '../card-botom-buttons/card-botom-buttons.vue'
 import { generateHighResolutionID } from '../../utils/index'
 import productCard from '../product-card/product-card.vue'
 import tabSearch from '../tab-search/tab-search.vue'
-import ControlTypeSupportor from '../../utils/control-type-supportor'
-
+import {useEnums} from '../../composables/useEnumes'
 defineOptions({
   name: 'WuiList',
 })
 defineProps<{
   detailButtonHandle?: (data: Entities) => void
 }>()
+
 const Zpaging = ref<any>(null)
 const config = ref<Config>({
   buttons: [],
@@ -57,13 +57,13 @@ const config = ref<Config>({
   displayConfig: [],
   showType: 'table',
 })
+const { getEnums, enumColumn} = useEnums({ config })
 const sourceId = ref('')
 const datas = ref<Entities[]>([])
 const pageTitle = ref('')
 const searchData = ref('')
 const tabSearchData = ref('')
 const pageType = ref('')
-const enumColumn = ref<Enums>({})
 const mainCode = ref('')
 const addEvent = generateHighResolutionID()// 全局事件名称
 onLoad((option: any) => {
@@ -143,40 +143,6 @@ async function queryList(pageNo: number, pageSize: number) {
   }
 }
 
-// 获取枚举
-async function getEnums() {
-  try {
-    const params: string[] = []
-    const criterias = config.value?.criterias ?? []
-    const columns = config.value.columns ?? []
-    const writes = config.value.rowActions?.reduce((acc: any, cur: any) => {
-      return [...acc, ...cur.writes]
-    }, []) || []
-    columns.forEach((item: any) => {
-      if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
-        params.push(`mstrucIds=${item.mstrucId}`)
-      }
-    })
-    criterias.forEach((item: any) => {
-      if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
-        params.push(`mstrucIds=${item.mstrucId}`)
-      }
-    })
-    writes.forEach((item: any) => {
-      if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
-        params.push(`mstrucIds=${item.mstrucId}`)
-      }
-    })
-    if (!params.length)
-      return
-    const res = await enums(params.join('&'))
-    enumColumn.value = res.enumMap || {}
-  }
-  catch (error) {
-    console.log('error:', error)
-  }
-}
-
 function submitSearch(data: any) {
   searchData.value = data
   // for (const key in data) {

package/components/wui-menus1/components/quick-panel.vue

@@ -2,7 +2,8 @@
 import { computed, defineOptions } from 'vue'
 import { RainbowColorGenerator } from '../../../utils'
 import { useSectionMenus } from '../../../composables/useSectionMenus'
-import {useLanguageStore} from '../../../store/language'
+import { useLanguageStore } from '../../../store/language'
+
 defineOptions({
   name: 'QuickPanel',
 })
@@ -40,7 +41,7 @@ const cstatistics = computed(() => {
               {{ item.count }}
             </view>
             <view class="text-size-3 color-gray">
-              {{  languageStore.t(item.title)}}
+              {{ languageStore.t(item.title) }}
             </view>
           </view>
         </view>

package/components/wui-menus1/components/section-menus.vue

@@ -2,7 +2,8 @@
 import { computed, defineOptions } from 'vue'
 import { useMenus } from '../../../composables/useMenus'
 import { RainbowColorGenerator } from '../../../utils/index'
-import {useLanguageStore} from '../../../store/language'
+import { useLanguageStore } from '../../../store/language'
+
 defineOptions({
   name: 'SectionMenus',
 })
@@ -50,7 +51,7 @@ const sectionmenuColor = computed(() => {
           <text class="i-carbon:grid text-lg .dark:text-white .light:text-#FFF" />
         </view>
         <text class="recent-label .dark:text-white .light:text-#4b5563">
-          {{languageStore.t( i.title )}}
+          {{ languageStore.t(i.title) }}
         </text>
       </view>
     </view>

package/components/wui-menus1/wui-menus.vue

@@ -5,12 +5,13 @@ import DemoCard from '../demo-card/demo-card.vue'
 import { useMenus } from '../../composables/useMenus'
 import type { Icon } from '../../composables/useMenus'
 import wuiNotifyInfo from '../wui-notify-info/wui-notify-info.vue'
+import { useLanguageStore } from '../../store/language'
 import sectionMenus from './components/section-menus.vue'
 import navbar from './components/navbar.vue'
 import quickPanel from './components/quick-panel.vue'
 import bannerCarousel from './components/banner-carousel.vue'
-import searchBar from './components/search-bar.vue'
-import {useLanguageStore} from '../../store/language'
+import searchBar from './components/search-bar.vue'
+
 defineOptions({
   name: 'WuiMenus1',
 })
@@ -72,12 +73,12 @@ const {
               <text class="i-carbon:apps text-sm" />
             </view> -->
             <text class="section-title .dark:text-white .light:color-#1f2937">
-              {{languageStore.t('全部功能')}}
+              {{ languageStore.t('全部功能') }}
             </text>
           </view>
           <view class="section-tag">
             <text class="tag-text">
-              {{ filtermenu.length }} {{languageStore.t('个分类')}}
+              {{ filtermenu.length }} {{ languageStore.t('个分类') }}
             </text>
           </view>
         </view>
@@ -106,7 +107,7 @@ const {
                   <template #text>
                     <view class="menu-text-wrapper">
                       <view class="menu-title .dark:text-white .light:color-#1f2937">
-                        {{languageStore.t( subItem.title) }}
+                        {{ languageStore.t(subItem.title) }}
                       </view>
                       <!-- <view class="menu-badge" v-if="subIndex === 0">
                         <text class="badge-dot" />

package/components/wui-notify-info/notify-handle.vue

@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { defineOptions, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import wuiDetailsPage from '../wui-details-page/wui-details-page.vue'
+import cardBotomButtons from '../card-botom-buttons/card-botom-buttons.vue'
+
+defineOptions({
+  name: 'NotifyHandle',
+})
+const item = ref<any>(null)
+const sourceId = ref<any>(null)
+const pagedata = ref<any>(null)
+const rowActions = ref<any>(null)
+const actions = ref<any>(null)
+const ractions = ref<any>(null)
+const primaryColumn = ref<any>(null)
+const enumColumn = ref<any>(null)
+onLoad(() => {
+  console.log('load')
+  uni.$on('notify-click', (data: any) => {
+    console.log(data, 'kkkk')
+    item.value = data.item
+    sourceId.value = data.sourceId
+    pagedata.value = data.data
+    rowActions.value = data.rowActions
+    actions.value = data.actions
+    ractions.value = data.ractions
+    primaryColumn.value = data.primaryColumn
+    enumColumn.value = data.enumColumn
+  })
+})
+onUnload(() => {
+  console.log('unload')
+  uni.$off('notify-click')
+})
+</script>
+
+<template>
+  <view>
+    <wuiDetailsPage>
+      <template #botombuttons>
+        <view class="flex justify-end bg-#ffff p-4">
+          <cardBotomButtons v-if="sourceId" :item="item" :source-id="sourceId" :code="pagedata.code" :data="pagedata" :row-actions="rowActions" :actions="actions" :ractions="ractions" :primary-column="primaryColumn" />
+        </view>
+      </template>
+    </wuiDetailsPage>
+    <view />
+  </view>
+</template>
+
+<style scoped>
+
+</style>

package/components/wui-notify-info/wui-notify-info.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { computed, defineOptions, watch } from 'vue'
 import { useRouter } from 'uni-mini-router'
-import { listData, pageConfig, pageKey } from '../../api/page'
+import { enums, listData, pageConfig, pageKey } from '../../api/page'
 import { useSectionMenus } from '../../composables/useSectionMenus'
 import { formatItemData } from '../../utils'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
-import {useLanguageStore} from '../../store/language'
+import { useLanguageStore } from '../../store/language'
+import type { Config, Entities, Enums } from '../../type'
+
 defineOptions({
   name: 'WuiNotifyInfo',
 })
@@ -19,22 +21,27 @@ const { rightSidebar01, rightSidebar02 } = useSectionMenus()
 //     default: return BellIcon
 //   }
 // }
+const dtmplConfig = ref<{ [key: string]: Config }>({})
+const enumColumn = ref<{ [key: string]: Enums }>({})
+interface Data {
+  type: 'system'
+  read: boolean
+  id: string
+  primaryColumn: string
+  primaryColumnLabel: string
+  secondColumn: string
+  secondColumnLabel: string
+  primaryColumnLabelConfig: any
+  primaryColumnConfig: any
+  secondColumnConfig: any
+  secondColumnLabelConfig: any
+  sourceid: string
+  data: Entities
+}
 interface Notification {
   id: string
   title: string
-  data: {
-    type: 'system'
-    read: boolean
-    id: string
-    primaryColumn: string
-    primaryColumnLabel: string
-    secondColumn: string
-    secondColumnLabel: string
-    primaryColumnLabelConfig: any
-    primaryColumnConfig: any
-    secondColumnConfig: any
-    secondColumnLabelConfig: any
-  }[]
+  data: Data[]
 }
 const router = useRouter()
 const notifications = ref<Notification[] | null>([])
@@ -56,17 +63,51 @@ const sources = computed(() => {
     }
   })
 })
-
+// 获取枚举
+async function getEnums(sourceId: string, config: Config) {
+  try {
+    const params: string[] = []
+    const criterias = config?.criterias ?? []
+    const columns = config?.columns ?? []
+    const writes = config?.rowActions?.reduce((acc: any, cur: any) => {
+      return [...acc, ...cur.writes]
+    }, []) || []
+    columns.forEach((item: any) => {
+      if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
+        params.push(`mstrucIds=${item.mstrucId}`)
+      }
+    })
+    criterias.forEach((item: any) => {
+      if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
+        params.push(`mstrucIds=${item.mstrucId}`)
+      }
+    })
+    writes.forEach((item: any) => {
+      if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
+        params.push(`mstrucIds=${item.mstrucId}`)
+      }
+    })
+    if (!params.length)
+      return
+    const res = await enums(params.join('&'))
+    enumColumn.value[sourceId] = res.enumMap || {}
+  }
+  catch (error) {
+    console.log('error:', error)
+  }
+}
 // 获取数据
 async function queryList(source: { id: string, title: string }): Promise<Notification | null> {
   try {
     const res = await pageConfig(source.id)
+    dtmplConfig.value[source.id] = res.ltmplConfig
+    getEnums(source.id, res.ltmplConfig)
     const res1 = await pageKey(source.id, '', '')// 获取key
     const data = await listData(res1.key, 1, 10)// 获取数据
     return {
       id: source.id,
       title: source.title,
-      data: data.entities.map((item: any) => {
+      data: data.entities.map((item: Entities) => {
         return {
           type: 'system',
           read: false,
@@ -80,6 +121,7 @@ async function queryList(source: { id: string, title: string }): Promise<Notific
           secondColumnConfig: res.ltmplConfig.secondColumn,
           secondColumnLabel: item.fieldMap[res.ltmplConfig.secondColumnLabel?.sourceId] || '',
           secondColumnLabelConfig: res.ltmplConfig.secondColumnLabel,
+          data: item,
         }
       }),
     }
@@ -126,8 +168,22 @@ function gotoPage(item: Notification) {
 }
 
 // 跳转详情页面
-function gotoDetailPage(item: any) {
-  router.push(`/pages/details-page/index?sourceId=${item.sourceid}&id=${item.id}&title=`)
+function gotoDetailPage(item: Data) {
+  router.push(`/pages/notify-handle/index?sourceId=${item.sourceid}&id=${item.id}&title=`)
+
+  // 延迟发送，确保事件被发送
+  setTimeout(() => {
+    uni.$emit('notify-click', {
+      item: dtmplConfig.value[item.sourceid],
+      sourceId: item.sourceid,
+      data: item.data,
+      rowActions: dtmplConfig.value[item.sourceid]?.rowActions,
+      actions: dtmplConfig.value[item.sourceid]?.actions,
+      ractions: dtmplConfig.value[item.sourceid]?.ractions,
+      primaryColumn: dtmplConfig.value[item.sourceid]?.primaryColumn,
+      enumColumn: enumColumn.value[item.sourceid],
+    })
+  }, 100)
 }
 </script>
 
@@ -141,42 +197,44 @@ function gotoDetailPage(item: any) {
 
     <view v-for="notification in notifications" :key="notification.id" class="space-y-3">
       <view class="mt-2 flex justify-between text-size-3 color-gray .dark:text-white">
-        <view>{{languageStore.t(notification.title)  }}</view>
+        <view>{{ languageStore.t(notification.title) }}</view>
         <view @click="() => { gotoPage(notification) }">
-          {{  languageStore.t('查看全部')  }}
+          {{ languageStore.t('查看全部') }}
         </view>
       </view>
-      <button
-        v-for="item in notification.data"
-        :key="item.id"
+      <button
+        v-for="item in notification.data" :key="item.id"
         class="w-full flex cursor-pointer items-start gap-3 rounded-xl bg-white p-4 text-left shadow-[0_4px_16px_rgba(99,102,241,0.1)] transition-all duration-200 .dark:bg-black hover:shadow-md"
-        :class="{ 'opacity-60': item.read }"
-        @click="handleNotificationClick(item)"
+        :class="{ 'opacity-60': item.read }" @click="handleNotificationClick(item)"
       >
-        <view
+        <view
           :class="getIconColor(item.type)"
-          class="h-10 w-10 flex flex-shrink-0 items-center justify-center rounded-full"
+          class="h-10 w-10 flex flex-shrink-0 items-center justify-center rounded-full"
         >
           <wd-icon name="notification" size="40rpx" color="#fff" />
         </view>
 
         <view class="min-w-0 flex-1">
           <view class="flex justify-between gap-1">
-            <span class="text-sm text-slate-800 font-medium .dark:text-white">{{ formatItemData(item.primaryColumn, ControlTypeSupportor.getControlType(item.primaryColumnConfig)) }}</span>
-            <span class="text-xs text-slate-400 .dark:text-white whitespace-nowrap">{{ formatItemData(item.primaryColumnLabel, ControlTypeSupportor.getControlType(item.primaryColumnLabelConfig)) }}</span>
+            <span class="text-sm text-slate-800 font-medium .dark:text-white">{{ formatItemData(item.primaryColumn,
+                                                                                                ControlTypeSupportor.getControlType(item.primaryColumnConfig)) }}</span>
+            <span class="whitespace-nowrap text-xs text-slate-400 .dark:text-white">{{
+              formatItemData(item.primaryColumnLabel,
+                             ControlTypeSupportor.getControlType(item.primaryColumnLabelConfig)) }}</span>
           </view>
           <p class="line-clamp-2 mt-1 text-sm text-slate-500 .dark:text-white">
             <text class="mr-1">
-              {{ formatItemData(item.secondColumn, ControlTypeSupportor.getControlType(item.secondColumnConfig||{})) }}
+              {{ formatItemData(item.secondColumn, ControlTypeSupportor.getControlType(item.secondColumnConfig || {}))
+              }}
+            </text>
+            <text>
+              {{ formatItemData(item.secondColumnLabel,
+                                ControlTypeSupportor.getControlType(item.secondColumnLabelConfig || {})) }}
             </text>
-            <text> {{ formatItemData(item.secondColumnLabel, ControlTypeSupportor.getControlType(item.secondColumnLabelConfig||{})) }}</text>
           </p>
         </view>
 
-        <view
-          v-if="!item.read"
-          class="mt-2 h-2 w-2 flex-shrink-0 rounded-full bg-indigo-500"
-        />
+        <view v-if="!item.read" class="mt-2 h-2 w-2 flex-shrink-0 rounded-full bg-indigo-500" />
       </button>
     </view>
   </view>

package/components/wui-search-history-babbar/components/SearchBar.vue

@@ -41,7 +41,7 @@ defineExpose({ addToHistory })
   <view v-if="modelValue.length > 0" class="mt-4">
     <view class="mb-3 flex items-center justify-between">
       <view class="flex items-center gap-2">
-        <ClockIcon class="h-4 w-4 text-slate-400" />
+        <!-- <ClockIcon class="h-4 w-4 text-slate-400" /> -->
         <view class="text-sm text-slate-600 font-medium">
           搜索历史
         </view>
@@ -62,7 +62,8 @@ defineExpose({ addToHistory })
       >
         <!-- <MagnifyingGlassCircleIcon class="h-3.5 w-3.5" /> -->
         <view>{{ keyword }}</view>
-        <wd-icon name="close-normal" size="16px" class="flex items-center" @click.stop="removeFromHistory(keyword)" />
+        <wd-icon name="close-normal" size="16px" class="flex items-center" @click.stop="removeFromHistory(keyword)" />
+        <!-- <wd-icon name="close-bold" size="22px" @click.stop="removeFromHistory(keyword)" ></wd-icon> -->
       </view>
     </view>
   </view>

package/components/wui-search-history-babbar/wui-search-history-babbar.vue

@@ -1,61 +1,101 @@
 <script setup lang="ts">
 import { computed, defineOptions, onMounted, ref } from 'vue'
-// import { useRouter } from 'vue-router'
+import { useRouter } from 'uni-mini-router'
+import { useMenus } from '../../composables/useMenus'
+import type { MenuItem } from '../../composables/useMenus'
+import { useGlobalToast } from '../../composables/useGlobalToast'
+import { menu } from '../../api/menu'
 import SearchHistory from './components/SearchBar.vue'
 
 defineOptions({
   name: 'WuiSearchHistoryBabbar',
 })
-// const router = useRouter()
-const allMenus: any = [
-  { id: 1, label: '打卡', icon: 'clock', color: 'bg-blue-500', description: '上下班打卡签到' },
-  { id: 2, label: '报销', icon: 'document-text', color: 'bg-green-500', description: '提交报销单据' },
-  { id: 3, label: '审批', icon: 'check-circle', color: 'bg-purple-500', description: '审批流程管理' },
-  { id: 4, label: '日程', icon: 'calendar', color: 'bg-orange-500', description: '查看和安排日程' },
-  { id: 5, label: '通讯录', icon: 'user-group', color: 'bg-indigo-500', description: '企业通讯录' },
-  { id: 6, label: '更多', icon: 'ellipsis-horizontal', color: 'bg-slate-500', description: '更多应用' },
-  { id: 7, label: '请假', icon: 'arrow-right-circle', color: 'bg-rose-500', description: '申请请假' },
-  { id: 8, label: '考勤', icon: 'clipboard-check', color: 'bg-cyan-500', description: '考勤记录查询' },
-  { id: 9, label: '会议', icon: 'video-camera', color: 'bg-violet-500', description: '会议室预约' },
-  { id: 10, label: '文档', icon: 'folder', color: 'bg-amber-500', description: '文档管理中心' },
-  { id: 11, label: '项目管理', icon: 'chart-bar', color: 'bg-emerald-500', description: '项目进度管理' },
-  { id: 12, label: 'CRM', icon: 'user-circle', color: 'bg-pink-500', description: '客户关系管理' },
-  { id: 13, label: '人力资源', icon: 'identification', color: 'bg-teal-500', description: 'HR管理' },
-  { id: 14, label: '财务管理', icon: 'banknotes', color: 'bg-lime-500', description: '财务相关操作' },
-  { id: 15, label: '资产管理', icon: 'cube', color: 'bg-fuchsia-500', description: '企业资产管理' },
-  { id: 16, label: '公告', icon: 'megaphone', color: 'bg-red-500', description: '公司公告通知' },
-  { id: 17, label: '任务', icon: 'check-badge', color: 'bg-sky-500', description: '任务分配与跟踪' },
-  { id: 18, label: '笔记', icon: 'pencil-square', color: 'bg-yellow-500', description: '个人笔记' },
-  { id: 19, label: '邮件', icon: 'envelope', color: 'bg-blue-600', description: '企业邮件' },
-  { id: 20, label: '云盘', icon: 'cloud', color: 'bg-indigo-600', description: '云端文件存储' },
-  { id: 21, label: '设置', icon: 'cog-6-tooth', color: 'bg-gray-500', description: '个人设置' },
-]
+
+const { gotoPage, filtermenu, menuList } = useMenus()
+const router = useRouter()
+const toast = useGlobalToast()
+
+function queryList() {
+  // 此处请求仅为演示，请替换为自己项目中的请求
+  menu().then((res: any) => {
+    if (!res?.blocks?.length) {
+      toast.warning('暂无权限，请重新登录或联系管理员')
+      setTimeout(() => {
+        router.replaceAll('/pages/login/index')
+      }, 1000)
+    }
+    else {
+      menuList.value = res?.blocks
+    }
+  }).catch((res: any) => {
+    console.log(res)
+  })
+}
+
+/**
+ * 提取树形结构中最深层的数据节点
+ * @param treeData - 树形结构数据
+ * @param childrenKey - 子节点的键名，默认为 'children'
+ * @returns 最深层节点组成的数组
+ */
+function extractDeepestNodes<T>(
+  treeData: T[],
+  childrenKey: string = 'children',
+): T[] {
+  const result: T[] = []
+
+  /**
+   * 递归遍历树节点
+   */
+  function traverse(nodes: T[], depth: number = 0) {
+    for (const node of nodes) {
+      // 检查当前节点是否有子节点
+      const children = (node as any)[childrenKey]
+
+      if (children && Array.isArray(children) && children.length > 0) {
+        // 如果有子节点，继续深入
+        traverse(children, depth + 1)
+      }
+      else {
+        // 如果没有子节点，这是最深层的节点，添加到结果中
+        result.push(node)
+      }
+    }
+  }
+
+  traverse(treeData)
+  return result
+}
+
+const a = computed(() => {
+  return extractDeepestNodes(filtermenu.value, 'items')
+})
 
 const searchQuery = ref('')
 const searchHistory = ref<string[]>([])
 const inputRef = ref<HTMLInputElement | null>(null)
 
-const filteredMenus = computed(() => {
+const filteredMenus = computed<MenuItem[]>(() => {
   if (!searchQuery.value.trim()) {
-    return allMenus
+    return a.value
   }
   const query = searchQuery.value.toLowerCase().trim()
-  return allMenus.filter(menu =>
-    menu.label.toLowerCase().includes(query)
-    || (menu.description && menu.description.toLowerCase().includes(query)),
+  return a.value.filter(menu =>
+    menu.title.toLowerCase().includes(query)
+    || (menu.tip && menu.tip.toLowerCase().includes(query)),
   )
 })
 
-function highlightedLabel(menu: any) {
-  if (!searchQuery.value.trim())
-    return menu.label
+function highlightedLabel(menu: MenuItem) {
+  if (!searchQuery.value.trim())
+    return menu.title
   const query = searchQuery.value.toLowerCase().trim()
-  const index = menu.label.toLowerCase().indexOf(query)
-  if (index === -1)
-    return menu.label
-  const before = menu.label.substring(0, index)
-  const match = menu.label.substring(index, index + query.length)
-  const after = menu.label.substring(index + query.length)
+  const index = menu.title.toLowerCase().indexOf(query)
+  if (index === -1)
+    return menu.title
+  const before = menu.title.substring(0, index)
+  const match = menu.title.substring(index, index + query.length)
+  const after = menu.title.substring(index + query.length)
   return `${before}<mark class="bg-yellow-200 text-yellow-800 rounded px-0.5">${match}</mark>${after}`
 }
 
@@ -65,18 +105,18 @@ function highlightedLabel(menu: any) {
 
 function handleClear() {
   searchQuery.value = ''
-  inputRef.value?.focus()
+  inputRef?.value?.focus()
 }
 
-function handleMenuClick(menu: any) {
+function handleMenuClick(menu: MenuItem) {
   if (searchQuery.value.trim()) {
     addToHistory(searchQuery.value.trim())
   }
-  console.log('Menu clicked:', menu.label)
+  gotoPage(menu)
 }
 
 function addToHistory(keyword: string) {
-  if (!keyword.trim())
+  if (!keyword.trim())
     return
   const current = [...searchHistory.value]
   const index = current.indexOf(keyword)
@@ -96,16 +136,16 @@ function handleSelectHistory(keyword: string) {
 }
 
 onMounted(() => {
+  queryList()
   const saved = localStorage.getItem('searchHistory')
   if (saved) {
     try {
       searchHistory.value = JSON.parse(saved)
-    }
+    }
     catch {
       searchHistory.value = []
     }
   }
-  inputRef.value?.focus()
 })
 </script>
 
@@ -113,7 +153,7 @@ onMounted(() => {
   <view class="min-h-screen bg-slate-50">
     <view class="sticky top-0 z-10 bg-white shadow-sm">
       <view class="flex items-center gap-3 px-4 py-3">
-        <view class="h-11 flex flex-1 items-center rounded-xl bg-slate-100 px-4">
+        <view class="h-11 flex flex-1 items-center rounded-xl bg-slate-100 px-4">
           <input
             ref="inputRef"
             v-model="searchQuery"
@@ -126,7 +166,7 @@ onMounted(() => {
             class="cursor-pointer rounded-full p-1 transition-colors hover:bg-slate-200"
             @click="handleClear"
           >
-            <XMarkIcon class="h-4 w-4 text-slate-400" />
+            <wd-icon name="close-circle-filled" size="22px" color="#ccc" />
           </view>
         </view>
       </view>
@@ -139,24 +179,24 @@ onMounted(() => {
       />
 
       <view v-if="filteredMenus.length === 0" class="mt-6">
-        <p class="text-center text-sm text-slate-400">
-          未找到相关菜单
+        <p class="text-center text-sm text-slate-400">
+          未找到相关菜单
         </p>
       </view>
 
       <view v-else class="mt-4">
-        <p class="mb-3 text-xs text-slate-400">
-          {{ searchQuery.trim() ? `找到 ${filteredMenus.length} 个相关菜单` : '全部菜单' }}
+        <p class="mb-3 text-xs text-slate-400">
+          {{ searchQuery.trim() ? `找到 ${filteredMenus.length} 个相关菜单` : '全部菜单' }}
         </p>
         <view class="space-y-2">
           <view
             v-for="menu in filteredMenus"
             :key="menu.id"
-            class="w-full flex cursor-pointer items-center gap-3 rounded-xl bg-white p-3 shadow-sm transition-all duration-200 active:scale-[0.98] hover:shadow-md"
+            class="flex cursor-pointer items-center gap-3 rounded-xl bg-white p-3 shadow-sm transition-all duration-200 active:scale-[0.98] hover:shadow-md"
             @click="handleMenuClick(menu)"
           >
             <view
-              :class="menu.color"
+              :style="{ background: menu.color }"
               class="h-10 w-10 flex flex-shrink-0 items-center justify-center rounded-lg"
             >
               <!-- <component
@@ -164,14 +204,15 @@ onMounted(() => {
                 :is="iconMap[menu.icon]"
                 class="w-5 h-5 text-white"
               /> -->
+              <wd-icon name="picture" size="22px" color="#FFF" />
             </view>
             <view class="flex-1 text-left">
               <p
                 class="text-base text-slate-800 font-medium"
                 v-html="highlightedLabel(menu)"
               />
-              <p v-if="menu.description" class="mt-0.5 text-xs text-slate-400">
-                {{ menu.description }}
+              <p v-if="menu.tip" class="mt-0.5 text-xs text-slate-400">
+                {{ menu.tip }}
               </p>
             </view>
           </view>

package/components/wui-system-settings/wui-system-settings.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, defineOptions } from 'vue'
 import { useManualTheme } from '../../composables/useManualTheme'
-import {useLanguageStore} from '../../store/language'
+import { useLanguageStore } from '../../store/language'
 import type { LocaleOption, ThemeColorOption } from '../../composables/useManualTheme'
 import demoBlock from '../demo-block/demo-block.vue'
 

package/composables/useEnumes.ts

@@ -0,0 +1,42 @@
+import { enums, listData, pageConfig, pageKey } from '../api/page'
+import { ref } from 'vue'
+import ControlTypeSupportor from '../utils/control-type-supportor'
+import type {  Enums } from '../type'
+export function useEnums({ config }: { config: any }) {
+    const enumColumn = ref<Enums>({})
+    // 获取枚举
+    async function getEnums() {
+        try {
+            const params: string[] = []
+            const criterias = config.value?.criterias ?? []
+            const columns = config.value.columns ?? []
+            const writes = config.value.rowActions?.reduce((acc: any, cur: any) => {
+                return [...acc, ...cur.writes]
+            }, []) || []
+            columns.forEach((item: any) => {
+                if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
+                    params.push(`mstrucIds=${item.mstrucId}`)
+                }
+            })
+            criterias.forEach((item: any) => {
+                if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
+                    params.push(`mstrucIds=${item.mstrucId}`)
+                }
+            })
+            writes.forEach((item: any) => {
+                if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
+                    params.push(`mstrucIds=${item.mstrucId}`)
+                }
+            })
+            if (!params.length)
+                return
+            const res = await enums(params.join('&'))
+            enumColumn.value = res.enumMap || {}
+        }
+        catch (error) {
+            console.log('error:', error)
+        }
+    }
+
+    return { getEnums, enumColumn }
+}

package/composables/useLocale.ts

@@ -8,7 +8,7 @@ import zhCN from 'wot-design-uni/locale/lang/zh-CN'
 import arSA from 'wot-design-uni/locale/lang/ar-SA'
 import { useManualThemeStore } from '../store/manualThemeStore'
 
-import {useLanguageStore} from '../store/language'
+import { useLanguageStore } from '../store/language'
 /**
  * 简化版系统语言切换组合式API
  *
@@ -16,15 +16,14 @@ import {useLanguageStore} from '../store/language'
 export function useLocale() {
   const store = useManualThemeStore()
   const languageStore = useLanguageStore()
- 
-  //获取语言包
- async function getLanguagePack(lang: string) {
+
+  // 获取语言包
+  async function getLanguagePack(lang: string) {
     await languageStore.loadLanguage(lang)
   }
 
   // 系统语言切换
-  function changeSystemLocale() {
-    
+  function changeSystemLocale() {
     switch (store.Locale.value) {
       case 'en-US':
         Locale.use('en-US', enUS)
@@ -32,7 +31,7 @@ export function useLocale() {
         break
       case 'ar-SA':
         Locale.use('ar-SA', arSA)
-        
+
         break
       default:
         Locale.use('zh-CN', zhCN)

package/composables/useMenus.ts

@@ -14,10 +14,12 @@ interface Props {
   load: () => void
   menuTopType: string
 }
-interface MenuItem {
+export interface MenuItem {
   id: string
   title: string
   icon: string
+  color: string
+  tip: string
   pageType: string
   children?: MenuItem[]
 }
@@ -31,7 +33,7 @@ export function useMenus(props?: Props, pagingRef?: Ref<any>) {
   const menuList = ref<MenuItem[]>([])
   const title = ref('')
   const navTitle = ref('')
-  const filtermenu = computed(() => {
+  const filtermenu = computed<MenuItem[]>(() => {
     let arr = []
     if (currentThemeColor.value.primary) {
       arr = filterHiddenTree(menuList.value, 'items', true)
@@ -170,7 +172,7 @@ export function useMenus(props?: Props, pagingRef?: Ref<any>) {
     try {
       const res = await fastmenu()
       if (res.fastMenu) {
-        sectionmenu.value = res.fastMenu.QuickQueryBar || []
+        sectionmenu.value = res.fastMenu.QuickQueryBar || []
       }
       else {
         sectionmenu.value = []

package/index.ts

@@ -11,7 +11,7 @@ import { useManualTheme } from './composables/useManualTheme'
 import { useGlobalLoading } from './composables/useGlobalLoading'
 import { useGlobalMessage } from './composables/useGlobalMessage'
 import { useGlobalToast } from './composables/useGlobalToast'
-import {useLanguageStore} from './store/language'
+import { useLanguageStore } from './store/language'
 import { useUser } from './composables/useUser'
 import { req } from './api/index'
 import { useTabbar } from './composables/useTabbar'
@@ -26,8 +26,7 @@ import WuiUser from './components/wui-user/wui-user.vue'
 import WuiAutoUpdateComponent from './components/wui-auto-update-component/wui-auto-update-component.vue'
 import iData from './utils/idata-scan'// PAD扫描
 import wuiSearchHistoryBabbar from './components/wui-search-history-babbar/wui-search-history-babbar.vue'
-
-
+import enumeSelectControl from './components/enume-select-control/enume-select-control.vue'
 // 组件列表
 const coms: Array<{ name: string }> = [
   WuiSystemSettings,
@@ -73,7 +72,8 @@ export {
   persistPlugin,
   iData, // PAD扫描
   // nfc, // nfc读取
-  useLanguageStore,// 语言
+  useLanguageStore, // 语言
+  enumeSelectControl,// 枚举选择
 }
 
 export default install

package/package.json

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

package/store/language.ts

@@ -1,7 +1,7 @@
 // src/core-components/store/language.ts
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
-import {language} from '../api/sys'
+import { computed, ref } from 'vue'
+import { language } from '../api/sys'
 // 定义语言包类型
 type LanguagePackage = Record<string, string>
 
@@ -11,12 +11,12 @@ export const useLanguageStore = defineStore('language', () => {
   const languagePackages = ref<Record<string, LanguagePackage>>({})
   const loading = ref<boolean>(false)
   const loadedLanguages = ref<string[]>([])
-  
+
   // 计算属性：当前语言包
   const currentLangPack = computed<LanguagePackage>(() => {
     return languagePackages.value[currentLanguage.value] || {}
   })
-  
+
   // 计算属性：是否已加载当前语言
   const isCurrentLanguageLoaded = computed<boolean>(() => {
     return loadedLanguages.value.includes(currentLanguage.value)
@@ -28,15 +28,16 @@ export const useLanguageStore = defineStore('language', () => {
   const loadLanguageFromNetwork = async (lang: string): Promise<LanguagePackage> => {
     try {
       // 调用API获取语言包，可根据实际API调整URL
-      const response= await language(lang)
-      
-      if (response.status!=="success") {
+      const response = await language(lang)
+
+      if (response.status !== 'success') {
         throw new Error(`Failed to fetch language package: ${response.status} ${response.statusText}`)
       }
-      
+
       const data: LanguagePackage = response.value
       return data
-    } catch (error) {
+    }
+    catch (error) {
       console.error(`Error loading language package for ${lang}:`, error)
       // 返回空对象，避免程序崩溃
       return {}
@@ -57,15 +58,16 @@ export const useLanguageStore = defineStore('language', () => {
     loading.value = true
     try {
       const langPack = await loadLanguageFromNetwork(lang)
-      
+
       // 更新语言包数据
       languagePackages.value[lang] = langPack
 
       //   loadedLanguages.value.push(lang)
-      
+
       // 设置当前语言
       currentLanguage.value = lang
-    } finally {
+    }
+    finally {
       loading.value = false
     }
   }
@@ -84,7 +86,7 @@ export const useLanguageStore = defineStore('language', () => {
   const preloadLanguages = async (languages: string[]): Promise<void> => {
     const promises = languages.map(lang => loadLanguageFromNetwork(lang))
     const results = await Promise.allSettled(promises)
-    
+
     results.forEach((result, index) => {
       if (result.status === 'fulfilled') {
         const lang = languages[index]
@@ -92,7 +94,8 @@ export const useLanguageStore = defineStore('language', () => {
         if (!loadedLanguages.value.includes(lang)) {
           loadedLanguages.value.push(lang)
         }
-      } else {
+      }
+      else {
         console.error(`Failed to preload language ${languages[index]}:`, result.reason)
       }
     })
@@ -138,7 +141,7 @@ export const useLanguageStore = defineStore('language', () => {
     loadedLanguages,
     currentLangPack,
     isCurrentLanguageLoaded,
-    
+
     // 方法
     loadLanguage,
     switchLanguage,
@@ -146,6 +149,6 @@ export const useLanguageStore = defineStore('language', () => {
     preloadLanguages,
     addLocalLanguage,
     getLoadedLanguages,
-    getCurrentLanguage
+    getCurrentLanguage,
   }
 })

package/type.ts

@@ -108,6 +108,7 @@ export interface Groups {
   readOnly: boolean
   displayConfig: string[]
   batchAddFileField?: Fields
+  primaryColumn?: Columns
 }
 
 export interface Entity extends Entities {