From af05a0f235a958b2f7bfb477c1774e18d82b0ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 26 Dec 2022 15:32:27 +0800
Subject: [PATCH] 'commit'

---
 .../formDesign/ayq/modules/formDesigner.js    |  4 +--
 .../formDesign/ayq/modules/staticField.js     |  6 ++---
 .../formDesign/{preview.html => fill.html}    |  0
 WebRoot/html/formDesign/index.html            | 27 ++++++++++++++-----
 4 files changed, 26 insertions(+), 11 deletions(-)
 rename WebRoot/html/formDesign/{preview.html => fill.html} (100%)

diff --git a/WebRoot/html/formDesign/ayq/modules/formDesigner.js b/WebRoot/html/formDesign/ayq/modules/formDesigner.js
index d68af03..599582a 100644
--- a/WebRoot/html/formDesign/ayq/modules/formDesigner.js
+++ b/WebRoot/html/formDesign/ayq/modules/formDesigner.js
@@ -4669,11 +4669,11 @@ layui.config({base: './ayq/modules/'}).define(["layer", 'flow', "laytpl", "eleme
                     },
                     async: false,
                     success: function (result) {
-                        layer.alert('保存成功!', {icon: 1, title: '成功'})
+                        layer.msg('保存成功!', {icon: 1,time:1500})
                         return;
                     }
                 });
-            });
+            })
 
             $('.generateCode').on('click', function () {
                 var _html = $('<div style="height:100%;width:100%;"></div>');
diff --git a/WebRoot/html/formDesign/ayq/modules/staticField.js b/WebRoot/html/formDesign/ayq/modules/staticField.js
index 34aa74b..b082950 100644
--- a/WebRoot/html/formDesign/ayq/modules/staticField.js
+++ b/WebRoot/html/formDesign/ayq/modules/staticField.js
@@ -175,9 +175,9 @@ layui.define(['layer'], function (exports) {
             '            <li class="layui-nav-item">\n' +
           '                <a id="btnExportJson" href="#" class="exportJson">保存</a>\n' +
             '            </li>\n' +
-            '            <li class="layui-nav-item">\n' +
-          '                <a href="#" class="previewForm">查看测试页</a>\n' +
-            '            </li>\n' +
+          //   '            <li class="layui-nav-item">\n' +
+          // '                <a href="#" class="previewForm">查看测试页</a>\n' +
+          //   '            </li>\n' +
             // '            <li class="layui-nav-item">\n' +
             // '                <a href="#" class="generateCode">生成代码</a>\n' +
             // '            </li>\n' +
diff --git a/WebRoot/html/formDesign/preview.html b/WebRoot/html/formDesign/fill.html
similarity index 100%
rename from WebRoot/html/formDesign/preview.html
rename to WebRoot/html/formDesign/fill.html
diff --git a/WebRoot/html/formDesign/index.html b/WebRoot/html/formDesign/index.html
index f306ac7..131721e 100644
--- a/WebRoot/html/formDesign/index.html
+++ b/WebRoot/html/formDesign/index.html
@@ -32,13 +32,28 @@
         layui.config({base: './ayq/modules/'}).use(['layer', 'formDesigner'], function () {
             var formDesigner = layui.formDesigner;
             var data = [];
-                var render = formDesigner.render({
-                    data:data,
-                    elem:'#formdesigner'
-                });
-
-                
 
+            //需要获取当前的url中参数module_id和page
+            let module_id = $.getUrlParam('module_id');
+            let page = $.getUrlParam('page');
+            //调用Ajax，将已经存储好的JSON数据导入进来
+            $.ajax({
+                type: "GET",
+                dataType: "json",
+                url: "/FengHuang/zjb/getModulePage",
+                data: {
+                    "module_id": module_id,
+                    "page": page
+                },
+                async: false,
+                success: function (result) {
+                    data=result;
+                    var render = formDesigner.render({
+                        data:data,
+                        elem:'#formdesigner'
+                    });
+                }
+            });
           //阻止body的drag冒泡问题        
           document.body.ondrop = function (event) {
             event.preventDefault();