vue2-client 1.18.28 → 1.18.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.28",
+  "version": "1.18.30",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/HIS/HButtons/HButtons.vue

@@ -27,6 +27,7 @@ const wrapperClassObject = computed(() => {
     'border', 'no-style',
     'fill-container',
     'no-boder-style',
+    'form-inline',
     'one-button-style' // 一个按钮样式，占满整个宽度
   ]
   for (const key of booleanStyleKeys) {

package/src/base-client/components/common/HIS/HTab/HTab.vue

@@ -154,7 +154,8 @@ defineExpose({
       border-radius: 6px 6px 0 0;
       color: #5D5C5C;
       font-weight: bold;
-      width: 134px;
+      min-width: 134px;
+      width: auto;
       font-size: 18px;
       line-height: 26px;
       font-family: "Source Han Sans";
@@ -162,17 +163,18 @@ defineExpose({
       height: 32px;
       text-align: center;
       margin: 0 !important;
-      padding: 0 !important;
+      padding: 0 12px !important;
     }
     .ant-tabs-tab-active {
       background-color: #0057FE;
       color: #ffffff;
-      width: 134px;
+      min-width: 134px;
+      width: auto;
       line-height: 26px;
       height: 32px;
       text-align: center;
       margin: 0 !important;
-      padding: 0 !important;
+      padding: 0 12px !important;
     }
   }
 

package/src/base-client/components/his/HChart/HChart.vue

@@ -274,12 +274,24 @@ const resolveStaticDataset = (config) => {
       return scoped
     }
     let scopedDataset = dataset
+    // 先处理时间粒度筛选（radioFilter），因为 dataset 的第一层可能是时间粒度
+    const filterKeys = [
+      selectedFilterValue.value,
+      radioFilterConfig.value?.defaultValue
+    ].filter(Boolean)
+    if (filterKeys.length) {
+      const filterScoped = pickByKeys(dataset, filterKeys, true)
+      if (Array.isArray(filterScoped)) return filterScoped
+      if (filterScoped && typeof filterScoped === 'object') scopedDataset = filterScoped
+    }
+    if (Array.isArray(scopedDataset)) return scopedDataset
+    // 再处理级联筛选或侧边列表筛选
     if (isCascadeMode.value) {
       const cascadeKeys = cascadeColumns.value
         .map(column => column.field && selectedCascadeValues.value[column.field])
         .filter(value => value !== undefined && value !== null && value !== '')
       if (cascadeKeys.length) {
-        const cascadeScoped = pickNestedByKeys(dataset, cascadeKeys)
+        const cascadeScoped = pickNestedByKeys(scopedDataset, cascadeKeys)
         if (Array.isArray(cascadeScoped)) return cascadeScoped
         if (cascadeScoped && typeof cascadeScoped === 'object') scopedDataset = cascadeScoped
       }
@@ -289,18 +301,32 @@ const resolveStaticDataset = (config) => {
         sideListConfig.value?.defaultValue
       ].filter(Boolean)
       if (listKeys.length) {
-        const listScoped = pickByKeys(dataset, listKeys, true)
+        // 优先在已按时间粒度过滤后的 scopedDataset 中取
+        const listScoped = pickByKeys(scopedDataset, listKeys, true)
         if (Array.isArray(listScoped)) return listScoped
-        if (listScoped && typeof listScoped === 'object') scopedDataset = listScoped
+        if (listScoped && typeof listScoped === 'object') {
+          // 在侧边列表命中的作用域内，再次按时间粒度过滤（处理 { dept: { week: [...] } } 场景）
+          let scopedAfterList = listScoped
+          if (filterKeys.length) {
+            const filterScopedInner = pickByKeys(scopedAfterList, filterKeys, true)
+            if (Array.isArray(filterScopedInner)) return filterScopedInner
+            if (filterScopedInner && typeof filterScopedInner === 'object') scopedAfterList = filterScopedInner
+          }
+          scopedDataset = scopedAfterList
+        } else {
+          // 如果时间粒度在第二层（如 { dept: { week: [...] } }），尝试反向嵌套取值
+          const nestedOrder = pickNestedByKeys(dataset, [...listKeys, ...filterKeys])
+          if (Array.isArray(nestedOrder)) return nestedOrder
+          if (nestedOrder && typeof nestedOrder === 'object') scopedDataset = nestedOrder
+          else {
+            const reverseNested = pickNestedByKeys(dataset, [...filterKeys, ...listKeys])
+            if (Array.isArray(reverseNested)) return reverseNested
+            if (reverseNested && typeof reverseNested === 'object') scopedDataset = reverseNested
+          }
+        }
       }
     }
     if (Array.isArray(scopedDataset)) return scopedDataset
-    const filterKeys = [
-      selectedFilterValue.value,
-      radioFilterConfig.value?.defaultValue
-    ].filter(Boolean)
-    const filterScoped = pickByKeys(scopedDataset, filterKeys, false)
-    if (Array.isArray(filterScoped)) return filterScoped
     const firstArray = pickFirstArray(scopedDataset)
     if (Array.isArray(firstArray)) return firstArray
   }

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

@@ -1,159 +1,159 @@
-<template>
-  <div>
-    <div class="filter-bar">
-      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
-      <a-select
-        style="width: 200px;"
-        v-model="fusetype"
-        :options="fusetypes"
-        placeholder="分类"
-        @change="selfSearch"
-        allow-clear />
-      <a-button type="primary" @click="selfSearch">查询</a-button>
-    </div>
-    <a-list bordered>
-      <a-list-item v-for="item in files" :key="item.days">
-        <div class="file-group">
-          <h4>{{ item.days }}</h4>
-          <div class="file-items">
-            <div v-for="file in item.arrays" :key="file.id" class="file-card">
-              <img :src="getFileUrl(file.f_downloadpath)" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
-              <p>上传时间: {{ file.f_uploaddate }}</p>
-              <p>操作员: {{ file.f_username }}</p>
-              <p>分类: {{ file.fusetype }}</p>
-              <p>说明: {{ file.fremarks }}</p>
-              <a :href="getFileUrl(file.f_downloadpath)" target="_blank">预览</a>
-              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
-            </div>
-          </div>
-        </div>
-      </a-list-item>
-    </a-list>
-    <ImagePreview :src="previewImg" :visible="previewVisible" @close="previewVisible = false" />
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-import { del } from '@vue2-client/services/api/restTools'
-import ImagePreview from './ImagePreview.vue'
-export default {
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  components: { ImagePreview },
-  data () {
-    return {
-      upload_date: null,
-      fusetype: null,
-      files: [],
-      fusetypes: [],
-      isDelete: '0',
-      previewVisible: false,
-      previewImg: ''
-    }
-  },
-  methods: {
-    async getfusetypes () {
-      this.fusetypes = [{ label: '全部', value: '' }]
-      const res = await post('/api/af-revenue/logic/getFileUseType', {})
-      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
-    },
-    async getFiles () {
-      if (!this.currUserInfo) return
-      this.files = []
-      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
-      if (this.upload_date) {
-        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
-      }
-      if (this.fusetype) {
-        condition += ` and fusetype = '${this.fusetype}'`
-      }
-      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
-      this.files = res.days.map(day => ({
-        days: day.uploadday,
-        arrays: res.array.filter(file => file.uploadday === day.uploadday)
-      }))
-    },
-    async delet (fileId) {
-      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
-      this.getFiles()
-    },
-    selfSearch () {
-      this.getFiles()
-    },
-    openPreview (src) {
-      this.previewImg = this.getFileUrl(src)
-      this.previewVisible = true
-    },
-    getFileUrl (path) {
-      if (!path) return ''
-
-      console.log('原始路径:', path)
-
-      // 获取当前域名和端口
-      const baseUrl = `${window.location.protocol}//${window.location.host}`
-
-      // 如果是本地文件路径，转换为新的转发路径
-      if (path.match(/^[A-Za-z]:[\/\\]/)) {
-        // 提取文件名
-        const fileName = path.split(/[/\\]/).pop()
-        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
-        console.log('转换后路径:', newUrl)
-        return newUrl
-      }
-      // 如果已经是HTTP路径，直接返回
-      if (path.startsWith('http')) {
-        console.log('HTTP路径，直接返回:', path)
-        return path
-      }
-      // 如果是相对路径，添加域名前缀
-      if (path.startsWith('/resource/')) {
-        const newUrl = `${baseUrl}${path}`
-        console.log('相对路径转换:', newUrl)
-        return newUrl
-      }
-      console.log('其他路径，直接返回:', path)
-      return path
-    }
-  },
-  mounted () {
-    if (this.$login.r.includes('上传附件删除')) {
-      this.isDelete = '1'
-    }
-    this.getFiles()
-    this.getfusetypes()
-  }
-}
-</script>
-
-<style scoped>
-.filter-bar {
-  display: flex;
-  gap: 10px;
-  margin-bottom: 15px;
-}
-.file-group {
-  margin-bottom: 15px;
-}
-.file-items {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-}
-.file-card {
-  border: 1px solid #ddd;
-  padding: 10px;
-  border-radius: 5px;
-  width: 200px;
-}
-.file-image {
-  width: 100%; /* 让图片填充整个容器 */
-  height: 150px; /* 调整高度 */
-  object-fit: cover; /* 保持图片比例，填充整个区域 */
-  border-radius: 5px; /* 圆角边框 */
-}
-</style>
+<template>
+  <div>
+    <div class="filter-bar">
+      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
+      <a-select
+        style="width: 200px;"
+        v-model="fusetype"
+        :options="fusetypes"
+        placeholder="分类"
+        @change="selfSearch"
+        allow-clear />
+      <a-button type="primary" @click="selfSearch">查询</a-button>
+    </div>
+    <a-list bordered>
+      <a-list-item v-for="item in files" :key="item.days">
+        <div class="file-group">
+          <h4>{{ item.days }}</h4>
+          <div class="file-items">
+            <div v-for="file in item.arrays" :key="file.id" class="file-card">
+              <img :src="getFileUrl(file.f_downloadpath)" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
+              <p>上传时间: {{ file.f_uploaddate }}</p>
+              <p>操作员: {{ file.f_username }}</p>
+              <p>分类: {{ file.fusetype }}</p>
+              <p>说明: {{ file.fremarks }}</p>
+              <a :href="getFileUrl(file.f_downloadpath)" target="_blank">预览</a>
+              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
+            </div>
+          </div>
+        </div>
+      </a-list-item>
+    </a-list>
+    <ImagePreview :src="previewImg" :visible="previewVisible" @close="previewVisible = false" />
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+import { del } from '@vue2-client/services/api/restTools'
+import ImagePreview from './ImagePreview.vue'
+export default {
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  components: { ImagePreview },
+  data () {
+    return {
+      upload_date: null,
+      fusetype: null,
+      files: [],
+      fusetypes: [],
+      isDelete: '0',
+      previewVisible: false,
+      previewImg: ''
+    }
+  },
+  methods: {
+    async getfusetypes () {
+      this.fusetypes = [{ label: '全部', value: '' }]
+      const res = await post('/api/af-revenue/logic/getFileUseType', {})
+      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
+    },
+    async getFiles () {
+      if (!this.currUserInfo) return
+      this.files = []
+      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
+      if (this.upload_date) {
+        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
+      }
+      if (this.fusetype) {
+        condition += ` and fusetype = '${this.fusetype}'`
+      }
+      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
+      this.files = res.days.map(day => ({
+        days: day.uploadday,
+        arrays: res.array.filter(file => file.uploadday === day.uploadday)
+      }))
+    },
+    async delet (fileId) {
+      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
+      this.getFiles()
+    },
+    selfSearch () {
+      this.getFiles()
+    },
+    openPreview (src) {
+      this.previewImg = this.getFileUrl(src)
+      this.previewVisible = true
+    },
+    getFileUrl (path) {
+      if (!path) return ''
+
+      console.log('原始路径:', path)
+
+      // 获取当前域名和端口
+      const baseUrl = `${window.location.protocol}//${window.location.host}`
+
+      // 如果是本地文件路径，转换为新的转发路径
+      if (path.match(/^[A-Za-z]:[\/\\]/)) {
+        // 提取文件名
+        const fileName = path.split(/[/\\]/).pop()
+        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
+        console.log('转换后路径:', newUrl)
+        return newUrl
+      }
+      // 如果已经是HTTP路径，直接返回
+      if (path.startsWith('http')) {
+        console.log('HTTP路径，直接返回:', path)
+        return path
+      }
+      // 如果是相对路径，添加域名前缀
+      if (path.startsWith('/resource/')) {
+        const newUrl = `${baseUrl}${path}`
+        console.log('相对路径转换:', newUrl)
+        return newUrl
+      }
+      console.log('其他路径，直接返回:', path)
+      return path
+    }
+  },
+  mounted () {
+    if (this.$login.r.includes('上传附件删除')) {
+      this.isDelete = '1'
+    }
+    this.getFiles()
+    this.getfusetypes()
+  }
+}
+</script>
+
+<style scoped>
+.filter-bar {
+  display: flex;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+.file-group {
+  margin-bottom: 15px;
+}
+.file-items {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.file-card {
+  border: 1px solid #ddd;
+  padding: 10px;
+  border-radius: 5px;
+  width: 200px;
+}
+.file-image {
+  width: 100%; /* 让图片填充整个容器 */
+  height: 150px; /* 调整高度 */
+  object-fit: cover; /* 保持图片比例，填充整个区域 */
+  border-radius: 5px; /* 圆角边框 */
+}
+</style>