fix:优化lin-table (#133)

Author: gongjs

package.json

@@ -18,10 +18,8 @@
     "element-ui": "^2.8.2",
     "event-source-polyfill": "^0.0.16",
     "fastscan": "^1.0.4",
-    "file-saver": "^2.0.1",
     "good-storage": "^1.1.0",
     "js-cookie": "^2.2.0",
-    "sortablejs": "^1.9.0",
     "vue": "^2.6.8",
     "vue-awesome-swiper": "^3.1.3",
     "vue-router": "~3.0.1",

src/components/base/line/lin-1px.vue

@@ -67,8 +67,8 @@
 </template>
 
 <script>
-import Sortable from 'sortablejs'
-import FileSaver from 'file-saver'
+// import Sortable from 'sortablejs'
+// import FileSaver from 'file-saver'
 
 export default {
   props: {
@@ -278,44 +278,44 @@ export default {
       this.oldVal = [...val]
     },
     // 拖拽
-    setDrag() {
-      const el = document.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
-      this.rowClassName = 'rowClassName' // 设置行样式，添加移动手势
-      this.sortable = Sortable.create(el, {
-        setData(dataTransfer) {
-          dataTransfer.setData('Text', '')
-        },
-        onEnd: (evt) => {
-          const dragData = [...this.currentData]
-          let { oldIndex, newIndex } = evt
-          if (this.pagination) {
-            oldIndex = evt.oldIndex * this.currentPage
-            newIndex = evt.newIndex * this.currentPage
-          }
-          dragData[oldIndex] = this.currentData[newIndex]
-          dragData[newIndex] = this.currentData[oldIndex]
-          this.$emit('getDragData', { dragData, oldIndex, newIndex })
-        },
-      })
-    },
+    // setDrag() {
+    //   const el = document.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+    //   this.rowClassName = 'rowClassName' // 设置行样式，添加移动手势
+    //   this.sortable = Sortable.create(el, {
+    //     setData(dataTransfer) {
+    //       dataTransfer.setData('Text', '')
+    //     },
+    //     onEnd: (evt) => {
+    //       const dragData = [...this.currentData]
+    //       let { oldIndex, newIndex } = evt
+    //       if (this.pagination) {
+    //         oldIndex = evt.oldIndex * this.currentPage
+    //         newIndex = evt.newIndex * this.currentPage
+    //       }
+    //       dragData[oldIndex] = this.currentData[newIndex]
+    //       dragData[newIndex] = this.currentData[oldIndex]
+    //       this.$emit('getDragData', { dragData, oldIndex, newIndex })
+    //     },
+    //   })
+    // },
     // 导出excel
-    exportExcel(fileName = 'sheet') {
-      const targetTable = this.$XLSX.utils.table_to_book(document.querySelectorAll('.el-table__body-wrapper > table')[0])
-      const writeTable = this.$XLSX.write(targetTable, { bookType: 'xlsx', bookSST: true, type: 'array' })
-      try {
-        FileSaver.saveAs(new Blob([writeTable], { type: 'application/octet-stream' }), `${fileName}.xlsx`)
-      } catch (e) { if (typeof console !== 'undefined') console.log(e, writeTable) }
-      return writeTable
-    },
+    // exportExcel(fileName = 'sheet') {
+    //   const targetTable = this.$XLSX.utils.table_to_book(document.querySelectorAll('.el-table__body-wrapper > table')[0])
+    //   const writeTable = this.$XLSX.write(targetTable, { bookType: 'xlsx', bookSST: true, type: 'array' })
+    //   try {
+    //     FileSaver.saveAs(new Blob([writeTable], { type: 'application/octet-stream' }), `${fileName}.xlsx`)
+    //   } catch (e) { if (typeof console !== 'undefined') console.log(e, writeTable) }
+    //   return writeTable
+    // },
     // 导出csv
-    exportCsv(fileName = 'sheet') {
-      const targetTable = this.$XLSX.utils.table_to_book(document.querySelectorAll('.el-table__body-wrapper > table')[0])
-      const writeTable = this.$XLSX.write(targetTable, { bookType: 'csv', bookSST: true, type: 'array' })
-      try {
-        FileSaver.saveAs(new Blob([writeTable], { type: 'application/octet-stream' }), `${fileName}.csv`)
-      } catch (e) { if (typeof console !== 'undefined') console.log(e, writeTable) }
-      return writeTable
-    },
+    // exportCsv(fileName = 'sheet') {
+    //   const targetTable = this.$XLSX.utils.table_to_book(document.querySelectorAll('.el-table__body-wrapper > table')[0])
+    //   const writeTable = this.$XLSX.write(targetTable, { bookType: 'csv', bookSST: true, type: 'array' })
+    //   try {
+    //     FileSaver.saveAs(new Blob([writeTable], { type: 'application/octet-stream' }), `${fileName}.csv`)
+    //   } catch (e) { if (typeof console !== 'undefined') console.log(e, writeTable) }
+    //   return writeTable
+    // },
   },
   watch: {
     fixedLeftList: {

src/components/base/table/lin-table.vue

@@ -2,7 +2,6 @@ import '@babel/polyfill'
 import Vue from 'vue'
 import ElementUI from 'element-ui'
 
-import Lin1px from '@/components/base/line/lin-1px'
 import StickyTop from '@/components/base/sticky-top/sticky-top'
 import SourceCode from '@/components/base/source-code/source-code'
 
@@ -28,7 +27,6 @@ Vue.use(plugins)
 
 Vue.component(CollapseTransition.name, CollapseTransition)
 
-Vue.component('lin-1px', Lin1px)
 Vue.component('sticky-top', StickyTop)
 Vue.component('source-code', SourceCode)
 

src/main.js

@@ -300,7 +300,7 @@ export default {
           type: 'success',
           message: '修改成功',
         })
-      }, 100)
+      }, 1000)
     },
     handleCellCancel(row) {
       row.editFlag = false; // eslint-disable-line

src/plugins/LinCmsUi/views/table/TableCombo.vue

@@ -26,7 +26,7 @@
         </lin-date-picker>
       </div>
     </div>
-    <lin-1px v-if="!keyword" :addWidth="40"></lin-1px>
+    <el-divider v-if="!keyword"></el-divider>
     </sticky-top>
     <transition name="fade">
       <div class="search" v-if="keyword">
@@ -50,7 +50,7 @@
         </section>
       </article>
 
-      <lin-1px></lin-1px>
+      <el-divider></el-divider>
       <div class="more">
         <i v-if="more" class="iconfont icon-loading"></i>
         <div v-show="!more && !finished" @click="nextPage">
@@ -264,6 +264,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     padding: 0 20px;
+    margin-bottom: -24px;
 
     .header-left {
       float: left;
@@ -292,6 +293,7 @@ export default {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
+    margin-top:24px;
 
     .search-tip {
       margin-left: 40px;
@@ -327,6 +329,7 @@ export default {
 
     article {
       position: relative;
+      margin-bottom: -24px;
 
       section {
         padding: 0 0 36px;

src/views/log/Log.vue

@@ -3921,11 +3921,6 @@ file-loader@^3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
-file-saver@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.1.tgz#7fe2242af1cbc559a29d8176078a8b56d781fa79"
-  integrity sha512-dCB3K7/BvAcUmtmh1DzFdv0eXSVJ9IAFt1mw3XZfAexodNRoE29l3xB2EX4wH2q8m/UTzwzEPq/ArYk98kUkBQ==
-
 filesize@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
@@ -8340,11 +8335,6 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
-sortablejs@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.9.0.tgz#2d1e74ae6bac2cb4ad0622908f340848969eb88d"
-  integrity sha512-Ot6bYJ6PoqPmpsqQYXjn1+RKrY2NWQvQt/o4jfd/UYwVWndyO5EPO8YHbnm5HIykf8ENsm4JUrdAvolPT86yYA==
-
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "http://r.cnpmjs.org/source-list-map/download/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"