优化重构

This commit is contained in:
xuliangzhan
2020-02-25 16:54:00 +08:00
parent 499e922869
commit fbc35cdfed
21 changed files with 31 additions and 47 deletions

View File

@@ -13,4 +13,4 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
})();</script><link href=/vxe-table/static/css/advanced.f0f9fd82.css rel=prefetch><link href=/vxe-table/static/css/api.4e9ea0a5.css rel=prefetch><link href=/vxe-table/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/static/css/edit.4d86bd3c.css rel=prefetch><link href=/vxe-table/static/css/grid.d29e02ac.css rel=prefetch><link href=/vxe-table/static/css/module.f87fe04e.css rel=prefetch><link href=/vxe-table/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/static/css/scroll.38d9b5ec.css rel=prefetch><link href=/vxe-table/static/css/start.068236aa.css rel=prefetch><link href=/vxe-table/static/css/tree.b4316aa7.css rel=prefetch><link href=/vxe-table/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/static/js/advanced.d7bdfab2.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.60a6a011.js rel=prefetch><link href=/vxe-table/static/js/api.3fb145bf.js rel=prefetch><link href=/vxe-table/static/js/base.08800e40.js rel=prefetch><link href=/vxe-table/static/js/edit.1b805c0e.js rel=prefetch><link href=/vxe-table/static/js/excel.28f68c00.js rel=prefetch><link href=/vxe-table/static/js/grid.eac8d4b8.js rel=prefetch><link href=/vxe-table/static/js/module.91d386f7.js rel=prefetch><link href=/vxe-table/static/js/other.05ddfb34.js rel=prefetch><link href=/vxe-table/static/js/plugin.90f3f902.js rel=prefetch><link href=/vxe-table/static/js/scroll.07ac6642.js rel=prefetch><link href=/vxe-table/static/js/start.80af3291.js rel=prefetch><link href=/vxe-table/static/js/tree.f539fb16.js rel=prefetch><link href=/vxe-table/static/js/virtual-tree.24d1ab04.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.ef656b67.css rel=preload as=style><link href=/vxe-table/static/css/index.343b4d1d.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.fdb37c13.js rel=preload as=script><link href=/vxe-table/static/js/index.6340054c.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.ef656b67.css rel=stylesheet><link href=/vxe-table/static/css/index.343b4d1d.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.fdb37c13.js></script><script src=/vxe-table/static/js/index.6340054c.js></script></body></html>
})();</script><link href=/vxe-table/static/css/advanced.f0f9fd82.css rel=prefetch><link href=/vxe-table/static/css/api.4e9ea0a5.css rel=prefetch><link href=/vxe-table/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/static/css/edit.4d86bd3c.css rel=prefetch><link href=/vxe-table/static/css/grid.d29e02ac.css rel=prefetch><link href=/vxe-table/static/css/module.f87fe04e.css rel=prefetch><link href=/vxe-table/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/static/css/scroll.38d9b5ec.css rel=prefetch><link href=/vxe-table/static/css/start.068236aa.css rel=prefetch><link href=/vxe-table/static/css/tree.b4316aa7.css rel=prefetch><link href=/vxe-table/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/static/js/advanced.d7bdfab2.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.60a6a011.js rel=prefetch><link href=/vxe-table/static/js/api.3fb145bf.js rel=prefetch><link href=/vxe-table/static/js/base.08800e40.js rel=prefetch><link href=/vxe-table/static/js/edit.1b805c0e.js rel=prefetch><link href=/vxe-table/static/js/excel.28f68c00.js rel=prefetch><link href=/vxe-table/static/js/grid.eac8d4b8.js rel=prefetch><link href=/vxe-table/static/js/module.74216259.js rel=prefetch><link href=/vxe-table/static/js/other.05ddfb34.js rel=prefetch><link href=/vxe-table/static/js/plugin.90f3f902.js rel=prefetch><link href=/vxe-table/static/js/scroll.07ac6642.js rel=prefetch><link href=/vxe-table/static/js/start.80af3291.js rel=prefetch><link href=/vxe-table/static/js/tree.f539fb16.js rel=prefetch><link href=/vxe-table/static/js/virtual-tree.24d1ab04.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.ef656b67.css rel=preload as=style><link href=/vxe-table/static/css/index.e4378895.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.fdb37c13.js rel=preload as=script><link href=/vxe-table/static/js/index.ffc2a8a1.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.ef656b67.css rel=stylesheet><link href=/vxe-table/static/css/index.e4378895.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.fdb37c13.js></script><script src=/vxe-table/static/js/index.ffc2a8a1.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -13,4 +13,4 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
})();</script><link href=/vxe-table/v1/static/css/advanced.f0f9fd82.css rel=prefetch><link href=/vxe-table/v1/static/css/api.4e9ea0a5.css rel=prefetch><link href=/vxe-table/v1/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.384e7a54.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.d29e02ac.css rel=prefetch><link href=/vxe-table/v1/static/css/module.e10fab70.css rel=prefetch><link href=/vxe-table/v1/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v1/static/css/scroll.38d9b5ec.css rel=prefetch><link href=/vxe-table/v1/static/css/start.068236aa.css rel=prefetch><link href=/vxe-table/v1/static/css/tree.9618a3e4.css rel=prefetch><link href=/vxe-table/v1/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.f2f43118.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.e100a9e4.js rel=prefetch><link href=/vxe-table/v1/static/js/api.d5440821.js rel=prefetch><link href=/vxe-table/v1/static/js/base.da377c15.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.f2f2c0cf.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.d9d08b7d.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.52eaef18.js rel=prefetch><link href=/vxe-table/v1/static/js/module.a9da2ea7.js rel=prefetch><link href=/vxe-table/v1/static/js/other.c12d98ae.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.2481c3a6.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.4157c7f3.js rel=prefetch><link href=/vxe-table/v1/static/js/start.1f1f2fd1.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.c90236d2.js rel=prefetch><link href=/vxe-table/v1/static/js/virtual-tree.d8a52c87.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.db3136af.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.14287d57.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.cfd01c0c.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.c7d08282.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.db3136af.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.14287d57.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/v1/static/js/chunk-vendors.cfd01c0c.js></script><script src=/vxe-table/v1/static/js/index.c7d08282.js></script></body></html>
})();</script><link href=/vxe-table/v1/static/css/advanced.f0f9fd82.css rel=prefetch><link href=/vxe-table/v1/static/css/api.4e9ea0a5.css rel=prefetch><link href=/vxe-table/v1/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.384e7a54.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.d29e02ac.css rel=prefetch><link href=/vxe-table/v1/static/css/module.e10fab70.css rel=prefetch><link href=/vxe-table/v1/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v1/static/css/scroll.38d9b5ec.css rel=prefetch><link href=/vxe-table/v1/static/css/start.068236aa.css rel=prefetch><link href=/vxe-table/v1/static/css/tree.9618a3e4.css rel=prefetch><link href=/vxe-table/v1/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.f2f43118.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.e100a9e4.js rel=prefetch><link href=/vxe-table/v1/static/js/api.fb5b89a6.js rel=prefetch><link href=/vxe-table/v1/static/js/base.da377c15.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.f2f2c0cf.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.d9d08b7d.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.52eaef18.js rel=prefetch><link href=/vxe-table/v1/static/js/module.0f02af13.js rel=prefetch><link href=/vxe-table/v1/static/js/other.c12d98ae.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.2481c3a6.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.4157c7f3.js rel=prefetch><link href=/vxe-table/v1/static/js/start.1f1f2fd1.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.c90236d2.js rel=prefetch><link href=/vxe-table/v1/static/js/virtual-tree.d8a52c87.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.db3136af.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.e0fdc9fa.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.cfd01c0c.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.1e0d0470.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.db3136af.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.e0fdc9fa.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/v1/static/js/chunk-vendors.cfd01c0c.js></script><script src=/vxe-table/v1/static/js/index.1e0d0470.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -13,4 +13,4 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
})();</script><link href=/vxe-table/v2/static/css/advanced.f0f9fd82.css rel=prefetch><link href=/vxe-table/v2/static/css/api.4e9ea0a5.css rel=prefetch><link href=/vxe-table/v2/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v2/static/css/edit.4d86bd3c.css rel=prefetch><link href=/vxe-table/v2/static/css/grid.d29e02ac.css rel=prefetch><link href=/vxe-table/v2/static/css/module.e10fab70.css rel=prefetch><link href=/vxe-table/v2/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v2/static/css/scroll.38d9b5ec.css rel=prefetch><link href=/vxe-table/v2/static/css/start.068236aa.css rel=prefetch><link href=/vxe-table/v2/static/css/tree.9618a3e4.css rel=prefetch><link href=/vxe-table/v2/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v2/static/js/advanced.759e5c65.js rel=prefetch><link href=/vxe-table/v2/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.60a6a011.js rel=prefetch><link href=/vxe-table/v2/static/js/api.8076a150.js rel=prefetch><link href=/vxe-table/v2/static/js/base.af4fc5b4.js rel=prefetch><link href=/vxe-table/v2/static/js/edit.8e2d6dba.js rel=prefetch><link href=/vxe-table/v2/static/js/excel.3da5f442.js rel=prefetch><link href=/vxe-table/v2/static/js/grid.1e986056.js rel=prefetch><link href=/vxe-table/v2/static/js/module.732d63d0.js rel=prefetch><link href=/vxe-table/v2/static/js/other.fca64414.js rel=prefetch><link href=/vxe-table/v2/static/js/plugin.f970948a.js rel=prefetch><link href=/vxe-table/v2/static/js/scroll.a3eab094.js rel=prefetch><link href=/vxe-table/v2/static/js/start.b38821c3.js rel=prefetch><link href=/vxe-table/v2/static/js/tree.aac93ba2.js rel=prefetch><link href=/vxe-table/v2/static/js/virtual-tree.f9c902dc.js rel=prefetch><link href=/vxe-table/v2/static/css/chunk-vendors.ef656b67.css rel=preload as=style><link href=/vxe-table/v2/static/css/index.343b4d1d.css rel=preload as=style><link href=/vxe-table/v2/static/js/chunk-vendors.eab2ec6d.js rel=preload as=script><link href=/vxe-table/v2/static/js/index.c0d728f0.js rel=preload as=script><link href=/vxe-table/v2/static/css/chunk-vendors.ef656b67.css rel=stylesheet><link href=/vxe-table/v2/static/css/index.343b4d1d.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/v2/static/js/chunk-vendors.eab2ec6d.js></script><script src=/vxe-table/v2/static/js/index.c0d728f0.js></script></body></html>
})();</script><link href=/vxe-table/v2/static/css/advanced.f0f9fd82.css rel=prefetch><link href=/vxe-table/v2/static/css/api.4e9ea0a5.css rel=prefetch><link href=/vxe-table/v2/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v2/static/css/edit.4d86bd3c.css rel=prefetch><link href=/vxe-table/v2/static/css/grid.d29e02ac.css rel=prefetch><link href=/vxe-table/v2/static/css/module.e10fab70.css rel=prefetch><link href=/vxe-table/v2/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v2/static/css/scroll.38d9b5ec.css rel=prefetch><link href=/vxe-table/v2/static/css/start.068236aa.css rel=prefetch><link href=/vxe-table/v2/static/css/tree.9618a3e4.css rel=prefetch><link href=/vxe-table/v2/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v2/static/js/advanced.759e5c65.js rel=prefetch><link href=/vxe-table/v2/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.60a6a011.js rel=prefetch><link href=/vxe-table/v2/static/js/api.40e79c9e.js rel=prefetch><link href=/vxe-table/v2/static/js/base.af4fc5b4.js rel=prefetch><link href=/vxe-table/v2/static/js/edit.8e2d6dba.js rel=prefetch><link href=/vxe-table/v2/static/js/excel.3da5f442.js rel=prefetch><link href=/vxe-table/v2/static/js/grid.1e986056.js rel=prefetch><link href=/vxe-table/v2/static/js/module.c69ee4b8.js rel=prefetch><link href=/vxe-table/v2/static/js/other.fca64414.js rel=prefetch><link href=/vxe-table/v2/static/js/plugin.f970948a.js rel=prefetch><link href=/vxe-table/v2/static/js/scroll.a3eab094.js rel=prefetch><link href=/vxe-table/v2/static/js/start.b38821c3.js rel=prefetch><link href=/vxe-table/v2/static/js/tree.aac93ba2.js rel=prefetch><link href=/vxe-table/v2/static/js/virtual-tree.f9c902dc.js rel=prefetch><link href=/vxe-table/v2/static/css/chunk-vendors.ef656b67.css rel=preload as=style><link href=/vxe-table/v2/static/css/index.e4378895.css rel=preload as=style><link href=/vxe-table/v2/static/js/chunk-vendors.eab2ec6d.js rel=preload as=script><link href=/vxe-table/v2/static/js/index.c53e01fa.js rel=preload as=script><link href=/vxe-table/v2/static/css/chunk-vendors.ef656b67.css rel=stylesheet><link href=/vxe-table/v2/static/css/index.e4378895.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/v2/static/js/chunk-vendors.eab2ec6d.js></script><script src=/vxe-table/v2/static/js/index.c53e01fa.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -5,7 +5,7 @@
<p>
<vxe-select v-model="value1" placeholder="默认尺寸">
<vxe-option v-for="num in 10" :key="num" :value="num" :label="`选项${num}`"></vxe-option>
<vxe-option v-for="num in 15" :key="num" :value="num" :label="`选项${num}`"></vxe-option>
</vxe-select>
<vxe-select v-model="value2" placeholder="中等尺寸" size="medium">
<vxe-option v-for="num in 10" :key="num" :value="num" :label="`选项${num}`"></vxe-option>
@@ -92,7 +92,7 @@ import hljs from 'highlight.js'
export default {
data () {
return {
value1: null,
value1: 12,
value2: null,
value3: null,
value4: null,
@@ -107,7 +107,7 @@ export default {
`
<p>
<vxe-select v-model="value1" placeholder="默认尺寸">
<vxe-option v-for="num in 10" :key="num" :value="num" :label="\`选项\${num}\`"></vxe-option>
<vxe-option v-for="num in 15" :key="num" :value="num" :label="\`选项\${num}\`"></vxe-option>
</vxe-select>
<vxe-select v-model="value2" placeholder="中等尺寸" size="medium">
<vxe-option v-for="num in 10" :key="num" :value="num" :label="\`选项\${num}\`"></vxe-option>
@@ -183,7 +183,7 @@ export default {
export default {
data () {
return {
value1: null,
value1: 12,
value2: null,
value3: null,
value4: null,

View File

@@ -56,8 +56,7 @@ export default {
},
on: {
click: this.optionEvent,
mouseenter: this.mouseenterEvent,
mouseleave: this.mouseleaveEvent
mouseenter: this.mouseenterEvent
}
}, UtilTools.getFuncText(this.label))
},
@@ -68,11 +67,8 @@ export default {
optionEvent (evnt) {
this.$xeselect.changeOptionEvent(evnt, this.value)
},
mouseenterEvent (evnt) {
this.$xeselect.currentOptionEvent(evnt, this.value)
},
mouseleaveEvent () {
this.$xeselect.updateCurrentOption(this.value)
mouseenterEvent () {
this.$xeselect.setCurrentOption(this)
}
}
}

View File

@@ -210,8 +210,13 @@ export default {
updateStatus () {
this.updateFlag++
},
updateCurrentOption (currentValue) {
this.currentValue = currentValue
setCurrentOption (option) {
if (option) {
this.currentValue = option.value
this.$nextTick(() => {
DomTools.toView(this.$refs.panel.querySelector(`[data-option-id='${option.id}']`))
})
}
},
clearEvent (params, evnt) {
this.clearValueEvent(evnt, null)
@@ -227,9 +232,6 @@ export default {
this.$emit('change', { value: selectValue }, evnt)
}
},
currentOptionEvent (evnt, currentValue) {
this.currentValue = currentValue
},
changeOptionEvent (evnt, selectValue) {
this.changeEvent(evnt, selectValue)
this.hideOptionPanel()
@@ -243,7 +245,7 @@ export default {
}
},
handleGlobalKeydownEvent (evnt) {
const { $refs, showPanel, currentValue, clearable, disabled } = this
const { showPanel, currentValue, clearable, disabled } = this
if (!disabled) {
const keyCode = evnt.keyCode
const isTab = keyCode === 9
@@ -266,12 +268,7 @@ export default {
if (!offsetOption && !findOption(groupList, currentValue)) {
offsetOption = firstOption
}
if (offsetOption) {
this.currentOptionEvent(evnt, offsetOption.value)
this.$nextTick(() => {
DomTools.toView($refs.panel.querySelector(`[data-option-id='${offsetOption.id}']`))
})
}
this.setCurrentOption(offsetOption)
}
} else if (isEnter && this.isActivated) {
this.showOptionPanel()
@@ -314,7 +311,7 @@ export default {
setTimeout(() => {
this.showPanel = true
}, 10)
this.updateCurrentOption(this.value)
this.setCurrentOption(findOption(this.getOptions(), this.value))
this.updateZindex()
this.updatePlacement()
}

View File

@@ -91,19 +91,12 @@
&.is--checked {
font-weight: 700;
color: $vxe-primary-color;
background-color: $vxe-select-option-checked-background-color;
}
&:not(.is--disabled) {
cursor: pointer;
&.is--hover {
color: $vxe-primary-color;
background-color: $vxe-select-option-hover-background-color;
}
&.is--checked {
&.is--hover {
background-color: $vxe-select-option-hover-checked-background-color;
}
}
}
&.is--disabled {
color: $vxe-disabled-color;

View File

@@ -135,6 +135,4 @@ $vxe-select-option-height-medium: 28px;
$vxe-select-option-height-small: 26px;
$vxe-select-option-height-mini: 24px;
$vxe-select-option-hover-background-color: #f5f7fa;
$vxe-select-option-checked-background-color: #e6f7ff;
$vxe-select-option-hover-checked-background-color: #d7effb;
$vxe-optgroup-title-color:#909399;