计算公式回显bug修改

树形表格添加修改接口增加关联表主键入参

zkqy-ui/node_modules/k-form-design/packages/components/KFormula/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form>
       <el-form-item>
-        <el-select v-model="calculationType" placeholder="请选择计算方式" @change="onCalculationTypeChange">
+        <el-select v-model="localCalculationType" placeholder="请选择计算方式" @change="onCalculationTypeChange">
           <el-option label="总计" value="sum" />
           <el-option label="平均值" value="average" />
           <el-option label="最大值" value="max" />
@@ -23,7 +23,7 @@ export default {
   name: "KFormula",
   data() {
     return {
-      calculationType: 'sum',
+      localCalculationType: this.value, // 使用传入的value初始化
     };
   },
   props: {
@@ -33,6 +33,12 @@ export default {
     },
 
   },
+  watch: {
+    value(newVal) {
+      // 监听外部传入的value变化，并更新localCalculationType
+      this.localCalculationType = newVal;
+    }
+  },
   computed: {
 
   },

zkqy-ui/src/views/treeTableMange/index.vue

@@ -397,7 +397,7 @@ export default {
                 let data = {}
                 let judgmentMenuResult = await this.judgmentMenu(this.mode);
                 if (judgmentMenuResult.code == 200) {
-                  console.log('this.tableList[1]',this.tableList)
+                  console.log('this.tableList[1]',this.tableList,this.tableList[0].primaryKey)
                   data = {
                     menuId: judgmentMenuResult.data,//菜单id
                     menuName: formTopData.menuName,//菜单名称
@@ -409,6 +409,7 @@ export default {
                     treeTableCondition: formTopData.treeTableCondition,//树形表是lable/还是value作为条件
                     tableId: x.tableId,//关联表 
                     tableNameDes: this.tableList[0].dtName,//关联表
+                    treeTableJoinTablePrimaryKey: this.tableList[0].primaryKey,//关联表主键
                     treeTableJoinTableCondition:x.treeTableJoinTableCondition,
                     treeTableJoinTable: this.tableList[0].dtTableName,//关联表表名
                     treeTableKey: this.treeTableKey//  树形菜单的treeTableKey
@@ -425,6 +426,7 @@ export default {
                       this.$message.warning("新增成功");
                     }
                   } else {
+                    console.log('this.tableList[0].primaryKey',this.tableList[0].primaryKey)
                     data = {
                       id: this.editorId,
                       menuId: judgmentMenuResult.data,//菜单id
@@ -437,6 +439,7 @@ export default {
                       treeTableCondition: formTopData.treeTableCondition,//树形表是lable/还是value作为条件
                       tableId: x.tableId,//关联表 
                       tableNameDes: this.tableList[0].dtName,//关联表
+                      treeTableJoinTablePrimaryKey: this.tableList[0].primaryKey,//关联表主键
                       treeTableJoinTableCondition:x.treeTableJoinTableCondition,
                       treeTableJoinTable: this.tableList[0].dtTableName,//关联表表名
                       treeTableKey: this.treeTableKey//  树形菜单的treeTableKey