wui-components-v2 1.1.65 → 1.1.67

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/card-botom-buttons/card-botom-buttons.vue

@@ -61,19 +61,22 @@ function edit() {
     const sourceData = props.item.classEditConfigs.find((item: ClassEditConfigs) => {
       return item.preposes[0].transDefaultValue.includes(props.data.fieldMap[item.preposes[0].sourceId])
     })
-    router.push(`/pages/edit-page/index?sourceId=${sourceData?.id || props.sourceId}&id=${props.code}&title=${props.item.title}&pageType=${props.pageType}&addEvent=${props.addEvent}`)
-  }
-  else {
-    router.push(`/pages/edit-page/index?sourceId=${props.sourceId}&id=${props.code}&title=${props.item.title}&pageType=${props.pageType}&addEvent=${props.addEvent}`)
+    router.push(
+      `/pages/edit-page/index?sourceId=${sourceData?.id || props.sourceId}&id=${props.code}&title=${props.item.title}&pageType=${props.pageType}&addEvent=${props.addEvent}`
+    )
+  } else {
+    router.push(
+      `/pages/edit-page/index?sourceId=${props.sourceId}&id=${props.code}&title=${props.item.title}&pageType=${props.pageType}&addEvent=${props.addEvent}`
+    )
   }
 }
 
 const actionItem = ref<Groups>()
-const actionItemShow = ref(false)// rowActions输入弹框开关
-const showMoreButn = ref(false)// 更多按钮开关
+const actionItemShow = ref(false) // rowActions输入弹框开关
+const showMoreButn = ref(false) // 更多按钮开关
 // 打开rowActions弹框
 async function action(subitem: rowActions) {
-  console.log(subitem)
+  console.log(subitem, 2222222222222222)
   if (subitem.writes.length) {
     actionItem.value = {
       ...props.item,
@@ -81,14 +84,12 @@ async function action(subitem: rowActions) {
       id: subitem.id,
     }
     actionItemShow.value = true
-  }
-  else {
+  } else {
     try {
       await actionDataSave(subitem.id, props.code, {})
       props.zpaging.reload()
       toast.success({ msg: '操作成功！' })
-    }
-    catch (error: any) {
+    } catch (error: any) {
       toast.error(error)
       console.log(error)
     }
@@ -97,7 +98,9 @@ async function action(subitem: rowActions) {
 
 // 跳转raction页面
 function raction(subitem: rowActions) {
-  router.push(`/pages/list/index?sourceId=${subitem.id}&mainCode=${props.code}&title=${subitem.title}&pageType=${props.pageType}`)
+  router.push(
+    `/pages/list/index?sourceId=${subitem.id}&mainCode=${props.code}&title=${subitem.title}&pageType=${props.pageType}`
+  )
 }
 
 // 跳转详情页面
@@ -121,7 +124,10 @@ function isShowAction(item: rowActions) {
 }
 
 function isControlType(item: Columns): string {
-  return ControlTypeSupportor.getControlType({ ...item, hidden: false, disabled: false, defaultValue: '', transDefaultValue: '', required: false }, props.data.fieldMap[item.sourceId])
+  return ControlTypeSupportor.getControlType(
+    { ...item, hidden: false, disabled: false, defaultValue: '', transDefaultValue: '', required: false },
+    props.data.fieldMap[item.sourceId]
+  )
 }
 
 // 删除
@@ -137,15 +143,12 @@ function del() {
           toast.success({ msg: '删除成功！' })
         }
         message.close()
-      }
-      catch (error) {
+      } catch (error) {
         console.log(error)
-      }
-      finally {
+      } finally {
         resolve(true)
       }
     },
-
   })
 }
 
