duy 1 сар өмнө
parent
commit
7b5370ae15

+ 15 - 0
src/global/components/table-form/index.vue

@@ -343,6 +343,20 @@ const unmountHtml = () => {
 const getCetCopyKeyList = ()=>{
     return checkKeyList.value
 }
+//清除所有选中的单元格
+
+const clearCheckKeyList = async ()=>{
+ 
+    
+    // 等待DOM更新
+    await nextTick()
+    
+    checkKeyList.value.forEach(item => {
+        HTableForm.setCheckKeyStyle(item['key'], activeKey.value, true)
+    })
+    checkKeyList.value = []
+    delStoreValue('TableFormCopyKeys')
+}
 // 暴露方法
 defineExpose({
     getFormData,
@@ -355,6 +369,7 @@ defineExpose({
     setCopyKeyList,
     setPasteKeyList,
     getCetCopyKeyList,
+    clearCheckKeyList,
 })
 </script>
 

+ 5 - 3
src/views/data-fill/collapse-form/formula.vue

@@ -19,7 +19,7 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue'
 import wbsApi from '~api/data-fill/wbs'
-import { getObjValue } from 'js-fast-way'
+import { arrToKey, getObjValue } from 'js-fast-way'
 
 const props = defineProps({
     projectId: [String, Number],
@@ -80,8 +80,10 @@ const formulaModalinfo = ref({
 const getPanel = async () => {
     const pkeyIds = pkey_id.value
     if (pkeyIds) {
+        let keys = checkKeys.value.length > 0 ? checkKeys.value.join(',') : key_name.value
         const { data } = await wbsApi.queryPanel({
-            key: key_name.value,
+            // key: key_name.value,
+            key:keys,
             contractId: contractId.value,
             parentId: formparent_id.value,
             pkeyId: pkeyIds,
@@ -98,7 +100,7 @@ const panelSave = async () => {
     const { error, code, msg } = await wbsApi.savePanelList({
         parentId: formparent_id.value,
         // key: key_name.value,
-        keys:checkKeys.value,
+        keys:checkKeys.value.length > 0 ? checkKeys.value : [key_name.value],
         contractId: contractId.value,
         value: formulaModalinfo.value?.type,
         pkeyId: pkey_id.value,

+ 18 - 2
src/views/data-fill/collapse-form/index.vue

@@ -263,7 +263,7 @@
                                 size="small"
                                 @click="enableBulkReplication"
                             >
-                                关闭批量复制
+                                关闭批量复制11
                             </el-button>
                             <el-button
                                 v-else
@@ -271,7 +271,7 @@
                                 size="small"
                                 @click="enableBulkReplication"
                             >
-                                开启批量复制
+                                开启批量复制11
                             </el-button>
                             <HcTooltip keys="wbs_save_table">
                                 <el-button
@@ -995,6 +995,8 @@ watch(
 
 //渲染完成
 onMounted(() => {
+
+    
     setFormDataNum(props.datas)
     setTableFormMenu(useAppState.projectInfo)
     const { offsetHeight } = document.body
@@ -1037,6 +1039,11 @@ const setChangeFormDatas = async (pkeyId, type) => {
 //展开事件
 const ActiveKey = ref('')
 const CollapseChange = (name) => {
+ 
+       if (isEnableBulk.value) {
+        setMountOnEventKey()
+    
+    }
     ActiveKey.value = name
     let index = getCollapseItemIndex(name)
     if (index > -1) {
@@ -1495,8 +1502,14 @@ const formulaModalLoading = ref(false)
 const formulaSaveClick = async () => {
     formulaModalLoading.value = true
     await formulaRefs.value?.panelSave()
+    const { pkeyId } = tableFormItemNode.value
+    const refs = await getFormRef(pkeyId)
+
+    
+    refs?.clearCheckKeyList()
     formulaModalLoading.value = false
     formulaModal.value = false
+
 }
 
 //关闭
@@ -2049,8 +2062,11 @@ const excelTableFormClick = (key) => {
 
 //缓存被激活时
 onActivated(() => {
+
+    
     if (isEnableBulk.value) {
         setMountOnEventKey()
+    
     }
 })
 

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

@@ -274,7 +274,13 @@ const setPasteKeyList = async (event) => {
 const getCetCopyKeyList = async (event)=>{
    let res = await tableFormRef.value?.getCetCopyKeyList(event)
    return res
-   
+
+
+}
+const clearCheckKeyList = ()=>{
+    tableFormRef.value?.clearCheckKeyList()
+
+
 
 }
 // 暴露出去
@@ -292,5 +298,6 @@ defineExpose({
     getHtmlBussColsApi,
     getCols,
     getCetCopyKeyList,
+    clearCheckKeyList,
 })
 </script>