diff --git a/src/views/haomo/components/panel/HmPanel.md b/src/views/haomo/components/panel/HmPanel.md
index bed6793e44b39a6af268be309acb4ab925990083..3a3b7ad61b2f42fcd18044866549f56790a49671 100644
--- a/src/views/haomo/components/panel/HmPanel.md
+++ b/src/views/haomo/components/panel/HmPanel.md
@@ -1,215 +1,30 @@
### 基本使用
```jsx
- <hm-panel :hmTitle="é¢æ¿æ ‡é¢˜"
- :hmTitleClass='center'
- :hmContentClass='center'
- :hmContentText='é¢æ¿æ–‡å—'
- :hmPanelHeight="200px"
- :schema="{
- 'model': 'HmUser',
- 'modelPlural': 'HmUsers',
- 'modelCamel': 'hmUser',
- 'modelCamelPlural': 'hmUsers',
- 'modelUnderscore': 'hm_user',
- 'modelUnderscorePlural': 'hm_users',
- 'columns': [
- {
- 'id': 'o50',
- 'objectId': '170A4473-36CC-47E1-96C3-F238F8132AA4',
- 'name': '用户åå—',
- 'code': 'USERNAME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1517859502',
- 'modifier': 'hm20160509',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'codeCamel': 'username',
- 'codeCamelPlural': 'usernames',
- 'codeUnderscore': 'username',
- 'codeUnderscorePlural': 'usernames',
- 'type': 'string'
- },
- {
- 'id': 'o51',
- 'objectId': '70EC38C6-4AE4-4E79-BA72-29DA2FE50782',
- 'name': '登录ID',
- 'code': 'LOGINID',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'columnMandatory': '1',
- 'codeCamel': 'loginid',
- 'codeCamelPlural': 'loginids',
- 'codeUnderscore': 'loginid',
- 'codeUnderscorePlural': 'loginids',
- 'type': 'string'
- },
- {
- 'id': 'o52',
- 'objectId': '4FCE7185-D489-4DED-AA5F-093A4DBC1112',
- 'name': '密ç ',
- 'code': 'PASSWORD',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'codeCamel': 'password',
- 'codeCamelPlural': 'passwords',
- 'codeUnderscore': 'password',
- 'codeUnderscorePlural': 'passwords',
- 'type': 'string'
- },
- {
- 'id': 'o53',
- 'objectId': '3A897125-CB02-40F5-9BB1-62A9B06553E0',
- 'name': 'è”系电è¯',
- 'code': 'MOBILE',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(16CHAR)',
- 'length': '16',
- 'codeCamel': 'mobile',
- 'codeCamelPlural': 'mobiles',
- 'codeUnderscore': 'mobile',
- 'codeUnderscorePlural': 'mobiles',
- 'type': 'string'
- },
- {
- 'id': 'o54',
- 'objectId': '48B9C079-3CCA-4886-9543-3AE764998E9A',
- 'name': '邮箱',
- 'code': 'EMAIL',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'codeCamel': 'email',
- 'codeCamelPlural': 'emails',
- 'codeUnderscore': 'email',
- 'codeUnderscorePlural': 'emails',
- 'type': 'string'
- },
- {
- 'id': 'o55',
- 'objectId': '533AB6E8-A3D0-473D-9DE6-0D0CABA6731C',
- 'name': '头åƒ',
- 'code': 'AVATAR',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(1024CHAR)',
- 'length': '1024',
- 'codeCamel': 'avatar',
- 'codeCamelPlural': 'avatars',
- 'codeUnderscore': 'avatar',
- 'codeUnderscorePlural': 'avatars',
- 'type': 'string'
- },
- {
- 'id': 'o56',
- 'objectId': 'EF44AF1F-F6B9-412F-9FF7-AAECD6B5521A',
- 'name': '创建时间',
- 'code': 'CREATE_TIME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'DATE',
- 'codeCamel': 'createTime',
- 'codeCamelPlural': 'createTimes',
- 'codeUnderscore': 'create_time',
- 'codeUnderscorePlural': 'create_times',
- 'type': 'datetime'
- },
- {
- 'id': 'o57',
- 'objectId': 'CD1BC772-356B-4D14-A40E-28F115F95EEC',
- 'name': '更新时间',
- 'code': 'LAST_UPDATE_TIME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'DATE',
- 'codeCamel': 'lastUpdateTime',
- 'codeCamelPlural': 'lastUpdateTimes',
- 'codeUnderscore': 'last_update_time',
- 'codeUnderscorePlural': 'last_update_times',
- 'type': 'datetime'
- },
- {
- 'id': 'o58',
- 'objectId': '297D03AE-459D-4991-A459-3449FE893EEB',
- 'name': '最åŽç™»å½•æ—¶é—´',
- 'code': 'LAST_LOGIN_TIME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'DATE',
- 'codeCamel': 'lastLoginTime',
- 'codeCamelPlural': 'lastLoginTimes',
- 'codeUnderscore': 'last_login_time',
- 'codeUnderscorePlural': 'last_login_times',
- 'type': 'datetime'
- },
- {
- 'id': 'o59',
- 'objectId': '6767F0FE-6C49-46F3-919E-D854C21FCA52',
- 'name': '安全级别',
- 'code': 'SECURITY_LEVEL',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'NUMBER(11,0)',
- 'length': '11',
- 'codeCamel': 'securityLevel',
- 'codeCamelPlural': 'securityLevels',
- 'codeUnderscore': 'security_level',
- 'codeUnderscorePlural': 'security_levels',
- 'type': 'number'
- },
- {
- 'id': 'o60',
- 'objectId': 'C4BF570D-C8FC-4B72-919C-78DB3D790171',
- 'name': '类型',
- 'code': 'TYPE',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'comment': '1:ä¼ä¸šï¼Œ2：代ç†å•†',
- 'dataType': 'NUMBER(11,0)',
- 'length': '11',
- 'codeCamel': 'type',
- 'codeCamelPlural': 'types',
- 'codeUnderscore': 'type',
- 'codeUnderscorePlural': 'types',
- 'type': 'number'
- }
- ]
- }"></hm-panel>
+ <hm-panel :options="{
+ 'title': 'é¢ç‰ˆå称',
+ 'panel_class': 'center',
+ 'title_class': 'weight',
+ 'content_class': 'center',
+ 'panel_style': {
+ width: '100%',
+ marginTop: '20px',
+ marginBottom: '20px'
+ },
+ 'panel_span': 22,
+ 'content_height': {
+ height: '600px'
+ },
+ 'canCollapse': true
+ }">
+ </hm-panel>
```
-### 指定显示的表å•ç±»åž‹
+### ä¸å¯æ”¶èµ·çš„panel
```vue
<template>
<div>
- <hm-panel :schema="schema['HmUser']" :hmTitle="hmTitle" :hmTitleClass="hmTitleClass" :hmContentClass="hmContentClass"
- :hmContentText="hmContentText" :hmPanelHeight="hmPanelHeight">
+ <hm-panel :options="options">
</hm-panel>
</div>
</template>
@@ -219,215 +34,24 @@
name: 'HmPanel',
data() {
return {
- schema: {
- 'HmUser': {
- 'model': 'HmUser',
- 'modelPlural': 'HmUsers',
- 'modelCamel': 'hmUser',
- 'modelCamelPlural': 'hmUsers',
- 'modelUnderscore': 'hm_user',
- 'modelUnderscorePlural': 'hm_users',
- 'columns': [
- {
- 'id': 'o50',
- 'objectId': '170A4473-36CC-47E1-96C3-F238F8132AA4',
- 'name': '用户åå—',
- 'code': 'USERNAME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1517859502',
- 'modifier': 'hm20160509',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'codeCamel': 'username',
- 'codeCamelPlural': 'usernames',
- 'codeUnderscore': 'username',
- 'codeUnderscorePlural': 'usernames',
- 'type': 'string'
- },
- {
- 'id': 'o51',
- 'objectId': '70EC38C6-4AE4-4E79-BA72-29DA2FE50782',
- 'name': '登录ID',
- 'code': 'LOGINID',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'columnMandatory': '1',
- 'codeCamel': 'loginid',
- 'codeCamelPlural': 'loginids',
- 'codeUnderscore': 'loginid',
- 'codeUnderscorePlural': 'loginids',
- 'type': 'string'
- },
- {
- 'id': 'o52',
- 'objectId': '4FCE7185-D489-4DED-AA5F-093A4DBC1112',
- 'name': '密ç ',
- 'code': 'PASSWORD',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'codeCamel': 'password',
- 'codeCamelPlural': 'passwords',
- 'codeUnderscore': 'password',
- 'codeUnderscorePlural': 'passwords',
- 'type': 'string'
- },
- {
- 'id': 'o53',
- 'objectId': '3A897125-CB02-40F5-9BB1-62A9B06553E0',
- 'name': 'è”系电è¯',
- 'code': 'MOBILE',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(16CHAR)',
- 'length': '16',
- 'codeCamel': 'mobile',
- 'codeCamelPlural': 'mobiles',
- 'codeUnderscore': 'mobile',
- 'codeUnderscorePlural': 'mobiles',
- 'type': 'string'
- },
- {
- 'id': 'o54',
- 'objectId': '48B9C079-3CCA-4886-9543-3AE764998E9A',
- 'name': '邮箱',
- 'code': 'EMAIL',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(256CHAR)',
- 'length': '256',
- 'codeCamel': 'email',
- 'codeCamelPlural': 'emails',
- 'codeUnderscore': 'email',
- 'codeUnderscorePlural': 'emails',
- 'type': 'string'
- },
- {
- 'id': 'o55',
- 'objectId': '533AB6E8-A3D0-473D-9DE6-0D0CABA6731C',
- 'name': '头åƒ',
- 'code': 'AVATAR',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'VARCHAR2(1024CHAR)',
- 'length': '1024',
- 'codeCamel': 'avatar',
- 'codeCamelPlural': 'avatars',
- 'codeUnderscore': 'avatar',
- 'codeUnderscorePlural': 'avatars',
- 'type': 'string'
- },
- {
- 'id': 'o56',
- 'objectId': 'EF44AF1F-F6B9-412F-9FF7-AAECD6B5521A',
- 'name': '创建时间',
- 'code': 'CREATE_TIME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'DATE',
- 'codeCamel': 'createTime',
- 'codeCamelPlural': 'createTimes',
- 'codeUnderscore': 'create_time',
- 'codeUnderscorePlural': 'create_times',
- 'type': 'datetime'
- },
- {
- 'id': 'o57',
- 'objectId': 'CD1BC772-356B-4D14-A40E-28F115F95EEC',
- 'name': '更新时间',
- 'code': 'LAST_UPDATE_TIME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'DATE',
- 'codeCamel': 'lastUpdateTime',
- 'codeCamelPlural': 'lastUpdateTimes',
- 'codeUnderscore': 'last_update_time',
- 'codeUnderscorePlural': 'last_update_times',
- 'type': 'datetime'
- },
- {
- 'id': 'o58',
- 'objectId': '297D03AE-459D-4991-A459-3449FE893EEB',
- 'name': '最åŽç™»å½•æ—¶é—´',
- 'code': 'LAST_LOGIN_TIME',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'DATE',
- 'codeCamel': 'lastLoginTime',
- 'codeCamelPlural': 'lastLoginTimes',
- 'codeUnderscore': 'last_login_time',
- 'codeUnderscorePlural': 'last_login_times',
- 'type': 'datetime'
- },
- {
- 'id': 'o59',
- 'objectId': '6767F0FE-6C49-46F3-919E-D854C21FCA52',
- 'name': '安全级别',
- 'code': 'SECURITY_LEVEL',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'dataType': 'NUMBER(11,0)',
- 'length': '11',
- 'codeCamel': 'securityLevel',
- 'codeCamelPlural': 'securityLevels',
- 'codeUnderscore': 'security_level',
- 'codeUnderscorePlural': 'security_levels',
- 'type': 'number'
- },
- {
- 'id': 'o60',
- 'objectId': 'C4BF570D-C8FC-4B72-919C-78DB3D790171',
- 'name': '类型',
- 'code': 'TYPE',
- 'creationDate': '1498990741',
- 'creator': 'hm20160509',
- 'modificationDate': '1498995491',
- 'modifier': 'xjq',
- 'comment': '1:ä¼ä¸šï¼Œ2：代ç†å•†',
- 'dataType': 'NUMBER(11,0)',
- 'length': '11',
- 'codeCamel': 'type',
- 'codeCamelPlural': 'types',
- 'codeUnderscore': 'type',
- 'codeUnderscorePlural': 'types',
- 'type': 'number'
- }
- ]
- }
- },
- hmTitle: 'é¢æ¿æ ‡é¢˜',
- hmTitleClass: 'weight',
- hmContentClass: 'center',
- hmContentText: 'é¢æ¿æ–‡å—',
- hmPanelHeight: {
- height: '100px'
- }
}
},
created() {
+ this.options = {
+ title: '测试é¢æ¿',
+ panel_class: 'center',
+ title_class: 'center',
+ content_class: 'center',
+ panel_style: {
+ width: '80%',
+ background: '#42b983',
+ margin: '0 auto'
+ },
+ panel_span: 20,
+ canCollapse: false
+ }
this.schema = schema
+ this.showFields = ['username', 'loginid', 'password', 'mobile', 'email']
}
}
</script>