公式

src/styles/view/project/edit-formula.scss

@@ -42,7 +42,8 @@
     .hc-formula-card-math {
         position: relative;
         .body {
-            padding: 24px 0;
+            padding: 12px 0;
+            line-height: 1.6;
             .element-class {
                 cursor: pointer;
                 padding: 0 3px;

src/views/project/list/edit-formula.vue

@@ -34,17 +34,18 @@
                     <div class="header hc-flex">
                         <div class="name flex-1 text-14px">函数公式.</div>
                         <div class="extra relative ml-24px">
+                            <el-button size="small" @click="clearResetFunClick">清除选择</el-button>
                             <el-button :type="isResetFun ? 'primary' : 'info'" size="small" @click="resetFunClick">重置函数</el-button>
                         </div>
                     </div>
                     <div class="body relative">
                         <template v-for="(item, index) in resultFormula" :key="index">
-                            <span class="element-class text-26px" :class="item.selected ? 'is-cur' : ''" @click="resultFormulaItem(item, index)">{{ item.name }}</span>
+                            <span class="element-class text-22px" :class="item.selected ? 'is-cur' : ''" @click="resultFormulaItem(item, index)">{{ item.name }}</span>
                         </template>
-                        <span class="ml-10px mr-10px text-26px">=</span>
+                        <span class="ml-10px mr-10px text-24px">=</span>
                         <template v-for="(item, index) in processFormula" :key="index">
-                            <el-tooltip :content="item.tableName" placement="top-start" :disabled="item.type !== 'Element'">
-                                <span class="element-class text-26px" :class="item.selected ? 'is-cur' : ''" :data-name="getItemTableName(item)" @click="processFormulaItem(item, index)">{{ item.name }}</span>
+                            <el-tooltip :content="item.tableName" placement="top-start" :disabled="item.type !== 'Element' || isNullES(item.tableName)">
+                                <span class="element-class text-22px" :class="item.selected ? 'is-cur' : ''" :data-name="getItemTableName(item)" @click="processFormulaItem(item, index)">{{ item.name }}</span>
                             </el-tooltip>
                         </template>
                     </div>
@@ -566,14 +567,7 @@ const getWbsFormElementData = async () => {
 const processIndex = ref(-1)
 const processType = ref('')
 const resultFormulaItem = (item, index) => {
-    //清除左边的选中
-    resultFormula.value.forEach((obj) => {
-        obj.selected = false
-    })
-    //清除右边的选中
-    processFormula.value.forEach((obj) => {
-        obj.selected = false
-    })
+    clearResetFunClick()
     //设置当前选中
     processIndex.value = index
     processType.value = 'resultFormula'
@@ -582,6 +576,15 @@ const resultFormulaItem = (item, index) => {
 
 //右边被点击
 const processFormulaItem = (item, index) => {
+    clearResetFunClick()
+    //设置当前选中
+    processIndex.value = index
+    processType.value = 'processFormula'
+    item.selected = true
+}
+
+//清除选择
+const clearResetFunClick = () => {
     //清除左边的选中
     resultFormula.value.forEach((obj) => {
         obj.selected = false
@@ -591,9 +594,8 @@ const processFormulaItem = (item, index) => {
         obj.selected = false
     })
     //设置当前选中
-    processIndex.value = index
-    processType.value = 'processFormula'
-    item.selected = true
+    processIndex.value = -1
+    processType.value = ''
 }
 
 //是否重置函数