Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-10 bb71b47a43244e6db57cbc3cd0223bc5a64023d7

 src/main/webapp/static/layui/lay/modules/formDesigner.js

@@ -4673,7 +4673,6 @@
                var _html = $('<div style="height:100%;width:100%;"></div>');
                var _script = $('<div style="height:100%;width:100%;"></div>');;
                that.generateHtml(options.data, _html,_script);
                console.log(_html.html());
                var _htmlCode = staticField.htmlCode.format(_html.html(),_script.html());
                document.getElementById('generate-code-view').value = style_html(_htmlCode, 4, ' ', 400);
                layer.open({
@@ -4700,7 +4699,6 @@
                var _html = $('<div style="height:100%;width:100%;"></div>');
                var _script = $('<div style="height:100%;width:100%;"></div>');
                that.generateHtml(options.data, _html,_script);
                console.log(_html.html());
                return _html.html();
            });