Browse Source

增强自动化代码使用体验

QM303176530 4 years ago
parent
commit
e13f1f61cb

+ 3 - 1
server/api/v1/sys_auto_code.go

@@ -80,7 +80,9 @@ func CreateTemp(c *gin.Context) {
 	err := service.CreateTemp(a)
 	if err != nil {
 		if errors.Is(err, model.AutoMoveErr) {
-			response.Ok(c)
+			c.Writer.Header().Add("success", "false")
+			c.Writer.Header().Add("msgtype", "success")
+			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
 		} else {
 			c.Writer.Header().Add("success", "false")
 			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))

+ 1 - 1
web/src/utils/request.js

@@ -68,7 +68,7 @@ service.interceptors.response.use(
             Message({
                 showClose: true,
                 message: response.data.msg || decodeURI(response.headers.msg),
-                type: response.headers.messageType||'error',
+                type: response.headers.msgtype||'error',
             })
             if (response.data.data && response.data.data.reload) {
                 store.commit('user/LoginOut')

+ 7 - 13
web/src/view/systemTools/autoCode/index.vue

@@ -140,7 +140,7 @@ const fieldTemplate = {
   dataTypeLong: "",
   comment: "",
   fieldSearchType: "",
-  dictType:""
+  dictType: ""
 };
 
 import FieldDialog from "@/view/systemTools/autoCode/component/fieldDialog.vue";
@@ -278,19 +278,13 @@ export default {
             return false;
           }
           const data = await createTemp(this.form);
-          if(data.headers?.success == "false"){
-            return
-          }else if(data.code == 0){
+          if (data.headers?.success == "false") {
+            return;
+          } else {
             this.$message({
-              type: "success",
-              message: "自动化代码创建成功,并已自动迁移"
-            })
-            return
-          }else{
-             this.$message({
               type: "success",
               message: "自动化代码创建成功,正在下载"
-            })
+            });
           }
           const blob = new Blob([data]);
           const fileName = "ginvueadmin.zip";
@@ -353,14 +347,14 @@ export default {
                 columnName: item.columnName,
                 comment: item.columnComment,
                 fieldSearchType: "",
-                dictType:""
+                dictType: ""
               });
             }
           });
       }
     },
     async setFdMap() {
-      const fdTypes= ["string", "int", "bool", "float64", "time.Time"];
+      const fdTypes = ["string", "int", "bool", "float64", "time.Time"];
       fdTypes.map(async fdtype => {
         const res = await getDict(fdtype);
         res.map(item => {