重构优化

This commit is contained in:
xuliangzhan
2020-03-13 17:53:44 +08:00
parent d45c10d7cf
commit 28762865b8
16 changed files with 68 additions and 19 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.34f51570.css rel=prefetch><link href=/vxe-table/static/css/api.844cfc73.css rel=prefetch><link href=/vxe-table/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/static/css/edit.229a13af.css rel=prefetch><link href=/vxe-table/static/css/grid.1043be4e.css rel=prefetch><link href=/vxe-table/static/css/module.5d437bf3.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.74b786c0.css rel=prefetch><link href=/vxe-table/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/static/js/advanced.813e3242.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.d9ecbab9.js rel=prefetch><link href=/vxe-table/static/js/api.5c148b7b.js rel=prefetch><link href=/vxe-table/static/js/base.d513bb51.js rel=prefetch><link href=/vxe-table/static/js/edit.0629b354.js rel=prefetch><link href=/vxe-table/static/js/excel.15918f97.js rel=prefetch><link href=/vxe-table/static/js/grid.7b0a21a9.js rel=prefetch><link href=/vxe-table/static/js/module.9e528216.js rel=prefetch><link href=/vxe-table/static/js/other.f7bebdb6.js rel=prefetch><link href=/vxe-table/static/js/plugin.5dabd830.js rel=prefetch><link href=/vxe-table/static/js/scroll.6b1f060f.js rel=prefetch><link href=/vxe-table/static/js/start.e947a484.js rel=prefetch><link href=/vxe-table/static/js/tree.faf41c9f.js rel=prefetch><link href=/vxe-table/static/js/virtual-tree.7a274694.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.04f4ac0e.css rel=preload as=style><link href=/vxe-table/static/css/index.eb22e44f.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.72fdf10c.js rel=preload as=script><link href=/vxe-table/static/js/index.92239cbb.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.04f4ac0e.css rel=stylesheet><link href=/vxe-table/static/css/index.eb22e44f.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.72fdf10c.js></script><script src=/vxe-table/static/js/index.92239cbb.js></script></body></html>
})();</script><link href=/vxe-table/static/css/advanced.34f51570.css rel=prefetch><link href=/vxe-table/static/css/api.844cfc73.css rel=prefetch><link href=/vxe-table/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/static/css/edit.229a13af.css rel=prefetch><link href=/vxe-table/static/css/grid.1043be4e.css rel=prefetch><link href=/vxe-table/static/css/module.5d437bf3.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.74b786c0.css rel=prefetch><link href=/vxe-table/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/static/js/advanced.813e3242.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.d9ecbab9.js rel=prefetch><link href=/vxe-table/static/js/api.ee9779b4.js rel=prefetch><link href=/vxe-table/static/js/base.d513bb51.js rel=prefetch><link href=/vxe-table/static/js/edit.a26f8ca1.js rel=prefetch><link href=/vxe-table/static/js/excel.15918f97.js rel=prefetch><link href=/vxe-table/static/js/grid.7b0a21a9.js rel=prefetch><link href=/vxe-table/static/js/module.9e528216.js rel=prefetch><link href=/vxe-table/static/js/other.f7bebdb6.js rel=prefetch><link href=/vxe-table/static/js/plugin.5dabd830.js rel=prefetch><link href=/vxe-table/static/js/scroll.6b1f060f.js rel=prefetch><link href=/vxe-table/static/js/start.e947a484.js rel=prefetch><link href=/vxe-table/static/js/tree.faf41c9f.js rel=prefetch><link href=/vxe-table/static/js/virtual-tree.7a274694.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.04f4ac0e.css rel=preload as=style><link href=/vxe-table/static/css/index.eb22e44f.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.72fdf10c.js rel=preload as=script><link href=/vxe-table/static/js/index.026461a0.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.04f4ac0e.css rel=stylesheet><link href=/vxe-table/static/css/index.eb22e44f.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.72fdf10c.js></script><script src=/vxe-table/static/js/index.026461a0.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.34f51570.css rel=prefetch><link href=/vxe-table/v1/static/css/api.844cfc73.css rel=prefetch><link href=/vxe-table/v1/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.1a30a84f.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.1043be4e.css rel=prefetch><link href=/vxe-table/v1/static/css/module.5d437bf3.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.74b786c0.css rel=prefetch><link href=/vxe-table/v1/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.301948cc.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.9c6eb998.js rel=prefetch><link href=/vxe-table/v1/static/js/api.b004ef34.js rel=prefetch><link href=/vxe-table/v1/static/js/base.a6e7bfbd.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.428f070c.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.c000bb4d.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.d72c00cb.js rel=prefetch><link href=/vxe-table/v1/static/js/module.01ba7416.js rel=prefetch><link href=/vxe-table/v1/static/js/other.a152467e.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.320dce14.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.83df4834.js rel=prefetch><link href=/vxe-table/v1/static/js/start.3ce6529c.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.858f151d.js rel=prefetch><link href=/vxe-table/v1/static/js/virtual-tree.c681f40b.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.08c15d8a.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.3cf556d0.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.fc80e5fd.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.28f611a9.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.08c15d8a.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.3cf556d0.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.fc80e5fd.js></script><script src=/vxe-table/v1/static/js/index.28f611a9.js></script></body></html>
})();</script><link href=/vxe-table/v1/static/css/advanced.34f51570.css rel=prefetch><link href=/vxe-table/v1/static/css/api.844cfc73.css rel=prefetch><link href=/vxe-table/v1/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.1a30a84f.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.1043be4e.css rel=prefetch><link href=/vxe-table/v1/static/css/module.5d437bf3.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.74b786c0.css rel=prefetch><link href=/vxe-table/v1/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.301948cc.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.9c6eb998.js rel=prefetch><link href=/vxe-table/v1/static/js/api.12660d3c.js rel=prefetch><link href=/vxe-table/v1/static/js/base.a6e7bfbd.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.c1ed4c9e.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.c000bb4d.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.d72c00cb.js rel=prefetch><link href=/vxe-table/v1/static/js/module.01ba7416.js rel=prefetch><link href=/vxe-table/v1/static/js/other.a152467e.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.320dce14.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.83df4834.js rel=prefetch><link href=/vxe-table/v1/static/js/start.3ce6529c.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.858f151d.js rel=prefetch><link href=/vxe-table/v1/static/js/virtual-tree.c681f40b.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.08c15d8a.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.3cf556d0.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.fc80e5fd.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.5697334b.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.08c15d8a.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.3cf556d0.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.fc80e5fd.js></script><script src=/vxe-table/v1/static/js/index.5697334b.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/v2/static/css/advanced.34f51570.css rel=prefetch><link href=/vxe-table/v2/static/css/api.844cfc73.css rel=prefetch><link href=/vxe-table/v2/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v2/static/css/edit.229a13af.css rel=prefetch><link href=/vxe-table/v2/static/css/grid.1043be4e.css rel=prefetch><link href=/vxe-table/v2/static/css/module.5d437bf3.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.74b786c0.css rel=prefetch><link href=/vxe-table/v2/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v2/static/js/advanced.00c560ef.js rel=prefetch><link href=/vxe-table/v2/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.d9ecbab9.js rel=prefetch><link href=/vxe-table/v2/static/js/api.f7d0292a.js rel=prefetch><link href=/vxe-table/v2/static/js/base.b3553fce.js rel=prefetch><link href=/vxe-table/v2/static/js/edit.5b267f7b.js rel=prefetch><link href=/vxe-table/v2/static/js/excel.ccbca98b.js rel=prefetch><link href=/vxe-table/v2/static/js/grid.c5b3005a.js rel=prefetch><link href=/vxe-table/v2/static/js/module.29e51f0c.js rel=prefetch><link href=/vxe-table/v2/static/js/other.8d0f37da.js rel=prefetch><link href=/vxe-table/v2/static/js/plugin.356b135d.js rel=prefetch><link href=/vxe-table/v2/static/js/scroll.b60ab094.js rel=prefetch><link href=/vxe-table/v2/static/js/start.a2d6da76.js rel=prefetch><link href=/vxe-table/v2/static/js/tree.29a4916c.js rel=prefetch><link href=/vxe-table/v2/static/js/virtual-tree.582a6333.js rel=prefetch><link href=/vxe-table/v2/static/css/chunk-vendors.04f4ac0e.css rel=preload as=style><link href=/vxe-table/v2/static/css/index.36791b06.css rel=preload as=style><link href=/vxe-table/v2/static/js/chunk-vendors.04e5025d.js rel=preload as=script><link href=/vxe-table/v2/static/js/index.299a4ba8.js rel=preload as=script><link href=/vxe-table/v2/static/css/chunk-vendors.04f4ac0e.css rel=stylesheet><link href=/vxe-table/v2/static/css/index.36791b06.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.04e5025d.js></script><script src=/vxe-table/v2/static/js/index.299a4ba8.js></script></body></html>
})();</script><link href=/vxe-table/v2/static/css/advanced.34f51570.css rel=prefetch><link href=/vxe-table/v2/static/css/api.844cfc73.css rel=prefetch><link href=/vxe-table/v2/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v2/static/css/edit.229a13af.css rel=prefetch><link href=/vxe-table/v2/static/css/grid.1043be4e.css rel=prefetch><link href=/vxe-table/v2/static/css/module.5d437bf3.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.74b786c0.css rel=prefetch><link href=/vxe-table/v2/static/css/virtual-tree.628317ae.css rel=prefetch><link href=/vxe-table/v2/static/js/advanced.00c560ef.js rel=prefetch><link href=/vxe-table/v2/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.d9ecbab9.js rel=prefetch><link href=/vxe-table/v2/static/js/api.29468b3e.js rel=prefetch><link href=/vxe-table/v2/static/js/base.b3553fce.js rel=prefetch><link href=/vxe-table/v2/static/js/edit.e02ea8a2.js rel=prefetch><link href=/vxe-table/v2/static/js/excel.ccbca98b.js rel=prefetch><link href=/vxe-table/v2/static/js/grid.c5b3005a.js rel=prefetch><link href=/vxe-table/v2/static/js/module.29e51f0c.js rel=prefetch><link href=/vxe-table/v2/static/js/other.8d0f37da.js rel=prefetch><link href=/vxe-table/v2/static/js/plugin.356b135d.js rel=prefetch><link href=/vxe-table/v2/static/js/scroll.b60ab094.js rel=prefetch><link href=/vxe-table/v2/static/js/start.a2d6da76.js rel=prefetch><link href=/vxe-table/v2/static/js/tree.29a4916c.js rel=prefetch><link href=/vxe-table/v2/static/js/virtual-tree.582a6333.js rel=prefetch><link href=/vxe-table/v2/static/css/chunk-vendors.04f4ac0e.css rel=preload as=style><link href=/vxe-table/v2/static/css/index.36791b06.css rel=preload as=style><link href=/vxe-table/v2/static/js/chunk-vendors.04e5025d.js rel=preload as=script><link href=/vxe-table/v2/static/js/index.1c331f97.js rel=preload as=script><link href=/vxe-table/v2/static/css/chunk-vendors.04f4ac0e.css rel=stylesheet><link href=/vxe-table/v2/static/css/index.36791b06.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.04e5025d.js></script><script src=/vxe-table/v2/static/js/index.1c331f97.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

