Merge remote-tracking branch 'origin/master'

src/views/data-fill/collapse-form/index.vue

@@ -323,8 +323,8 @@ import HcCopy from './test-copy.vue'
 import NoDataSvg from '~src/assets/view/no-data.svg'
 import HcWater from './water.vue'
 import {
-    arrIndex, deepClone, downloadBlob,
-    getArrValue, getObjVal, getObjValue, isNullES, setPosRange,
+    arrIndex, deepClone,
+    downloadBlob, getArrValue, getObjVal, getObjValue, isNullES, setPosRange,
 } from 'js-fast-way'
 import { delMessageV2 } from '~com/message/index.js'
 import { getTokenHeader } from '~src/api/request/header'
@@ -581,7 +581,8 @@ const setTableFormMenu = (info) => {
     newArr.push({ label: '含水率', key: 'water' })
 
     if (isStatus.value !== 3) {
-        newArr.push({ label: '清除数据', key: 'clear' })
+        newArr.push({ label: '清除所有数据', key: 'clear' }),
+        newArr.push({ label: '清除字段数据', key: 'clearcur' })
     }
     console.log(treenodeDataInfo.value, 'treenodeDataInfo')
 
@@ -665,6 +666,21 @@ const handleMenuSelect = async ({ key }) => {
         } else {
             window.$message.warning('请先选择设计强度')
         }
+    } else if (key === 'clearcur') {
+        const { pkeyId } = tableFormItemNode.value
+        const refs = await getFormRef(pkeyId)
+        const curFormData = refs.getFormData()
+        const curKeyName = tableFormItemNode.value.KeyName.split('_')[1]
+        // 遍历对象的属性
+        for (let key in curFormData) {
+            // 检查是否是目标元素
+            if (key.split('_')[1] === curKeyName) {
+                // 替换值
+                curFormData[key] = ''
+            }
+        }
+        refs?.setFormData(curFormData)
+        
     }
 }
 

src/views/data-fill/collapse-form/table-form-item.vue

@@ -10,9 +10,9 @@
         :pkey="keyId"
         :scroll="scroll"
         :width="widths"
-        @excelBodyTap="excelTableFormClick"
+        @excel-body-tap="excelTableFormClick"
         @render="tableFormRender"
-        @rightTap="tableFormRightTap"
+        @right-tap="tableFormRightTap"
     />
 </template>
 
@@ -237,7 +237,9 @@ const getFormData = () => {
     return tableFormInfo.value
     //return tableFormRef.value?.getFormData()
 }
-
+const getCols = ()=>{
+    return colsKeys.value
+}
 const setFormData = (data) => {
     setFormChangeData(data)
     tableFormRef.value?.setFormData(tableFormInfo.value)
@@ -284,5 +286,6 @@ defineExpose({
     getExcelHtml,
     getTableFormInfo,
     getHtmlBussColsApi,
+    getCols,
 })
 </script>