From 36b619d9daed2e5dad4b863482f5d5adbba4848f 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 21:46:54 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BE=AE=E8=B0=83=20=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=94=9F=E6=88=90=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GenFormConfServiceImpl.java  |  2 +-
 .../src/main/resources/template/index.vue.vm  | 24 ++++---------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenFormConfServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenFormConfServiceImpl.java
index 48c36d38b..9b7a545d2 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenFormConfServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenFormConfServiceImpl.java
@@ -65,7 +65,6 @@ public class GenFormConfServiceImpl extends ServiceImpl<GenFormConfMapper, GenFo
 	@Override
 	@SneakyThrows
 	public String getForm(Integer dsId, String tableName) {
-		DynamicDataSourceContextHolder.setDataSourceType(dsId);
 		GenFormConf form = getOne(Wrappers.<GenFormConf>lambdaQuery()
 				.eq(GenFormConf::getTableName, tableName)
 				.orderByDesc(GenFormConf::getCreateTime), false);
@@ -74,6 +73,7 @@ public class GenFormConfServiceImpl extends ServiceImpl<GenFormConfMapper, GenFo
 			return form.getFormInfo();
 		}
 
+		DynamicDataSourceContextHolder.setDataSourceType(dsId);
 		List<Map<String, String>> columns = generatorMapper.queryColumns(tableName);
 		//设置velocity资源加载器
 		Properties prop = new Properties();
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 91ab08216..47fd26051 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
@@ -87,22 +87,13 @@
                 }).then(function () {
                     return delObj(row.$pk.lowerAttrName)
                 }).then(data => {
-                    _this.tableData.splice(index, 1)
-                    _this.$message({
-                        showClose: true,
-                        message: '删除成功',
-                        type: 'success'
-                    })
+                    _this.$message.success('删除成功')
                     this.getList(this.page)
                 })
             },
             handleUpdate: function (row, index, done,loading) {
                 putObj(row).then(data => {
-                    this.$message({
-                        showClose: true,
-                        message: '修改成功',
-                        type: 'success'
-                    })
+                    this.$message.success('修改成功')
                     done()
                     this.getList(this.page)
                 }).catch(() => {
@@ -111,11 +102,7 @@
             },
             handleSave: function (row, done,loading) {
                 addObj(row).then(data => {
-                    this.$message({
-                        showClose: true,
-                        message: '添加成功',
-                        type: 'success'
-                    })
+                    this.$message.success('添加成功')
                     done()
                     this.getList(this.page)
                 }).catch(() => {
@@ -131,7 +118,4 @@
             }
         }
     }
-</script>
-
-<style lang="scss" scoped>
-</style>
+</script>
\ No newline at end of file