tianheng-ui 0.1.4 → 0.1.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/TableMaking/generateTable.vue

@@ -220,9 +220,6 @@ export default {
           // table
           for (let i = 0; i < this.tableJson.table.options.length; i++) {
             const element = this.tableJson.table.options[i];
-            if (element.primaryKey) {
-              element.hide = true
-            }
             delete element.type;
           }
           if (this.tableJson.table.sequence) {

package/packages/TableMaking/widgetConfig.vue

@@ -239,7 +239,7 @@ export default {
               sizes: [10, 20, 30, 50, 100]
             }
           },
-          sort: { type: "1", key: "create_time" },
+          sort: { type: "1", key: "" },
           loading: { show: false, text: "加载中", image: "" },
           empty: { show: true, text: "暂无数据", image: "" },
           sequence: true //是否显示序号

package/packages/TableMaking/widgetTable.vue

@@ -68,12 +68,13 @@
     <div class="table-title">列表字段</div>
     <div class="tableList">
       <div class="table-header">
-        <div>拖动</div>
+        <div class="table-item-custom">拖动</div>
         <div>列名</div>
         <!-- <div>字段</div> -->
-        <div>排序</div>
         <div>对齐</div>
         <div>宽度</div>
+        <div class="table-item-custom">排序</div>
+        <div class="table-item-custom" style="width:50px">隐藏</div>
       </div>
       <draggable
         class="table-content"
@@ -88,15 +89,14 @@
       >
         <div
           v-for="item in tableData"
-          :key="item.key"
+          :key="item.prop"
           class="table-content-item"
         >
-          <div class="drag">
+          <div class="table-item-custom drag">
             <i class="iconfont icon-drag drag-widget"></i>
           </div>
           <div>{{ item.label }}</div>
           <!-- <div>{{ item.prop }}</div> -->
-          <div><el-checkbox v-model="item.sortable"></el-checkbox></div>
           <div>
             <el-select v-model="item.align" placeholder="请选择" size="mini">
               <el-option
@@ -116,6 +116,12 @@
               size="mini"
             ></el-input-number>
           </div>
+          <div class="table-item-custom">
+            <el-checkbox v-model="item.sortable"></el-checkbox>
+          </div>
+          <div class="table-item-custom">
+            <el-checkbox v-model="item.hide"></el-checkbox>
+          </div>
         </div>
       </draggable>
     </div>
@@ -227,7 +233,7 @@ export default {
 
     .table-content {
       height: 120px;
-      overflow-y: scroll;
+      overflow-y: overlay;
     }
   }
   .tableList {
@@ -235,20 +241,10 @@ export default {
     height: calc(100% - 240px);
     border: 1px solid #dcdfe6;
 
-    // .table-header {
-    //   div:nth-child(4) {
-    //     flex: none;
-    //     width: 70px !important;
-    //   }
-    // }
     .table-content {
       height: calc(100% - 40px);
-      overflow-y: scroll;
+      overflow-y: overlay;
     }
-    // .table-content .table-content-item > div:nth-child(4) {
-    //   flex: none;
-    //   width: 70px !important;
-    // }
     .el-input-number--mini {
       width: 100%;
     }
@@ -264,11 +260,6 @@ export default {
       height: 40px;
       line-height: 40px;
     }
-    div:nth-child(1) {
-      flex: none;
-      width: 60px;
-      text-align: center;
-    }
   }
   .table-content {
     .table-content-item {
@@ -288,13 +279,13 @@ export default {
         line-height: 40px;
         padding: 0 10px;
       }
-      > div:nth-child(1) {
-        flex: none;
-        width: 60px;
-        text-align: center;
-      }
     }
   }
+  .table-item-custom {
+    flex: none !important;
+    width: 60px !important;
+    text-align: center;
+  }
   // .table-content:hover::-webkit-scrollbar-thumb {
   //   background-color: rgba(69, 90, 100, 0.2);
   // }