From 47e3087067abd35e6337c011f96d2338c0bb1aae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2024 13:39:31 +0800
Subject: [PATCH] 优化自动化代码

---
 src/main/resources/generater/admin/add.ftl |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/generater/admin/add.ftl b/src/main/resources/generater/admin/add.ftl
index 5c2a16e..a9c8825 100644
--- a/src/main/resources/generater/admin/add.ftl
+++ b/src/main/resources/generater/admin/add.ftl
@@ -8,13 +8,16 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport"
           content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
-    <link rel="stylesheet" href="../css/font.css">
-    <link rel="stylesheet" href="../css/xadmin.css">
-    <script type="text/javascript" src="../lib/layui/layui.js" charset="utf-8"></script>
-    <script type="text/javascript" src="../js/xadmin.js"></script>
-    <script src="../js/vue.min.js" type="text/javascript" charset="utf-8"></script>
-    <script src="../js/http.js" type="text/javascript" charset="utf-8"></script>
-    <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <link rel="stylesheet" href="/admin/css/font.css">
+    <link rel="stylesheet" href="/admin/css/xadmin.css">
+    <link rel="stylesheet" href="/admin/css/theme3049.min.css">
+
+    <script src="/admin/lib/layui/layui.js" charset="utf-8"></script>
+    <script src="/admin/js/vue.min.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/admin/js/xadmin.js" type="text/javascript"></script>
+    <script src="/admin/js/http.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/admin/js/jquery.min.js" type="text/javascript"></script>
+    <script src="/admin/js/utils.js"></script>
     <!-- 璁㊣E8/9鏀寔濯掍綋鏌ヨ锛屼粠鑰屽吋瀹规爡鏍� -->
     <!--[if lt IE 9]>
     <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
@@ -83,7 +86,7 @@
                 auto: false,
                 accept: 'images',
                 acceptMime: 'image/*',
-                field: "file_${value.key}",
+                field: "file_url",
                 choose: function (obj) {
                     //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
                     var files = obj.pushFile();
@@ -106,10 +109,10 @@
                     if (res.code == 0) {
                         //鑾峰彇閾炬帴
                         $("input[name='${value.key}']").val(res.data.url);
-                        delete chooseImage["${value.key}"];
-                        if (Object.keys(chooseImage).length == 0) {
+                        delete uploadTool.chooseImage["${value.key}"];
+                        if (Object.keys(uploadTool.chooseImage).length == 0) {
                             //鍏ㄩ儴涓婁紶鎴愬姛
-                            callback();
+                            uploadTool.callback(true);
                         }
                     } else {
                         layer.msg(res.msg);
@@ -125,7 +128,7 @@
 
         },
         upload: function (result) {
-            if (this.uploadArray.length > 0) {
+            if (this.uploadArray.length > 0 && Object.keys(this.chooseImage).length > 0) {
                 this.callback = result;
                 //鍚屾椂涓婁紶
                 for (var i = 0; i < this.uploadArray.length; i++) {
@@ -159,14 +162,13 @@
         uploadTool.init(upload);
 
         <#list rowsList as row >
-               <#if (row.type=="Text" && (row.params.inputType=="DATE"||row.params.inputType=="DATETIME"))>
+            <#if (row.type=="Text" && (row.params.inputType=="DATE"||row.params.inputType=="DATETIME"))>
                     laydate.render({
-                          elem: "intput[name=${row.key}]", //鎸囧畾鍏冪礌
-                          type: ${row.params.inputType?lower_case}
+                        elem: "input[name=${row.key}]", //鎸囧畾鍏冪礌
+                        type: '${row.params.inputType?lower_case}'
                     });
-               </#if>
+            </#if>
         </#list>
-
 
         //鐩戝惉鎻愪氦
         form.on('submit(add)',
@@ -185,7 +187,12 @@
                             data.field[onkeys[0]][onkeys[1]] = value;
                         }
                     }
-                    uploadTool.upload(function () {
+                    uploadTool.upload(function (hasFile) {
+                        if (hasFile) {
+                            //浠庢柊鎻愪氦琛ㄥ崟
+                            $("button[lay-filter=add]").click();
+                            return;
+                        }
                         //鍙戝紓姝ワ紝鎶婃暟鎹彁浜ょ粰php
                         ksapp.post('${addApi}', data.field, function (res) {
                             if (res.code == 0) {

--
Gitblit v1.8.0