@@ -157,7 +160,7 @@ interface Morebutns extends Omit<rowActions, ''> {
 const morebutns = computed(() => {
   let buts: Morebutns[] = []
   if (props.rowActions) {
-    buts = anctions.value.map((item) => {
+    buts = anctions.value.map(item => {
       return {
         actionType: 'rowActions',
         name: item.title,
@@ -167,26 +170,24 @@ const morebutns = computed(() => {
   }
   if (props.ractions) {
     buts = buts.concat(
-      ractions.value.map((item) => {
+      ractions.value.map(item => {
         return {
           actionType: 'ractions',
           name: item.title,
           ...item,
         }
-      }),
-
+      })
     )
   }
   if (props.actions) {
     buts = buts.concat(
-      actions.value.map((item) => {
+      actions.value.map(item => {
         return {
           actionType: 'rowActions',
           name: item.title,
           ...item,
         }
-      }),
-
+      })
     )
   }
   return buts
@@ -199,6 +200,9 @@ function closeMoreButn() {
 
 // 点击更多按钮
 function select({ item }: { item: any }) {
+  if (item.title.includes('评价') && item.actionType === 'rowActions') {
+    return action(item)
+  }
   message.confirm({
     msg: `确定${item.title}操作吗？`,
     title: '提示',
@@ -212,6 +216,7 @@ function select({ item }: { item: any }) {
     },
   })
 }
+console.log(props, '3333333333333')
 </script>
 
 <template>
@@ -227,28 +232,46 @@ function select({ item }: { item: any }) {
       </wd-button>
     </view> -->
     <view>
-      <wd-button v-if="morebutns.length > 3" size="small" type="info" @click="() => { showMoreButn = true }">
+      <wd-button
+        v-if="morebutns.length > 3"
+        size="small"
+        type="info"
+        @click="
+          () => {
+            showMoreButn = true
+          }
+        "
+      >
         更多
       </wd-button>
       <view v-else class="flex gap-2 flex-wrap">
-        <wd-button v-for="subitem in morebutns" :key="subitem.id" plain size="small" @click="() => { select({ item: subitem }) }">
+        <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()">
-      编辑
-    </wd-button>
-    <wd-button v-if="props.item.buttons.includes('detail')" size="small" type="info" @click="detail()">
-      详情
-    </wd-button>
+    <wd-button v-if="props.item.buttons.includes('dtmplEdit')" size="small" @click="edit()">编辑</wd-button>
+    <wd-button v-if="props.item.buttons.includes('detail')" size="small" type="info" @click="detail()">详情</wd-button>
     <wd-button v-if="props.item.buttons.includes('singleDelete')" size="small" type="danger" @click="del()">
       删除
     </wd-button>
     <ActionPopup
-      v-model:show="actionItemShow" :enum-column="props.enumColumn" :zpaging="props.zpaging"
-      :field-group="actionItem" :code="props.code"
+      v-model:show="actionItemShow"
+      :enum-column="props.enumColumn"
+      :zpaging="props.zpaging"
+      :field-group="actionItem"
+      :code="props.code"
     />
     <!-- 更多按钮 -->
     <wd-action-sheet v-model="showMoreButn" :actions="morebutns" @close="closeMoreButn" @select="select" />

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

@@ -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/evaluation-page/evaluation-page.vue

@@ -0,0 +1,192 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { detailPageConfig, detailPageData, pageConfig as OperationPageConfig, actionDataSave } from '../../api/page'
+import type { Entities, Groups, dtmplConfig, rowActions } from '../../type'
+import LabelValue from '../label-value/label-value.vue'
+import ActionPopup from '../action-popup/action-popup.vue'
+import { useGlobalToast } from '../../composables/useGlobalToast'
+
+defineOptions({
+  name: 'EvaluationPage',
+})
+const toast = useGlobalToast()
+const sourceId = ref('')
+const id = ref('')
+const title = ref('')
+const pageConfig = ref<dtmplConfig>({
+  id: '',
+  title: '',
+  groups: [],
+  entity: {} as any,
+  buttons: [],
+})
+const data = ref<Entities>({
+  code: '',
+  fieldMap: {},
+  arrayMap: {},
+})
+const groups = ref<Groups>({
+  id: '',
+  buttons: ['detail'],
+  fields: [],
+  title: '',
+  type: '',
+  pointSourceId: '',
+  mstrucId: '',
+  relationNames: [],
+  readOnly: false,
+  displayConfig: [],
+})
+const loading = ref(false)
+// 折叠面板
+const collapses = ref()
+// 评价操作配置
+const evaluationActions = ref<rowActions[]>([])
+onLoad((option: any) => {
+  sourceId.value = option.sourceId
+  id.value = option.id
+  // #ifdef MP-WEIXIN
+  const q = decodeURIComponent(option.q) // 获取到二维码原始链接内容
+  const sc: any = getQueryParams(q)
+  sourceId.value = sc.sourceId || option.sourceId
+  id.value = sc.id || option.id
+  // #endif
+  title.value = option.title
+  uni.setNavigationBarTitle({
+    title: `${option.title}`,
+  })
+  getPageConfig()
+})
+
+// 将 URL 中问号后面的参数转换为对象
+function getQueryParams(url: string) {
+  // 获取问号后面的部分
+  const queryString = url.split('?')[1]
+
+  if (!queryString) {
+    return {}
+  }
+
+  // 将参数字符串分割成键值对数组
+  const pairs = queryString.split('&')
+
+  // 创建结果对象
+  const result: { [key: string]: string } = {}
+
+  // 遍历键值对
+  pairs.forEach(pair => {
+    const [key, value] = pair.split('=')
+    // 解码URI组件并添加到结果对象
+    result[decodeURIComponent(key)] = decodeURIComponent(value || '')
+  })
+
+  return result
+}
+
+// 获取页面配置
+async function getPageConfig() {
+  try {
+    loading.value = true
+    const res = await detailPageConfig(sourceId.value)
+    // 初始化折叠面板
+    if (res.dtmplConfig) {
+      uni.setNavigationBarTitle({
+        title: `${res.dtmplConfig.title}`,
+      })
+      pageConfig.value = res.dtmplConfig
+      collapses.value = pageConfig.value.groups.map((item: Groups) => {
+        return item.id
+      })
+      getDetailData()
+      getOperationPageConfig()
+    }
+  } catch (error) {
+    console.log(error)
+    loading.value = false
+  }
+}
+
+// 获取详情数据
+async function getDetailData() {
+  try {
+    const res = await detailPageData(sourceId.value, id.value)
+    data.value = res.entity
+    loading.value = false
+  } catch (error) {
+    loading.value = false
+    console.log(error)
+  }
+}
+async function getOperationPageConfig() {
+  try {
+    const res: any = await OperationPageConfig(sourceId.value)
+    // 筛选出评价相关的操作
+    if (res.ltmplConfig?.rowActions) {
+      evaluationActions.value = res.ltmplConfig.rowActions.filter((item: rowActions) => item.title.includes('评价'))
+    }
+    console.log(res, '222222222')
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const actionItemShow = ref(false)
+const actionItem = ref<Groups>()
+const code = ref('')
+const enumColumn = ref()
+// 模拟 zpaging 对象，用于 ActionPopup 刷新
+const mockZpaging = {
+  reload: () => getDetailData(),
+}
+
+// 评价按钮点击事件 - 迁移自 card-botom-buttons 的 select action 功能
+async function handleEvaluationClick() {
+  if (evaluationActions.value.length === 0) {
+    toast.error({ msg: '未找到评价操作配置' })
+    return
+  }
+  // 取第一个评价操作
+  const subitem = evaluationActions.value[0]
+  if (subitem.writes.length) {
+    actionItem.value = {
+      ...groups.value,
+      fields: subitem.writes,
+      id: subitem.id,
+    }
+    code.value = id.value
+    actionItemShow.value = true
+  } else {
+    try {
+      await actionDataSave(subitem.id, id.value, {})
+      toast.success({ msg: '评价成功！' })
+    } catch (error: any) {
+      toast.error(error)
+      console.log(error)
+    }
+  }
+}
+</script>
+
+<template>
+  <view class="p-4">
+    <view v-if="loading" class="flex justify-center p-3">
+      <wd-loading />
+    </view>
+    <view v-else>
+      <view v-for="(group, index) in pageConfig.groups" :key="group.id" :title="group.title" :name="group.id">
+        <view class="text-sm space-y-3">
+          <LabelValue :index="index" :exhibit-data="group.fields" :data="data" />
+        </view>
+      </view>
+    </view>
+    <wd-button type="primary" class="mt-4 w-full" @click="handleEvaluationClick">评价</wd-button>
+    <ActionPopup
+      v-model:show="actionItemShow"
+      :enum-column="enumColumn"
+      :zpaging="mockZpaging"
+      :field-group="actionItem"
+      :code="code"
+    />
+  </view>
+</template>

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>