wui-components-v2 1.1.41 → 1.1.43

package/components/wui-menus1/components/banner-carousel.vue

@@ -64,7 +64,7 @@ let startX = 0
  * 每 3 秒切换到下一张，循环播放
  */
 function startAutoplay() {
-  if (autoplayTimer)
+  if (autoplayTimer)
     clearInterval(autoplayTimer)
   autoplayTimer = setInterval(() => {
     currentIndex.value = (currentIndex.value + 1) % banners.length
@@ -132,7 +132,7 @@ function onDragStart(clientX: number) {
  * @param clientX 鼠标/触摸的当前 X 坐标
  */
 function onDragMove(clientX: number) {
-  if (!isDragging.value)
+  if (!isDragging.value)
     return
   dragOffset.value = clientX - startX
 }
@@ -146,14 +146,14 @@ function onDragMove(clientX: number) {
  * 拖动结束后恢复自动播放
  */
 function onDragEnd() {
-  if (!isDragging.value)
+  if (!isDragging.value)
     return
   isDragging.value = false
 
   const threshold = 50
   if (dragOffset.value < -threshold) {
     nextSlide()
-  }
+  }
   else if (dragOffset.value > threshold) {
     prevSlide()
   }
@@ -282,11 +282,11 @@ onUnmounted(() => {
           >
             <!-- 左侧文字区域 -->
             <view class="flex-1">
-              <h3 class="text-lg text-white font-semibold">
-                {{ banner.title }}
+              <h3 class="text-lg text-white font-semibold">
+                {{ banner.title }}
               </h3>
-              <p class="mt-1 text-sm text-white/80">
-                {{ banner.subtitle }}
+              <p class="mt-1 text-sm text-white/80">
+                {{ banner.subtitle }}
               </p>
             </view>
 

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

@@ -2,7 +2,7 @@
 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',

package/components/wui-menus1/components/search-bar.vue

@@ -32,7 +32,7 @@ function goToSearch() {
     <div
       class="h-12 flex items-center rounded-xl bg-white px-4 transition-all duration-200"
       :class="isFocused ? 'ring-2 ring-indigo-500 shadow-lg' : 'shadow-md'"
-    >
+    >
       <wd-icon name="search" class="h-5 w-5 flex-shrink-0 text-slate-400" size="22px" />
       <input
         v-model="searchQuery"

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

@@ -2,7 +2,7 @@
 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',

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

@@ -10,7 +10,7 @@ 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 searchBar from './components/search-bar.vue'
 
 defineOptions({
   name: 'WuiMenus1',
@@ -90,7 +90,7 @@ const {
                 <wd-grid-item
                   v-for="(subItem, subIndex) in item.items" :key="subIndex" use-text-slot use-icon-slot
                   class="menu-grid-item"
-                  @itemclick="gotoPage(subItem)"
+                  @click="gotoPage(subItem)"
                 >
                   <template #icon>
                     <view
@@ -106,7 +106,7 @@ const {
                   </template>
                   <template #text>
                     <view class="menu-text-wrapper">
-                      <view class="menu-title .dark:text-white .light:color-#1f2937">
+                      <view class="menu-title text-ellipsis .dark:text-white .light:color-#1f2937">
                         {{ languageStore.t(subItem.title) }}
                       </view>
                       <!-- <view class="menu-badge" v-if="subIndex === 0">
@@ -536,4 +536,7 @@ const {
     }
   }
 }
+.menu-grid-container :deep(.wd-grid-item__content){
+  align-items: normal;
+}
 </style>

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

@@ -46,7 +46,7 @@ onUnload(() => {
     </wuiDetailsPage>
     <view />
   </view>
-</template>
+</template>
 
 <style scoped>
 

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

@@ -6,7 +6,7 @@ import { useSectionMenus } from '../../composables/useSectionMenus'
 import { formatItemData } from '../../utils'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
 import { useLanguageStore } from '../../store/language'
-import type { Config, Entities, Enums } from '../../type'
+import type { Config, Entities, Enums } from '../../type'
 
 defineOptions({
   name: 'WuiNotifyInfo',
@@ -202,14 +202,14 @@ function gotoDetailPage(item: Data) {
           {{ languageStore.t('查看全部') }}
         </view>
       </view>
-      <button
+      <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>
@@ -227,9 +227,9 @@ function gotoDetailPage(item: Data) {
               {{ formatItemData(item.secondColumn, ControlTypeSupportor.getControlType(item.secondColumnConfig || {}))
               }}
             </text>
-            <text>
+            <text>
               {{ formatItemData(item.secondColumnLabel,
-                                ControlTypeSupportor.getControlType(item.secondColumnLabelConfig || {})) }}
+                                ControlTypeSupportor.getControlType(item.secondColumnLabelConfig || {})) }}
             </text>
           </p>
         </view>

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

@@ -5,7 +5,7 @@ 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'
+import SearchHistory from './components/SearchBar.vue'
 
 defineOptions({
   name: 'WuiSearchHistoryBabbar',
@@ -23,12 +23,12 @@ function queryList() {
       setTimeout(() => {
         router.replaceAll('/pages/login/index')
       }, 1000)
-    }
+    }
     else {
-      menuList.value = res?.blocks
-    }
+      menuList.value = res?.blocks
+    }
   }).catch((res: any) => {
-    console.log(res)
+    console.log(res)
   })
 }
 
@@ -47,15 +47,15 @@ function extractDeepestNodes<T>(
   /**
    * 递归遍历树节点
    */
-  function traverse(nodes: T[], depth: number = 0) {
+  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) {
+      if (children && Array.isArray(children) && children.length > 0) {
         // 如果有子节点，继续深入
         traverse(children, depth + 1)
-      }
+      }
       else {
         // 如果没有子节点，这是最深层的节点，添加到结果中
         result.push(node)
@@ -67,7 +67,7 @@ function extractDeepestNodes<T>(
   return result
 }
 
-const a = computed(() => {
+const a = computed(() => {
   return extractDeepestNodes(filtermenu.value, 'items')
 })
 
@@ -75,7 +75,7 @@ const searchQuery = ref('')
 const searchHistory = ref<string[]>([])
 const inputRef = ref<HTMLInputElement | null>(null)
 
-const filteredMenus = computed<MenuItem[]>(() => {
+const filteredMenus = computed<MenuItem[]>(() => {
   if (!searchQuery.value.trim()) {
     return a.value
   }

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

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, defineOptions, onMounted, onUnmounted, ref } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { useRouter } from 'uni-mini-router'
 import { enums, listData, pageConfig, pageKey } from '../../api/page'
@@ -37,6 +37,7 @@ const config = ref<Config>({
     transDefaultValue: '',
     required: false,
     extControlType: '',
+    hidden: false,
   },
   criterias: [],
   buttons: [],
@@ -50,6 +51,8 @@ const config = ref<Config>({
   readOnly: false,
   displayConfig: [],
   showType: 'table',
+  extShowConfig: {},
+  extDisplayConfig: {}, // 扩展显示配置
 })
 const sourceId = ref('')
 const datas = ref<Entities[]>([])
@@ -66,44 +69,43 @@ onLoad((option: any) => {
   selectEvent.value = option.selectEvent
   sendSelectEvent.value = option.sendSelectEvent
   extControlType.value = option.extControlType
-  model.value = option.foldCardModel || 'simple'
+  model.value = option.foldCardModel || option.cardModel || 'simple'
   uni.setNavigationBarTitle({
     title: `选择${option.title}`,
   })
+  // 必须在 onLoad 内注册：setup 阶段 sendSelectEvent 仍为空字符串
+  if (sendSelectEvent.value) {
+    uni.$once(sendSelectEvent.value, (data: string | string[]) => {
+      if (!data)
+        return
+
+      if (Array.isArray(data)) {
+        const newdata: Record<string, string> = {}
+        data.forEach((item) => {
+          newdata[item.split('@R@')[0]] = item
+        })
+        selectData.value = newdata
+      }
+      else {
+        selectData.value[data.split('@R@')[0]] = data
+      }
+    })
+  }
   getPageConfig()
 })
 const selectData = ref<Record<string, string>>({})// 选择数据
 const selectDataforMat = computed(() => {
   const newdata: Record<string, string> = {}
-  console.log('selectData.value', selectData.value)
-  // 如果 selectData.value 是对象，则遍历它的值
   if (typeof selectData.value === 'object' && selectData.value !== null) {
     Object.values(selectData.value).forEach((item) => {
       newdata[item.split('@R@')[0]] = item.split('@R@')[0]
     })
   }
-  console.log('selectDataforMat', newdata)
   return newdata
 })
 onMounted(() => {
   // selectData.value = { '447607223953539077': '447607223953539077@R@光机' }
 })
-uni.$once(sendSelectEvent.value, async (data: string | string[]) => {
-  if (!data)
-    return
-
-  if (Array.isArray(data)) {
-    const newdata: Record<string, string> = {}
-    data.forEach((item) => {
-      newdata[item.split('@R@')[0]] = item
-    })
-    selectData.value = newdata
-  }
-  else {
-    selectData.value[data.split('@R@')[0]] = data
-  }
-  uni.$off(sendSelectEvent.value)
-})
 
 // 获取页面配置
 async function getPageConfig() {
@@ -188,27 +190,25 @@ function handleChange(item: Entities) {
   }
 
   // 判断是否为单选，清空选项
-  if (extControlType.value === 'relselect') {
+  if (extControlType.value === 'relselect'||extControlType.value === 'relselect-extdis') {
     selectData.value = {}
   }
 
   selectData.value[item.code] = `${item.code}@R@${item.fieldMap[config.value.primaryColumn.sourceId]}`
 }
-// 发送选中数据
+// 发送选中数据（与编辑页 / mulselect-picker 的 uni.$once(selectEvent) 约定一致）
 function send() {
-  const data = Object.values(selectData.value)
-  if (!data.length) {
+  const keys = Object.keys(selectData.value)
+  if (!keys.length) {
     globalToast.warning(`请选择${pageTitle.value}`)
     return
   }
 
-  // 判断是否为单选，是：发送字符串，否：发送数组
-  if (extControlType.value === 'relselect') {
-    uni.$emit(selectEvent.value, data[0])
-  }
-  else {
-    uni.$emit(selectEvent.value, data)
+  const payload = Object.values(selectData.value)
+  if (selectEvent.value) {
+    uni.$emit(selectEvent.value, payload)
   }
+
   router.back()
 }
 // 取消
@@ -221,20 +221,22 @@ function confirm() {
   send()
 }
 onUnmounted(() => {
-  console.log('unmounted')
   uni.$off(selectEvent.value)
 })
 
 function submitSearch(data: any) {
   searchData.value = data
-  // for (const key in data) {
-  //   if (Object.prototype.hasOwnProperty.call(data, key)) {
-  //     const element = data[key]
-  //     searchData.value = `${searchData.value}&c_${key}=${element}`
-  //   }
-  // }
   Zpaging.value.reload()
 }
+const showAddressInfo = computed(() => {
+  return extControlType.value=='relselect-extdis' || false
+})
+const formatAddress = (value:string) => {
+  return (value?.split(',') || [])[2] || ''
+}
+ const checkboxType:any=computed(()=>{
+  return ['relselect','relselect-extdis'].includes(extControlType.value)?'':'square'
+ })
 </script>
 
 <template>
@@ -249,7 +251,14 @@ function submitSearch(data: any) {
 
     <foldCard v-for="(item, index) in datas" :key="item.code" :index="index" :data="item" :columns="config.columns" :primary-column="config.primaryColumn" :second-column="config.secondColumn" :model="model" :groups="config" :source-id="sourceId" @click="() => { handleChange(item) }">
       <template #select>
-        <wd-checkbox :true-value="`${item.code}`" false-value="" :model-value="selectDataforMat[item.code]" />
+        <wd-checkbox :true-value="`${item.code}`" false-value="" :model-value="selectDataforMat[item.code]" :type="checkboxType" />
+      </template>
+
+      <template #addressInfo v-if="showAddressInfo" >
+        <div>{{ item.fieldMap[config.extDisplayConfig?.secondColumn?.sourceId] }}</div>
+      </template>
+      <template #detailAddress v-if="showAddressInfo" >
+        <div>{{ formatAddress(item.fieldMap[config.extDisplayConfig?.cardShowCols?.[0]?.sourceId]) }}</div>
       </template>
       <!-- <template #buttons>
         <CardBotomButtons :data="item" :groups="config" :source-id="sourceId" :item="config" :code="item.code" />

package/components/wui-tabbar/wui-tabbar.vue

@@ -20,7 +20,7 @@ const router = useRouter()
 
 const route = useRoute()
 
-const { themeVars, theme } = useManualTheme()
+const { themeVars, theme, currentThemeColor } = useManualTheme()
 
 const { activeTabbar, getTabbarItemValue, setTabbarItemActive, tabbarList } = useTabbar(props.tabbarItems)
 
@@ -56,6 +56,7 @@ export default {
     <slot />
     <wd-tabbar
       :model-value="activeTabbar.name" bordered safe-area-inset-bottom placeholder fixed custom-class="z-14!"
+      :active-color="currentThemeColor.primary"
       @change="handleTabbarChange"
     >
       <wd-tabbar-item
@@ -72,7 +73,6 @@ export default {
     <privacy-popup />
     <!-- #endif -->
     <wd-notify />
-    <wd-message-box />
     <wd-toast />
     <global-loading />
     <global-toast />

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

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, defineOptions, onMounted, onUnmounted, ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
-import { useMessage } from 'wot-design-uni'
+import { useDialog } from '@wot-ui/ui'
 import { useGlobalLoading } from '../../composables/useGlobalLoading'
 import { useGlobalToast } from '../../composables/useGlobalToast'
 import ListTopButtons from '../list-top-buttons/list-top-buttons.vue'
@@ -21,11 +21,11 @@ const pageTitle = ref('')
 const mainCode = ref('')
 const addEvent = generateHighResolutionID()// 全局事件名称
 const Zpaging = ref<any>(null)
-const message = useMessage()
+const dialog = useDialog()
 const parentId = ref('')
 const parentNodeType = ref<nodeType>('root')
 const targetNodeType = ref<nodeType>('root')
-const { loading, close } = useGlobalLoading()
+const { loading } = useGlobalLoading()
 const { success, error } = useGlobalToast()
 
 onLoad((option: any) => {
@@ -158,11 +158,11 @@ function handleRemove(targetNode: TreeNode) {
     sourceId = treeConfig.value.branchRatmplId || ''
   }
 
-  message
+  dialog
     .confirm({
       msg: `确定要删除 "${targetNode.label}" 及其子节点吗？`,
       title: '提示',
-      beforeConfirm: async ({ resolve }) => {
+      beforeConfirm: async () => {
         loading('删除中...')
         try {
           // const res = await editPageConfig(sourceId || '', targetNode.id)
@@ -171,18 +171,17 @@ function handleRemove(targetNode: TreeNode) {
           if (res1.status === 'success') {
             success('删除成功')
             removeNodeRecursively(filteredTreeData.value, targetNode.id)
+            return true
           }
           else {
             error('删除失败')
+            return false
           }
         }
         catch (error1) {
           error('删除失败')
           console.log(error1)
-        }
-        finally {
-          resolve(true)
-          close()
+          return false
         }
       },
     })
@@ -280,7 +279,7 @@ function handleSearch() {
         />
       </view>
     </view>
-    <wd-message-box />
+    <wd-dialog />
   </z-paging>
 </template>
 

package/components/wui-user/wui-user.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import {
-  useMessage,
-} from 'wot-design-uni'
+  useDialog,
+} from '@wot-ui/ui'
 import { useUser } from '../../composables/useUser'
 import { generateGradientColor } from '../../utils'
 import { useManualTheme } from '../../composables/useManualTheme'
@@ -14,7 +14,7 @@ const {
   currentThemeColor,
 } = useManualTheme()
 const user = useUser().getUserInfo()
-const message = useMessage()
+const dialog = useDialog()
 const userInfo = ref({
   name: user.name,
   nickName: user.nickName,
@@ -22,7 +22,7 @@ const userInfo = ref({
 })
 // 退出登录
 function quit() {
-  message
+  dialog
     .confirm({
       // msg: '提示文案',
       title: '退出登录',
@@ -82,7 +82,7 @@ function setting() {
       <wd-cell title="系统设置" icon="setting" :is-link="true" :clickable="true" @click="setting" />
       <wd-cell title="退出登录" icon="logout" :is-link="true" :clickable="true" @click="quit" />
     </wd-cell-group>
-    <wd-message-box />
+    <wd-dialog />
   </view>
 </template>
 

package/composables/types/theme.ts

@@ -1,4 +1,4 @@
-import type { ConfigProviderThemeVars } from 'wot-design-uni'
+import type { ConfigProviderThemeVars } from '@wot-ui/ui'
 
 /**
  * 主题色选项接口

package/composables/useCompanyFieldFilter.ts

@@ -0,0 +1,59 @@
+import { computed, ref, watch } from 'vue'
+import type { Ref } from 'vue'
+import type { Groups } from '../type'
+
+const COMPANY_FIELD_SOURCE_ID = '' // 公司字段 sourceId
+
+export function useCompanyFieldFilter(
+  fieldGroup: () => Groups | undefined,
+  model: Ref<any>,
+  enabled: boolean = true,
+  companyFieldSourceId: string = COMPANY_FIELD_SOURCE_ID,
+) {
+  const deliveryCompanySourceId = ref<string>('')
+  const selectedCompany = ref<string>('')
+
+  if (enabled) {
+    watch(
+      () => fieldGroup()?.fields,
+      (newFields) => {
+        const companyField: any = newFields?.find((item: any) => item.sourceId === companyFieldSourceId) || {}
+        deliveryCompanySourceId.value = companyField.sourceId || ''
+      },
+      { deep: true, immediate: true },
+    )
+
+    watch(
+      () => model.value[deliveryCompanySourceId.value],
+      (newValue) => {
+        selectedCompany.value = newValue ? newValue.substring(0, 2) : ''
+      },
+      { immediate: true },
+    )
+  }
+
+  const filteredFields = computed(() => {
+    const allFields = fieldGroup()?.fields
+    if (!allFields)
+      return []
+    return allFields.filter((item: any) => {
+      // 如果没有选中公司，所有字段都显示
+      if (!selectedCompany.value) {
+        return true
+      }
+      // 检查 usableRuleCriterias 是否存在且有值
+      if (!item.usableRuleCriterias || item.usableRuleCriterias.length === 0) {
+        return true
+      }
+      // 获取 transDefaultValue 并检查是否包含选中的公司
+      const transDefaultValue = item.usableRuleCriterias[0]?.transDefaultValue
+      if (typeof transDefaultValue === 'string') {
+        const values = transDefaultValue.split(',').map(v => v.trim())
+        return values.includes(selectedCompany.value)
+      }
+      return true
+    })
+  })
+
+  return { filteredFields, selectedCompany }
+}

package/composables/useEnumes.ts

@@ -1,42 +1,43 @@
-import { enums, listData, pageConfig, pageKey } from '../api/page'
 import { ref } from 'vue'
+import { enums } from '../api/page'
 import ControlTypeSupportor from '../utils/control-type-supportor'
-import type {  Enums } from '../type'
+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 || {}
+  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}`)
         }
-        catch (error) {
-            console.log('error:', error)
+      })
+      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 }
-}
+  return { getEnums, enumColumn }
+}