Merge branch 'master' into ouqian

src/components/Template/CustomTable.vue

@@ -22,7 +22,7 @@
 									<template v-if="headerCol.type === 'span'">
 										<div class="span-content">{{ $t(headerCol.label) }}</div>
 									</template>
-									<template v-else-if="headerCol.type === 'sj'">
+									<template v-else-if="isRegent(headerCol)">
 										<HandleFormItem
 											:fieldKey="prefixKey + colIndex + '_' + headerCol.key + '_' + headerIndex"
 											:fieldItemLabel="fieldItemLabel" :type="headerCol.type"
@@ -33,7 +33,7 @@
 											@update:error="onHeaderColumnErrorUpdate(colIndex, headerIndex, headerCol.key, $event)" 
 											@onRegentSubmit="(data, inputValue) => onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex)" />
 									</template>
-									<template v-else-if="headerCol.type === 'input' || headerCol.type === 'select'">
+									<template v-else-if="headerCol.type === 'input' || headerCol.type === 'select'|| headerCol.type === 'inputNumber'">
 										<HandleFormItem
 											:fieldKey="prefixKey + '_header_' + colIndex + '_' + headerIndex"
 											:fieldItemLabel="fieldItemLabel" :type="headerCol.type"