Merge branch 'master' of 115.28.80.125:softwarefactory/vueelementtemplate

src/views/haomo/components/tables/HmComplexTable.vue

@@ -102,7 +102,7 @@
 
     <!-- 表格 -->
     <el-table :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
-              style="width: 100%" @selection-change="handleSelectionChange" @sort-change="sortChange">
+              style="width: 100%" @selection-change="handleSelectionChange" @sort-change="sortChange" @current-change="tableCurrentChange">
       <el-table-column type="index" :index="indexMethod" label="序号" width="50px"></el-table-column>
       <el-table-column type="selection" width="55" v-if="isShowSelection"></el-table-column>
       <el-table-column v-for="(column,index) in showColumns" :key="index" align="center" :label="column.name" :prop="column.codeCamel" :sortable="column.isSort">
@@ -116,6 +116,7 @@
           <el-button @click="openDialog('editData',scope.row)" v-if="isShowEditDataButton" type="text" size="small">编辑</el-button>
           <el-button @click="deleteData(scope.row)" type="text" v-if="isShowDeleteButton" size="small">删除</el-button>
           <el-button @click="openDialog('detail',scope.row)" type="text" v-if="isShowDetail" size="small">详情</el-button>
+          <el-button @click="openDialog('detail',scope.row)" type="text" v-if="isShowDetail" size="small"></el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -285,6 +286,7 @@
        *    "showRefresh": false, //默认不显示刷新按钮
        *    "showDeleteButton": false,  //默认不显示删除按钮
        *    "buttonGroup": false  //默认不以按钮组的方式呈现button
+       *    tableCurrentChange(value){} // 设置点击某行所执行方法
        *    showDetail: {
        *      isShow: false,      // 默认不显示详情
        *      showColumns: ['mobile', 'loginid', 'username', 'email']
@@ -552,6 +554,13 @@
           self.listLoading = false
         })
       },
+      tableCurrentChange(value) {
+        const self = this
+        if (self.options && self.options.tableCurrentChange) {
+          console.log('value', value)
+          self.options.tableCurrentChange(value)
+        }
+      },
       // 数据库字段转化显示，例如(0=否,1=是)
       changeValue(data) {
         const self = this
@@ -595,12 +604,18 @@
         if (type === 'editData') {
           self.dialogName = '编辑'
           self.showUserColumns = self.options.editData.showUserColumns
+          if (self.options.editData.showUserButtons) {
+            self.showUserButtons = self.options.editData.showUserButtons
+          }
           self.formSchema = self.options.editData.formSchema
           self.layout = self.options.editData.layout
           self.tableId = data.id
         }
         if (type === 'newData') {
           self.dialogName = '新建'
+          if (self.options.newData.showUserButtons) {
+            self.showUserButtons = self.options.newData.showUserButtons
+          }
           self.showUserColumns = self.options.newData.showUserColumns
           self.formSchema = self.options.newData.formSchema
           self.layout = self.options.newData.layout

src/views/haomo/components/tables/index.vue

@@ -60,12 +60,14 @@
             { name: '登录ID', codeCamel: 'loginid', widgetType: 1 },
             { name: '类型', codeCamel: 'type', widgetType: 1 }
           ],
+          showUserButtons: [],
           formSchema: schema['HmUser'],
           layout: { left: 0, middle: 24, right: 0 }
         },
         editData: {
           isShow: true,
           showUserColumns: [{ name: '姓名', codeCamel: 'username', widgetType: 1 }],
+          showUserButtons: [],
           formSchema: schema['HmUser'],
           layout: { left: 0, middle: 24, right: 0 }
         },
@@ -77,7 +79,8 @@
         showDetail: {
           isShow: true,
           showColumns: ['mobile', 'loginid', 'username', 'email']
-        }
+        },
+        tableCurrentChange(value) {}
         // dataProcessing(value, params, definedOperate) {} // 处理返回后的数据,必须return 处理后的数据
       }
       this.userDefined = {
@@ -89,6 +92,9 @@
           { type: 'input', label: '', placeholder: '邮箱', code: 'email', value: '' },
           { type: 'datetime', label: '', placeholder: '创建时间', code: 'createTime', value: '' }
         ],
+        definedOperation: {
+          label: '测试'
+        },
         definedEdit() {
 
         },