n20-common-lib 1.3.29 → 1.3.30

package/src/components/Table/index.vue

@@ -1,6 +1,5 @@
 <template>
   <el-table
-    v-if="!pageObj"
     ref="el-table"
     :header-cell-style="{ 'text-align': 'center' }"
     :data="data"
@@ -25,146 +24,30 @@
         :filters="item.filters | colftF(filtersMap)"
         v-bind="item"
       >
-        <template slot="header">
-          <span v-if="item.filter" class="">
-            {{ item.label }}
-            <ThSelectHeader
-              :property="item.prop"
-              :th-index="dataList"
-              :check-list="checkList"
-              @selectChange="selectChange"
-            />
-          </span>
+        <template v-if="item.filterPre" slot="header">
+          {{ item.label }}
+          <th-select-header
+            :property="item.prop"
+            :data-list="dataList"
+            :check-list="checkList"
+            @selectChange="selectChange"
+          />
         </template>
       </el-table-column>
     </template>
   </el-table>
-
-  <div v-else :style="{ height: heightW }">
-    <el-table
-      ref="el-table"
-      :header-cell-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-      :data="data"
-      v-bind="$attrs"
-      :height="heightC"
-      v-on="$listeners"
-    >
-      <template v-for="(item, i) in columns">
-        <slot v-if="item.slotName" :name="item.slotName"></slot>
-        <el-table-column
-          v-else-if="item.render"
-          :key="'cl-table-' + i"
-          v-bind="item"
-        >
-          <columnRender
-            slot-scope="{ row }"
-            :c-render="item.render"
-            :row="row"
-          />
-        </el-table-column>
-        <el-table-column
-          v-else
-          :key="'cl-table-' + i"
-          :formatter="item.formatter | colfF"
-          v-bind="item"
-        />
-      </template>
-    </el-table>
-    <div v-if="pageObj" class="flex-box flex-r m-t-s">
-      <Pagination
-        :page-obj="pageObj"
-        :page-key="pageKey"
-        @change="(obj) => $emit('pageChange', obj)"
-      />
-    </div>
-  </div>
 </template>
 
 <script>
 import numerify from 'numerify'
 import dayjs from 'dayjs'
