From 634c094a666b724caf36c162fefb41ba9f3db994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8B=8D=E6=8B=8D=E7=86=8A?= <1196323914@qq.com>
Date: Wed, 2 Nov 2022 15:34:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BF=AB=E6=8D=B7=E6=8C=89?=
 =?UTF-8?q?=E9=92=AEUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/lycrud.vue | 39 ++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/lycrud.vue b/frontend/src/components/lycrud.vue
index 82a7823..13f1822 100644
--- a/frontend/src/components/lycrud.vue
+++ b/frontend/src/components/lycrud.vue
@@ -16,7 +16,7 @@
                     </el-select>
                     <el-date-picker
                             v-else-if="sitem.type === 'datepicker-datetimerange'"
-                            style="width:350px"
+                            style="width:100% !important;"
                             v-model="timers"
                             type="datetimerange"
                             @change="timeChange"
@@ -41,9 +41,8 @@
                     <div>
                         <el-button  @click="handleEdit('','add')" type="primary" icon="Plus" v-show="rowHandle.permission.add">新增</el-button>
                         <el-button  @click="handleMutiDelete" type="danger" icon="Delete" :disabled="multiple" v-if="showSelectable && rowHandle.permission.del">删除</el-button>
-                        <slot name="tablebar-l"></slot>
                     </div>
-
+                    <slot name="tablebar-l"></slot>
                 </div>
                 <div>
                     <slot name="tablebar-c"></slot>
@@ -52,16 +51,27 @@
                     <slot name="tablebar-r"></slot>
                     <!-- 右侧表头筛选 -->
                     <div class="transfer">
-                        <el-button icon="Refresh" circle @click="handleRefresh"></el-button>
-                        <el-button icon="Search" circle type="primary" @click="showSearchBar=showSearchBar?false:true"></el-button>
-                        <el-button icon="Filter" @click="drawer=true" circle type="success"></el-button>
-                        <el-drawer v-model="drawer" direction="rtl" title="显示/隐藏列" size="20%">
+                        <el-button type="primary" link @click="handleRefresh">
+                            <el-icon size="20px"><Refresh/></el-icon>
+                        </el-button>
+                        <el-popover placement="bottom" trigger="click" :width="100">
                             <el-checkbox :indeterminate="drawerIndeterminate" @change="handleDrawerCheckAllChange">全选 {{ "("+drawerCheckedValue.length+"/"+tableColumns.length+")"}}</el-checkbox>
+                            <el-divider style="margin:  5px auto"></el-divider>
                             <el-checkbox-group v-model="drawerCheckedValue" @change="handleDrawerColumnsChange" style="overflow: auto;display: flex;flex-direction: column">
                                 <el-checkbox  v-for="ckitem in tableColumns" :key="ckitem.prop" :label="ckitem.label" :checked="!ckitem.hidden"></el-checkbox>
                             </el-checkbox-group>
-
-                        </el-drawer>
+                            <template #reference>
+                                <el-button link type="primary">
+                                    <el-icon size="20px"><Setting/></el-icon>
+                                </el-button>
+                            </template>
+                        </el-popover>
+                        <el-button link type="primary" @click="showSearchBar=!showSearchBar">
+                            <el-icon size="20px"><Search/></el-icon>
+                        </el-button>
+                        <el-button type="primary" link @click="setFull">
+                            <el-icon size="20px"><FullScreen/></el-icon>
+                        </el-button>
                     </div>
                 </div>
             </div>
@@ -101,11 +111,6 @@
                     <template #header>
                         <div style="display: flex;justify-content: space-between;align-items: center;">
                             <div>操作</div>
-                            <div @click="setFull">
-                                <el-tooltip content="全屏" placement="bottom">
-                                    <el-icon ><full-screen /></el-icon>
-                                </el-tooltip>
-                            </div>
                         </div>
                     </template>
                     <template #default="scope">
@@ -132,8 +137,7 @@
                         <el-form-item :label="fitem.label+'：'" :prop="fitem.prop" v-if="(fitem.form.hidden!==undefined && dialogTitle!=='详情')?!fitem.form.hidden:true">
                             <el-input v-if="fitem.type=='input'" :show-password="fitem.form.showPassword?fitem.form.showPassword:false"  v-model="formData[fitem.prop]" clearable :placeholder="fitem.form.placeholder?fitem.form.placeholder:''" @change="fitem.form.valueChange"></el-input>
                             <el-input v-else-if="fitem.type=='textarea'"  type="textarea" v-model="formData[fitem.prop]" :placeholder="fitem.form.placeholder?fitem.form.placeholder:''" @change="fitem.form.valueChange"></el-input>
-                            <el-input-number v-else-if="fitem.type=='number'"  v-model="formData[fitem.prop]"  :min="0" :max="999999" @change="fitem.form.valueChange"></el-input-number>
-                            <el-input-number v-else-if="fitem.type=='price'"  v-model="formData[fitem.prop]" :precision="2" :step="0.1"    @change="fitem.form.valueChange"></el-input-number>
+                            <el-input-number v-else-if="fitem.type=='number'"  v-model="formData[fitem.prop]"  :min="0" :max="9999" @change="fitem.form.valueChange"></el-input-number>
                             <el-switch v-else-if="fitem.type=='switch'" v-model="formData[fitem.prop]" active-color="#13ce66" inactive-color="#ff4949" @change="fitem.form.valueChange"></el-switch>
                             <el-select v-else-if="fitem.type === 'select'" v-model="formData[fitem.prop]" :placeholder="fitem.placeholder" clearable filterable  @change="fitem.form.valueChange" style="width: 100%;">
                                 <el-option
@@ -352,7 +356,6 @@
                     this.getTheTableHeight()
                 })
             }
-
         },
         created() {
             this.showSearchBar = this.searchBar.showSearchBar
@@ -634,7 +637,7 @@
 
         unmounted() {
             //解决table 表格缩放错位问题
-            window.removeEventListener("resize", this.handleResize);
+             window.removeEventListener("resize", this.handleResize);
              // 页面销毁，去掉监听事件
 			window.removeEventListener("resize", this.listenResize);
         },
-- 
Gitee