From 6f3ddc7d1a14392ae710eb4cf859bd3886512006 Mon Sep 17 00:00:00 2001 From: Julyp Date: Wed, 29 Jan 2020 13:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2smartTable=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=8F=8A=E4=BD=BF=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/webpack.common.js | 4 ++-- {packages/table/src => lib/core}/core.js | 0 {packages/table/src => lib/core}/utils.js | 0 {packages/table/src => lib/core}/vdom.js | 3 ++- {packages/table => lib}/index.js | 2 +- {packages/table => lib}/index.scss | 13 ++++++------- packages/alert/index.js | 0 public/index.html | 12 ++++++++---- src/index.js | 8 ++++---- 9 files changed, 23 insertions(+), 19 deletions(-) rename {packages/table/src => lib/core}/core.js (100%) rename {packages/table/src => lib/core}/utils.js (100%) rename {packages/table/src => lib/core}/vdom.js (98%) rename {packages/table => lib}/index.js (91%) rename {packages/table => lib}/index.scss (97%) delete mode 100644 packages/alert/index.js diff --git a/config/webpack.common.js b/config/webpack.common.js index b69b18a..2538c06 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -25,7 +25,7 @@ module.exports = { }, ] }, output: { - filename: 'smartUtils.[chunkhash:8].js', + filename: 'smartTable.[chunkhash:8].js', path: path.resolve(__dirname, '../dist') }, -} +} \ No newline at end of file diff --git a/packages/table/src/core.js b/lib/core/core.js similarity index 100% rename from packages/table/src/core.js rename to lib/core/core.js diff --git a/packages/table/src/utils.js b/lib/core/utils.js similarity index 100% rename from packages/table/src/utils.js rename to lib/core/utils.js diff --git a/packages/table/src/vdom.js b/lib/core/vdom.js similarity index 98% rename from packages/table/src/vdom.js rename to lib/core/vdom.js index 7324325..1806092 100644 --- a/packages/table/src/vdom.js +++ b/lib/core/vdom.js @@ -11,6 +11,7 @@ export function sort(vm, key, sortType, sortOrder) { } } +//借鉴react diff算法实现 function diff(oldVnode, vnode) { let lastIndex = 0; for (let i = 0; i < vnode.length; i++) { @@ -72,4 +73,4 @@ function compare(key1, key2, sortType, sortOrder) { key2 = parseFloat(key2); } return sortType === 'ASC' ? key1 < key2 : key1 > key2; -} +} \ No newline at end of file diff --git a/packages/table/index.js b/lib/index.js similarity index 91% rename from packages/table/index.js rename to lib/index.js index f510f65..03e8297 100644 --- a/packages/table/index.js +++ b/lib/index.js @@ -1,6 +1,6 @@ import './index.scss' -import initMixin from './src/core' +import initMixin from './core/core' function Table(options) { if (!(this instanceof Table)) { diff --git a/packages/table/index.scss b/lib/index.scss similarity index 97% rename from packages/table/index.scss rename to lib/index.scss index df952dc..0b10799 100644 --- a/packages/table/index.scss +++ b/lib/index.scss @@ -2,7 +2,6 @@ position: relative; overflow: hidden; box-sizing: border-box; - flex: 1; width: 100%; max-width: 100%; background-color: #fff; @@ -54,17 +53,17 @@ overflow: hidden; &[sort] { cursor: pointer; - :after { + :after { margin-left: 5px; content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAOCAYAAAAbvf3sAAAAAXNSR0IArs4c6QAAAR5JREFUKBVjYKA7+P//P/OBo2dmHzx6rgab5YzIgseOPeb8/e/Vyv8M/33B4owM0+2tjHMYGRn/wdTBNRw7dlXo9/8fm4E2WMEkQTQjA+N6OWmhKEVFxR8QPpA8eOqyLMPvXzuBijVBgugAaMNhPi4mP0NDww8sIMn/f35aMP1nnA00DV0thP+fgeHz93/mQM5O7ArwiIKNPHDkjCMTEwM/HnUM//4zvXSwNjoOdhIzK9O7f7//LQXaLIlNE9DUW+zMjO4gObijjx8/r/Dr79+dQE1qyJoYGRlOcbMzeJuYmLwBiTPBJC0tDR9wczBYgxTAxIDsbUDFjjDFIHG4DTBFFy9e5P7w+c/q/4wML+2tjFKBQfoHJoeTBiUPXJIAbjheeFXAZxsAAAAASUVORK5CYII='); } &.desc { - :after { + :after { content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAOCAYAAAAbvf3sAAAAAXNSR0IArs4c6QAAASdJREFUKBVjYKA7+P//P/OBo2dmHzx6rgab5YzIgseOPeb8/e/Vyv8M/33B4owM0+2tjHMYGRn/wdTBNRw7dlXo9/8fm4E2WMEkQTQjA+N6OWmhKEVFxR8QPpA8eOqyLMPvXzuBijVBgugAaMNhPi4mP0NDww8sIMn/f35aMP1nnA00DV0thP+fgeHz93/mQM5O7ArwiIKNdF7435HhHwM/HnUMDEwML/fGMx4HO+kfE8O7//8YljL8Z5DEpomRkeEW+z8Gd5AcE4jYH8t4kYOBwQokAeIjA6DYKR52BusdiYwPQOIovvRd9l/ky0+Grf//M5iBJRkZtvGIMIRu9mX8BuKDAIoGkIDbov/cv/4wrAbKvHRQYEhtcGT8AxLHC0JX/WfGpQAAJIlcYMXwsAoAAAAASUVORK5CYII='); } } &.asc { - :after { + :after { content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAOCAYAAAAbvf3sAAAAAXNSR0IArs4c6QAAARlJREFUKBVjYKA7aPj/n8lx/v+pQFyFzXJGZEHPbf/Zf7xkWPr/P0MwSJyRkWGqfQJDXgMj4z+YOrgGl1X/+f9+Ydj4n4HBHiYJ1bSWQ5whersX408wH0S4Lv8v9ecHw3agyXogPjoAmnqQmYfBf08Y40cWkOSfnww2DIwMS4FOWIquGMb/+5XBGsjeBuMTTYP9cODIGUcmJgZ+fLr+/Wd66WBtdBzsJGZWpnf/fv9bCvSwJDZNQFNvsTMzuoPk4KF0/Ph5hV9//+4EalJD1gT01yludgZvExOTNyBxJpikpaXhA24OBmuQApgYkL0NqNgRphgkDrcBpujixYvcHz7/Wf2fkeGlvZVRKiMj4x+YHE76////zLgkATPDVMggLp6aAAAAAElFTkSuQmCC'); } } @@ -187,19 +186,19 @@ .smart-table_hover-tr { background-color: #f0f5fd !important; } - ::-webkit-scrollbar { + ::-webkit-scrollbar { width: 8px; height: 8px; background-color: #e9edf4; } - ::-webkit-scrollbar-thumb { + ::-webkit-scrollbar-thumb { background-color: #ccc; border-radius: 2em; -webkit-border-radius: 2em; -moz-border-radius: 2em; -o-border-radius: 2em; } - ::-webkit-scrollbar-thumb:hover { + ::-webkit-scrollbar-thumb:hover { background-color: #9bbbfa; } } \ No newline at end of file diff --git a/packages/alert/index.js b/packages/alert/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/public/index.html b/public/index.html index fe50496..d87b47c 100644 --- a/public/index.html +++ b/public/index.html @@ -30,6 +30,10 @@ margin: 0; } + .api-wrap { + font-size: 13px; + } + .smart-table { margin: 20px 0px; } @@ -63,10 +67,10 @@
日期
- +
姓名
- +
省份
@@ -472,10 +476,10 @@