diff --git a/docs/styleguide/develop.md b/docs/styleguide/develop.md index d04eece08911cf9a2efdf8055c00f0f5e3f59815..3d14e0b8ba16299539bb7b8d25a6c750433d09cb 100644 --- a/docs/styleguide/develop.md +++ b/docs/styleguide/develop.md @@ -1 +1 @@ -### 开呿–°ç»„ä»¶ \ No newline at end of file +关于如何进行组件化开å‘ï¼Œè¯·è§æ–‡æ¡£ï¼šhttp://factory.haomo-studio.com/frontend/react/react-element-based.html diff --git a/src/views/haomo/components/details/HmComplexDetail.md b/src/views/haomo/components/details/HmComplexDetail.md index 339fc647a13349864ed0a5246008601d8c5bcc54..2378afefc9d8891808020b301f6417d3a96e7447 100644 --- a/src/views/haomo/components/details/HmComplexDetail.md +++ b/src/views/haomo/components/details/HmComplexDetail.md @@ -1,7 +1,7 @@ ### 基本使用 ```jsx - <hm-complex-detail :userId="0e26566e953449a7a7500c34be39fd26" + <hm-complex-detail :tableId="0e26566e953449a7a7500c34be39fd26" :schema="{ 'model': 'HmUser', 'modelPlural': 'HmUsers', @@ -205,7 +205,7 @@ <template> <div> <hm-complex-detail :schema="schema['HmUser']" - :userId="userId" + :tableId="tableId" :columns="showUserColumns"> </hm-complex-detail> </div> @@ -430,7 +430,7 @@ filters: { }, created() { - this.userId = '0e26566e953449a7a7500c34be39fd26' + this.tableId = '0e26566e953449a7a7500c34be39fd26' }, methods: {} } diff --git a/src/views/haomo/components/details/HmComplexDetail.vue b/src/views/haomo/components/details/HmComplexDetail.vue index c69268eeef302ba3fa85c5ba02927d4f6137f831..b1e8d48ba906225f0258badbd6790a3140414150 100644 --- a/src/views/haomo/components/details/HmComplexDetail.vue +++ b/src/views/haomo/components/details/HmComplexDetail.vue @@ -1,7 +1,6 @@ <template> <el-row type="flex"> <el-col :span="24" class="detail-content"> - <h2 class="title">详情页é¢</h2> <el-form :data="detail" label-width="110px" status-icon style="width:80%;margin:0 auto"> <el-form-item v-for="(column,index) in showColumns" :key="index" :label="column.name"> <div>{{detail[column.codeCamel]}}</div> @@ -56,11 +55,11 @@ return true } }, - /* - * 在详情页需è¦ä¼ 入用户的id用æ¥å¸¦å‡ºç”¨æˆ·ä¿¡æ¯ - * */ - userId: { - type: null, + /** + * 在详情页需è¦ä¼ 入用户的id用æ¥å¸¦å‡ºç”¨æˆ·ä¿¡æ¯ + */ + tableId: { + type: String, required: true } }, @@ -68,7 +67,7 @@ return { list: null, detail: null, - showColumns: [] // è¦æ˜¾ç¤ºçš„åˆ—æ•°æ® + showColumns: [] // è¦æ˜¾ç¤ºçš„列数æ®, } }, computed: { @@ -138,7 +137,7 @@ self.list = resp.data // 匹é…需è¦å±•示的用户 _.each(self.list, function(item) { - if (item.id === self.userId) { + if (item.id === self.tableId) { self.detail = item } }) diff --git a/src/views/haomo/components/details/index.vue b/src/views/haomo/components/details/index.vue index ad7a5dc64cda51a338bed34d0d665f6d0b85b3f6..fc4639ddd461b86d53c2560c612c74d2681481c1 100644 --- a/src/views/haomo/components/details/index.vue +++ b/src/views/haomo/components/details/index.vue @@ -1,8 +1,8 @@ <template> <div> - <hm-complex-detail :schema="schema['HmUser']" :userId="userId"> + <hm-complex-detail :schema="schema['HmUser']" :tableId="tableId"> </hm-complex-detail> - <hm-complex-detail :schema="schema['HmUser']" :userId="userId" :columns="showUserColumns"> + <hm-complex-detail :schema="schema['HmUser']" :tableId="tableId" :columns="showUserColumns"> </hm-complex-detail> </div> </template> @@ -30,7 +30,7 @@ }, created() { this.schema = schema - this.userId = '0e26566e953449a7a7500c34be39fd26' + this.tableId = '0e26566e953449a7a7500c34be39fd26' }, methods: {} } diff --git a/src/views/haomo/components/forms/HmComplexForm.md b/src/views/haomo/components/forms/HmComplexForm.md index d20eaec849945303ea039ed0a6d5f73dab546e98..c60b5845bd51ea4fc991a8f9b410ea9a22dc1038 100644 --- a/src/views/haomo/components/forms/HmComplexForm.md +++ b/src/views/haomo/components/forms/HmComplexForm.md @@ -200,6 +200,7 @@ }"></hm-complex-form> ``` ### 指定显示的表å•类型 + ```vue <template> <div> @@ -210,17 +211,8 @@ </template> <script> - import HmComplexForm from './HmComplexForm.vue' - import schema from '../../schemas/hm_org_schema' - export default { name: 'HmComplexForm', - // 继承其他组件 - extends: {}, - // 使用其它组件 - components: { - 'hm-complex-form': HmComplexForm - }, data() { return { schema: { @@ -424,16 +416,9 @@ showFields: ['username', 'loginid', 'password', 'mobile', 'email'] } }, - computed: { - }, - filters: { - }, created() { this.schema = schema - }, - methods: {} + } } </script> -<style scoped> -</style> ``` \ No newline at end of file diff --git a/src/views/haomo/components/forms/HmComplexForm.vue b/src/views/haomo/components/forms/HmComplexForm.vue index 26e668fa75901a0aefc3da4958cafec044ea03c3..dea897a97551e117a4d8e7909db758d976648468 100644 --- a/src/views/haomo/components/forms/HmComplexForm.vue +++ b/src/views/haomo/components/forms/HmComplexForm.vue @@ -1,11 +1,10 @@ <template> - <el-row type="flex" class="hm-form"> + <el-row type="flex" class="hm-form" style="margin-top: 50px"> <el-col :span="6"> <div></div> </el-col> - <el-col :span="12" style="border:1px solid orange"> + <el-col :span="12"> <div> - <h2 class="title">表å•页é¢</h2> <!--表å•部分--> <el-form ref="form" :model="formModel" :rules="rules" label-width="110px" style="width:80%;margin:0 auto"> @@ -136,6 +135,7 @@ _.each(self.showFields, function(column, index) { if (typeof column === 'string') { // 生æˆä¸€ä¸ªæ–°å¯¹è±¡ + console.log(column) const tmp = _.keyBy(self.schema['columns'], 'code')[column.toUpperCase()] // console.log(tmp) // self.$set(tmp, 'code', tmp.code.toLowerCase()) @@ -209,12 +209,5 @@ } </script> <style scoped> - .title { - line-height: 40px; - background: orange; - color: #fff; - text-align: center; - margin-top: 0; - } </style> diff --git a/src/views/haomo/components/tables/HmComplexTable.vue b/src/views/haomo/components/tables/HmComplexTable.vue index 87af4588e5d68042dcc8b7ffc9481772a791169c..37c6583cb361261359d2e59eabd9b54770fc5028 100644 --- a/src/views/haomo/components/tables/HmComplexTable.vue +++ b/src/views/haomo/components/tables/HmComplexTable.vue @@ -83,19 +83,12 @@ }, /** * æœç´¢è¿‡æ»¤é€‰é¡¹ã€‚默认没有过滤功能。完整的示例为: - * * { - * * "column1": { - * * like: '%abc%', 模糊查询,包å«å—符â€abc†- * * notLike: '' 模糊查询,ä¸åŒ…å«å—符 - * * between: [1, 10], å–值在[1,10]之间,包å«1与10 - * * notBetween: [1, 10], å–值å°äºŽ1大于10 - * * isNull: true, // åªèƒ½ä¸ºtrue 判æ–å—æ®µæ˜¯å¦ä¸ºç©º * isNotNull: true, // åªèƒ½ä¸ºtrue 判æ–å—æ®µæ˜¯å¦ä¸ä¸ºç©º * equalTo: "abc", 相ç‰äºŽ