From 6e4fd62df38a4d70a78f5e396193416cd3b50828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Fri, 23 Aug 2019 19:42:07 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82=E6=94=AF=E6=8C=81avue=202.0+=20?=
 =?UTF-8?q?=E7=9A=84=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/crud.js.vm    |   3 -
 .../src/main/resources/template/index.vue.vm  | 202 ++++++------------
 2 files changed, 68 insertions(+), 137 deletions(-)

diff --git a/pig-visual/pig-codegen/src/main/resources/template/crud.js.vm b/pig-visual/pig-codegen/src/main/resources/template/crud.js.vm
index c9e692c4..ba643de4 100755
--- a/pig-visual/pig-codegen/src/main/resources/template/crud.js.vm
+++ b/pig-visual/pig-codegen/src/main/resources/template/crud.js.vm
@@ -22,9 +22,6 @@ export const tableOption = {
   stripe: true,
   menuAlign: 'center',
   align: 'center',
-  editBtn: false,
-  delBtn: false,
-  addBtn: false,
   column: [
 #foreach ($column in $columns)
 	  {
diff --git a/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm b/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm
index 93a13fa1..c092ab98 100755
--- a/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm
+++ b/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm
@@ -1,171 +1,105 @@
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"
                  :data="tableData"
+                 :permission="permissionList"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
+                 @on-load="getList"
+                 @search-change="searchChange"
                  @refresh-change="refreshChange"
-                 @size-change="sizeChange"
                  @row-update="handleUpdate"
                  @row-save="handleSave"
                  @row-del="rowDel">
-        <template slot="menuLeft">
-          <el-button type="primary"
-                     @click="handleAdd"
-                     size="small"
-                     v-if="permissions.${moduleName}_${pathName}_add">新 增</el-button>
-          <br /><br />
-        </template>
-        <template slot-scope="scope"
-                  slot="menu">
-          <el-button type="primary"
-                     v-if="permissions.${moduleName}_${pathName}_edit"
-                     icon="el-icon-check"
-                     size="small"
-                     plain
-                     @click="handleEdit(scope.row,scope.index)">编辑</el-button>
-          <el-button type="danger"
-                     v-if="permissions.${moduleName}_${pathName}_del"
-                     icon="el-icon-delete"
-                     size="small"
-                     plain
-                     @click="handleDel(scope.row,scope.index)">删除</el-button>
-        </template>
       </avue-crud>
     </basic-container>
   </div>
 </template>
 
 <script>
-  import { fetchList, getObj, addObj, putObj, delObj } from '@/api/${moduleName}/${pathName}'
-  import { tableOption } from '@/const/crud/${moduleName}/${pathName}'
-  import { mapGetters } from 'vuex'
+  import {fetchList, getObj, addObj, putObj, delObj} from '@/api/${moduleName}/${pathName}'
+  import {tableOption} from '@/const/crud/${moduleName}/${pathName}'
+  import {mapGetters} from 'vuex'
+
   export default {
     name: '${pathName}',
     data() {
       return {
+        searchForm: {},
         tableData: [],
         page: {
           total: 0, // 总页数
           currentPage: 1, // 当前页数
           pageSize: 20 // 每页显示多少条
         },
-        listQuery: {
-          current: 1,
-          size: 20
-        },
         tableLoading: false,
         tableOption: tableOption
       }
     },
-    created() {
-      this.getList()
-    },
-    mounted: function() { },
     computed: {
-      ...mapGetters(['permissions'])
-  },
-  methods: {
-    getList() {
-      this.tableLoading = true
-      fetchList(this.listQuery).then(response => {
-        this.tableData = response.data.data.records
-        this.page.total = response.data.data.total
-        this.tableLoading = false
-    })
+      ...mapGetters(['permissions']),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permissions.${moduleName}_${pathName}_add, false),
+          delBtn: this.vaildData(this.permissions.${moduleName}_${pathName}_del, false),
+          editBtn: this.vaildData(this.permissions.${moduleName}_${pathName}_edit, false)
+        };
+      }
     },
-    currentChange(val) {
-      this.page.current = val
-      this.listQuery.current = val
-      this.getList()
-    },
-    sizeChange(val) {
-      this.page.size = val
-      this.listQuery.size = val
-      this.getList()
-    },
-    /**
-     * @title 打开新增窗口
-     * @detail 调用crud的handleadd方法即可
-     *
-     **/
-    handleAdd: function() {
-      this.$refs.crud.rowAdd()
-    },
-    handleEdit(row, index) {
-      this.$refs.crud.rowEdit(row, index)
-    },
-    handleDel(row, index) {
-      this.$refs.crud.rowDel(row, index)
-    },
-    rowDel: function(row, index) {
-      var _this = this
-      this.$confirm('是否确认删除ID为' + row.$pk.lowerAttrName + '的记录', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(function() {
-          return delObj(row.$pk.lowerAttrName)
+    methods: {
+      getList(page, params) {
+        this.tableLoading = true
+        fetchList(Object.assign({
+          current: page.currentPage,
+          size: page.pageSize
+        }, params, this.searchForm )).then(response => {
+          this.tableData = response.data.data.records
+          this.page.total = response.data.data.total
+          this.tableLoading = false
+        }).catch(() => {
+          this.tableLoading=false
         })
-        .then(data => {
-        _this.tableData.splice(index, 1)
-      _this.$message({
-        showClose: true,
-        message: '删除成功',
-        type: 'success'
-      })
-    })
-    .catch(function(err) { })
-    },
-    /**
-     * @title 数据更新
-     * @param row 为当前的数据
-     * @param index 为当前更新数据的行数
-     * @param done 为表单关闭函数
-     *
-     **/
-    handleUpdate: function(row, index, done) {
-      putObj(row).then(data => {
-        this.tableData.splice(index, 1, Object.assign({}, row))
-      this.$message({
-        showClose: true,
-        message: '修改成功',
-        type: 'success'
-      })
-      done()
-    })
-    },
-    /**
-     * @title 数据添加
-     * @param row 为当前的数据
-     * @param done 为表单关闭函数
-     *
-     **/
-    handleSave: function(row, done) {
-      addObj(row).then(data => {
-        this.tableData.push(Object.assign({}, row))
-      this.$message({
-        showClose: true,
-        message: '添加成功',
-        type: 'success'
-      })
-      done()
-    })
-    },
-    /**
-     * 刷新回调
-     */
-    refreshChange() {
-      this.getList()
+      },
+      rowDel: function (row, index) {
+        var _this = this
+        this.$confirm('是否确认删除ID为' + row.$pk.lowerAttrName, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function () {
+          return delObj(row.$pk.lowerAttrName)
+        }).then(data => {
+          _this.$message.success('删除成功')
+          this.getList(this.page)
+        })
+      },
+      handleUpdate: function (row, index, done,loading) {
+        putObj(row).then(data => {
+          this.$message.success('修改成功')
+          done()
+          this.getList(this.page)
+        }).catch(() => {
+          loading();
+        });
+      },
+      handleSave: function (row, done,loading) {
+        addObj(row).then(data => {
+          this.$message.success('添加成功')
+          done()
+          this.getList(this.page)
+        }).catch(() => {
+          loading();
+        });
+      },
+      searchChange(form) {
+        this.searchForm = form
+        this.getList(this.page, form)
+      },
+      refreshChange() {
+        this.getList(this.page)
+      }
     }
   }
-  }
 </script>
-
-<style lang="scss" scoped>
-</style>
-