@zscreate/zhxy-app-component 1.0.362 → 1.0.364

package/components/evan-form-item/evan-form-item.vue

@@ -1507,7 +1507,7 @@ export default {
         columnName: widget.columnName,
         columnCode: widget.columnCode,
         apiUrl: widget.apiUrl,
-        selectedCode: widget.labels
+        selectedCode: widget.SQLKey || 'IDIndex'
       }
       if (widget.defaultSQL && widget.defaultSQL.dataSourceId) params.datasourceId = widget.defaultSQL.dataSourceId
       if (widget.defaultSQL && widget.defaultSQL.serverId) params.serverId = widget.defaultSQL.serverId

package/components/l-file/l-file.vue

@@ -262,7 +262,20 @@ export default {
 				      	}
 				      })
             } else {
-            window.open( process.uniEnv.imgUrl+  res.message + '?download=0')
+              // #ifdef H5
+              // H5环境下使用a标签打开，避免window.open被阻止
+              const url = process.uniEnv.imgUrl + res.message + '?download=0'
+              const link = document.createElement('a')
+              link.href = url
+              link.target = '_blank'
+              link.rel = 'noopener noreferrer'
+              document.body.appendChild(link)
+              link.click()
+              document.body.removeChild(link)
+              // #endif
+              // #ifndef H5
+              window.open(process.uniEnv.imgUrl + res.message + '?download=0')
+              // #endif
             }
           } else {
             uni.showToast({
@@ -275,7 +288,38 @@ export default {
         })
         return
       }
-      window.open(process.uniEnv.imgUrl + file.url + '?download=0')
+      
+      // 处理图片和其他文件类型
+      const imageTypes = ['jpg', 'jpeg', 'png', 'gif']
+      const previewUrl = process.uniEnv.imgUrl + file.url + '?download=0'
+      
+      // #ifdef H5
+      if (imageTypes.includes(ext)) {
+        // 图片类型使用uni.previewImage
+        uni.previewImage({
+          urls: [previewUrl],
+          fail() {
+            uni.showToast({
+              icon: 'none',
+              title: '图片预览失败',
+              duration: 2000
+            })
+          }
+        })
+      } else {
+        // 其他文件类型使用a标签打开
+        const link = document.createElement('a')
+        link.href = previewUrl
+        link.target = '_blank'
+        link.rel = 'noopener noreferrer'
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+      }
+      // #endif
+      // #ifndef H5
+      window.open(previewUrl)
+      // #endif
     },
     getFileExt(filename) {
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.362",
+	"version": "1.0.364",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",