wui-components-v2 1.0.96 → 1.0.97

package/components/label-value/label-value.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { computed, defineOptions, defineProps, ref } from 'vue'
 import type { Columns, Entities } from '../../type'
-import { formatItemData } from '../../utils'
+import { downloadFile, formatItemData } from '../../utils'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
 import VideoPlay from '../video-play/video-play.vue'
+import { useManualTheme } from '../../composables/useManualTheme'
 
 defineOptions({
   name: 'LabelValue',
@@ -12,20 +13,11 @@ const props = defineProps<{
   exhibitData: Columns[]
   data: Entities
 }>()
+const { primary } = useManualTheme()
 const clums = computed(() => {
   return props.exhibitData.filter(item => !item.title?.includes('y'))
 })
 const videoPlayRef = ref()
-// function splitUrlStr(str: string) {
-//   if (str) {
-//     const strarr = str.split('&')
-//     return strarr[strarr.length - 1].split('=')[1] || ''
-//   }
-//   else {
-//     return '暂无文件'
-//   }
-// }
-
 function openVideo(uitem: any) {
   videoPlayRef.value.open(uitem.url)
 }
@@ -42,23 +34,19 @@ function isControlType(item: Columns): string {
     </view>
     <view
       v-if="isControlType(item) === 'file' || isControlType(item) === 'relfile'"
-      class="flex-1 text-gray-800 dark:text-white"
+      class="flex flex-1 items-center text-gray-800 dark:text-white"
     >
       <view v-if="data.fieldMap[item.sourceId]">
         <view
           v-for="(uitem, uindex) in formatItemData(data.fieldMap[item.sourceId], isControlType(item))"
           :key="uindex"
         >
+          <!-- 图片 -->
           <wd-img
             v-if="['png', 'jpg', 'jpeg'].includes(uitem.type)" enable-preview :width="100" :height="100"
             :src="uitem.url"
           >
             <template #error>
-              <!-- <view class="error-wrap">
-                <wd-button type="text" @click="downloadFile(url)">
-                  {{ splitUrlStr(url) || '' }}
-                </wd-button>
-              </view> -->
               无图片
             </template>
             <template #loading>
@@ -67,6 +55,7 @@ function isControlType(item: Columns): string {
               </view>
             </template>
           </wd-img>
+          <!-- 视频 -->
           <view
             v-else-if="['mp4', 'mov', 'wmv', 'avi', 'rmvb', 'flv', 'mkv'].includes(uitem.type)"
             style="width: 70px;height: 70px;display: flex;align-items: center;justify-content: center;border: 1px solid #ccc;border-radius: 4px;"
@@ -74,6 +63,12 @@ function isControlType(item: Columns): string {
           >
             <wd-icon name="play-circle-filled" size="22px" />
           </view>
+          <!-- 文件 -->
+          <view v-else-if="['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf', 'txt', 'zip', 'rar', '7z', 'gz', 'bz2', 'tar', 'iso', 'exe', 'dmg', 'apk', 'apk', 'apk', 'apk', 'apk', 'apk', 'apk', 'apk'].includes(uitem.type)">
+            <span :style="{ color: primary }" @click="downloadFile(uitem.url)">
+              {{ uitem.name }}
+            </span>
+          </view>
         </view>
       </view>
     </view>

package/composables/useManualTheme.ts

@@ -146,6 +146,7 @@ export function useManualTheme() {
   return {
     // 状态
     theme: computed(() => store.theme),
+    // 主题色
     primary: computed(() => store.themeVars.colorTheme),
     isDark: computed(() => store.isDark),
     followSystem: computed(() => store.followSystem),

package/package.json

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

package/utils/index.ts

@@ -44,7 +44,7 @@ export function formatItemData(data: any, type: string) {
         const a = JSON.parse(data)
         return [{
           url: `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`,
-          name: a.base.path.fileName,
+          name: a.base.fileName,
           type: a.base.type,
         }]
       }
@@ -54,7 +54,7 @@ export function formatItemData(data: any, type: string) {
             const a = JSON.parse(item.split('@R@')[1])
             return [{
               url: `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`,
-              name: a.base.path.fileName,
+              name: a.base.fileName,
               type: a.base.type,
             }]
           }
@@ -62,7 +62,7 @@ export function formatItemData(data: any, type: string) {
             const a = JSON.parse(item)
             return [{
               url: `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`,
-              name: a.base.path.fileName,
+              name: a.base.fileName,
               type: a.base.type,
             }]
           }
@@ -95,7 +95,7 @@ export function generateHighResolutionID(): string {
 }
 
 // 下载文件
-export function downloadFile(url: any) {
+export function downloadFile(url: string) {
   console.log('下载', url)
   uni.downloadFile({
     url, // 文件的网络地址