From dd028de0fb095d775a3cec4335d6a80b4e6c03f6 Mon Sep 17 00:00:00 2001
From: han2015 <1019850453@qq.com>
Date: Thu, 15 Jan 2026 14:03:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=91=E7=9B=98=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=AE=E5=BD=95=E5=9B=9E=E9=80=80=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/doc/index.ts       | 20 ++++++++++++-
 src/views/doc/logpanel.vue |  2 +-
 src/views/doc/manage.vue   | 60 +++++++++++++++++++++++++++++++-------
 src/views/doc/share.vue    |  2 +-
 src/views/doc/space.vue    | 24 ++++++++++++---
 5 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/src/api/doc/index.ts b/src/api/doc/index.ts
index 1316459..c7badfd 100644
--- a/src/api/doc/index.ts
+++ b/src/api/doc/index.ts
@@ -136,7 +136,7 @@ export function postCreateDir(uid:string,data?: createDir){
  */
 export function postDelMatter(uid:string,data?: any){
   return request({
-    url: '/hxpan/api/matter/delete',
+    url: '/hxpan/api/matter/soft/delete',
     method: 'post',
     headers: {
       'Identifier':uid,
@@ -145,10 +145,28 @@ export function postDelMatter(uid:string,data?: any){
     data: data
   });
 }
+
+
+
 /**
  * 批量删除文件或目录
  */
 export function postDelMatBatch(uid:string,data?: any){
+  return request({
+    url: '/hxpan/api/matter/soft/delete/batch',
+    method: 'post',
+    headers: {
+      'Identifier':uid,
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    data: data
+  });
+}
+
+/**
+ * 批量删除回收站文件或目录
+ */
+export function postClearDelsBatch(uid:string,data?: any){
   return request({
     url: '/hxpan/api/matter/delete/batch',
     method: 'post',
diff --git a/src/views/doc/logpanel.vue b/src/views/doc/logpanel.vue
index 8d9052d..6ed19b0 100644
--- a/src/views/doc/logpanel.vue
+++ b/src/views/doc/logpanel.vue
@@ -1,7 +1,7 @@
 <!--
 @ 作者: han2015
 @ 时间: 2025-05-12 15:39:13
-@ 备注: 文档管理组件
+@ 备注: 文件上传错误日志
 -->
 <script lang="ts" setup>
 import { getUploadErrList,ErrUploadLog} from "@/api/doc/type"
diff --git a/src/views/doc/manage.vue b/src/views/doc/manage.vue
index 716d3b7..414fa6e 100644
--- a/src/views/doc/manage.vue
+++ b/src/views/doc/manage.vue
@@ -7,7 +7,7 @@
 import { getExpirTime, getFileIcon, readableSize,fileType} from "./tools"
 import sharePermission from './sharePermission.vue';
 import { useUserStore } from "@/store/modules/user";
-import { getMatterList,postCreateDir,postDelMatter,postCreateShare,postMatterRename,postMatterMove,
+import { getMatterList,postCreateDir,postDelMatter,postClearDelsBatch,postCreateShare,postMatterRename,postMatterMove,
   postDelMatBatch,getMySpaces,doCreateSpace,getRecyclingList} from "@/api/doc/index"
 import { matterPage,matterInfo,respCreateShare,matterTree, doFileUpload,matterPermit} from "@/api/doc/type"
 import { h } from 'vue'
@@ -178,7 +178,7 @@ function onShareMatter(row?:matterInfo){
 }
 
 function showShareMessage(row:respCreateShare){
-  let _shareURL=`${siteHost}/#/doc/share/?uuid=${row.uuid}&code=${row.code}`
+  let _shareURL=`${siteHost}/#/doc/share/?uuid=${row.uuid}&code=${row.code}&分享=${row.name}`
   ElMessageBox({
     title: '分享详情',
     customStyle: { '--el-messagebox-width':'800px',padding:'40px'},
@@ -202,7 +202,7 @@ function onDelNodeMatter(row:matterInfo){
 //删除
 function onDelMatter(row:matterInfo,dir?:boolean){
   if (row.uuid){
-    ElMessageBox.confirm(`确认删除( ${row.name}) ?删除后不可恢复！取消则放弃删除操作。`, "警告", {
+    ElMessageBox.confirm(`确认删除( ${row.name}) 到回收站?取消则放弃删除操作。`, "警告", {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
       type: "warning",
@@ -217,14 +217,14 @@ function onDelMatter(row:matterInfo,dir?:boolean){
           }
           currentNode.value.uuid = row.puuid ?? "root"
         }
-        onLoadMatterList()  
+        onLoadMatterList()
       })
     })
   }
 }
 
 function onDelMatBatch(){
-  ElMessageBox.confirm("确认删除选择的内容?", "警告", {
+  ElMessageBox.confirm("确认删除选择的内容到回收站?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
@@ -237,6 +237,20 @@ function onDelMatBatch(){
   })
 }
 
+function onClearDelsBatch(){
+  ElMessageBox.confirm("确认删除选择的内容, 不可恢复！！！", "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(()=>{
+    postClearDelsBatch(uid,{
+      "uuids":tabSelected.value.map((item:matterInfo)=>item.uuid).join(",")
+    }).then(()=>{
+      router.replace({ query: { t: Date.now() } })
+    })
+  })
+}
+
 function onDownload(row:matterInfo){
   ElMessageBox.confirm("确认下载此数据项?", "提示", {
     confirmButtonText: "确定",
@@ -370,6 +384,15 @@ function restoreMatter(row:matterInfo){
     })
   }
 }
+//处理个人空间上一级目录跳转问题
+const gotoParentLevel=()=>{
+  const pnode=treeRef.value.getNode(currentNode.value.puuid)
+  if(pnode){
+    onNodeClick(pnode.data, null as unknown as TreeNode, null, null)
+  }else if(treeData.value.length>=0){
+    onNodeClick(treeData.value[0], null as unknown as TreeNode, null, null)
+  }
+}
 
 //加载目录文件列表
 function onLoadMatterList(){
@@ -807,6 +830,14 @@ function flushSpaceTree(uuid:string,data:matterTree[]){
   spaceTreeRef.value.updateKeyChildren(uuid,data)
 }
 
+//处理共享空间上一级目录跳转问题，因为树组件都在manager容器内，共享空间需要触发->
+const goSpaceParentLevel=(puuid:string)=>{
+  const pnode=spaceTreeRef.value.getNode(puuid)
+  if(pnode){
+    onSpaceNodeClick(pnode.data,null,null,null)
+  }
+}
+
 //空间成员管理
 function onAccessManage(){
   dynamicVNode.value = h(sharePermission, {
@@ -1042,10 +1073,17 @@ const handleSelectionChange = (val:matterInfo[]) => {
 <el-tabs  v-model="tabName">
   <el-tab-pane name="main">
   <div v-if="PRIVATESPACE" class="app_container">
-    <el-row v-if="modRecycling"><span style="margin: 12px 0px;font-weight: bold;font-size: 20px;"> 回收站 </span>  </el-row>
+    <el-row v-if="modRecycling">
+      <div style="display: flex;margin: 10px ;width: 97%;font-weight: bold;font-size: 20px;"> 回收站 
+        <el-button style="margin:0 5px 0 auto;" @click="onClearDelsBatch">选中删除</el-button> 
+      </div> 
+    </el-row>
     <el-row v-else :gutter="24" style="margin: 12px 0px;">
       <el-link v-if="currentNode.name!=='root'"  @click="onNodeClick(treeData[0], null as unknown as TreeNode, null, null)">
-         <span style="font-weight: bold;margin-right: 5px;align-content: center;">根目录</span>/
+         <span style="font-weight: bold;margin-right: 5px;align-content: center;">根目录</span>/ 
+      </el-link> 
+      <el-link v-if="currentNode.name &&currentNode.name!=='root'"  @click="gotoParentLevel">
+         <span style="font-weight: bold;margin: 0 5px;align-content: center;"> {{ '< 返回上一级' }} </span>/
       </el-link> 
       <span style="font-weight: bold;margin:0 5px;align-content:center;">{{ currentNode.name }}</span>
       
@@ -1073,8 +1111,8 @@ const handleSelectionChange = (val:matterInfo[]) => {
         </div>
         <el-button @click="createDir">新建目录</el-button>
         <span v-if="tabSelected.length>1" style="margin:12px">
-          <el-button  @click="onShareMatter()">分享</el-button>
-          <el-button  @click="onDelMatBatch">删除</el-button>
+          <!-- <el-button  @click="onShareMatter()">分享</el-button> -->
+          <el-button  @click="onDelMatBatch">批量删除</el-button>
         </span>
       </el-col>
       <el-button-group style="margin:0 50px 0 auto;">
@@ -1094,7 +1132,7 @@ const handleSelectionChange = (val:matterInfo[]) => {
         :row-style ="() => ({ lineHeight: '36px' })"
         @selection-change="handleSelectionChange"
         @cell-mouse-enter="handleMouseEnter">
-        <!-- <el-table-column type="selection" width="50" /> -->
+        <el-table-column type="selection" width="50" />
         <el-table-column width="450" property="name" label="文件名">
           <template #default="scope">
             <input v-if="scope.row.name===''"  v-model="newdirName" type="text" autofocus placeholder="文件夹名" style="border:groove;height:30px;"  @change="onCreateDir" />
@@ -1175,7 +1213,7 @@ const handleSelectionChange = (val:matterInfo[]) => {
       :spaceid="SpaceID.uuid" :roles="Departs" :spacename="SpaceID.name" :space-permit="SpaceID.permits"
       :owner="SpaceID.userUuid" :ismanager="SpaceID.manager"
       :officeHost="officeHost" :site-host="siteHost" :api-u-r-l="apiURL"
-      :flushSpaceTree="flushSpaceTree"></space> 
+      :flushSpaceTree="flushSpaceTree" :backToParent="goSpaceParentLevel"></space> 
   </div>
   </el-tab-pane>
   <el-tab-pane name="logs">
diff --git a/src/views/doc/share.vue b/src/views/doc/share.vue
index 0dbe785..35c7c82 100644
--- a/src/views/doc/share.vue
+++ b/src/views/doc/share.vue
@@ -43,7 +43,7 @@ const dynamicVNode = ref<VNode | null>(null) //permission 组件的父组件
 
 
 function showShareMessage(row:{uuid:string,code:string,name:string,expireTime:string}){
-  let _shareURL=`${siteHost}/#/doc/share?uuid=${row.uuid}&code=${row.code}`
+  let _shareURL=`${siteHost}/#/doc/share?uuid=${row.uuid}&code=${row.code}&分享=${row.name}`
   ElMessageBox({
     title: '分享详情',
     customStyle: { '--el-messagebox-width':'800px',padding:'40px'},
diff --git a/src/views/doc/space.vue b/src/views/doc/space.vue
index 8db7516..8c9ab63 100644
--- a/src/views/doc/space.vue
+++ b/src/views/doc/space.vue
@@ -78,7 +78,8 @@ const props = withDefaults(defineProps<{
   ismanager:boolean,
   spacePermit:matterPermit,
 
-  flushSpaceTree:(uuid:string,data:matterTree[])=>void
+  flushSpaceTree:(uuid:string,data:matterTree[])=>void,
+  backToParent:(uuid:string)=>void
 }>(),{})
 
 //属性变更，特别是为了处理空间切换的状态更新
@@ -310,7 +311,16 @@ function onSpaceMatterRename(row:matterInfo){
   })
 }
 
-//------------------------------------------
+//-----------------------树结构点击展开操作部分-------------------
+
+const goBackToParent=(puuid:string)=>{
+  if(puuid=="root"){
+    handleDoubleClick(breadcrumbList.value[0])
+    return
+  }
+  props.backToParent(puuid)
+}
+
 // @cell-dblclick="handleDoubleClick" 取消了目录双击打开功能
 //打开一个目录
 function handleDoubleClick(row:matterInfo,ind?:number){
@@ -371,6 +381,9 @@ function handleDoubleClick(row:matterInfo,ind?:number){
 function handleMouseEnter(row:any){
   currentHoverRow.value=row.name
 }
+//------------------------------------------------------------------------------------
+
+//-----------------------------文件上传部分-----------------------------------------------------
 //上传成功
 function handleSingleUpload(response:any){
   handleAiUpload(response.data)
@@ -553,7 +566,7 @@ function handleAiDelete(info:matterInfo){
 //空间文件分享链接
 const onShareSpaceFile=(row:matterInfo)=>{
   const str=btoa(encodeURIComponent(`${props.spaceid}|${row.puuid}|${row.name}`))
-  let _shareURL=`${siteHost}/#/doc/manage?s_token=${str}`
+  let _shareURL=`${siteHost}/#/doc/manage?s_token=${str}&分享=${row.name}`
   ElMessageBox({
     title: '文件分享:',
     customStyle: { '--el-messagebox-width':'800px',padding:'40px'},
@@ -670,9 +683,12 @@ function isOwner(){
       <el-breadcrumb separator="/" style="align-content: center;">
         <el-breadcrumb-item v-for="(item,index) in breadcrumbList" 
           :key="index" @click="handleDoubleClick(item,index)">
-          <span style="font-weight: bold;cursor: pointer;">{{ item.name }}</span>
+          <span style="font-weight: bold;cursor: pointer;">{{ item.name }} </span>
         </el-breadcrumb-item>
       </el-breadcrumb>
+      <el-link v-if="currentNode.uuid!=='root'"  @click="goBackToParent(currentNode.puuid)">
+         <span style="font-weight: bold;margin: 0 5px;align-content: center;">/ {{ '< 返回上一级' }}</span>
+      </el-link> 
       <span v-if="currentNode.uuid!='root'" style="font-weight: bold;margin:0 5px;align-content:center;">/ {{ currentNode.name }}</span>
       
       <el-col :span="6" class="search">

From 51d7b8e4a60374541795c18f1133cca5cd436e58 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 16 Jan 2026 14:29:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E8=A1=8C=E5=88=97=E6=9C=AA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 50 ++++++++++++-------
 .../DesignForm/public/form/form.vue           | 18 +++++--
 2 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index a311287..2e9825b 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2912,7 +2912,6 @@ function mergeArrays(a, b) {
 
 
 
-
 // 自动填充设置 liwenxuan 20251230 start
 
 let datapropsformList = JSON.parse(JSON.stringify(props.formList))
@@ -2989,13 +2988,17 @@ const leftTopLabel = computed(() => {
   return `${indexColumnLabel.value}\\${titleColumnLabel.value}`
 })
 
-// 原始选项数组（标题行=列，索引列=行）
+// 原始选项数组（标题行=列，索引列=行），将空值选项放在末尾，键改为'未选择'
 const titleOptions = computed(() => {
-  return currentTitleColumnNode.value?.options || []
+  const options = currentTitleColumnNode.value?.options || []
+  // 将空值选项放在正常选项后面，键改为'未选择'
+  return [...options, { label: '未选择', value: 'notChosen' }]
 })
 
 const indexOptions = computed(() => {
-  return currentIndexColumnNode.value?.options || []
+  const options = currentIndexColumnNode.value?.options || []
+  // 将空值选项放在正常选项后面，键改为'未选择'
+  return [...options, { label: '未选择', value: 'notChosen' }]
 })
 
 // 表格列配置
@@ -3016,22 +3019,38 @@ watch([titleOptions, indexOptions], ([newTitleOptions, newIndexOptions]) => {
     return
   }
 
-  // 从 controlData 中获取之前保存的数据
+  // 从 controlData 中获取之前保存的数据，并兼容旧数据（空字符串键）
   const savedData = controlData.value?.control?.zdtcsz?.tableData || {}
   
+  // 转换旧数据：将空字符串键转换为'未选择'
+  const convertOldData = (data) => {
+    const converted = {}
+    Object.keys(data).forEach(rowKey => {
+      const newRowKey = rowKey === '' ? 'notChosen' : rowKey
+      converted[newRowKey] = {}
+      Object.keys(data[rowKey]).forEach(colKey => {
+        const newColKey = colKey === '' ? 'notChosen' : colKey
+        converted[newRowKey][newColKey] = data[rowKey][colKey]
+      })
+    })
+    return converted
+  }
+  
+  const convertedSavedData = convertOldData(savedData)
+  
   // 情况1：只有标题行，没有索引列
   if (newTitleOptions.length && !newIndexOptions.length) {
-    // 创建一行默认数据
-    const defaultRowKey = 'default'
+    // 创建一行数据，键为'未选择'
+    const rowKey = 'notChosen'
     const rowObj = {
-      rowKey: defaultRowKey,
-      rowLabel: '默认' // 第一列显示"默认"
+      rowKey: rowKey,
+      rowLabel: '未选择' // 第一列显示"未选择"
     }
     
     // 为每个标题列生成值，如果有保存的数据则使用保存的数据
     newTitleOptions.forEach(colItem => {
       const colKey = colItem.value
-      const savedValue = savedData[defaultRowKey]?.[colKey] || ''
+      const savedValue = convertedSavedData[rowKey]?.[colKey] || ''
       rowObj[`col_${colKey}`] = savedValue
     })
     
@@ -3048,8 +3067,8 @@ watch([titleOptions, indexOptions], ([newTitleOptions, newIndexOptions]) => {
       }
       
       // 创建一个默认列
-      const defaultColKey = 'default'
-      const savedValue = savedData[rowKey]?.[defaultColKey] || ''
+      const defaultColKey = 'notChosen'
+      const savedValue = convertedSavedData[rowKey]?.[defaultColKey] || ''
       rowObj[`col_${defaultColKey}`] = savedValue
       
       return rowObj
@@ -3057,7 +3076,7 @@ watch([titleOptions, indexOptions], ([newTitleOptions, newIndexOptions]) => {
     
     zdtcszTableData.value = newTableData
   }
-  // 情况3：标题行和索引列都有
+  // 情况3：标题行和索引列都有（包括空值选项）
   else if (newTitleOptions.length && newIndexOptions.length) {
     // 生成新的表格数据
     const newTableData = newIndexOptions.map(rowItem => {
@@ -3070,7 +3089,7 @@ watch([titleOptions, indexOptions], ([newTitleOptions, newIndexOptions]) => {
       // 为每个标题列生成值，如果有保存的数据则使用保存的数据
       newTitleOptions.forEach(colItem => {
         const colKey = colItem.value
-        const savedValue = savedData[rowKey]?.[colKey] || ''
+        const savedValue = convertedSavedData[rowKey]?.[colKey] || ''
         rowObj[`col_${colKey}`] = savedValue
       })
       
@@ -3135,9 +3154,6 @@ const handleDetermineZdtcszDialogFlag = () => {
 }
 
 
-
-
-
 /**
  * 合并两个组件树，仅保留type为radio和select的节点，并过滤掉指定compId的节点，同时保留options属性
  * @param {Array} treeA - 组件树a，包含表单结构信息
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 8719f84..c0ae24b 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -694,9 +694,9 @@ function showOrHide(data: any,currentDataNameValue?:any) {
   if(data=="onMounted"||data=="kong"){
     
   }else{
-    console.log(data)
+    //console.log(data)
     dataObjFlag = true
-    console.log(data.name)
+    //console.log(data.name)
   }
   if(dataObjFlag){
     if(data.type=="select"||data.type=="radio"||data.type=="checkbox"||data.type=="switch"){
@@ -1306,10 +1306,20 @@ nextTick(()=>{
 
     //console.log(element.name)
     let rowValue = model.value[tbx]
-    //console.log(rowValue)
+    
     let columnValue = model.value[tby]
-    //console.log(columnValue)
+    
 
+    
+    if(rowValue==""){
+      rowValue="notChosen"
+    }
+
+    if(columnValue==""){
+      columnValue="notChosen"
+    }
+    /* console.log(rowValue)
+    console.log(columnValue) */
     /* if(dataObjFlag && element.name==data.name && currentDataNameValue!=""){//允许直接选择被矩阵填充的字段
       console.log(data.name)
       console.log("直接选择被矩阵填充的字段,允许")

From 01c24654a3faddabf2e700569954827a6bcc2f86 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 19 Jan 2026 08:41:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E8=A1=8C=E5=88=97=E6=9C=AA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6-=E5=85=81=E8=AE=B8=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlPropertiNew.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 2e9825b..d7201fa 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -8709,6 +8709,7 @@ const formatTooltip = (val: number) => {
               size="small"
               placeholder="请选择"
               style="width: 100%;"
+              clearable
               @change="handleTableDataChange"
             >
               <el-option