-import Pagination from '../Pagination/index.vue'
-
-import ThSelectHeader from './ThSelectHeader.vue'
-
-const columnRender = {
-  props: {
-    cRender: {
-      type: Function
-    },
-    row: {
-      type: Object
-    }
-  },
-  render(h) {
-    return this.cRender(h, this.row)
-  }
-}
-
-function colfF(colf, map) {
-  if (typeof colf !== 'string') return colf
-  let sc = colf.split(/{.+?}/g) || []
-  let mc = colf.match(/{.+?}/g) || []
-  let mck = []
-  mc.forEach((t) => {
-    t = t.replace(/^{|\s+|}$/g, '').split('|')
-    mck.push(t)
-  })
-
-  return (row) => tplFn(row, sc, mck, map)
-}
-function tplFn(row, sc, mck, map = {}) {
-  let str = ''
-  sc.forEach((s, i) => {
-    str += s
-    let kA = mck[i]
-    if (kA && kA.length) {
-      let key = kA[0]
-      if (kA.length === 1) {
-        str += row[key]
-      } else {
-        let type = kA[1]
-        switch (type) {
-          case 'money':
-            str += numerify(row[key], '0,0.00')
-            break
-          case 'rate':
-            str += numerify(row[key], '0.000000')
-            break
-          case 'map':
-            str += map[row[key]]
-            break
-          case 'date':
-            str += dayjs(row[key]).format('YYYY-MM-DD')
-            break
-          case 'datetime':
-            str += dayjs(row[key]).format('YYYY-MM-DD HH:mm:ss')
-            break
-          case 'time':
-            str += dayjs(row[key]).format('HH:mm:ss')
-            break
-          default:
-            str += row[key]
-            break
-        }
-      }
-    }
-  })
-  return str
-}
-
-function colftF(colft, fMap) {
-  if (typeof colft !== 'string') return colft
-  return fMap[colft]
-}
+import thSelectHeader from './ThSelectHeader.vue'
 
 export default {
   name: 'Table',
   components: {
-    Pagination,
     columnRender,
-    ThSelectHeader
+    thSelectHeader
   },
   filters: {
     colfF,
@@ -208,21 +91,6 @@ export default {
       dataList: []
     }
   },
-  computed: {
-    heightW() {
-      if (this.height === undefined) {
-        return undefined
-      }
-      if (/\D/.test(this.height)) {
-        return this.height
-      } else {
-        return this.height + 'px'
-      }
-    },
-    heightC() {
-      return this.pageObj ? 'calc(100% - 38px)' : '100%'
-    }
-  },
   created() {
     this.dataList = JSON.parse(JSON.stringify(this.data))
     for (let k in this.dataList[0]) {
@@ -230,17 +98,11 @@ export default {
     }
     for (let i in this.dataList) {
       for (let k in this.dataList[i]) {
-        if (
-          this.checkList[k].findIndex((item) => item == this.dataList[i][k]) ==
-          -1
-        ) {
+        if (!this.checkList[k].some((item) => item === this.dataList[i][k])) {
           this.checkList[k].push(this.dataList[i][k])
         }
       }
     }
-    if (this.column) {
-      console.warn('调整列顺序,请使用ShowColumn组件')
-    }
   },
   methods: {
     selectChange(val) {
@@ -258,4 +120,75 @@ export default {
     }
   }
 }
+
+const columnRender = {
+  props: {
+    cRender: {
+      type: Function
+    },
+    row: {
+      type: Object
+    }
+  },
+  render(h) {
+    return this.cRender(h, this.row)
+  }
+}
+
+function colfF(colf, map) {
+  if (typeof colf !== 'string') return colf
+  let sc = colf.split(/{.+?}/g) || []
+  let mc = colf.match(/{.+?}/g) || []
+  let mck = []
+  mc.forEach((t) => {
+    t = t.replace(/^{|\s+|}$/g, '').split('|')
+    mck.push(t)
+  })
+
+  return (row) => tplFn(row, sc, mck, map)
+}
+function tplFn(row, sc, mck, map = {}) {
+  let str = ''
+  sc.forEach((s, i) => {
+    str += s
+    let kA = mck[i]
+    if (kA && kA.length) {
+      let key = kA[0]
+      if (kA.length === 1) {
+        str += row[key]
+      } else {
+        let type = kA[1]
+        switch (type) {
+          case 'money':
+            str += numerify(row[key], '0,0.00')
+            break
+          case 'rate':
+            str += numerify(row[key], '0.000000')
+            break
+          case 'map':
+            str += map[row[key]]
+            break
+          case 'date':
+            str += dayjs(row[key]).format('YYYY-MM-DD')
+            break
+          case 'datetime':
+            str += dayjs(row[key]).format('YYYY-MM-DD HH:mm:ss')
+            break
+          case 'time':
+            str += dayjs(row[key]).format('HH:mm:ss')
+            break
+          default:
+            str += row[key]
+            break
+        }
+      }
+    }
+  })
+  return str
+}
+
+function colftF(colft, fMap) {
+  if (typeof colft !== 'string') return colft
+  return fMap[colft]
+}
 </script>

package/src/components/TableOperateColumn/OperateBtns.vue

@@ -0,0 +1,73 @@
+<template>
+  <span>
+    <el-button
+      v-for="item in dfBtns"
+      :key="item.label"
+      type="text"
+      size="mini"
+      @click="$emit('command', item.command)"
+      >{{ item.label }}</el-button
+    >
+    <el-dropdown v-if="moreBtns.length" @command="(c) => $emit('command', c)">
+      <el-button class="n20-icon-moren" type="text" size="mini" />
+      <el-dropdown-menu slot="dropdown" class="text-c">
+        <el-dropdown-item
+          v-for="item in moreBtns"
+          :key="item.label"
+          :command="item.command"
+          >{{ item.label }}</el-dropdown-item
+        >
+      </el-dropdown-menu>
+    </el-dropdown>
+  </span>
+</template>
+
+<script>
+export default {
+  props: {
+    btnList: {
+      type: Array,
+      default: () => []
+    },
+    row: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    hasBtns() {
+      return this.btnList.filter((btn) => this.hasBtn(btn.isHas, this.row))
+    },
+    dfBtns() {
+      if (this.hasBtns.length > 3) {
+        return this.hasBtns.slice(0, 2)
+      } else {
+        return this.hasBtns
+      }
+    },
+    moreBtns() {
+      if (this.hasBtns.length > 3) {
+        return this.hasBtns.slice(2)
+      } else {
+        return []
+      }
+    }
+  },
+  methods: {
+    hasBtn(isHas, row) {
+      if (isHas === undefined || isHas === null) {
+        return true
+      } else if (typeof isHas === 'boolean') {
+        return isHas
+      } else if (typeof isHas === 'string' || Array.isArray(isHas)) {
+        return this.$has(isHas)
+      } else if (typeof isHas === 'function') {
+        return isHas(row)
+      }
+    }
+  }
+}
+</script>

package/src/components/TableOperateColumn/index.vue

@@ -0,0 +1,26 @@
+<template>
+  <el-table-column v-bind="$attrs">
+    <OperateBtns
+      slot-scope="{ row, $index }"
+      :btn-list="btnList"
+      :row="row"
+      @command="(c) => $emit(c, row, $index)"
+    />
+  </el-table-column>
+</template>
+
+<script>
+import OperateBtns from './OperateBtns.vue'
+export default {
+  name: 'TableOperateColumn',
+  components: {
+    OperateBtns
+  },
+  props: {
+    btnList: {
+      type: Array,
+      default: () => []
+    }
+  }
+}
+</script>

package/src/index.js

@@ -35,6 +35,7 @@ import FileUploadTable from './components/FileUploadTable/index.vue'
 import FooterBox from './components/FooterBox/index.vue'
 import Filters from './components/Filters/index.vue'
 import Table from './components/Table/index.vue'
+import TableOperateColumn from './components/TableOperateColumn/index.vue'
 import Button from './components/Button/index.vue'
 import ButtonGroup from './components/Button/button-group.vue'
 import ShowColumn from './components/ShowColumn/index.vue'
@@ -124,6 +125,7 @@ const components = [
   FooterBox,
   Filters,
   Table,
+  TableOperateColumn,
   Button,
   ButtonGroup,
   ShowColumn,
@@ -232,6 +234,7 @@ export {
   FooterBox,
   Filters,
   Table,
+  TableOperateColumn,
   Button,
   ButtonGroup,
   ShowColumn,