diff --git a/.gitignore b/.gitignore index a0dddc6..c53939a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,12 @@ node_modules /dist +examples/ +packages/ +public/ +vue.config.js +babel.config.js + # local env files .env.local .env.*.local diff --git a/README.md b/README.md index 94291f2..da6967e 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ ```sh $ npm i yi-table -S ``` + Next, you must register the component. The most common use case is to do that globally. ```js @@ -47,6 +48,16 @@ example - [x] `多选框样式统一成element-ui样式` - [ ] `scroll滚动条样式固定` +## Example + +```sh +$ cd /yi-table +$ git checkout dev +$ npm i +$ npm start +``` + + ## Git Commit Guidelines [↑Top](#top) ### Type diff --git a/package-lock.json b/package-lock.json index 7ec6415..96a7a3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "yi-table", - "version": "0.1.0", + "version": "0.6.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2a8571e..fda3857 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yi-table", - "version": "0.4.8", + "version": "0.6.9", "description": "表格组件", "jsnext:main": "src/index.js", "main": "lib/yi-table.umd.min.js", @@ -10,13 +10,19 @@ "vuejs", "vue", "table", - "Table" + "Table", + "element-ui", + "elementUi", + "element" ], "author": "lmislm", "license": "MIT", "repository": { "type": "git", - "url": "" + "url": "git+https://github.com/lmislm/YiTable.git" + }, + "bugs": { + "url": "https://github.com/lmislm/YiTable/issues" }, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/components/ColumnExample.vue b/src/components/ColumnExample.vue deleted file mode 100644 index ff287ee..0000000 --- a/src/components/ColumnExample.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/src/components/Example.vue b/src/components/Example.vue deleted file mode 100644 index c82e96d..0000000 --- a/src/components/Example.vue +++ /dev/null @@ -1,233 +0,0 @@ - - - - diff --git a/src/components/Table.vue b/src/components/Table.vue index b4b5869..4539a10 100644 --- a/src/components/Table.vue +++ b/src/components/Table.vue @@ -538,6 +538,7 @@ $--scrollbar-hover-background-color: rgba($--color-text-secondary, 0.5); .yi-table { position: relative; + overflow-y: auto; box-sizing: border-box; width: 100%; max-width: 100%; diff --git a/src/index.js b/src/index.js index 9733c31..7bd1b70 100644 --- a/src/index.js +++ b/src/index.js @@ -1,16 +1,17 @@ -import Vue from 'vue' - import YiTable from './components/Table' import YiColumn from './components/TableColumn' - import ColumnMixin from './components/column-mixin' -import './icon/index' -import Example from './components/Example' +import YiTableIcon from '@/components/YiTableIcon' -if (process.env.NODE_ENV !== 'production') { - new Vue({ - render: (h) => h(Example), - }).$mount('#app') -} +const req = require.context('./icon/svg') +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) -export { YiTable, YiColumn, ColumnMixin } +export default { + install(Vue) { + Vue.component('yi-table', YiTable) + Vue.component('yi-table-column', YiColumn) + Vue.component('yi-table-icon', YiTableIcon) + } +} +export {YiTable, YiColumn, ColumnMixin, YiTableIcon} diff --git a/vue.config.js b/vue.config.js index 680ff35..d2ca0c5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,14 +1,17 @@ -const port = 8100 // dev port const path = require('path') +const port = 8100 // dev port + function resolve(dir) { return path.join(__dirname, dir) } module.exports = { - productionSourceMap: false, + publicPath: '/dist/', + productionSourceMap:false, css: { - extract: false, -}, + extract: false + }, + outputDir: path.resolve(__dirname, './dist'), devServer: { port: port, open: true, @@ -21,11 +24,11 @@ module.exports = { configureWebpack: { resolve: { alias: { - '@': resolve('src') + '@': resolve('src'), + 'vue$': 'vue/dist/vue.runtime.esm.js' } }, externals: { - Vue: 'vue', vue: 'Vue' } },