@@ -79,6 +79,15 @@ const apis = [
defVal: '默认 false继承 setup.form.titleColon',
list: []
},
{
name: 'items',
desc: '项列表',
version: '',
type: 'Array',
enum: '',
defVal: '',
list: []
},
{
name: 'rules',
descKey: 'app.api.form.desc.rules',

View File

@@ -33,6 +33,23 @@
</template>
<template v-slot="{ row }">选中日期{{ row.date3 }}</template>
</vxe-table-column>
<vxe-table-column field="attr1" title="不同行渲染" :edit-render="{type: 'default'}">
<template v-slot:edit="{ row, rowIndex }">
<template v-if="rowIndex <= 1">
<vxe-input type="date" v-model="row.attr1" placeholder="请选择日期" transfer></vxe-input>
</template>
<template v-else-if="rowIndex <= 3">
<vxe-select v-model="row.attr1" placeholder="请选择下拉" transfer>
<vxe-option value="选项1" label="选项1"></vxe-option>
<vxe-option value="选项2" label="选项2"></vxe-option>
<vxe-option value="选项3" label="选项3"></vxe-option>
</vxe-select>
</template>
<template v-else>
<vxe-input type="number" v-model="row.attr1" placeholder="请输入数值" transfer></vxe-input>
</template>
</template>
</vxe-table-column>
</vxe-table>
<p class="demo-code">{{ $t('app.body.button.showCode') }}</p>
@@ -80,6 +97,23 @@ export default {
</template>
<template v-slot="{ row }">选中日期:{{ row.date3 }}</template>
</vxe-table-column>
<vxe-table-column field="attr1" title="不同行渲染" :edit-render="{type: 'default'}">
<template v-slot:edit="{ row, rowIndex }">
<template v-if="rowIndex <= 1">
<vxe-input type="date" v-model="row.attr1" placeholder="请选择日期" transfer></vxe-input>
</template>
<template v-else-if="rowIndex <= 3">
<vxe-select v-model="row.attr1" placeholder="请选择下拉" transfer>
<vxe-option value="选项1" label="选项1"></vxe-option>
<vxe-option value="选项2" label="选项2"></vxe-option>
<vxe-option value="选项3" label="选项3"></vxe-option>
</vxe-select>
</template>
<template v-else>
<vxe-input type="number" v-model="row.attr1" placeholder="请输入数值" transfer></vxe-input>
</template>
</template>
</vxe-table-column>
</vxe-table>
`,
`

View File

@@ -34,6 +34,15 @@ function getResetValue (value, resetValue) {
return resetValue
}
function renderItems (h, _vm) {
const { items } = _vm
return items ? items.map(item => {
return h('vxe-form-item', {
props: item
})
}) : []
}
export default {
name: 'VxeForm',
props: {
@@ -45,6 +54,7 @@ export default {
titleAlign: String,
titleWidth: [String, Number],
titleColon: { type: Boolean, default: () => GlobalConfig.form.titleColon },
items: Array,
rules: Object
},
data () {
@@ -79,8 +89,8 @@ export default {
}
},
render (h) {
const { titleColon, loading, isLoading, vSize } = this
const itemSlots = [].concat(this.$slots.default)
const { $slots, titleColon, loading, isLoading, vSize } = this
const itemSlots = [].concat($slots.default || renderItems(h, this))
if (VXETable._loading && isLoading) {
itemSlots.push(
h('vxe-loading', {

View File

@@ -41,11 +41,7 @@ function renderFormContent (h, _vm) {
'toggle-collapse': _vm.togglCollapseEvent
},
ref: 'form'
}, formOpts.items.map(item => {
return h('vxe-form-item', {
props: item
})
}))
})
]
}
return []