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 @@ 取消 - 确定 + 确定 @@ -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; + }); } } })