wui-components-v2 1.0.85 → 1.0.86

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

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { computed, defineOptions, defineProps } from 'vue'
-import type { Columns, Entities } from '../../type'
+import type { Columns, Entities, Fields } from '../../type'
 import { downloadFile, formatItemData } from '../../utils'
+import ControlTypeSupportor from '../../utils/control-type-supportor'
 
 defineOptions({
   name: 'LabelValue',
@@ -23,6 +24,10 @@ function splitUrlStr(str: string) {
     return '暂无文件'
   }
 }
+
+function isControlType(item: Columns): string {
+  return ControlTypeSupportor.getControlType({ ...item, disabled: false, defaultValue: '', transDefaultValue: '', required: false }, props.data.fieldMap[item.sourceId])
+}
 </script>
 
 <template>
@@ -30,24 +35,28 @@ function splitUrlStr(str: string) {
     <view class="mr-2 w-20 p-1 text-gray-500 dark:text-white">
       {{ item.title }}:
     </view>
-    <view v-if="item.controlType === 'file' || item.extControlType === 'file' || item.extControlType === 'relfile'" class="flex-1 text-gray-800 dark:text-white">
-      <wd-img v-if="data.fieldMap[item.sourceId]" enable-preview :width="100" :height="100" :src="formatItemData(data.fieldMap[item.sourceId], item.extControlType || item.controlType)">
-        <template #error>
-          <view class="error-wrap">
-            <wd-button type="text" @click="downloadFile(formatItemData(data.fieldMap[item.sourceId], item.extControlType || item.controlType))">
-              {{ splitUrlStr(formatItemData(data.fieldMap[item.sourceId], item.extControlType || item.controlType)) || '' }}
-            </wd-button>
-          </view>
-        </template>
-        <template #loading>
-          <view class="loading-wrap">
-            <wd-loading />
-          </view>
-        </template>
-      </wd-img>
+    <view v-if="isControlType(item) === 'file' || isControlType(item) === 'relfile'" class="flex-1 text-gray-800 dark:text-white">
+      <view v-if="data.fieldMap[item.sourceId]">
+        <view v-for="(url, uindex) in formatItemData(data.fieldMap[item.sourceId], isControlType(item))" :key="uindex">
+          <wd-img enable-preview :width="100" :height="100" :src="url">
+            <template #error>
+              <view class="error-wrap">
+                <wd-button type="text" @click="downloadFile(url)">
+                  {{ splitUrlStr(url) || '' }}
+                </wd-button>
+              </view>
+            </template>
+            <template #loading>
+              <view class="loading-wrap">
+                <wd-loading />
+              </view>
+            </template>
+          </wd-img>
+        </view>
+      </view>
     </view>
     <view v-else class="flex flex-1 items-center text-gray-800 dark:text-white">
-      {{ formatItemData(data.fieldMap[item.sourceId], item.extControlType || item.controlType) }}
+      {{ formatItemData(data.fieldMap[item.sourceId], isControlType(item)) }}
     </view>
   </view>
 </template>

package/package.json

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

package/utils/control-type-supportor.ts

@@ -131,6 +131,10 @@ ControlTypeSupportor.getControlType = function (fieldConfig: Fields, fieldValue?
   if (!!fieldValue && typeof (fieldValue) == 'string' && !fieldValue.includes('@R@') && itemType === 'relselect' && fieldValue.includes('download-files/')) {
     itemType = 'file'
   }
+
+  if (fieldValue && Array.isArray(fieldValue) && itemType === 'relselect' && fieldValue[0].includes('valid')) {
+    itemType = 'file'
+  }
   return itemType
 }
 

package/utils/index.ts

@@ -42,11 +42,19 @@ export function formatItemData(data: any, type: string) {
       // 判断是否为JSON文件
       if (typeof data === 'string') {
         const a = JSON.parse(data)
-        return `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`
-        // return {
-        //   url: `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,
-        //   name: a.base.fileName,
-        // }
+        return [`${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`]
+      }
+      else if (Array.isArray(data)) {
+        return data.map((item) => {
+          if (item.includes('@R@')) {
+            const a = JSON.parse(item.split('@R@')[1])
+            return `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`
+          }
+          else {
+            const a = JSON.parse(item)
+            return `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`
+          }
+        })
       }
       else {
         return data.url