diff --git a/.gitignore b/.gitignore index f61b14d6c4f4bf7ce270370f778b85d8882cc799..dd94cab1a92e9966e3e400fdbd8c0f64fb8ec4de 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,5 @@ unpackage/dist/dev/ # python *.pyc uni_modules/ -!uni_modules/thirdlucky-uml-entity/ +!uni_modules/thirdlucky*/**/* .hbuilderx/ diff --git a/pages/test/test-er/test-er.vue b/pages/test/test-er/test-er.vue index c0f86c32f54c1ee7e99029bb643502993348201b..d7e46099d77c770d389fd02cefae899105a749ff 100644 --- a/pages/test/test-er/test-er.vue +++ b/pages/test/test-er/test-er.vue @@ -31,8 +31,55 @@ export default { }, tables: [ { - key: 'CalendarEvent', - title: 'CalendarEvent', + key: 'CalendarEvent1', + title: 'TESTABCD', + columns: [ + { + name: 'id', + info: '唯一主键', + type: 'BigInt' + } + ] + }, + { + key: 'TESTABCDE', + title: 'TESTABCDE', + columns: [ + { + name: 'id', + info: '唯一主键', + type: 'BigInt' + }, + { + name: 'name', + info: '说明', + type: 'String' + } + ] + },{ + key: 'TESTABCDEF', + title: 'TESTABCDEF', + columns: [ + { + name: 'id', + info: '唯一主键', + type: 'BigInt' + }, + { + name: 'name', + info: '说明', + type: 'String' + }, + { + name: 'date', + info: '日期', + type: 'Date' + } + ] + }, + { + key: 'TESTABCDEFG', + title: 'TESTABCDEFG', columns: [ { name: 'id', @@ -57,8 +104,75 @@ export default { ] }, { - key: 'CalendarEventAlert', - title: 'CalendarEventAlert', + key: 'TESTABCDEFGA', + title: 'TESTABCDEFGA', + columns: [ + { + name: 'id', + info: '唯一主键', + type: 'BigInt' + }, + { + name: 'name', + info: '说明', + type: 'String' + }, + { + name: 'date', + info: '日期', + type: 'Date' + }, + { + name: 'starttime', + info: '开始时间', + type: 'DateTime' + }, + { + name: 'endtime', + info: '结束时间', + type: 'DateTime' + }, + ] + }, + { + key: 'TESTABCDEFGAB', + title: 'TESTABCDEFGAB', + columns: [ + { + name: 'id', + info: '唯一主键', + type: 'BigInt' + }, + { + name: 'name', + info: '说明', + type: 'String' + }, + { + name: 'date', + info: '日期', + type: 'Date' + }, + { + name: 'starttime', + info: '开始时间', + type: 'DateTime' + }, + { + name: 'endtime', + info: '结束时间', + type: 'DateTime' + }, + { + name: 'sex', + info: '性别', + type: 'String' + }, + ] + }, + { + key: 'TESTABCDEFGABC', + title: 'TESTABCDEFGABC', columns: [ { name: 'id', @@ -90,6 +204,138 @@ export default { info: '性别', type: 'String' }, + { + name: 'description', + info: '描述', + type: 'String' + }, + ] + }, + { + key: 'TESTABCDEFGABCD', + title: 'TESTABCDEFGABCD1231231231231231', + columns: [ + { + name: 'id', + info: '唯一主键', + type: 'BigInt' + }, + { + name: 'name', + info: '说明', + type: 'String' + }, + { + name: 'date', + info: '日期', + type: 'Date' + }, + { + name: 'starttime', + info: '开始时间', + type: 'DateTime' + }, + { + name: 'endtime', + info: '结束时间', + type: 'DateTime' + }, + { + name: 'sex', + info: '性别', + type: 'String' + }, + { + name: 'description', + info: '描述', + type: 'String' + }, + { + name: 'description1', + info: '描述', + type: 'String' + }, + { + name: 'description2', + info: '描述', + type: 'String' + }, + { + name: 'description3', + info: '描述', + type: 'String' + }, + { + name: 'description4', + info: '描述', + type: 'String' + }, + { + name: 'description5', + info: '描述', + type: 'String' + }, + { + name: 'description6', + info: '描述', + type: 'String' + }, + ] + }, + { + key: 'TESTABCDEFGABCD123123', + title: 'TESTABCDEFGABCD1231231231231231', + columns: [ + { + name: 'id', + info: '唯一主键', + type: 'BigInt' + }, + { + name: 'name', + info: '说明', + type: 'String' + }, + { + name: 'date', + info: '日期', + type: 'Date' + }, + { + name: 'starttime', + info: '开始时间', + type: 'DateTime' + }, + { + name: 'endtime', + info: '结束时间', + type: 'DateTime' + }, + { + name: 'sex', + info: '性别', + type: 'String' + }, + { + name: 'description', + info: '描述', + type: 'String' + }, + { + name: 'description2', + info: '描述', + type: 'String' + }, + { + name: 'description3', + info: '描述', + type: 'String' + }, + { + name: 'description4', + info: '描述', + type: 'String' + }, ] } ]