vue2-client 1.18.62 → 1.18.64

package/src/pages/system/dictionary/index.vue

@@ -1,44 +1,44 @@
-<template>
-  <a-card :bordered="false">
-    <dictionary-details-view
-      v-if="selectId"
-      :id="selectId"
-      :visible.sync="detailVisible"
-    />
-    <x-form-table
-      serviceName="af-system"
-      :queryParamsName="queryParamsName"
-      title="字典"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-
-  export default {
-    name: 'Dictionary',
-    components: {
-      XFormTable,
-      DictionaryDetailsView
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'crud_dictionary_manage',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <dictionary-details-view
+      v-if="selectId"
+      :id="selectId"
+      :visible.sync="detailVisible"
+    />
+    <x-form-table
+      serviceName="af-system"
+      :queryParamsName="queryParamsName"
+      title="字典"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
+
+  export default {
+    name: 'Dictionary',
+    components: {
+      XFormTable,
+      DictionaryDetailsView
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'crud_dictionary_manage',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>

package/src/pages/system/monitor/loginInfor/index.vue

@@ -1,37 +1,37 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="登录日志"
-      serviceName="af-system"
-      :queryParamsName="queryParamsName"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'LoginInfor',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'crud_login_infor_manage',
-      // 是否显示详情抽屉
-      detailVisible: false
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="登录日志"
+      serviceName="af-system"
+      :queryParamsName="queryParamsName"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'LoginInfor',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 选中的编号
+      selectNo: undefined,
+      // 查询配置文件名
+      queryParamsName: 'crud_login_infor_manage',
+      // 是否显示详情抽屉
+      detailVisible: false
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      this.selectNo = id + ''
+      this.detailVisible = true
+    }
+  }
+}
+</script>

package/src/pages/system/monitor/operLog/index.vue

@@ -1,37 +1,37 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="操作日志"
-      :queryParamsName="queryParamsName"
-      serviceName="af-system"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'OperLog',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'crud_oper_log_manage',
-      // 是否显示详情抽屉
-      detailVisible: false
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="操作日志"
+      :queryParamsName="queryParamsName"
+      serviceName="af-system"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'OperLog',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 选中的编号
+      selectNo: undefined,
+      // 查询配置文件名
+      queryParamsName: 'crud_oper_log_manage',
+      // 是否显示详情抽屉
+      detailVisible: false
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      this.selectNo = id + ''
+      this.detailVisible = true
+    }
+  }
+}
+</script>

package/src/pages/userInfoDetailManage/uploadFilesHistory/ImagePreview.vue

@@ -2,10 +2,11 @@
   <div v-if="visible" class="preview-mask">
     <div class="preview-container">
       <img
-        :src="src"
+        :src="imageSrc"
         :style="imgStyle"
         class="preview-img"
         @mousedown="startDrag"
+        @error="handleImageError"
         draggable="false"
       />
       <div class="preview-actions">
@@ -20,22 +21,43 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, computed, watch } from 'vue'
 
