zhangjinan
2018-05-18 307f2c5bbe5856de149e77b570d4931ecd484b82
Merge branch 'master' of http://122.114.176.216:7070/r/CustomForm-publish
2 files modified
13 ■■■■■ changed files
publish/WEB-INF/jsp/showForm.jsp 3 ●●●● patch | view | raw | blame | history
publish/js/customMin/customS_min.js 10 ●●●● patch | view | raw | blame | history
publish/WEB-INF/jsp/showForm.jsp
@@ -59,7 +59,7 @@
    <div id="CursorLayerCanvas" style="display: none;"></div> 
    </div>
    <div class="sure_box">
        <button class="btn btn-info btn-action closeBtn s_savebtn" onclick="customShow.onclickSave2()">保存</button>
        <button class="btn btn-info btn-action closeBtn s_savebtn" onclick="customShow.onclickSave2()" style="display:none">保存</button>
    </div>
    <!-- des -->
    <script type="text/javascript" charset="utf-8" src="../js/tripledes.js"></script>
@@ -77,7 +77,6 @@
        // var formbaseInfo = ${formbaseInfo};
        
        var formID = "${formID}";
        console.log(formID);
        var tenantID = "${tenantID}";
        var obj = {"tenantID":"${tenantID}"};
        var token = {"accessToken":"${accessToken}"};
publish/js/customMin/customS_min.js
@@ -3096,9 +3096,14 @@
        });
    }
    //隐藏保存
    if (publishShowflag==1){
        $(".preview-edit-pane").hide();
    // if (publishShowflag==1){
    //     $(".preview-edit-pane").hide();
    // }
    if (m_save_fl == undefined && publishShowflag == undefined) {
        $('.s_savebtn').css("display","block");
    }
}
// 12/4 李元杰 当前时间
customShow.currentDate = '';
@@ -8464,6 +8469,7 @@
    if(customShow.options.customShowFlag == '3'){//发布修改   0120
        ren = 0;
    } else {
        $('.s_savebtn').css("display","block");
        var ren = 1;
        if (btnFlag == 'printableBtn') {
            ren = customShow.options.formsetting['printable'];