From ddea9a419d9b7e38f099579ffeefb2024b94efab Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 23 Aug 2022 14:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=97=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=202022=E5=B9=B48=E6=9C=8823=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/null.vue             |  2 +-
 src/views/modules/common/column.vue | 60 +++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/src/views/demo/null.vue b/src/views/demo/null.vue
index e1f605f..2fb4dac 100644
--- a/src/views/demo/null.vue
+++ b/src/views/demo/null.vue
@@ -27,7 +27,7 @@
         :header-align="item.headerAlign"
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
-        :fixed="item.fixed"
+        :fixed="item.fixed==''?false:item.fixed"
         min-width="20%"
         :label="item.columnLabel">
         <template slot-scope="scope">
diff --git a/src/views/modules/common/column.vue b/src/views/modules/common/column.vue
index 8736cc6..e3a6e36 100644
--- a/src/views/modules/common/column.vue
+++ b/src/views/modules/common/column.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-dialog :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false" title="设置table列"
+  <el-dialog :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false" title="设置表格列"
              :visible.sync="visible"
-             width="1200px" v-drag>
+             width="852px" v-drag>
     <el-form label-position="top"  @keyup.enter.native="updateColumnList()"
              v-model="userColumnList"
              inline="inline"
@@ -12,7 +12,7 @@
                     :label="item.columnLabel"
                     :prop="item.columnProp">
         <el-form-item label="排序">
-          <el-input oninput="value=value.replace(/[^\d]/g, '')" v-model="item.sortLv"  :min="0" ></el-input>
+          <el-input style="width: 100px" oninput="value=value.replace(/[^\d]/g, '')" v-model="item.sortLv"  :min="0" ></el-input>
 <!--          <el-input-number v-model="item.sortLv" controls-position="right" size="mini" :min="0"-->
 <!--                           :max="100"></el-input-number>-->
         </el-form-item>
@@ -30,27 +30,28 @@
             inactive-text="不排序">
           </el-switch>
         </el-form-item>
-        <el-form-item label="固定状态">
-          <el-switch
-            v-model="item.fixed"
-            active-text="固定"
-            inactive-text="不固定">
-          </el-switch>
+        <el-form-item label="固定位置">
+          <el-select style="width: 100px"  v-model="item.fixed">
+            <el-option label="不固定" value=""></el-option>
+            <el-option label="左固定" value="left"></el-option>
+            <el-option label="右固定" value="right"></el-option>
+          </el-select>
+
         </el-form-item>
         <el-form-item label="宽度">
-          <el-input oninput="value=value.replace(/[^\d]/g, '')" v-model="item.columnWidth"  :min="0" ></el-input>
+          <el-input style="width: 100px" oninput="value=value.replace(/[^\d]/g, '')" v-model="item.columnWidth"  :min="0" ></el-input>
 <!--          <el-input-number v-model="item.columnWidth" controls-position="right" size="mini" :min="0"-->
 <!--                           :max="1000"></el-input-number>-->
         </el-form-item>
         <el-form-item label="类型">
-          <el-select v-model="item.columnType" >
-            <el-option value="string" label="string"></el-option>
-            <el-option value="number" label="number"></el-option>
-            <el-option value="date" label="date"></el-option>
+          <el-select style="width: 100px" v-model="item.columnType" >
+            <el-option value="string" label="字符"></el-option>
+            <el-option value="number" label="数字"></el-option>
+            <el-option value="date" label="日期"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="位置">
-          <el-select v-model="item.align" >
+          <el-select style="width: 100px" v-model="item.align" >
             <el-option value="left" label="居左"></el-option>
             <el-option value="center" label="居中"></el-option>
             <el-option value="right" label="居右"></el-option>
@@ -150,7 +151,34 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style >
+
+   .el-switch__label * {
+    font-size: 12px;
+  }
+   .el-switch {
+
+     font-size: 12px;
+     line-height: 15px;
+     height: 15px;
+   }
 
+   .el-switch__core {
+     margin: 0;
+     position: relative;
+     width: 30px;
+     height: 18px;
+      border: 0px solid #dcdfe6;
+     outline: 0;
+     border-radius: 10px;
+     -webkit-box-sizing: border-box;
+   }
+   .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
+     margin-bottom: 0px;
+   }
 
+   .el-select-dropdown__item {
+     height: 28px;
+     line-height: 28px;
+   }
 </style>