duy 6 днів тому
батько
коміт
1cf2899902

+ 2 - 2
src/views/formula/component/formulaTemplate.vue

@@ -8,8 +8,8 @@
         <span v-if="JSON.stringify(item)!=='null'">
  
             <el-radio-group v-model="formulainfo.arguments[index]"  v-if="formulainfo.template.args[index].m=='是否同行/列计算(选填)'">
-                <el-radio label="x">同行</el-radio>
-                <el-radio label="y">同列</el-radio>
+                <el-radio label="y">同行</el-radio>
+                <el-radio label="x">同列</el-radio>
                
               </el-radio-group>
 

+ 4 - 7
src/views/formula/component/funComponent/multiIfElseTools.js

@@ -638,16 +638,13 @@ export function convertToFCDataChange(data) {
     // 6. 单位:取frequencyUnit(默认空字符串)
     const unit = data && data.frequencyUnit ? data.frequencyUnit : '';
 
-    // 7. 停止元素:优先coordinationTags数组 → 再stopConditionParamTags数组 → 最后fallback到stopConditionParamTag单个标签
+    // 7. stopConditionParamTags → 再stopConditionParamTags数组 → 最后fallback到stopConditionParamTag单个标签
     let stopElement = '';
-    // 优先取coordinationTags数组
-    if (data && data.coordinationTags && data.coordinationTags.length > 0 && data.coordinationTags[0].tableElementKey) {
-        stopElement = `E[${data.coordinationTags[0].tableElementKey}]`;
-    } 
-    // coordinationTags无值时,取stopConditionParamTags数组
-    else if (data && data.stopConditionParamTags && data.stopConditionParamTags.length > 0 && data.stopConditionParamTags[0].tableElementKey) {
+    // stopConditionParamTags
+    if (data && data.stopConditionParamTags && data.stopConditionParamTags.length > 0 && data.stopConditionParamTags[0].tableElementKey) {
         stopElement = `E[${data.stopConditionParamTags[0].tableElementKey}]`;
     } 
+ 
     // 两个数组都无值时,取stopConditionParamTag单个标签(需非空)
     else if (data && data.stopConditionParamTag && data.stopConditionParamTag.trim() !== '') {
         stopElement = data.stopConditionParamTag;