Merge pull request #26 from wenjianzhang/v1.0.0

V1.0.0

src/views/tools/gen/editTable.vue

@@ -48,22 +48,22 @@
 
           <el-table-column label="插入" width="50">
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.isInsert" true-label="1" />
+              <el-checkbox v-model="scope.row.isInsert" true-label="1" false-label="0" />
             </template>
           </el-table-column>
           <el-table-column label="编辑" width="50">
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.isEdit" true-label="1" />
+              <el-checkbox v-model="scope.row.isEdit" true-label="1" false-label="0" />
             </template>
           </el-table-column>
           <el-table-column label="列表" width="50">
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.isList" true-label="1" />
+              <el-checkbox v-model="scope.row.isList" true-label="1" false-label="0" />
             </template>
           </el-table-column>
           <el-table-column label="查询" width="50">
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.isQuery" true-label="1" />
+              <el-checkbox v-model="scope.row.isQuery" true-label="1" false-label="0" />
             </template>
           </el-table-column>
           <el-table-column label="查询方式" width="120">
@@ -174,6 +174,7 @@ export default {
         const validateResult = res.every(item => !!item)
         if (validateResult) {
           const genTable = Object.assign({}, basicForm.model, genForm.model)
+          console.log(this.columns)
           genTable.columns = this.columns
           genTable.params = {
             treeCode: genTable.treeCode,

src/views/tools/gen/importTable.vue

@@ -42,7 +42,7 @@
       />
     </el-row>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="handleImportTable">确 定</el-button>
+      <el-button type="primary" :loading="loading" @click="handleImportTable">确 定</el-button>
       <el-button @click="visible = false">取 消</el-button>
     </div>
   </el-dialog>
@@ -53,6 +53,7 @@ import { listDbTable, importTable } from '@/api/tools/gen'
 export default {
   data() {
     return {
+      loading: false,
       // 遮罩层
       visible: false,
       // 选中数组值
@@ -104,12 +105,15 @@ export default {
     },
     /** 导入按钮操作 */
     handleImportTable() {
+      this.loading = true
+      this.visible = true
       importTable({ tables: this.tables.join(',') }).then(res => {
         this.msgSuccess(res.msg)
         if (res.code === 200) {
           this.visible = false
           this.$emit('ok')
         }
+        this.loading = false
       })
     }
   }