修复已知问题

This commit is contained in:
xuliangzhan
2020-11-19 22:26:21 +08:00
parent f7809e6772
commit 252fbf526d
6 changed files with 7 additions and 12 deletions

View File

@@ -190,7 +190,7 @@ const apis = [
},
{
name: 'prevent-submit',
desc: '禁用默认提交方式,禁用后配合 validate() 方法可以更加自由的控制提交逻辑',
desc: '是否禁用默认的回车提交方式,禁用后配合 validate() 方法可以更加自由的控制提交逻辑',
version: '',
type: 'boolean',
enum: '',

View File

@@ -116,7 +116,7 @@ export default {
value301: '',
value302: '',
value303: '',
value400: 'fdgfdgfdg09',
value400: '2018-01-09',
value401: '',
value402: '',
value403: '',

View File

@@ -82,7 +82,7 @@
"vxe-table-plugin-export-pdf": "^1.9.0",
"vxe-table-plugin-export-xlsx": "^2.0.6",
"vxe-table-plugin-iview": "^1.10.0",
"vxe-table-plugin-menus": "^1.5.0",
"vxe-table-plugin-menus": "^1.5.1",
"vxe-table-plugin-shortcut-key": "^1.4.0",
"vxe-table-plugin-virtual-tree": "0.5.6",
"xe-ajax": "^4.0.5",

View File

@@ -626,7 +626,6 @@ export default {
maxDate: { type: [String, Number, Date], default: () => GlobalConfig.input.maxDate },
startWeek: { type: Number, default: () => GlobalConfig.input.startWeek },
labelFormat: { type: String, default: () => GlobalConfig.input.labelFormat },
parseFormat: { type: String, default: () => GlobalConfig.input.parseFormat },
valueFormat: { type: String, default: () => GlobalConfig.input.valueFormat },
editable: { type: Boolean, default: true },
festivalMethod: { type: Function, default: () => GlobalConfig.input.festivalMethod },
@@ -1471,14 +1470,14 @@ export default {
}
},
dateParseValue (date) {
const { type, dateLabelFormat, parseFormat } = this
const { type, dateLabelFormat, valueFormat } = this
let dValue = null
let dLabel = ''
if (date) {
if (type === 'time') {
dValue = toStringTimeDate(date, parseFormat)
dValue = toStringTimeDate(date, valueFormat)
} else {
dValue = XEUtils.toStringDate(date, parseFormat)
dValue = XEUtils.toStringDate(date, valueFormat)
}
}
if (XEUtils.isValidDate(dValue)) {

4
types/input.d.ts vendored
View File

@@ -60,10 +60,6 @@ export declare class Input extends VXETableComponent {
* 只对 type=date|week|month|year 有效,输入框中显示的日期格式
*/
labelFormat?: string;
/**
* 只对 type=date|week|month|year 有效,绑定值的解析格式,如果是值为字符串时可能会用到
*/
parseFormat?: string;
/**
* 只对 type=date|week|month|year 有效,绑定值的返回格式,默认返回 Date 类型,如果指定格式则返回字符串
*/

2
types/table.d.ts vendored
View File

@@ -801,7 +801,7 @@ export declare class Table extends VXETableComponent {
* @param records 新数据
* @param row 指定行
*/
insertAt(records: RecordInfo | RecordInfo[], row: RowInfo | number | null): Promise<{ row: RowInfo, rows: RowInfo[] }>;
insertAt(records: RecordInfo | RecordInfo[], row: RowInfo | -1 | null): Promise<{ row: RowInfo, rows: RowInfo[] }>;
/**
* 删除指定行数据,指定 row 或 [row, ...] 删除多条数据,如果为空则删除所有数据
* @param rows 指定行