wui-components-v2 1.1.92 → 1.1.93

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

@@ -77,7 +77,6 @@ function edit() {
 
 const actionItem = ref<Groups>()
 const actionItemShow = ref(false) // rowActions输入弹框开关
-const showMoreButn = ref(false) // 更多按钮开关
 // 打开rowActions弹框
 async function action(subitem: rowActions) {
   console.log(subitem, 2222222222222222)
@@ -196,12 +195,7 @@ const morebutns = computed(() => {
   return buts
 })
 
-// 关闭更多按钮
-function closeMoreButn() {
-  showMoreButn.value = false
-}
-
-// 点击更多按钮
+// 点击操作按钮
 async function select({ item }: { item: any }) {
   // 复制操作：跳转新增页，仅复制基本信息（fieldMap），不带原 ID 和 relation 分组数据（如快递运单）
   if (item.title.includes('复制')) {
@@ -246,7 +240,7 @@ console.log(props, '3333333333333')
 </script>
 
 <template>
-  <view class="flex items-center gap-1">
+  <view class="flex items-center gap-1 flex-wrap justify-end">
     <!-- <view v-if="props.rowActions" class="flex gap-1">
       <wd-button v-for="subitem in anctions" :key="subitem.id" plain size="small" @click="action(subitem)">
         {{ subitem.title }}
@@ -257,36 +251,21 @@ console.log(props, '3333333333333')
         {{ subitem.title }}
       </wd-button>
     </view> -->
-    <view>
+
+    <template v-for="subitem in morebutns" :key="subitem.id">
       <wd-button
-        v-if="morebutns.length > 1"
+        v-if="isShowAction(subitem)"
+        plain
         size="small"
-        type="info"
         @click="
           () => {
-            showMoreButn = true
+            select({ item: subitem })
           }
         "
       >
-        更多
+        {{ subitem.title }}
       </wd-button>
-      <view v-else class="flex gap-2 flex-wrap">
-        <template v-for="subitem in morebutns" :key="subitem.id">
-          <wd-button
-            v-if="isShowAction(subitem)"
-            plain
-            size="small"
-            @click="
-              () => {
-                select({ item: subitem })
-              }
-            "
-          >
-            {{ subitem.title }}
-          </wd-button>
-        </template>
-      </view>
-    </view>
+    </template>
 
     <wd-button
       v-if="props.item.buttons.includes('dtmplEdit') && isShowAction(props.buttonEditAction)"
@@ -311,7 +290,5 @@ console.log(props, '3333333333333')
       :field-group="actionItem"
       :code="props.code"
     />
-    <!-- 更多按钮 -->
-    <wd-action-sheet v-model="showMoreButn" :actions="morebutns" @close="closeMoreButn" @select="select" />
   </view>
 </template>

package/components/fold-card2/fold-card2.vue

@@ -0,0 +1,204 @@
+<script lang="ts" setup>
+import { computed, defineEmits, 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'
+import { useManualTheme } from '../../composables/useManualTheme'
+
+defineOptions({
+  name: 'FoldCard2',
+  // ★ 关闭属性透传，避免 H5 下根节点原生 onClick 与下面显式 emit('click') 重复触发
+  inheritAttrs: false,
+})
+
+// ★ 显式 emit click，保证微信小程序下 @click 能正常触发（小程序自定义组件不会自动透传原生 tap）
+const emit = defineEmits<{
+  (e: 'click'): void
+}>()
+
+const props = defineProps<{
+  columns: Columns[]
+  collapseNum?: number
+  primaryColumn?: Columns
+  secondColumn?: Columns
+  labelColumn?: Columns
+  data: Entities
+  model: FoldCardModel
+  sourceId: string
+  groups: Groups
+  enumColumn?: Enums
+  index: number
+}>()
+const { currentThemeColor } = useManualTheme()
+// 展示内容
+const exhibitData = computed(() => {
+  const { collapseNum } = props
+  // collapseNum 为 0 时，只显示标题，不展示任何字段数据
+  if (collapseNum === 0) return []
+  const num = collapseNum || 5
+  const columns = props.columns.length >= num ? props.columns.slice(0, num) : props.columns
+  return columns.filter(item => item.title !== '操作')
+})
+
+// 是否展示折叠按钮
+const showCollapse = computed(() => {
+  const { collapseNum } = props
+  // collapseNum 为 0 时，默认收起全部字段，仍可点击展开
+  if (collapseNum === 0) return true
+  const num = collapseNum || 5
+  return props.columns.length > num
+})
+
+// 折叠内容
+const collapseData = ref<Columns[]>([])
+// 是否展开（用于驱动动画）
+const expanded = ref(false)
+
+// 标签字段
+const labelColumns = computed(() => {
+  if (props.labelColumn && props.enumColumn) {
+    return props.enumColumn[props.labelColumn.mstrucId]
+  } else {
+    return []
+  }
+})
+
+// 折叠图标：未展开为 left，展开为 down
+const collapseIcon = ref('left')
+
+// 计算需要折叠展示的字段
+function getCollapseColumns(): Columns[] {
+  const { collapseNum } = props
+  let columns: Columns[]
+  if (collapseNum === 0) {
+    // 默认不展示任何字段，展开时显示全部
+    columns = props.columns
+  } else {
+    const num = collapseNum || 5
+    columns = props.columns.length >= num ? props.columns.slice(num) : []
+  }
+  return columns.filter(item => item.title !== '操作')
+}
+
+// 切换折叠内容
+function toggleCollapse(contentId: string) {
+  console.log(contentId)
+  if (!expanded.value) {
+    collapseData.value = getCollapseColumns()
+    expanded.value = true
+    collapseIcon.value = 'down'
+  } else {
+    expanded.value = false
+    collapseIcon.value = 'left'
+    // 等收起动画结束后再清空内容，保证退出动画可见
+    setTimeout(() => {
+      if (!expanded.value) collapseData.value = []
+    }, 300)
+  }
+}
+</script>
+
+<template>
+  <!-- 订单卡片容器 -->
+  <view class="mx-auto max-w-md space-y-4">
+    <!-- 订单卡片2 -->
+    <view class="ma-2 overflow-hidden rounded-xl bg-white shadow-sm dark:bg-[var(--wot-dark-background2)]" @click="emit('click')">
+      <!-- 订单头部 -->
+      <view v-if="props.primaryColumn" class="flex items-center justify-between border-b border-gray-100 p-4">
+        <view class="flex min-w-0 flex-1 items-center gap-4 text-base text-gray-800 font-medium dark:text-white">
+          <view class="flex items-center gap-1">
+            <slot name="select" />
+            <view class="mr-1 h-4 w-1 rounded-2xl" :style="{ backgroundColor: currentThemeColor.primary }" />
+          </view>
+          <view class="min-w-0 flex-1">
+            <view class="flex min-w-0 flex-1 items-center gap-2">
+              <view class="min-w-0 flex-1 truncate font-700">
+                {{
+                  formatItemData(
+                    data.fieldMap[props.primaryColumn.sourceId],
+                    props.primaryColumn.extControlType || props.primaryColumn.controlType
+                  )
+                }}
+              </view>
+              <!-- 折叠按钮 -->
+              <wd-icon
+                v-if="showCollapse"
+                id="toggle-btn-2"
+                :name="collapseIcon"
+                size="24px"
+                class="ml-1 flex items-center text-sm text-[#6b7280]"
+                @click.stop="toggleCollapse(data.code)"
+              />
+              <!-- <slot name="addressInfo" />s -->
+            </view>
+            <!-- <slot name="detailAddress" /> -->
+          </view>
+        </view>
+        <view
+          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,
+          }"
+        >
+          {{
+            formatItemData(
+              data.fieldMap[props.labelColumn.sourceId],
+              props.labelColumn.extControlType || props.labelColumn.controlType
+            )
+          }}
+        </view>
+      </view>
+
+      <!-- 订单内容 -->
+      <view v-if="props.model === 'complex'" class="p-4 pt-0">
+        <!-- 商品列表 -->
+        <view class="mb-3">
+          <!-- 订单信息 -->
+          <view class="text-sm space-y-3">
+            <LabelValue :exhibit-data="exhibitData" :data="data" :index="index" />
+
+            <!-- 可折叠内容 -->
+            <view class="fold-collapse" :class="expanded ? 'is-expanded' : 'is-collapsed'">
+              <view class="space-y-3">
+                <LabelValue :exhibit-data="collapseData" :data="data" :index="index" />
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 订单底部 -->
+        <view class="flex items-center justify-end border-t border-gray-100">
+          <view class="flex items-center gap-1">
+            <slot name="buttons" />
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style>
+.fold-collapse {
+  display: grid;
+  grid-template-rows: 0fr;
+  opacity: 0;
+  transition: grid-template-rows 0.3s ease, opacity 0.25s ease;
+}
+.fold-collapse > view {
+  overflow: hidden;
+  min-height: 0;
+}
+.fold-collapse.is-expanded {
+  grid-template-rows: 1fr;
+  opacity: 1;
+}
+:deep(.wd-collapse-item__body) {
+  background-color: #f9f9f9 !important;
+}
+:deep(.wot-theme-dark .wd-collapse-item__body) {
+  background-color: #1b1b1e !important;
+}
+</style>

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

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref, toRaw, watch } from 'vue'
+import { computed, onMounted, nextTick, ref, toRaw, watch } from 'vue'
 import type { FormSchema, FormSchemaIssue } from '@wot-ui/ui/components/wd-form/types'
 import dayjs from 'dayjs/esm/index'
 import type { Enums, Fields, Groups } from '../../type'
@@ -126,6 +126,14 @@ function initFormData() {
       return (models[item.sourceId] = val !== undefined && val !== null && val !== '' ? Number(val) : 0)
     }
 
+    // 开关：归一化为 "是"/"否" 字符串，避免 wd-switch 在 onBeforeMount 校验时
+    // 因 modelValue 非 active/inactive 值（如 ''、布尔、数字）被强制重置为未选中
+    if (ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'yes-no-switch') {
+      const def = (props.entity && props.entity[item.sourceId]) ?? item.transDefaultValue
+      const isYes = def === '是' || def === true || def === 1 || def === 'true' || def === '1'
+      return (models[item.sourceId] = isYes ? '是' : '否')
+    }
+
     return (models[item.sourceId] = (props.entity && props.entity[item.sourceId]) || item.transDefaultValue || '')
   })
 
@@ -427,6 +435,24 @@ hydrocarbonProgramToken.value = uni.getStorageSync('HYDROCARBON_PROGRAM_TOKEN')
 token.value = uni.getStorageSync('TOKEN')
 initFormData()
 initialModel.value = JSON.parse(JSON.stringify(model.value))
+
+// 小程序端 setData 异步：wd-switch 在 popup 内延迟挂载时，onBeforeMount 可能读到
+// 初始（未同步）的 modelValue，被组件校正逻辑强制重置为 inactiveValue("否")。
+// 挂载完成后再兜底恢复一次正确的默认值，确保默认选中生效。
+onMounted(() => {
+  nextTick(() => {
+    fields.value.forEach((item: any) => {
+      if (ControlTypeSupportor.getControlType(item) === 'yes-no-switch') {
+        const def = (props.entity && props.entity[item.sourceId]) ?? item.transDefaultValue
+        const isYes = def === '是' || def === true || def === 1 || def === 'true' || def === '1'
+        const expected = isYes ? '是' : '否'
+        if (model.value[item.sourceId] !== expected) {
+          model.value[item.sourceId] = expected
+        }
+      }
+    })
+  })
+})
 function formatSelectColumns(columns: any) {
   return columns.map((item: any) => {
     return {

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

@@ -4,7 +4,7 @@ import { onLoad } from '@dcloudio/uni-app'
 import { detailPageConfig, detailPageData } from '../../api/page'
 import type { Entities, Groups, dtmplConfig } from '../../type'
 import CardBotomButtons from '../card-botom-buttons/card-botom-buttons.vue'
-import foldCard from '../fold-card/fold-card.vue'
+import foldCard2 from '../fold-card2/fold-card2.vue'
 import LabelValue from '../label-value/label-value.vue'
 
 defineOptions({
@@ -132,11 +132,11 @@ async function getDetailData() {
           </view>
           <view v-if="group.type === 'relation'">
             <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">
+              <foldCard2 :index="subindex" :enum-column="{}" :groups="group" :source-id="sourceId" :columns="group.fields" model="complex" :data="field">
                 <template #buttons>
                   <CardBotomButtons :primary-column="group.primaryColumn || { controlType: '', extControlType: '', sourceId: '', mstrucId: '' }" :source-id="group.id" :item="groups" :code="field.code" :data="data" />
                 </template>
-              </foldCard>
+              </foldCard2>
             </view>
           </view>
         </wd-collapse-item>

package/components/wui-edit-page/wui-edit-page-copy.vue

@@ -7,7 +7,7 @@ import FormControl from '../form-control/form-control.vue'
 import { addPageConfig, editPageConfig, editPageDataSave, enums, selectDatas } from '../../api/page'
 import type { Entities, Enums, Groups, dtmplConfig } from '../../type'
 import { useGlobalToast } from '../../composables/useGlobalToast'
-import foldCard from '../fold-card/fold-card.vue'
+import foldCard2 from '../fold-card2/fold-card2.vue'
 import { generateHighResolutionID } from '../../utils/index'
 import TreeSelectControl from '../tree-select/index.vue'
 import batchUploadFile from '../batch-upload-file/batch-upload-file.vue'
@@ -720,7 +720,7 @@ function handleFileChange(e: any, group: Groups) {
                 </wd-button>
               </view>
               <view v-for="(field, index) in pageConfig?.entity?.arrayMap[group.id]" :key="field.code">
-                <foldCard
+                <foldCard2
                   :index="index" :enum-column="{}" :groups="group" :source-id="sourceId" :columns="group.fields"
                   model="complex" :data="field"
                 >
@@ -738,7 +738,7 @@ function handleFileChange(e: any, group: Groups) {
                       删除
                     </wd-button>
                   </template>
-                </foldCard>
+                </foldCard2>
               </view>
             </view>
           </view>

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

@@ -7,7 +7,7 @@ import { addPageConfig, editPageConfig, editPageDataSave, enums, selectDatas, ac
 import type { Entities, Enums, Groups, dtmplConfig, rowActions, Fields } from '../../type'
 import { useGlobalToast } from '../../composables/useGlobalToast'
 import { useGlobalMessage } from '../../composables/useGlobalMessage'
-import foldCard from '../fold-card/fold-card.vue'
+import foldCard2 from '../fold-card2/fold-card2.vue'
 import ActionPopup from '../action-popup/action-popup.vue'
 import { generateHighResolutionID, comparator } from '../../utils/index'
 import TreeSelectControl from '../tree-select/index.vue'
@@ -937,7 +937,7 @@ console.log(pageConfig, 'props111')
             </view>
             <view v-else>
               <view v-for="(field, index) in pageConfig?.entity?.arrayMap[group.id]" :key="field.code">
-                <foldCard
+                <foldCard2
                   :index="index"
                   :enum-column="{}"
                   :groups="group"
@@ -962,7 +962,7 @@ console.log(pageConfig, 'props111')
                       删除
                     </wd-button>
                   </template>
-                </foldCard>
+                </foldCard2>
               </view>
             </view>
           </view>

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

@@ -2,7 +2,7 @@
 import { defineOptions, defineProps, onMounted, onUnmounted, ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { listData, pageConfig, pageKey } from '../../api/page'
-import foldCard from '../fold-card/fold-card.vue'
+import foldCard2 from '../fold-card2/fold-card2.vue'
 import type { Config, Entities } from '../../type'
 import Search from '../search/search.vue'
 import ListTopButtons from '../list-top-buttons/list-top-buttons.vue'
@@ -246,7 +246,7 @@ function tabSearchClick(data: any) {
       </productCard>
     </view>
     <view v-else>
-      <foldCard
+      <foldCard2
         v-for="(item, index) in datas"
         :key="item.code"
         :index="index"
@@ -281,7 +281,7 @@ function tabSearchClick(data: any) {
             :button-edit-action="config.buttonEditAction"
           />
         </template>
-      </foldCard>
+      </foldCard2>
     </view>
 
     <template #bottom>

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

@@ -3,7 +3,7 @@ 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'
-import foldCard from '../fold-card/fold-card.vue'
+import foldCard2 from '../fold-card2/fold-card2.vue'
 import type { Config, Entities, Enums, FoldCardModel } from '../../type'
 import { useGlobalToast } from '../../composables/useGlobalToast'
 import Search from '../search/search.vue'
@@ -251,7 +251,7 @@ onUnmounted(() => {
       <slot name="top" />
     </template>
 
-    <foldCard
+    <foldCard2
       v-for="(item, index) in datas"
       :key="item.code"
       :index="index"
@@ -286,7 +286,7 @@ onUnmounted(() => {
       <!-- <template #buttons>
         <CardBotomButtons :data="item" :groups="config" :source-id="sourceId" :item="config" :code="item.code" />
       </template> -->
-    </foldCard>
+    </foldCard2>
 
     <template #bottom>
       <slot name="bottom">

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { enums, listData, pageConfig, pageKey } from '../../api/page'
-import foldCard from '../fold-card/fold-card.vue'
+import foldCard2 from '../fold-card2/fold-card2.vue'
 import Search from '../search/search.vue'
 import type { Config, Entities, Enums, FoldCardModel } from '../../type'
 import { useGlobalToast } from '../../composables/useGlobalToast'
@@ -475,7 +475,7 @@ console.log(props, 'props')
               <slot name="top" />
             </template>
 
-            <foldCard
+            <foldCard2
               v-for="(item, index) in datas"
               :key="item.code"
               :index="index"
@@ -496,7 +496,7 @@ console.log(props, 'props')
                   :type="checkboxType"
                 />
               </template>
-            </foldCard>
+            </foldCard2>
 
             <template #bottom>
               <view class="popup-footer flex justify-center gap-4 p-4 border-t border-gray-200">

package/package.json

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