n20-common-lib 1.2.6 → 1.2.9

package/src/components/Table/index.vue

@@ -1,179 +1,179 @@
-<template>
-  <el-table
-    v-if="!pageObj"
-    ref="el-table"
-    :header-cell-style="{ 'text-align': 'center' }"
-    :data="data"
-    :height="height"
-    v-bind="$attrs"
-    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"
-        :filters="item.filters | colftF(filtersMap)"
-        v-bind="item"
-      />
-    </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 Pagination from '../Pagination/index.vue'
-
-const columnRender = {
-  props: {
-    cRender: {
-      type: Function
-    },
-    row: {
-      type: Object
-    }
-  },
-  render(h) {
-    return this.cRender(h, this.row)
-  }
-}
-
-export default {
-  name: 'Table',
-  components: {
-    Pagination,
-    columnRender
-  },
-  filters: {
-    colfF(colf) {
-      if (typeof colf !== 'string') return colf
-
-      if (/\|money/.test(colf)) {
-        let mc = colf.match(/{(\S+)\|money}/)
-        let key = mc && mc[1]
-
-        return (row) => numerify(row[key], '0,0.00')
-      } else if (/\|rate/.test(colf)) {
-        let mc = colf.match(/{(\S+)\|rate}/)
-        let key = mc && mc[1]
-
-        return (row) => numerify(row[key], '0.000000')
-      } else {
-        let mc = colf.match(/{[^}]+}/g) || []
-        let mcv = mc.map((m) => m.replace(/{|}/g, ''))
-
-        return (row) => {
-          let str = colf
-          mc.forEach((tp, i) => {
-            str = str.replace(tp, row[mcv[i]])
-          })
-          return str
-        }
-      }
-    },
-    colftF(colft, fMap) {
-      if (typeof colft !== 'string') return colft
-      return fMap[colft]
-    }
-  },
-  props: {
-    column: {
-      type: Boolean,
-      default: false
-    },
-    data: {
-      type: Array,
-      default: undefined
-    },
-    columns: {
-      type: Array,
-      require: true,
-      default: () => []
-    },
-    filtersMap: {
-      type: Object,
-      default: () => ({})
-    },
-    pageObj: {
-      type: Object,
-      default: undefined
-    },
-    pageKey: {
-      type: Object,
-      default: undefined
-    },
-    height: {
-      type: [String, Number],
-      default: undefined
-    }
-  },
-  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() {
-    if (this.column) {
-      console.warn('调整列顺序,请使用ShowColumn组件')
-    }
-  }
-}
-</script>
+<template>
+  <el-table
+    v-if="!pageObj"
+    ref="el-table"
+    :header-cell-style="{ 'text-align': 'center' }"
+    :data="data"
+    :height="height"
+    v-bind="$attrs"
+    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"
+        :filters="item.filters | colftF(filtersMap)"
+        v-bind="item"
+      />
+    </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 Pagination from '../Pagination/index.vue'
+
+const columnRender = {
+  props: {
+    cRender: {
+      type: Function
+    },
+    row: {
+      type: Object
+    }
+  },
+  render(h) {
+    return this.cRender(h, this.row)
+  }
+}
+
+export default {
+  name: 'Table',
+  components: {
+    Pagination,
+    columnRender
+  },
+  filters: {
+    colfF(colf) {
+      if (typeof colf !== 'string') return colf
+
+      if (/\|money/.test(colf)) {
+        let mc = colf.match(/{(\S+)\|money}/)
+        let key = mc && mc[1]
+
+        return (row) => numerify(row[key], '0,0.00')
+      } else if (/\|rate/.test(colf)) {
+        let mc = colf.match(/{(\S+)\|rate}/)
+        let key = mc && mc[1]
+
+        return (row) => numerify(row[key], '0.000000')
+      } else {
+        let mc = colf.match(/{[^}]+}/g) || []
+        let mcv = mc.map((m) => m.replace(/{|}/g, ''))
+
+        return (row) => {
+          let str = colf
+          mc.forEach((tp, i) => {
+            str = str.replace(tp, row[mcv[i]])
+          })
+          return str
+        }
+      }
+    },
+    colftF(colft, fMap) {
+      if (typeof colft !== 'string') return colft
+      return fMap[colft]
+    }
+  },
+  props: {
+    column: {
+      type: Boolean,
+      default: false
+    },
+    data: {
+      type: Array,
+      default: undefined
+    },
+    columns: {
+      type: Array,
+      require: true,
+      default: () => []
+    },
+    filtersMap: {
+      type: Object,
+      default: () => ({})
+    },
+    pageObj: {
+      type: Object,
+      default: undefined
+    },
+    pageKey: {
+      type: Object,
+      default: undefined
+    },
+    height: {
+      type: [String, Number],
+      default: undefined
+    }
+  },
+  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() {
+    if (this.column) {
+      console.warn('调整列顺序,请使用ShowColumn组件')
+    }
+  }
+}
+</script>