- defineProps({
+ const props = defineProps({
   src: {
     type: String,
     required: true
   },
+  originalPath: {
+    type: String,
+    default: ''
+  },
   visible: Boolean
 })
-const emits = defineEmits(['close'])
+const emits = defineEmits(['close', 'src-updated'])
 
 const scale = ref(1)
 const rotate = ref(0)
 const offset = ref({ x: 0, y: 0 })
 const dragging = ref(false)
 const dragStart = ref({ x: 0, y: 0 })
+const imageSrc = ref(props.src)
+const isFixed = ref(false) // 标记是否已修复过路径
+
+// 当src变化时，更新imageSrc（如果路径没有被修复过）
+watch(() => props.src, (newSrc) => {
+  if (!isFixed.value) {
+    imageSrc.value = newSrc
+  }
+})
+
+// 当visible变化时，如果是打开状态，重置imageSrc和修复标记
+watch(() => props.visible, (newVisible) => {
+  if (newVisible) {
+    imageSrc.value = props.src
+    isFixed.value = false
+  }
+})
 
 const imgStyle = computed(() => ({
   transform: `scale(${scale.value}) rotate(${rotate.value}deg) translate(${offset.value.x}px, ${offset.value.y}px)`,
@@ -69,6 +91,38 @@ const stopDrag = () => {
   document.removeEventListener('mousemove', onDrag)
   document.removeEventListener('mouseup', stopDrag)
 }
+
+const handleImageError = (event) => {
+  if (!event.target || !props.originalPath) return
+  
+  const currentSrc = imageSrc.value || ''
+  console.log('ImagePreview error - currentSrc:', currentSrc, 'originalPath:', props.originalPath)
+  
+  if (currentSrc.includes('/files/')) {
+    console.log('ImagePreview: 已经是新格式，不再处理')
+    return
+  }
+  if (!currentSrc.includes('/rs/image/file/')) {
+    console.log('ImagePreview: 不是旧格式，不再处理')
+    return
+  }
+  
+  const baseUrl = `${window.location.protocol}//${window.location.host}`
+  
+  // 如果是本地文件路径，尝试新格式（保留目录结构）
+  if (props.originalPath.match(/^[A-Za-z]:[/\\]/)) {
+    const normalizedPath = props.originalPath.replace(/\\/g, '/')
+    const filesIndex = normalizedPath.toLowerCase().indexOf('/files/')
+    if (filesIndex !== -1) {
+      const relativePath = normalizedPath.substring(filesIndex + 1)
+      const newUrl = `${baseUrl}/${relativePath}`
+      console.log('ImagePreview: 切换到新格式URL:', newUrl)
+      imageSrc.value = newUrl
+      isFixed.value = true // 标记已修复
+      emits('src-updated', newUrl) // 通知父组件更新路径
+    }
+  }
+}
 </script>
 
 <style scoped>

package/src/pages/userInfoDetailManage/uploadFilesHistory/index.vue

@@ -23,6 +23,7 @@
                 class="file-image"
                 v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')"
                 @click="openPreview(file.f_downloadpath)"
+                @error="(e) => handleImageError(e, file.f_downloadpath)"
                 style="cursor: pointer"
               />
               <p>上传时间: {{ file.f_uploaddate }}</p>
@@ -36,7 +37,7 @@
         </div>
       </a-list-item>
     </a-list>
-    <ImagePreview :src="previewImg" :visible="previewVisible" @close="previewVisible = false" />
+    <ImagePreview :src="previewImg" :original-path="previewOriginalPath" :visible="previewVisible" @close="previewVisible = false" @src-updated="handleSrcUpdated" />
   </div>
 </template>
 
@@ -60,7 +61,8 @@ export default {
       fusetypes: [],
       isDelete: '0',
       previewVisible: false,
-      previewImg: ''
+      previewImg: '',
+      previewOriginalPath: ''
     }
   },
   methods: {
@@ -93,24 +95,62 @@ export default {
       this.getFiles()
     },
     openPreview(src) {
+      this.previewOriginalPath = src
       this.previewImg = this.getFileUrl(src)
       this.previewVisible = true
     },
+    handleImageError(event, path) {
+      if (!path || !event.target) return
+      const currentSrc = event.target.src || ''
+      console.log('列表图片error - currentSrc:', currentSrc, 'path:', path)
+      
+      if (currentSrc.includes('/files/')) {
+        console.log('列表图片: 已经是新格式，不再处理')
+        return
+      }
+      if (!currentSrc.includes('/rs/image/file/')) {
+        console.log('列表图片: 不是旧格式，不再处理')
+        return
+      }
+      const baseUrl = `${window.location.protocol}//${window.location.host}`
+      // 如果是本地文件路径，尝试新格式（保留目录结构）
+      if (path.match(/^[A-Za-z]:[/\\]/)) {
+        const normalizedPath = path.replace(/\\/g, '/')
+        const filesIndex = normalizedPath.toLowerCase().indexOf('/files/')
+        if (filesIndex !== -1) {
+          const relativePath = normalizedPath.substring(filesIndex + 1)
+          const newUrl = `${baseUrl}/${relativePath}`
+          console.log('列表图片: 切换到新格式URL:', newUrl)
+          event.target.src = newUrl
+        }
+      }
+    },
+    handleSrcUpdated(newUrl) {
+      console.log('ImagePreview通知更新路径:', newUrl)
+      this.previewImg = newUrl
+    },
     getFileUrl(path) {
       if (!path) return ''
-
       console.log('原始路径:', path)
-
       // 获取当前域名和端口
       const baseUrl = `${window.location.protocol}//${window.location.host}`
-
-      // 如果是本地文件路径，转换为新的转发路径
+      // 如果是本地文件路径，优先使用新格式（/files/...保留目录结构）
       if (path.match(/^[A-Za-z]:[/\\]/)) {
-        // 提取文件名
-        const fileName = path.split(/[/\\]/).pop()
-        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
-        console.log('转换后路径:', newUrl)
-        return newUrl
+        const normalizedPath = path.replace(/\\/g, '/')
+        const filesIndex = normalizedPath.toLowerCase().indexOf('/files/')
+        if (filesIndex !== -1) {
+          // 找到 /files/ 位置，使用新格式（保留目录结构）
+          const relativePath = normalizedPath.substring(filesIndex + 1)
+          const newUrl = `${baseUrl}/${relativePath}`
+          console.log('使用新格式路径:', newUrl)
+          return newUrl
+        } else {
+          // 如果路径中没有 /files/，使用旧格式
+          const fileName = normalizedPath.split('/').pop()
+          const newUrl = `${baseUrl}/rs/image/file/${encodeURIComponent(fileName)}`
+          console.log('使用旧格式路径:', newUrl)
+          return newUrl
+        }
       }
       // 如果已经是HTTP路径，直接返回
       if (path.startsWith('http')) {
@@ -123,6 +163,12 @@ export default {
         console.log('相对路径转换:', newUrl)
         return newUrl
       }
+      // 如果已经是 /files/ 开头的相对路径，直接添加域名前缀
+      if (path.startsWith('/files/')) {
+        const newUrl = `${baseUrl}${path}`
+        console.log('files相对路径转换:', newUrl)
+        return newUrl
+      }
       console.log('其他路径，直接返回:', path)
       return path
     }

package/src/services/api/cas.js

@@ -1,79 +1,79 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
-  // 其他验证
-  otherValidate: '/api/af-sso/logic'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, inner) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !inner) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export function doOtherValidate (logicName, st, serviceKey) {
-  return post(casApi.otherValidate + '/' + logicName, {
-    st: st,
-    serviceKey: serviceKey
-  }, null)
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
+  // 其他验证
+  otherValidate: '/api/af-sso/logic'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !inner) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              window.location.href = '/login?serviceKey=' + serviceKey
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export function doOtherValidate (logicName, st, serviceKey) {
+  return post(casApi.otherValidate + '/' + logicName, {
+    st: st,
+    serviceKey: serviceKey
+  }, null)
+}
+
+export default casApi