From cdc28eb9915eb136f0ef5886b8cdb80c9783207c Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 7 Jan 2021 09:56:49 +0800
Subject: [PATCH] =?UTF-8?q?:lock:=20Fixing=20security=20issues.=20#2235=20?=
 =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E3=80=91=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9elemenet=20=E9=A3=8E=E6=A0=BC=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E8=A1=A8=E5=8D=95=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/8pigxx_codegen.sql                         |  6 ++++++
 .../resources/template/element/form.vue.vm    | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/db/8pigxx_codegen.sql b/db/8pigxx_codegen.sql
index 47da6fc18..780ab2ade 100644
--- a/db/8pigxx_codegen.sql
+++ b/db/8pigxx_codegen.sql
@@ -13,6 +13,12 @@ CREATE TABLE `gen_datasource_conf` (
   `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
   `username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
   `password` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ds_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `instance` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `host` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `port` int(11)   DEFAULT NULL,
+  `ds_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `conf_type` int(1) DEFAULT NULL,
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新',
   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0',
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm
index bef510cdb..3e716ccb0 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/element/form.vue.vm
@@ -14,7 +14,7 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="canSubmit">确定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -26,6 +26,7 @@
     data () {
       return {
         visible: false,
+        canSubmit: false,
         dataForm: {
 #foreach($column in $columns)
 #if($column.columnName == $pk.columnName)
@@ -50,8 +51,9 @@
     },
     methods: {
       init (id) {
-        this.dataForm.${pk.lowerAttrName} = id || 0
-        this.visible = true
+        this.dataForm.${pk.lowerAttrName} = id || 0;
+        this.visible = true;
+        this.canSubmit = true;
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
           if (this.dataForm.${pk.lowerAttrName}) {
@@ -65,18 +67,23 @@
       dataFormSubmit () {
         #[[this.$refs['dataForm'].validate((valid) => {]]#
           if (valid) {
+            this.canSubmit = false;
             if (this.dataForm.${pk.lowerAttrName}) {
                 putObj(this.dataForm).then(data => {
-                    this.$message.success('修改成功')
+                    this.$notify.success('修改成功')
                     this.visible = false
                     this.$emit('refreshDataList')
+                }).catch(() => {
+                    this.canSubmit = true;
                 });
             } else {
                 addObj(this.dataForm).then(data => {
-                    this.$message.success('添加成功')
+                    this.$notify.success('添加成功')
                     this.visible = false
                     this.$emit('refreshDataList')
-                })
+                }).catch(() => {
+                    this.canSubmit = true;
+                });
             }
           }
         })