wui-components-v2 1.1.54 → 1.1.55

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

@@ -31,23 +31,38 @@ const show = computed({
   },
 })
 
+// 格式化文件数据为后端期望的 JSON 字符串
+function formatFileData(data: Record<string, any>) {
+  const result = { ...data }
+  for (const key in result) {
+    if (result[key]?.response) {
+      const fileObj = result[key]
+      const res = typeof fileObj.response === 'string' ? JSON.parse(fileObj.response) : fileObj.response
+      result[key] = JSON.stringify({
+        valid: fileObj.disabled ? 'old' : 'new',
+        fileKey: res.fileKey,
+        fileName: fileObj.name,
+      })
+    }
+  }
+  return result
+}
+
 // 提交数据
 async function action() {
-  console.log('提交action')
   btnLoading.value = true
   if (!props.fieldGroup?.id) {
     return toast.warning({ msg: '无sourceId' })
   }
   try {
     const data = await formControlRef.value.submit()
-    await actionDataSave(props.fieldGroup?.id || '', props.code, data)
+    await actionDataSave(props.fieldGroup?.id || '', props.code, formatFileData(data))
     btnLoading.value = false
     show.value = false
     props.zpaging.reload()
     toast.success({ msg: '操作成功！' })
   }
   catch (error: any) {
-    console.log(error, 'error')
     btnLoading.value = false
     toast.error(error)
   }

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

@@ -124,6 +124,7 @@ const schema = computed((): FormSchema => {
 
 // 监听文件上传成功
 function handleFileChange(e: any, item: Fields) {
+  console.log(e, item,'2222222222222')
   model.value[item.sourceId] = e.fileList
 }
 
@@ -177,7 +178,7 @@ defineExpose({
 <template>
   <view>
     <wd-form ref="form" :model="model" :schema="schema" error-type="toast" :label-width="120" class="custom-from-style">
-      <addAddressPage  v-if="props.smartPaste" v-model="model" :group="props.fieldGroup" />
+      <addAddressPage  v-if="props?.smartPaste" v-model="model" :group="props.fieldGroup" />
       <view v-for="item in fields" :key="item.sourceId">
         <view v-show="!item.title?.includes('y') && !item.hidden">
           <wd-form-item
@@ -318,6 +319,22 @@ defineExpose({
               :clearable="!item.disabled"
               :placeholder="`请选择${item.title}`"
             />
+
+          </wd-form-item>
+                  <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'date-YY'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <customDatePicker
+              v-model="model[item.sourceId]"
+              type="year"
+              use-second
+              :clearable="!item.disabled"
+              :placeholder="`请选择${item.title}`"
+            />
+
           </wd-form-item>
           <wd-form-item
             v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'file' || ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relfile'"

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

@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import { defineOptions, defineProps } from 'vue'
 import { useRouter } from 'uni-mini-router'
 
 defineOptions({
   name: 'ListTopButtons',
 })
-const props = defineProps<{ mainCode: string, buttons: string[], sourceId: string, id?: string, pageTitle: string, pageType?: string, addEvent?: string }>()
+const props = defineProps<{ mainCode: string, buttons: string[], sourceId: string, id?: string, pageTitle: string, pageType?: string, addEvent?: string, config?: any }>()
 const router = useRouter()
 // 跳转添加页面
 function gotoAddPage() {
@@ -14,7 +13,7 @@ function gotoAddPage() {
 </script>
 
 <template>
-  <view class="flex justify-end gap-1 py-2 pr-2 .light:bg-white">
-    <wd-icon v-if="buttons.includes('dtmplAdd')" name="plus" size="24px" class="text-[#6b7280]" @click="gotoAddPage" />
+  <view class="flex justify-end gap-1 py-2 px-2 .light:bg-white">
+    <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/scan-input/scan-input.vue

@@ -0,0 +1,312 @@
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted, nextTick } from 'vue'
+
+defineOptions({
+  name: 'ScanInput',
+})
+
+const props = withDefaults(defineProps<{
+  autoStart?: boolean
+  placeholder?: string
+}>(), {
+  autoStart: false,
+  placeholder: '请输入或扫描二维码/条形码',
+})
+
+const emit = defineEmits<{
+  (e: 'scan', data: string): void
+  (e: 'input', data: string): void
+  (e: 'error', error: string): void
+}>()
+
+const inputValue = ref('')
+const isScanning = ref(false)
+const showScanModal = ref(false)
+const isLoading = ref(false)
+let html5QrcodeScanner: any = null
+
+// #ifdef H5
+import { Html5Qrcode } from 'html5-qrcode'
+
+function checkCameraEnvironment(): { ok: boolean, reason?: string } {
+  const hostname = window.location.hostname
+  if (hostname === 'localhost' || hostname === '127.0.0.1') return { ok: true }
+  if (window.location.protocol !== 'https:') {
+    return { ok: false, reason: '当前非HTTPS环境，请在 https 下使用扫码功能' }
+  }
+  return { ok: true }
+}
+
+async function startScan() {
+  if (isScanning.value) return
+  const envCheck = checkCameraEnvironment()
+  if (!envCheck.ok) {
+    uni.showToast({ title: envCheck.reason || '环境不支持', icon: 'none' })
+    return
+  }
+
+  isLoading.value = true
+  isScanning.value = true
+  showScanModal.value = true
+
+  try {
+    await nextTick()
+    // 减少延时，库已打包进 bundle 无需等待加载
+    await new Promise(r => setTimeout(r, 200))
+
+    const container = document.getElementById('h5-scan-reader')
+    if (!container) throw new Error('容器未找到')
+
+    html5QrcodeScanner = new Html5Qrcode('h5-scan-reader')
+
+    await html5QrcodeScanner.start(
+      { facingMode: 'environment' },
+      {
+        fps: 5,
+        // 不设置 qrbox，全屏显示摄像头画面
+      },
+      (decodedText: string) => {
+        console.log('扫码成功:', decodedText)
+        // 防抖：短时间内多次触发只处理第一次
+        if (!isScanning.value) return
+        inputValue.value = decodedText
+        emit('scan', decodedText)
+        emit('input', decodedText)
+        stopScan()
+        uni.showToast({ title: '扫描成功', icon: 'success' })
+      },
+      () => {}, // 忽略中间帧错误
+    )
+  }
+  catch (error: any) {
+    console.error('扫码启动失败:', error)
+    let msg = '摄像头访问失败'
+    const errMsg = error.message || ''
+    if (/Permission|NotAllowed/i.test(errMsg)) msg = '请允许浏览器使用摄像头'
+    else if (/NotFound|not found/i.test(errMsg)) msg = '未检测到摄像头设备'
+    else if (/secure origin|insecure/i.test(errMsg)) msg = '需要HTTPS环境才能使用摄像头'
+
+    emit('error', msg)
+    isScanning.value = false
+    showScanModal.value = false
+    uni.showModal({ title: '提示', content: msg, showCancel: false })
+  }
+  finally {
+    isLoading.value = false
+  }
+}
+
+async function stopScan() {
+  isScanning.value = false
+  showScanModal.value = false
+  if (html5QrcodeScanner) {
+    try {
+      if (html5QrcodeScanner.isScanning) await html5QrcodeScanner.stop()
+      html5QrcodeScanner.clear()
+    }
+    catch { /* ignore */ }
+    html5QrcodeScanner = null
+  }
+}
+// #endif
+
+function startUniScanCode() {
+  // #ifndef H5
+  uni.scanCode({
+    success(res: any) {
+      inputValue.value = res.result
+      emit('scan', res.result)
+      emit('input', res.result)
+      uni.showToast({ title: '扫描成功', icon: 'success' })
+    },
+    fail() { emit('error', '扫描已取消') },
+  })
+  // #endif
+}
+
+function handleStartScan() {
+  // #ifdef H5
+  isScanning.value ? stopScan() : startScan()
+  // #endif
+  // #ifndef H5
+  startUniScanCode()
+  // #endif
+}
+
+function handleConfirm() {
+  if (inputValue.value.trim()) emit('scan', inputValue.value.trim())
+}
+
+onMounted(() => { if (props.autoStart) handleStartScan() })
+onUnmounted(() => { /* #ifdef H5 */ stopScan() /* #endif */ })
+</script>
+
+<template>
+  <view class="si-wrap">
+    <!-- 使用 wot-ui wd-input -->
+    <wd-input
+      v-model="inputValue"
+      class="!pr-3"
+      :placeholder="placeholder"
+      type="text"
+      confirm-type="search"
+      clearable
+      no-border
+      custom-class="si-wd-input"
+      @confirm="handleConfirm"
+      @change="(val: string) => emit('input', val)"
+      suffix-icon="scan"
+       @clicksuffixicon="handleStartScan"
+    >
+    </wd-input>
+
+    <!-- #ifdef H5 -->
+    <!-- 全屏扫码遮罩 -->
+    <view v-if="showScanModal" class="si-modal" catchtouchmove>
+      <!-- 摄像头区域 -->
+      <view class="si-camera-area">
+        <!-- 加载中 -->
+        <view v-if="isLoading" class="si-loading-mask">
+          <view class="si-loading-box">
+            <text class="si-loading-text">正在启动摄像头...</text>
+          </view>
+        </view>
+        <!-- 渲染容器 -->
+        <div id="h5-scan-reader" class="si-reader" />
+        <!-- 扫描框装饰 -->
+        <view v-show="isScanning && !isLoading" class="si-scan-frame">
+          <view class="si-scan-line" />
+        </view>
+      </view>
+
+      <!-- 底部提示 -->
+      <view class="si-modal-footer">
+        <text class="si-tip">识别二维码 / 条形码 / 商品码等</text>
+      </view>
+    </view>
+    <!-- #endif -->
+  </view>
+</template>
+
+<!-- 全局样式：html5-qrcode 内部元素 -->
+<style lang="scss">
+#h5-scan-reader {
+  width: 100%;
+  height: 100%;
+  border-radius: inherit;
+  display: flex;
+
+  video {
+    border-radius: inherit;
+    object-fit: cover;
+  }
+
+  #qr-shaded-region {
+    border-radius: inherit;
+  }
+}
+</style>
+
+<style scoped lang="scss">
+.si-wrap {
+  width: 100%;
+  padding: 16rpx;
+  box-sizing: border-box;
+
+  // ---- wot-ui 输入框容器 ----
+  :deep(.si-wd-input) {
+    background: #f6f7f9;
+    border-radius: 10rpx;
+    border: 2rpx solid #eaecef;
+    padding-right: 4rpx;
+  }
+
+  // ---- 全屏扫码遮罩 ----
+  .si-modal {
+    position: fixed;
+    top: 0; left: 0; right: 0; bottom: 0;
+    z-index: 999;
+    background: #000;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .si-camera-area {
+    flex: 1;
+    width: 100%;
+    position: relative;
+    overflow: hidden;
+
+    .si-reader {
+      position: absolute;
+      top: 50%;
+      left: 0;
+      transform: translateY(-50%);
+      width: 100%;
+      height: 50vh;
+    }
+
+    // ---- 扫描框（覆盖在 reader 上方） ----
+    .si-scan-frame {
+      position: absolute;
+      top: 50%;
+      left: 0;
+      transform: translateY(-50%);
+      width: 100%;
+      height: 50vh;
+      pointer-events: none;
+      z-index: 5;
+      overflow: hidden;
+
+      .si-scan-line {
+        position: absolute;
+        top: 0;
+        left: 10rpx;
+        right: 10rpx;
+        height: 6rpx;
+        background: #07C160;
+        border-radius: 3rpx;
+        box-shadow: 0 0 20rpx 4rpx rgba(7,193,96,0.7);
+        animation: si-sweep 2.5s ease-in-out infinite;
+      }
+    }
+
+    .si-loading-mask {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      z-index: 10;
+
+      .si-loading-box {
+        background: rgba(0,0,0,0.75);
+        padding: 30rpx 48rpx;
+        border-radius: 16rpx;
+
+        .si-loading-text {
+          color: #fff;
+          font-size: 28rpx;
+        }
+      }
+    }
+  }
+
+  .si-modal-footer {
+    padding: 40rpx 32rpx 80rpx;
+    text-align: center;
+    flex-shrink: 0;
+
+    .si-tip {
+      color: rgba(255,255,255,0.65);
+      font-size: 26rpx;
+      letter-spacing: 2rpx;
+    }
+  }
+}
+
+@keyframes si-sweep {
+  0% { top: 0; opacity: 1; }
+  50% { opacity: 1; }
+  100% { top: calc(100% - 4rpx); opacity: 0.3; }
+}
+</style>

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

@@ -95,6 +95,7 @@ async function getPageConfig() {
     const res = await pageConfig(sourceId.value)
     if (res.ltmplConfig) {
       config.value = res.ltmplConfig
+      console.log('config', config.value)
       getEnums()
     }
   }
@@ -175,19 +176,18 @@ function tabSearchClick(data: any) {
   >
     <template #top>
       <slot name="top" />
-      <view class="flex items-center pl-3 bg-white">
-        <ListTopButtons
-          :add-event="addEvent" :main-code="mainCode" :buttons="config.buttons" :source-id="sourceId"
-          :page-title="pageTitle" :page-type="pageType"
-        />
       <Search
         :main-code="mainCode" :enum-column="enumColumn" :criterias="config.criterias"
         :primary-criteria="config.primaryCriteria" :split2-tab-criterias="config.split2TabCriterias"
         @submit="submitSearch"
       />
+      <view>
+        <ListTopButtons
+          :add-event="addEvent" :main-code="mainCode" :buttons="config.buttons" :source-id="sourceId"
+          :page-title="pageTitle" :page-type="pageType"
+          :config="config"
+        />
       </view>
-
-
       <!-- 自定义tab搜索 -->
       <view v-if="config.split2TabCriterias">
         <tabSearch :split2-tab-criterias="config.split2TabCriterias" :enums="enumColumn" @click="tabSearchClick" />

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

@@ -6,6 +6,9 @@ import {
 import { useUser } from '../../composables/useUser'
 import { generateGradientColor } from '../../utils'
 import { useManualTheme } from '../../composables/useManualTheme'
+import scan from '../scan-input/scan-input.vue'
+import { getUserConfig } from '../../api/login'
+import { useGlobalToast } from '../../composables/useGlobalToast'
 
 defineOptions({
   name: 'WuiUser',
@@ -21,6 +24,7 @@ const {
 } = useManualTheme()
 const user = useUser().getUserInfo()
 const dialog = useDialog()
+const toast = useGlobalToast()
 const userInfo = ref({
   name: user.name,
   nickName: user.nickName,
@@ -50,6 +54,14 @@ function setting() {
     url: '/pages/system-settings/index',
   })
 }
+ async function clearCache() {
+  // uni.removeStorageSync('userInfo')
+  const res= await getUserConfig();
+  if(res.status=='success') {
+    toast.success({ msg: '清除成功！' })
+    uni.setStorageSync('userInfo', res.user)
+  }
+}
 
 // 查看用户信息
 // function goUserInfo() {
@@ -60,6 +72,7 @@ function setting() {
 </script>
 
 <template>
+  <!-- <scan/> -->
   <view class="user">
     <view class="top-box">
       <!-- 用户头部信息 -->
@@ -87,6 +100,7 @@ function setting() {
       <!-- <wd-cell title="修改密码" icon="keywords" :is-link="true" :clickable="true"  /> -->
       <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 title="清空缓存"  :is-link="true" :clickable="true" @click="clearCache" />
     </wd-cell-group>
     <wd-dialog />
   </view>

package/composables/useCompanyFieldFilter.ts

@@ -41,7 +41,7 @@ export function useCompanyFieldFilter(
   }
 
   const formatFieldsItem=(company:string,item:any)=>{
-     const transDefaultValue = item.usableRuleCriterias[0]?.transDefaultValue||''
+     const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue||''
       const isHidden=item?.unusableMode==='hidden'
       const values = transDefaultValue.split(',').map(v => v.trim())
     if(!company){
@@ -73,7 +73,7 @@ export function useCompanyFieldFilter(
         return true
       }
       // 获取 transDefaultValue 并检查是否包含选中的公司
-      const transDefaultValue = item.usableRuleCriterias[0]?.transDefaultValue
+      const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue
       if (typeof transDefaultValue === 'string') {
         const values = transDefaultValue.split(',').map(v => v.trim())
         // console.log('transDefaultValue', company, 'values', values,values.includes(company))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.54",
+  "version": "1.1.55",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",
@@ -16,6 +16,7 @@
     "@wot-ui/ui": "^2.0.8",
     "china-address-parse": "^1.2.1",
     "dayjs": "^1.11.20",
+    "html5-qrcode": "^2.3.8",
     "jsencrypt": "^3.3.2",
     "sass": "^1.100.0",
     "z-paging": "^2.8.5"

package/store/language.ts

@@ -48,7 +48,7 @@ export const useLanguageStore = defineStore('language', () => {
    * 加载并设置语言
    */
   const loadLanguage = async (lang: string): Promise<void> => {
-    console.log(`网络加载语言 ${lang}...`)
+    // console.log(`网络加载语言 ${lang}...`)
     if (loadedLanguages.value.includes(lang)) {
       currentLanguage.value = lang
       return

package/store/manualThemeStore.ts

@@ -129,7 +129,7 @@ export const useManualThemeStore = defineStore('manualTheme', {
         this.theme = systemTheme
         if (!this.hasUserSet) {
           this.followSystem = true
-          console.log('首次启动，使用系统主题:', this.theme)
+          // console.log('首次启动，使用系统主题:', this.theme)
         }
         else {
           console.log('跟随系统主题:', this.theme)