package/src/components/Table/indexO.vue

@@ -1,149 +1,149 @@
-<template>
-  <el-table
-    v-if="!pagination"
-    ref="el-table"
-    :header-cell-style="{ 'text-align': 'center' }"
-    :data="data"
-    :height="height"
-    v-bind="$attrs"
-    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" v-bind="item" />
-    </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" v-bind="item" />
-      </template>
-    </el-table>
-    <div v-if="pagination" class="flex-box flex-r m-t-s">
-      <Pagination
-        :page-obj="paginationOption"
-        :page-key="{ no: 'page', size: 'pageSize', total: 'total' }"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from '../Pagination/index.vue'
-const columnRender = {
-  props: {
-    cRender: {
-      type: Function
-    },
-    row: {
-      type: Object
-    }
-  },
-  render(h) {
-    return this.cRender(h, this.row)
-  }
-}
-
-export default {
-  name: 'TableO',
-  components: {
-    Pagination,
-    columnRender
-  },
-  props: {
-    column: {
-      type: Boolean,
-      default: false
-    },
-    data: {
-      type: Array,
-      default: undefined
-    },
-    columns: {
-      type: Array,
-      require: true,
-      default: () => []
-    },
-    pagination: {
-      type: Boolean,
-      default: false
-    },
-    paginationOption: {
-      type: Object,
-      default: () => ({
-        page: 1,
-        total: 0,
-        pageSize: 20
-      })
-    },
-    height: {
-      type: [String, Number],
-      default: undefined
-    }
-  },
-  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%'
-    }
-  },
-  watch: {
-    'paginationOption.page': {
-      handler(val) {
-        if (this.pagination) {
-          this.$emit('changePage', val)
-        }
-      }
-    },
-    'paginationOption.pageSize': {
-      handler(val) {
-        if (this.pagination) {
-          this.$emit('changePageSize', val)
-        }
-      }
-    }
-  },
-  created() {
-    if (this.column) {
-      console.warn('调整列顺序,请使用ShowColumn组件')
-    }
-  }
-}
-</script>
+<template>
+  <el-table
+    v-if="!pagination"
+    ref="el-table"
+    :header-cell-style="{ 'text-align': 'center' }"
+    :data="data"
+    :height="height"
+    v-bind="$attrs"
+    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" v-bind="item" />
+    </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" v-bind="item" />
+      </template>
+    </el-table>
+    <div v-if="pagination" class="flex-box flex-r m-t-s">
+      <Pagination
+        :page-obj="paginationOption"
+        :page-key="{ no: 'page', size: 'pageSize', total: 'total' }"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '../Pagination/index.vue'
+const columnRender = {
+  props: {
+    cRender: {
+      type: Function
+    },
+    row: {
+      type: Object
+    }
+  },
+  render(h) {
+    return this.cRender(h, this.row)
+  }
+}
+
+export default {
+  name: 'TableO',
+  components: {
+    Pagination,
+    columnRender
+  },
+  props: {
+    column: {
+      type: Boolean,
+      default: false
+    },
+    data: {
+      type: Array,
+      default: undefined
+    },
+    columns: {
+      type: Array,
+      require: true,
+      default: () => []
+    },
+    pagination: {
+      type: Boolean,
+      default: false
+    },
+    paginationOption: {
+      type: Object,
+      default: () => ({
+        page: 1,
+        total: 0,
+        pageSize: 20
+      })
+    },
+    height: {
+      type: [String, Number],
+      default: undefined
+    }
+  },
+  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%'
+    }
+  },
+  watch: {
+    'paginationOption.page': {
+      handler(val) {
+        if (this.pagination) {
+          this.$emit('changePage', val)
+        }
+      }
+    },
+    'paginationOption.pageSize': {
+      handler(val) {
+        if (this.pagination) {
+          this.$emit('changePageSize', val)
+        }
+      }
+    }
+  },
+  created() {
+    if (this.column) {
+      console.warn('调整列顺序,请使用ShowColumn组件')
+    }
+  }
+}
+</script>