8
0
ZaiZai 10 сар өмнө
parent
commit
b770f1b084

+ 35 - 12
src/styles/view/project/edit-formula.scss

@@ -71,32 +71,55 @@
         .hc-div-new-card-box.reset-fun-right-card .body {
             position: relative;
             .tag-box {
-
+                position: relative;
+                padding-bottom: 4px;
+                height: 40%;
+                .el-button {
+                    margin-right: 10px;
+                    margin-bottom: 10px;
+                }
+                .el-button + .el-button {
+                    margin-left: 0;
+                }
             }
             .action-box {
-                .left {
-
-                }
-                .right {
-
+                position: relative;
+                height: 36px;
+                padding: 0 6px;
+                background: #f5f5f5;
+                border: 1px solid #e9e9e9;
+                .left, .right {
+                    position: relative;
                 }
                 .btn {
+                    position: relative;
+                    cursor: pointer;
+                    color: #409EFF;
+                    padding: 1px 6px;
+                    border-radius: 2px;
+                    height: 22px;
+                    transition: color .2s, background-color .2s;
                     .text {
-
+                        font-size: 14px;
                     }
                     .symbol {
-
+                        font-size: 12px;
                     }
                     i {
                         display: inline-block;
+                        font-size: 20px;
+                    }
+                    &:hover {
+                        color: #007dfd;
+                        background: #dadadb;
                     }
-                }
-                .btn + .btn {
-
                 }
             }
             .input-box {
-
+                position: relative;
+                height: calc((100% - 40% ) - 36px);
+                padding-top: 8px;
+                font-size: 14px;
             }
         }
     }

+ 15 - 12
src/views/project/list/edit-formula.vue

@@ -64,37 +64,40 @@
                             </template>
                             <div class="body h-full">
                                 <div class="tag-box">
-                                    resetFunEleData
+                                    <template v-for="(item, index) in resetFunEleData" :key="index">
+                                        <el-button v-if="item.k" type="primary" plain size="small">{{ item.name }}</el-button>
+                                        <el-button v-else type="primary" plain size="small">{{ item.eName }}</el-button>
+                                    </template>
                                 </div>
                                 <div class="action-box hc-flex">
                                     <div class="left hc-flex flex-1">
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <span class="text">输入值</span>
                                         </div>
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <span class="symbol">(</span>
                                         </div>
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <span class="symbol">)</span>
                                         </div>
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <i class="i-ri-add-line" />
                                         </div>
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <i class="i-ri-subtract-line" />
                                         </div>
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <i class="i-ri-close-line" />
                                         </div>
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <i class="i-ri-divide-line" />
                                         </div>
                                     </div>
                                     <div class="right hc-flex">
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <i class="i-ri-delete-back-2-line" />
                                         </div>
-                                        <div class="btn">
+                                        <div class="btn hc-flex-center">
                                             <i class="i-ri-delete-bin-3-line" />
                                         </div>
                                     </div>
@@ -311,16 +314,16 @@ const resetFunEleData = ref([])
 const getNodeDetailApi = async (item) => {
     await useClick(300)
     if (isNullES(item.initTableId)) {
+        resetFunEleData.value = []
         return
     }
     if (item.hasChildren === false || item.isLinkTable === 2) {
         const { data } = await treeApi.getTableElments({
             id: item.initTableId,
         })
-        console.log(data)
         resetFunEleData.value = getArrValue(data)
     } else {
-        console.log('no')
+        resetFunEleData.value = []
     }
 }