From bcac3326a38ab59443a5ede25c42b641947b7996 Mon Sep 17 00:00:00 2001
From: mll <1874467086>
Date: Mon, 9 Feb 2026 20:16:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E9=9A=90=E8=97=8F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LowDesign/src/LowReport/index.vue         | 15 +++++++-
 .../general/components/useRenderVxeColumn.tsx | 37 +++++++++++++++++++
 .../reportDesign/components/TableInfo.vue     |  9 ++++-
 .../lowdesign/reportDesign/designData.ts      |  5 ++-
 src/views/lowdesign/reportDesign/index.vue    |  2 +-
 5 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue
index 38d99a7..6f556dc 100644
--- a/src/components/LowDesign/src/LowReport/index.vue
+++ b/src/components/LowDesign/src/LowReport/index.vue
@@ -68,7 +68,7 @@
         ></InputTimeRange>
       </template>
       <template #header v-if="Object.keys(dimensionFields)?.length">
-      <div style="display:flex;margin-left:40px">
+        <div style="display:flex;margin-left:40px">
          <el-checkbox-group @change="searchDimension" v-model="tableSearch['Group by']"
                          placeholder="请选择内容">
             <template  v-for="(item,key) in dimensionFields">
@@ -136,6 +136,7 @@ const crudRef = ref()
 const dimensionFields=ref<any>({})
 const exportLoading = ref(false)
 const fieldList = ref<any[]>([]) // 添加fieldList引用
