diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 6d99572c5..01edd456f 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -17,7 +17,7 @@ 3.2 - 3.1.0 + 3.1.2 1.1.16 8.0.16 1.5.22 diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm index e0b919242..91ab08216 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm @@ -43,6 +43,7 @@ name: '${pathName}', data() { return { + searchForm: {}, tableData: [], page: { total: 0, // 总页数 @@ -69,7 +70,7 @@ fetchList(Object.assign({ current: page.currentPage, size: page.pageSize - }, params)).then(response => { + }, params, this.searchForm )).then(response => { this.tableData = response.data.data.records this.page.total = response.data.data.total this.tableLoading = false @@ -95,13 +96,6 @@ this.getList(this.page) }) }, - /** - * @title 数据更新 - * @param row 为当前的数据 - * @param index 为当前更新数据的行数 - * @param done 为表单关闭函数 - * - **/ handleUpdate: function (row, index, done,loading) { putObj(row).then(data => { this.$message({ @@ -115,12 +109,6 @@ loading(); }); }, - /** - * @title 数据添加 - * @param row 为当前的数据 - * @param done 为表单关闭函数 - * - **/ handleSave: function (row, done,loading) { addObj(row).then(data => { this.$message({ @@ -134,15 +122,10 @@ loading(); }); }, - /** - * 搜索回调 - */ searchChange(form) { + this.searchForm = form this.getList(this.page, form) }, - /** - * 刷新回调 - */ refreshChange() { this.getList(this.page) } diff --git a/pom.xml b/pom.xml index 253c15ddb..03f37f8e0 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ UTF-8 1.8 1.8 - 2.1.5 + 2.1.6 1.1.2-beta5 4.5.15 0.0.9