wui-components-v2 1.0.72 → 1.0.74

package/components/action-popup/action-popup.vue

@@ -61,7 +61,7 @@ async function action() {
         <formControl v-if="props.fieldGroup" ref="formControlRef" :field-group="props.fieldGroup" />
         <view class="h-44px .dark:bg-gray-900 .light:bg-white" />
         <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 .dark:bg-gray-900 .light:bg-white">
-          <wd-button :loading="btnLoading" class="flex-1" @click="() => { action() }">
+          <wd-button :loading="btnLoading" custom-class="flex-1" @click="() => { action() }">
             提交
           </wd-button>
         </view>

package/components/fold-card/fold-card.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
-import { computed, defineOptions, defineProps, onBeforeMount, ref } from 'vue'
-import { useManualTheme } from '../../composables/useManualTheme'
+import { computed, defineOptions, defineProps, ref } from 'vue'
 import type { Columns, Entities, Enums, FoldCardModel, Groups } from '../../type'
 import { formatItemData } from '../../utils'
 import LabelValue from '../label-value/label-value.vue'

package/components/search/search.vue

@@ -85,7 +85,7 @@ function handleSubmit() {
         <formControl ref="formControlRef" :field-group="{ fields: filterCriterias, readOnly: false, displayConfig: [], id: '', buttons: [], title: '', type: '', pointSourceId: '', mstrucId: '', relationNames: [] }" :entity="entity" :enum-column="enumColumn" />
         <view class="h-12" />
         <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 .dark:bg-gray-900 .light:bg-white">
-          <wd-button block class="flex-1" @click="handleSubmit">
+          <wd-button block custom-class="flex-1" @click="handleSubmit">
             确定
           </wd-button>
         </view>

package/components/tree-select/components/index.vue

@@ -374,7 +374,7 @@ function handleConfirm() {
     <!-- 底部按钮 -->
     <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 .dark:bg-gray-900 .light:bg-white">
       <wd-button
-        class="flex-1"
+        custom-class="flex-1"
         type="primary"
         @click="handleConfirm"
       >

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

@@ -2,9 +2,9 @@
 import { computed, defineOptions, onMounted, onUnmounted, ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { useRouter } from 'uni-mini-router'
-import { listData, pageConfig, pageKey } from '../../api/page'
+import { enums, listData, pageConfig, pageKey } from '../../api/page'
 import foldCard from '../fold-card/fold-card.vue'
-import type { Config, Entities, FoldCardModel } from '../../type'
+import type { Config, Entities, Enums, FoldCardModel } from '../../type'
 import { useGlobalToast } from '../../composables/useGlobalToast'
 import Search from '../search/search.vue'
 
@@ -58,6 +58,7 @@ const sendSelectEvent = ref('')
 const extControlType = ref('relselect')// 选择模式，例如：单选:relselect、多选
 const model = ref<FoldCardModel>('simple')
 const searchData = ref('')
+const enumColumn = ref<Enums>({})
 onLoad((option: any) => {
   sourceId.value = option.sourceId
   pageTitle.value = option.title
@@ -103,11 +104,13 @@ uni.$once(sendSelectEvent.value, async (data: string | string[]) => {
   uni.$off(sendSelectEvent.value)
 })
 
+// 获取页面配置
 async function getPageConfig() {
   try {
     const res = await pageConfig(sourceId.value)
     if (res.ltmplConfig) {
       config.value = res.ltmplConfig
+      getEnums()
     }
   }
   catch (error) {
@@ -115,6 +118,26 @@ async function getPageConfig() {
   }
 }
 
+// 获取枚举
+async function getEnums() {
+  try {
+    const params: string[] = []
+    config.value.columns?.forEach((item: any) => {
+      if (item.controlType === 'select' || item.controlType === 'multiselect') {
+        params.push(`mstrucIds=${item.mstrucId}`)
+      }
+    })
+    console.log('获取枚举', config.value.columns, params.length)
+    if (!params.length)
+      return
+    const res = await enums(params.join('&'))
+    enumColumn.value = res.enumMap || {}
+  }
+  catch (error) {
+    console.log('error:', error)
+  }
+}
+
 // @query所绑定的方法不要自己调用！！需要刷新列表数据时，只需要调用this.$refs.paging.reload()即可
 async function queryList(pageNo: number, pageSize: number) {
   // 此处请求仅为演示，请替换为自己项目中的请求
@@ -190,13 +213,13 @@ onUnmounted(() => {
 })
 
 function submitSearch(data: any) {
-  searchData.value = ''
-  for (const key in data) {
-    if (Object.prototype.hasOwnProperty.call(data, key)) {
-      const element = data[key]
-      searchData.value = `${searchData.value}&c_${key}=${element}`
-    }
-  }
+  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()
 }
 </script>
@@ -204,7 +227,7 @@ function submitSearch(data: any) {
 <template>
   <z-paging ref="Zpaging" v-model="datas" :show-loading-more-when-reload="true" @query="queryList">
     <template #top>
-      <Search :criterias="config.criterias" :primary-criteria="config.primaryCriteria" @submit="submitSearch" />
+      <Search :enum-column="enumColumn" :criterias="config.criterias" :primary-criteria="config.primaryCriteria" @submit="submitSearch" />
       <!-- <view>
         <ListTopButtons :buttons="config.buttons" :source-id="sourceId" :page-title="pageTitle" />
       </view> -->
@@ -226,7 +249,7 @@ function submitSearch(data: any) {
           <!-- <wd-button class="flex-1" type="info" @click="cancel">
             取消
           </wd-button> -->
-          <wd-button class="flex-1" @click="confirm">
+          <wd-button custom-class="flex-1" @click="confirm">
             确定
           </wd-button>
         </view>

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

@@ -24,7 +24,7 @@ function quit() {
       title: '退出登录',
     })
     .then(() => {
-      uni.removeStorageSync('token')
+      uni.removeStorageSync('TOKEN')
       uni.reLaunch({
         url: '/pages/login/index',
       })

package/package.json

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