+const hideFeilds= ref<any>({}) 
 const permissions =
   wsCache.get(CACHE_KEY.USER).lideeYunjipermissions?.[route.meta.menuDataId as string] || false
 const selectIds = computed(() => {
@@ -258,6 +259,8 @@ const initTable = async () => {
     }
     if(item.isDimension=='Y'){
       dimensionFields.value[config.prop]=config
+      hideFeilds.value[config.prop]=item.isHideDimension
+      
     }
     
     if (item.queryMode == 'RANGE') config.searchRange = true
@@ -301,6 +304,7 @@ const initTable = async () => {
   initTableLayout()
 }
 const searchDimension=()=>{
+  
   searchChange()
 }
 const initTableLayout = () => {
@@ -467,6 +471,15 @@ const clearSearch = () => {
 const searchChange = (params?, done?) => {
   if (tablePage.value) tablePage.value['currentPage'] = 1
   getTableData().finally(() => {
+    let field=tableSearch.value['Group by']
+    let hides=[]
+    if(field.length){
+      hides=Object.keys(hideFeilds.value).length?hideFeilds.value[field].split(','):[]
+    }
+    Object.keys(tableOption.value.column).forEach(key=>{
+      let item=tableOption.value.column[key]
+      item.hide=hides.includes(item.prop)
+    })
     if (done) done()
   })
 }
diff --git a/src/views/lowdesign/general/components/useRenderVxeColumn.tsx b/src/views/lowdesign/general/components/useRenderVxeColumn.tsx
index 59e0be6..f76c28e 100644
--- a/src/views/lowdesign/general/components/useRenderVxeColumn.tsx
+++ b/src/views/lowdesign/general/components/useRenderVxeColumn.tsx
@@ -183,6 +183,43 @@ export const useRenderVxeColumn = (useType = 'table') => {
         )
       }
     },
+    LowSelectMultiple: {
+      default: (renderOpts, { row, column }, isStop = false) => {
+        const { dicData } = renderOpts
+        const value = row[column.field]
+        const valStr=dicData.filter(item=>value.includes(item.value)).map(item=>item.label).join('，')
+        return <span>{valStr}</span>
+      },
+      edit: (renderOpts, { row, rowIndex, column }) => {
+        const { multiple, filterable, allowCreate, typeKey ,dicData} = renderOpts
+        interface DictItem {
+          label: string;
+          value: string | number;
+          [key: string]: any; // 兼容其他可能的字段
+        }
+        return (
+          <el-select
+            popper-class="vxe-table--ignore-clear"
+            v-model={row[column.field]}
+            placeholder={'请选择 ' + column.title}
+            multiple={multiple}
+            filterable={filterable}
+            collapseTags={true}
+            collapseTagsTooltip={true}
+            allowCreate={allowCreate}
+            clearable={true}
+          >
+            {dicData.map((item: DictItem, index: number) => (
+              <el-option 
+                key={index} // 建议用 item.value 作为 key，更稳定
+                label={item.label} 
+                value={item.value} 
+              />
+            ))}
+          </el-select>
+        )
+      }
+    },
     LowSummaryBottomSql: {
       default: (renderOpts, { row, column }, isStop = false) => {
         const { dicObj } = renderOpts
diff --git a/src/views/lowdesign/reportDesign/components/TableInfo.vue b/src/views/lowdesign/reportDesign/components/TableInfo.vue
index b41e7fd..0fe5212 100644
--- a/src/views/lowdesign/reportDesign/components/TableInfo.vue
+++ b/src/views/lowdesign/reportDesign/components/TableInfo.vue
@@ -89,6 +89,7 @@ const parentFieldMap = ref(new Map())
 const fieldList = computed(() => {
   let dicData: Array<{ label: string; value: string; type: string }> = []
   infoData.value.basics.forEach((item) => {
+     
     if (item.fieldCode && item.isDb == 'Y')
       dicData.push({
         label: `${item.fieldCode}${item.fieldName ? '（' + item.fieldName + '）' : ''}`,
@@ -257,7 +258,9 @@ const initEditInfoData = () => {
     if (fieldItem.hasChildren === 'Y') {
       fieldItem.hasChildren = 'Y'
     }
-    
+    if (!!fieldItem.isHideDimension&&Object.prototype.toString.call(fieldItem.isHideDimension) == '[object String]') {
+      fieldItem.isHideDimension=fieldItem.isHideDimension.split(',')
+    }
     fieldList.push(fieldItem)
   })
   
@@ -282,7 +285,9 @@ onMounted(() => {
       })
     }
   }
-  
+  tableInfoOption.infoColumn.fieldColumn.isHideDimension.editRender.dicData = infoData.value.basics.map(({fieldCode,fieldName})=>{
+    return {label:fieldName,value:fieldCode}
+  })
   // 设置父字段下拉选项
   const updateParentFieldOptions = () => {
     // 获取所有parentFieldCode为空的字段作为可选父字段
diff --git a/src/views/lowdesign/reportDesign/designData.ts b/src/views/lowdesign/reportDesign/designData.ts
index b0320d9..bed1b87 100644
--- a/src/views/lowdesign/reportDesign/designData.ts
+++ b/src/views/lowdesign/reportDesign/designData.ts
@@ -159,7 +159,8 @@ const infoColumn = {
     isExport: { title: '是否可导出', width: 90, align: "center", editRender: { name: 'LowCheckbox' } },
     isAmount: { title: '是否合计', width: 75, align: "center", editRender: { name: 'LowCheckboxSum' } },
     isDimension: { title: '是否维度', width: 75, align: "center", editRender: { name: 'LowCheckbox' } },
-    
+
+    isHideDimension: { title: '维度隐藏列', width: 180, editRender: { name: 'LowSelectMultiple', verifyEdit: true, filterable: true, multiple:true,dicData: [] } },
     isShowSort: { title: '是否排序', width: 75, align: "center", editRender: { name: 'LowCheckbox' } },
     hasChildren: { title: '子字段', width: 90, align: "center", editRender: { name: 'LowButton', disabled: (row) => row.isSubField === true, buttonText: '添加子字段', buttonType: 'primary', buttonSize: 'small' } },
   },
@@ -187,7 +188,7 @@ for (const key in infoColumn) {
 //默认值
 const infoDefaultData = {
   basics: {
-    fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '',
+    fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '',isHideDimension:'', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '',
   },
 }
 
diff --git a/src/views/lowdesign/reportDesign/index.vue b/src/views/lowdesign/reportDesign/index.vue
index c40d1a8..124010d 100644
--- a/src/views/lowdesign/reportDesign/index.vue
+++ b/src/views/lowdesign/reportDesign/index.vue
@@ -349,7 +349,7 @@ const tableFormVerify = (type) => {
         const index = Number(i)
         const item = filedData[index]
         item.sortNum = index + 1
-
+        item.isHideDimension?item.isHideDimension=item.isHideDimension.join(','):''
         let messageText = ''
         let tabKey = 'mysql'
         // 子字段不能再包含子字段