From 9953da6bd5f7cdc5b277c21ee50e01f2889f022e Mon Sep 17 00:00:00 2001
From: likun <906102152@qq.com>
Date: Mon, 9 Jun 2025 13:58:58 +0800
Subject: [PATCH] optimize some

---
 ui/src/components/restful/table.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ui/src/components/restful/table.vue b/ui/src/components/restful/table.vue
index 17dbbff..2f32ff2 100644
--- a/ui/src/components/restful/table.vue
+++ b/ui/src/components/restful/table.vue
@@ -116,6 +116,11 @@ const handleServerRowData = (fieldsDescInfoData, rowData) => {
         }
       }
       if (!find) {
+        if (whereFieldsDescInfo.value.length == 0) {
+          field.isFirstWhereDesc = true
+        } else {
+          field.isFirstWhereDesc = false
+        }
         whereFieldsDescInfo.value.push(field)
       }
     }
@@ -536,34 +541,34 @@ const handlePaginationCurChange = (val) => {
                 <!--                <el-col :span="calcElColSpan">-->
                 <el-date-picker v-model="fieldDescInfo.value1" type="datetime"
                                 :placeholder="(fieldDescInfo.name + '起始')" format="YYYY/MM/DD HH:mm:ss"
-                                value-format="YYYY/MM/DD HH:mm:ss" style="margin-left: 10px"></el-date-picker>
+                                value-format="YYYY/MM/DD HH:mm:ss" style="margin-right: 10px"></el-date-picker>
                 <!--                </el-col>-->
                 <!--                <el-col :span="calcElColSpan">-->
                 <el-date-picker v-model="fieldDescInfo.value2" type="datetime"
                                 :placeholder="(fieldDescInfo.name + '结束')" format="YYYY/MM/DD HH:mm:ss"
-                                value-format="YYYY/MM/DD HH:mm:ss" style="margin-left: 10px"></el-date-picker>
+                                value-format="YYYY/MM/DD HH:mm:ss" style="margin-right: 10px"></el-date-picker>
                 <!--                </el-col>-->
               </template>
               <template v-else>
                 <!--                <el-col :span="calcElColSpan">-->
                 <el-select v-model="fieldDescInfo.value1"
                            :placeholder="(fieldDescInfo.multi_choice === true ? '--' + fieldDescInfo.name + '--' : '--' + fieldDescInfo.name + '--')"
-                           style="width: 150px;margin-left: 10px"
+                           style="width: 150px;margin-right: 10px"
                            filterable v-if="(fieldDescInfo.choices.length > 0)">
                   <el-option v-for="choice in fieldDescInfo.choices" :key="choice.value" :label="choice.desc"
                              :value="choice.value"></el-option>
                 </el-select>
                 <el-input v-model="fieldDescInfo.value1"
                           :placeholder="(fieldDescInfo.name + fieldDescInfo.whereDesc)"
-                          style="width: 150px;margin-left: 10px" v-else></el-input>
+                          style="width: 150px;margin-right: 10px" v-else></el-input>
                 <!--                </el-col>-->
               </template>
             </template>
             <!--            <el-col :span="calcElColSpan">-->
-            <el-button @click="listData" type="primary" style="margin-left: 10px">条件搜索</el-button>
+            <el-button @click="listData" type="primary">条件搜索</el-button>
             <!--            </el-col>-->
             <!--            <el-col :span="calcElColSpan">-->
-            <el-button @click="resetConditionSearch">清空条件</el-button>
+            <el-button @click="resetConditionSearch" type="default">清空条件</el-button>
             <!--            </el-col>-->
           </el-row>