修改公共接口中conditionMap的传参逻辑

zkqy-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -890,14 +890,22 @@ export default {
         btnParametersMap: {},
       };
       if (this.currentBtnData.btnParams) {
-        let btnParams = JSON.parse(this.currentBtnData.btnParams);
+        let btnParams =
+          JSON.parse(this.currentBtnData.btnParams)?.commonFieldData || [];
+        let conditionData =
+          JSON.parse(this.currentBtnData.btnParams).conditionData || [];
+        conditionData.forEach((item) => {
+          data.conditionMap[item.fieldName.split(".")[1]] = item.fieldValue
+            ? item.fieldValue
+            : this.currentRow[camelCase(item.fieldName.replace(".", "_"))];
+        });
         btnParams.forEach((item) => {
           data.btnParametersMap[item.fieldName.split(".")[1]] = item.fieldValue
             ? item.fieldValue
             : this.currentRow[camelCase(item.fieldName.replace(".", "_"))];
         });
       }
-      data.conditionMap[this.templateInfo.template?.primaryKey] = delIds;
+      // data.conditionMap[this.templateInfo.template?.primaryKey] = delIds;
       this.$modal
         .confirm('是否确认删除"' + delIds + '"的数据项？')
         .then(function () {
@@ -1071,7 +1079,12 @@ export default {
               btnParametersMap: {},
             };
             if (this.currentBtnData.btnParams) {
-              let btnParams = JSON.parse(this.currentBtnData.btnParams);
+              let btnParams =
+                JSON.parse(this.currentBtnData.btnParams)?.commonFieldData ||
+                [];
+              let conditionData =
+                JSON.parse(this.currentBtnData.btnParams).conditionData || [];
+              // let
               btnParams.forEach((item) => {
                 data.btnParametersMap[item.fieldName.split(".")[1]] =
                   item.fieldValue
@@ -1080,10 +1093,18 @@ export default {
                         camelCase(item.fieldName.replace(".", "_"))
                       ];
               });
+              conditionData.forEach((item) => {
+                data.conditionMap[item.fieldName.split(".")[1]] =
+                  item.fieldValue
+                    ? item.fieldValue
+                    : this.currentRow[
+                        camelCase(item.fieldName.replace(".", "_"))
+                      ];
+              });
             }
             if (Object.keys(this.defaultValue).length) {
-              data.conditionMap[this.templateInfo.template?.primaryKey] =
-                this.defaultValue[this.templateInfo.template?.primaryKey];
+              // data.conditionMap[this.templateInfo.template?.primaryKey] =
+              //   this.defaultValue[this.templateInfo.template?.primaryKey];
               Object.keys(values).map((k) => {
                 data.commMap[k] = values[k];
               });
@@ -1128,7 +1149,15 @@ export default {
           btnParametersMap: {},
         };
         if (this.currentBtnData.btnParams) {
-          let btnParams = JSON.parse(this.currentBtnData.btnParams);
+          let btnParams =
+            JSON.parse(this.currentBtnData.btnParams)?.commonFieldData || [];
+          let conditionData =
+            JSON.parse(this.currentBtnData.btnParams).conditionData || [];
+          conditionData.forEach((item) => {
+            data.conditionMap[item.fieldName.split(".")[1]] = item.fieldValue
+              ? item.fieldValue
+              : this.currentRow[camelCase(item.fieldName.replace(".", "_"))];
+          });
           btnParams.forEach((item) => {
             data.btnParametersMap[item.fieldName.split(".")[1]] =
               item.fieldValue
@@ -1363,12 +1392,25 @@ export default {
           };
           console.log(this.currentBtnData, this.currentRow);
           if (this.currentBtnData.btnParams) {
-            let btnParams = JSON.parse(this.currentBtnData.btnParams);
-            btnParams.forEach((item) => {
+            let conditionData =
+              JSON.parse(this.currentBtnData.btnParams).conditionData || [];
+            // let
+            let commonData =
+              JSON.parse(this.currentBtnData.btnParams).commonFieldData || [];
+
+            conditionData.forEach((item) => {
               data.conditionMap[item.fieldName.split(".")[1]] = item.fieldValue
                 ? item.fieldValue
                 : this.currentRow[camelCase(item.fieldName.replace(".", "_"))];
             });
+            commonData.forEach((item) => {
+              data.btnParametersMap[item.fieldName.split(".")[1]] =
+                item.fieldValue
+                  ? item.fieldValue
+                  : this.currentRow[
+                      camelCase(item.fieldName.replace(".", "_"))
+                    ];
+            });
           }
           data.basicMap.btnType = this.currentBtnData.btnType;
           data.basicMap.visible = true;