wui-components-v2 1.0.44 → 1.0.46

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

@@ -522,14 +522,23 @@ function rowEdit(group: Groups, field: Entities) {
 
     // 显示数据
     if (pageConfig.value.entity.arrayMap[group.id]) {
-      pageConfig.value.entity.arrayMap[group.id] = pageConfig.value.entity.arrayMap[group.id].filter((item: any) => item.code !== newData.id)
-      pageConfig.value.entity.arrayMap[group.id].push({
+      const index = pageConfig.value.entity.arrayMap[group.id].findIndex((item: any) => item.code === newData.id)
+      console.log('index', index)
+      pageConfig.value.entity.arrayMap[group.id][index] = {
         arrayMap: {},
         code: '',
         fieldMap: {
           ...newData,
         },
-      })
+      }
+      // pageConfig.value.entity.arrayMap[group.id] = pageConfig.value.entity.arrayMap[group.id].filter((item: any) => item.code !== newData.id)
+      // pageConfig.value.entity.arrayMap[group.id].push({
+      //   arrayMap: {},
+      //   code: '',
+      //   fieldMap: {
+      //     ...newData,
+      //   },
+      // })
     }
 
     console.log(rowData.value, group.id, 'rowData.value')

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

@@ -43,7 +43,7 @@ function initFormData() {
       if (props.entity && typeof props.entity[item.sourceId] === 'object') {
         return models[item.sourceId] = [props.entity[item.sourceId]]
       }
-      return models[item.sourceId] = (props.entity && props.entity[item.sourceId] && [{ disabled: item.disabled, url: `${action.value}/v3/files${JSON.parse(props.entity[item.sourceId])?.base.path}?@token=${token.value}&@programToken=${hydrocarbonProgramToken.value}`, name: `${JSON.parse(props.entity[item.sourceId])?.base.fileName}`, response: JSON.stringify({
+      return models[item.sourceId] = (props.entity && props.entity[item.sourceId] && [{ disabled: JSON.parse(props.entity[item.sourceId]).valid, url: `${action.value}/v3/files${JSON.parse(props.entity[item.sourceId])?.base.path}?@token=${token.value}&@programToken=${hydrocarbonProgramToken.value}`, name: `${JSON.parse(props.entity[item.sourceId])?.base.fileName}`, response: JSON.stringify({
         fileKey: `$blob:${JSON.parse(props.entity[item.sourceId])?.base.bytesInfoVO.code}`,
       }) }]) || item.transDefaultValue || []
     }

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, defineOptions, defineProps } from 'vue'
 import type { Columns, Entities, FoldCardModel, Groups } from '../../type'
-import { formatItemData } from '../../utils'
+import { downloadFile, formatItemData } from '../../utils'
 
 defineOptions({
   name: 'LabelValue',
@@ -13,6 +13,11 @@ const props = defineProps<{
 const clums = computed(() => {
   return props.exhibitData.filter(item => !item.title?.includes('y'))
 })
+
+function splitUrlStr(str: string) {
+  const strarr = str.split('&')
+  return strarr[strarr.length - 1] || ''
+}
 </script>
 
 <template>
@@ -21,7 +26,20 @@ const clums = computed(() => {
       {{ 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 enable-preview :width="100" :height="100" :src="formatItemData(data.fieldMap[item.sourceId], item.extControlType || item.controlType)" />
+      <wd-img 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>
     <view v-else class="flex flex-1 items-center text-gray-800 dark:text-white">
       {{ formatItemData(data.fieldMap[item.sourceId], item.extControlType || item.controlType) }}

package/package.json

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

package/utils/index.ts

@@ -39,11 +39,14 @@ export function formatItemData(data: any, type: string) {
 
   if (type === 'file' || type === 'relfile') {
     if (data) {
-      console.log('sdsadasd', data)
       // 判断是否为JSON文件
       if (typeof data === 'string') {
         const a = JSON.parse(data)
-        return `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`
+        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,
+        // }
       }
       else {
         return data.url
@@ -66,3 +69,36 @@ export function generateHighResolutionID(): string {
   counter = (counter + 1) % Number.MAX_SAFE_INTEGER
   return `${time}-${random}-${counter.toString(36).padStart(6, '0')}`
 }
+
+// 下载文件
+export function downloadFile(url: any) {
+  console.log('下载', url)
+  uni.downloadFile({
+    url, // 文件的网络地址
+    success: (res) => {
+      if (res.statusCode === 200) {
+        console.log('下载成功', res.tempFilePath)
+        // 打开文件（如PDF、Word等）
+        uni.openDocument({
+          filePath: res.tempFilePath,
+          showMenu: true,
+          success: () => console.log('打开文件成功'),
+        })
+      }
+      else {
+        console.error('下载失败', res)
+        uni.showToast({
+          title: '下载失败',
+          icon: 'none',
+        })
+      }
+    },
+    fail: (err) => {
+      console.error('下载失败', err)
+      uni.showToast({
+        title: '下载失败',
+        icon: 'none',
+      })
+    },
+  })
+}