wui-components-v2 1.1.64 → 1.1.66

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

@@ -72,11 +72,11 @@ async function action() {
 <template>
   <wd-popup v-model="show" position="bottom" closable :z-index="999999" @close="() => { show = false }">
     <view class="h-50vh w-100vw">
-      <view class="h-44px .dark:bg-gray-900 .light:bg-white" />
-      <view class="w-[calc(100%-44px)] overflow-auto .dark:bg-gray-900 .light:bg-white">
+      <view class="h-44px bg-white dark:bg-[var(--wot-dark-background)]" />
+      <view class="w-[calc(100%-44px)] overflow-auto bg-white dark:bg-[var(--wot-dark-background)]">
         <formControl v-if="props.fieldGroup" ref="formControlRef" :field-group="props.fieldGroup" :enum-column="enumColumn" />
-        <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">
+        <view class="h-44px bg-white dark:bg-[var(--wot-dark-background)]" />
+        <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 bg-white dark:bg-[var(--wot-dark-background)]">
           <wd-button :loading="btnLoading" custom-class="flex-1" @click="() => { action() }">
             提交
           </wd-button>

package/components/add-address-page/add-address-page.vue

@@ -1,9 +1,11 @@
 <template>
-  <view class="  rounded-md mb-3" >
-    <view class=" rounded-md shadow-md bg-white pb-3">
-      <wd-textarea v-model="personDetail" placeholder="「粘贴识别」或输入文本，智能拆分、姓名、电话和地址"  />
-      <view class=" flex justify-end align-center px-3">
-                <view class=" px-3 text-white bg-[#007AFF] rounded-md py-1 text-sm   box-border" @click="identifyingFn">智能识别</view>
+  <view class="rounded-md mb-3">
+    <view class="rounded-md shadow-md bg-white pb-3">
+      <wd-textarea v-model="personDetail" placeholder="「粘贴识别」或输入文本，智能拆分、姓名、电话和地址" />
+      <view class="flex justify-end align-center px-3">
+        <view class="px-3 text-white bg-[#007AFF] rounded-md py-1 text-sm box-border" @click="identifyingFn">
+          智能识别
+        </view>
       </view>
     </view>
   </view>
@@ -22,16 +24,16 @@ const props = defineProps<{
 const model = defineModel<any>()
 const personDetail = ref('')
 const loading = ref(false)
-const form=ref(null)
+const form = ref(null)
 /**
  * @description: 智能识别
  */
-function identifyingFn(){
-  if(!personDetail.value){
-   toast.info('请输入内容')
+function identifyingFn() {
+  if (!personDetail.value) {
+    toast.info('请输入内容')
     return
   }
-  const currentValue:any =  parse(personDetail.value)
+  const currentValue: any = parse(personDetail.value)
   console.log('智能识别', currentValue)
   if (!currentValue) {
     toast.info('无法识别地址')
@@ -44,34 +46,32 @@ function identifyingFn(){
     switch (index) {
       case 0:
         model.value[item.sourceId] = currentValue.name || ''
-        break;
+        break
       case 1:
         model.value[item.sourceId] = currentValue.telNumber || currentValue.phone || ''
-        break;
+        break
       case 2:
         model.value[item.sourceId] = currentValue.provinceName || ''
-        break;
+        break
       case 3:
         model.value[item.sourceId] = currentValue.cityName || ''
-        break;
+        break
       case 4:
         model.value[item.sourceId] = currentValue.countyName || ''
-        break;
+        break
       case 5:
         model.value[item.sourceId] = currentValue.address || ''
-        break;
+        break
       default:
-        break;
+        break
     }
   })
   console.log('智能识别', currentValue)
 }
-
-
 </script>
 
 <style scoped>
-.custom-border{
+.custom-border {
   border-bottom: 0.6px solid #e8e8e8;
 }
 </style>

package/components/custom-select-picker/custom-select-picker.vue

@@ -34,44 +34,36 @@ function clear() {
 
 watch(
   () => props.modelValue,
-  (val) => {
+  val => {
     console.log('val', val, Array.isArray(val))
     currentValue.value = val
-  },
+  }
 )
 
-watch(currentValue, (val) => {
+watch(currentValue, val => {
   emit('update:modelValue', val)
 })
 
 const labelText = computed(() => {
   // 多选情况：currentValue 是数组
   if (Array.isArray(currentValue.value)) {
-    const labels = currentValue.value.map((val) => {
-      const item = props.columns.find(
-        item => item[props.valueKey] === val,
-      )
-      return item ? item[props.labelKey] : ''
-    }).filter(Boolean)
+    const labels = currentValue.value
+      .map(val => {
+        const item = props.columns.find(item => item[props.valueKey] === val)
+        return item ? item[props.labelKey] : ''
+      })
+      .filter(Boolean)
     return labels.join(', ')
   }
   // 单选情况：currentValue 是单个值
-  const item = props.columns.find(
-    item => item[props.valueKey] === currentValue.value,
-  )
+  const item = props.columns.find(item => item[props.valueKey] === currentValue.value)
   return item ? item[props.labelKey] : ''
 })
 </script>
 
 <template>
   <div class="flex items-center justify-between">
-    <wd-input
-      v-model="labelText"
-      readonly
-      :placeholder="placeholder"
-      class="flex-1"
-      @click="open = true"
-    />
+    <wd-input v-model="labelText" readonly :placeholder="placeholder" class="flex-1" @click="open = true" />
     <wd-icon v-if="labelText" name="close-circle" size="16px" @click="clear" />
     <wd-icon v-else name="right" size="16px" @click="clear" />
   </div>
@@ -91,13 +83,13 @@ const labelText = computed(() => {
 .custom-select-picker {
   width: 100%;
   :deep(.wd-select-picker__wrapper) {
-  padding : 0 20px;
-  overflow: auto;
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-}
-:deep(.uni-scroll-view) {
-   scrollbar-width: none;
-}
+    padding: 0 20px;
+    overflow: auto;
+    scrollbar-width: none;
+    -ms-overflow-style: none;
+  }
+  :deep(.uni-scroll-view) {
+    scrollbar-width: none;
+  }
 }
 </style>

package/components/demo-block/demo-block.vue

@@ -51,12 +51,9 @@ export default {
 <template>
   <view
     class="mb-3 box-border w-full px-3 text-gray-500 last:mb-0 dark:text-gray-300"
-    :class="[
-      transparent ? '' : 'bg-white dark:bg-[var(--wot-dark-background2)]',
-      customClass,
-    ]"
+    :class="[transparent ? '' : 'bg-white dark:bg-[var(--wot-dark-background2)]', customClass]"
   >
-    <view v-if="title" class="px-4 py-3 text-26rpx">
+    <view v-if="title" class="px-4 py-3 text-26rpx dark:text-gray-200">
       {{ title }}
     </view>
     <view :style="transparent ? '' : style">

package/components/detail-popup/detail-popup.vue

@@ -3,7 +3,7 @@ import { ref } from 'vue'
 import type { Columns, Entities } from '../../type'
 import { formatItemData } from '../../utils'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
-import { detailPageConfig, detailPageData } from '@/core-components/api/page'
+import { detailPageConfig, detailPageData } from '../../api/page'
 
 defineOptions({
   name: 'DetailPopup',
@@ -54,11 +54,11 @@ function handleClose() {
   <view class="text-[#1c64fd]" @click="open">{{ text }}</view>
   <wd-popup v-model="showDetail" custom-style="border-radius: 32rpx;">
     <view class="custom-popup">
-      <view class="text-center mb-4">详情内容</view>
+      <view class="text-center mb-4 text-gray-900 dark:text-gray-100">详情内容</view>
       <scroll-view scroll-y class="scroll-area">
-        <view class="flex items-center gap-2 mb-4 text-[#6b7280]" v-for="(item, sindex) in columns" :key="sindex">
-          <view class="break-words">{{ item.title }}:</view>
-          <view class="text-[#1f2937] break-all">
+        <view class="flex items-center gap-2 mb-4 text-gray-500 dark:text-gray-400" v-for="(item, sindex) in columns" :key="sindex">
+          <view class="break-words dark:text-gray-400">{{ item.title }}:</view>
+          <view class="text-gray-800 dark:text-gray-200 break-all">
             {{ formatItemData(rowData.fieldMap[item.sourceId], isControlType(item)) }}
           </view>
         </view>
@@ -72,7 +72,7 @@ function handleClose() {
 
 <style scoped lang="scss">
 .custom-popup {
-  color: black;
+  color: var(--wot-dark-color, #333);
   padding: 24rpx;
   width: 600rpx;
   max-width: 600rpx;
@@ -89,4 +89,11 @@ function handleClose() {
     margin-top: 24rpx;
   }
 }
+
+// 暗黑模式适配
+:global(.wot-theme-dark) {
+  .custom-popup {
+    color: var(--wot-dark-color2, #e0e0e0);
+  }
+}
 </style>

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

@@ -90,7 +90,12 @@ function toggleCollapse(contentId: string) {
           <view>
             <view class="flex items-center gap-2">
               <view class="overflow-hidden text-ellipsis font-700">
-                {{ formatItemData(data.fieldMap[props.primaryColumn.sourceId], props.primaryColumn.extControlType || props.primaryColumn.controlType) }}
+                {{
+                  formatItemData(
+                    data.fieldMap[props.primaryColumn.sourceId],
+                    props.primaryColumn.extControlType || props.primaryColumn.controlType
+                  )
+                }}
               </view>
               <slot name="addressInfo" />
             </view>
@@ -101,10 +106,17 @@ function toggleCollapse(contentId: string) {
           v-if="props.labelColumn"
           class="whitespace-nowrap rounded px-1 py-1 text-sm text-white font-700"
           :style="{
-            color: labelColumns?.find(item => props.labelColumn && item.value === data.fieldMap[props.labelColumn.sourceId])?.css?.color,
+            color: labelColumns?.find(
+              item => props.labelColumn && item.value === data.fieldMap[props.labelColumn.sourceId]
+            )?.css?.color,
           }"
         >
-          {{ formatItemData(data.fieldMap[props.labelColumn.sourceId], props.labelColumn.extControlType || props.labelColumn.controlType) }}
+          {{
+            formatItemData(
+              data.fieldMap[props.labelColumn.sourceId],
+              props.labelColumn.extControlType || props.labelColumn.controlType
+            )
+          }}
         </view>
       </view>
 
@@ -129,7 +141,15 @@ function toggleCollapse(contentId: string) {
         <view class="flex items-center justify-between border-t border-gray-100">
           <!-- 折叠按钮 -->
           <view>
-            <wd-icon v-if="showCollapse" id="toggle-btn-2" name="down" size="24px" :icon="collapseIcon" class="mr-auto flex items-center px-3 py-2 text-sm text-[#6b7280] !py-1" @click.stop="toggleCollapse(data.code)" />
+            <wd-icon
+              v-if="showCollapse"
+              id="toggle-btn-2"
+              name="down"
+              size="24px"
+              :icon="collapseIcon"
+              class="mr-auto flex items-center px-3 py-2 text-sm text-[#6b7280] !py-1"
+              @click.stop="toggleCollapse(data.code)"
+            />
           </view>
 
           <view class="flex items-center gap-1">
@@ -146,6 +166,6 @@ function toggleCollapse(contentId: string) {
   background-color: #f9f9f9 !important;
 }
 :deep(.wot-theme-dark .wd-collapse-item__body) {
-  background-color: #222222 !important;
+  background-color: #1b1b1e !important;
 }
 </style>

package/components/form-control/form-control.vue

@@ -412,4 +412,12 @@ defineExpose({
 :deep(.disabled-input) {
   background-color: #e8e8e8 !important;
 }
+
+/* 暗黑模式适配 */
+:global(.wot-theme-dark) .custom-from-style :deep(.wd-form-item) {
+  border-top-color: #3d3d3d;
+}
+:global(.wot-theme-dark) ::deep(.disabled-input) {
+  background-color: #2f2f2f !important;
+}
 </style>

package/components/list-top-buttons/list-top-buttons.vue

@@ -13,7 +13,7 @@ function gotoAddPage() {
 </script>
 
 <template>
-  <view class="flex justify-end gap-1 py-2 px-2 .light:bg-white">
+  <view class="flex justify-end gap-1 py-2 px-2 bg-white dark:bg-[var(--wot-dark-background)]">
     <wd-button class="flex-1" v-if="buttons.includes('dtmplAdd')" type="primary" @click="gotoAddPage" icon="plus">{{ props.config?.editBtnTitle || '新增' }}</wd-button>
   </view>
 </template>

package/components/login-form/login-form.vue

@@ -57,8 +57,7 @@ function handleSubmit() {
                 uni.setStorageSync('USER_NAME', model.name)
                 uni.setStorageSync('USER_PASSWORD', model.password)
                 uni.setStorageSync('REMEMBER', model.remember)
-              }
-              else {
+              } else {
                 // 删除账号密码
                 uni.removeStorageSync('USER_NAME')
                 uni.removeStorageSync('USER_PASSWORD')
@@ -70,16 +69,13 @@ function handleSubmit() {
               setTabbarItemActive('index')
               toast.success({ msg: '登录成功！' })
             }
-          }
-          else {
+          } else {
             toast.error({ msg: res.message })
           }
-        }
-        catch (error: any) {
+        } catch (error: any) {
           console.log(error, 'error')
         }
-      }
-      else {
+      } else {
         toast.error({ msg: '请填写登录信息' })
         console.log(errors, 'errors')
       }
@@ -96,25 +92,34 @@ function handleSubmit() {
   <view class="bg-white pa-3 dark:bg-[var(--wot-dark-background2)]">
     <!-- //账号登录 -->
     <wd-form ref="form" :model="model">
-      <wd-cell-group border>
-        <wd-input
-          v-model="model.name" label="用户名" label-width="100px" prop="name" clearable placeholder="请输入用户名"
-          :rules="[{ required: true, message: '请填写用户名' }]"
-        />
-        <wd-input
-          v-model="model.password" label="密码" label-width="100px" prop="password" clearable show-password
-          placeholder="请输入密码" :rules="[{ required: true, message: '请填写密码' }]"
-        />
-        <view class="p-4 pb-0 pt-0">
-          <wd-checkbox v-model="model.remember" shape="square">
-            记住密码
-          </wd-checkbox>
-        </view>
-      </wd-cell-group>
+      <view class="rounded-2 overflow-hidden">
+        <wd-cell-group border>
+          <wd-input
+            v-model="model.name"
+            label="用户名"
+            label-width="100px"
+            prop="name"
+            clearable
+            placeholder="请输入用户名"
+            :rules="[{ required: true, message: '请填写用户名' }]"
+          />
+          <wd-input
+            v-model="model.password"
+            label="密码"
+            label-width="100px"
+            prop="password"
+            clearable
+            show-password
+            placeholder="请输入密码"
+            :rules="[{ required: true, message: '请填写密码' }]"
+          />
+          <view class="p-4 pb-0 pt-0">
+            <wd-checkbox v-model="model.remember" shape="square">记住密码</wd-checkbox>
+          </view>
+        </wd-cell-group>
+      </view>
       <view class="p-4">
-        <wd-button block :loading="subloading" :round="false" @click="handleSubmit">
-          登录
-        </wd-button>
+        <wd-button block :loading="subloading" :round="false" @click="handleSubmit">登录</wd-button>
       </view>
     </wd-form>
   </view>

package/components/mulselect-picker/mulselect-picker.vue

@@ -9,13 +9,13 @@ defineOptions({
 })
 
 const props = defineProps<{
-  extControlType: string// 选择模式，例如：单选:relselect、多选
+  extControlType: string // 选择模式，例如：单选:relselect、多选
   sourceId: string
   title?: string
   modelValue: string | Array<string>
   readonly: boolean
   clearable: boolean
-  foldCardModel?: FoldCardModel// 折叠面板模式
+  foldCardModel?: FoldCardModel // 折叠面板模式
 }>()
 const emits = defineEmits<{
   (e: 'update:modelValue', value: string | string[]): void
@@ -32,9 +32,10 @@ const router = useRouter()
 const SELECTEVENT = generateHighResolutionID()
 const SENDSELECTEVENT = generateHighResolutionID()
 function gotoSlect() {
-  if (props.readonly)
-    return
-  router.push(`/pages/select-list/index?sourceId=${props.sourceId}&title=${props.title}&selectEvent=${SELECTEVENT}&sendSelectEvent=${SENDSELECTEVENT}&extControlType=${props.extControlType}&foldCardModel=${props.foldCardModel}`)
+  if (props.readonly) return
+  router.push(
+    `/pages/select-list/index?sourceId=${props.sourceId}&title=${props.title}&selectEvent=${SELECTEVENT}&sendSelectEvent=${SENDSELECTEVENT}&extControlType=${props.extControlType}&foldCardModel=${props.foldCardModel}`
+  )
   // 发送数据给选择页面,延迟发送防止页面不刷新
   setTimeout(() => {
     uni.$emit(SENDSELECTEVENT, toRaw(selectData.value))
@@ -53,8 +54,7 @@ function clearSelect() {
   if (props.extControlType === 'relselect') {
     selectData.value = ''
     emits('update:modelValue', '')
-  }
-  else {
+  } else {
     selectData.value = []
     emits('update:modelValue', [])
   }
@@ -68,9 +68,7 @@ function clearSelect() {
         <text v-if="selectformatData">
           {{ selectformatData }}
         </text>
-        <text v-else class="text-gray-400">
-          请选择{{ title }}
-        </text>
+        <text v-else class="text-gray-400">请选择{{ title }}</text>
       </view>
       <view class="h-3px w-17px" />
     </view>
@@ -82,7 +80,7 @@ function clearSelect() {
 </template>
 
 <style scoped>
-:deep(.wd-tag__close){
- line-height:0.6
+:deep(.wd-tag__close) {
+  line-height: 0.6;
 }
 </style>

package/components/privacy-popup/privacy-popup.vue

@@ -175,4 +175,17 @@ export default {
     }
   }
 }
+
+/* 暗黑模式适配 */
+:global(.wot-theme-dark) {
+  .wd-privacy-popup {
+    &__header {
+      color: var(--wot-dark-color2, #e0e0e0);
+    }
+
+    &__container {
+      color: var(--wot-dark-color3, #a0a0a0);
+    }
+  }
+}
 </style>