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

Junjie

2023-08-31 cff0c053baeb229a6c7a7794c061c179111e0b7f

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

@@ -174,7 +174,7 @@
                    $label.empty();
                    $label.css("width",json.labelWidth);
                    if (json.required) {
                        $label.append('<span style="color:red;">*</span>');
                        // $label.append('<span style="color:red;">*</span>');
                    }
                    $label.append(json.label + ":");
                    if (json.hideLabel) {
@@ -536,7 +536,7 @@
                    $label.empty();
                    $label.css("width",json.labelWidth);
                    if (json.required) {
                        $label.append('<span style="color:red;">*</span>');
                        // $label.append('<span style="color:red;">*</span>');
                    }
                    $label.append(json.label + ":");
                    if (json.hideLabel) {
@@ -664,7 +664,7 @@
                    $label.css({width: '{0}'.format(json.width)});
                    $block.css({width: '{0}'.format(json.width)});
                    if (json.required) {
                        $label.append('<span style="color:red;">*</span>');
                        // $label.append('<span style="color:red;">*</span>');
                    }
                    $label.append(json.label + ":");
                },
@@ -791,7 +791,7 @@
                    $('#' + json.id + ' .layui-input-block').append(_html);
                    $label.css("width",json.labelWidth);
                    if (json.required) {
                        $label.append('<span style="color:red;">*</span>');
                        // $label.append('<span style="color:red;">*</span>');
                    }
                    $label.append(json.label + ":");
                    form.render('select',json.id);
@@ -1065,7 +1065,7 @@
                        $block.css("margin-left",json.labelWidth);
                    }
                    if (json.required) {
                        $label.append('<span style="color:red;">*</span>');
                        // $label.append('<span style="color:red;">*</span>');
                    }
                    $label.append(json.label + ":");
                    form.render('checkbox');
@@ -1441,7 +1441,7 @@
                    }
                    $label.css("width",json.labelWidth);
                    if (json.required) {
                        $label.append('<span style="color:red;">*</span>');
                        // $label.append('<span style="color:red;">*</span>');
                    }
                    $label.append(json.label + ":");
                    var _html = '<input id="{0}" name="{0}"  lay-verify="{3}" class="layui-input icon-date widget-date {1}" style="line-height: 40px;{2}"></input>'.format(json.tag + json.id,_disabledClass,_disabledStyle,_required);
@@ -2879,7 +2879,7 @@
                    }
                    $label.css("width",json.labelWidth);
                    if (json.required) {
                        $label.append('<span style="color:red;">*</span>');
                        // $label.append('<span style="color:red;">*</span>');
                    }
                    $label.append(json.label + ":");
                    var _html = '';
@@ -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();
            });

@@ -5223,4 +5221,4 @@

        exports('formDesigner'
            , formDesigner);
    });
    });