wps 正文丢失问题优化

com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm

@@ -536,9 +536,27 @@
         //by bzp 默认不会选中形状所以隐藏~~
         $("#dock_btn_richtext").hide();
         checkUserFirstCreateModel();
+        //定制模版
+        //initCoverTpl()
 
         });
 
+        //初始化封面模板
+        function initCoverTpl(){
+            $.ajax({
+                url: "./jd?sid=" + sid + "&cmd=com.awspaas.user.apps.output.template.getCoverTpl",
+                type: 'GET',
+                success: function (data) {
+                    console.log(data);
+                    var opt = {
+                        width : 100,
+                        data : data
+                    };
+                    $("#tpl_list").select2($.extend({}, opt, {minimumResultsForSearch:-1}));
+                }
+            });
+        }
+
         //检查用户是否第一次创建对应类型的模型
         function checkUserFirstCreateModel(){
                 var data_type = window.performance.navigation.type;
@@ -831,7 +849,7 @@
                 ifrm.style.height = getDocHeight(doc) + 4 + "px";
                 ifrm.style.visibility = 'visible';
             }
-            function switchWpsDisplay(flag){
+        async function switchWpsDisplay(flag){
                 if(flag){//显示wps页面，隐藏其余页面
                     debugger;
                     $("#wpsPage").css('display','block');
@@ -843,20 +861,6 @@
                     $("#dock").css("right", 0);
                     openWpsUrl();
                 }else{
-                    //先触发保存
-                    saveWps();
-                    setTimeout(function(){
-                        //刷新画布区域
-                        debugger;
-                        $.ajax({
-                            url: "./jd?sid=" + sid + "&cmd=com.awspaas.user.apps.yiliwps.getCoeDefinition&palId=" + ruuid,
-                            type: 'GET',
-                            success: function(data) {
-                                definition = data;
-                                Designer.open(definition);
-                            }
-                        });
-                    }, 2000);
                     $("#wpsPage").css('display','none');
                     $("#shape_panel").css('display','block');
                     $("#shape_panel_more_shape").css('display','block');
@@ -866,7 +870,11 @@
                     // 总宽度减去可视区域的宽度，得到滚动条宽度
                     var navRight = layoutW - viewW;
                     $("#dock").css("right", navRight);
+                    //先触发保存
+                    await saveWps();
                     updateShapePanel();
+                    //更新画布
+                    reloadFile();
 
                 }
             }
@@ -880,9 +888,13 @@
             }
             //保存wps内容
             async function saveWps() {
-                debugger;
-                await jssdk.ready();
-                await jssdk.save();
+                try {
+                    debugger;
+                    await jssdk.ready();
+                    await jssdk.save();
+                }catch (e) {
+                    console.log(e);
+                }
             }
 
             function openWpsUrl(){
@@ -981,6 +993,8 @@
         -->
         </ul>
         <div id="saving_tip"></div>
+        <!-- <div style="display: inline-block;float: left;margin-left: 10px;line-height: 28px;">
+            封面模版:<select id="tpl_list"></select></div>-->
 		<!-- 倒计时显示 -->
 		<div id="autoSave_countdown"></div>
     </div>

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js

@@ -43,8 +43,9 @@ $(function () {
 				} else {
 					save();
 				}
-				
+
 				function save() {
+					saveWps();
 					$.simpleAlert("正在保存", "loading");
 					var params = {
 						sid: CLB.sid,

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js

@@ -3596,7 +3596,7 @@ function getRelevanceAwsOrgNameByShapeId(objIds, shapeId) {
 
 // 形状关联弹窗
 function openRelationDig(obj, value) {
-    if (value.readonly) return;
+    //if (value.readonly) return;
     var shapeRelationValue = $("input[objid_shapeId='" + $(obj).attr("objid") + "']").val();
     var ref = $("input[objid_shapeId='" + $(obj).attr("objid") + "']").attr("ref");   // shape  file  shapeAndFile
     var relationShapeIds = '';
@@ -4792,6 +4792,27 @@ function downLoadTmpFile(){
     });
 }
 
+/**
+ * 下载正文附件模版
+ */
+function reloadFile(){
+    $.ajax({
+        type: "POST",
+        url: "./jd?sid="
+            + CLB.sid
+            + "&cmd=com.actionsoft.apps.coe.pal.datamigration_reloadFile",
+        data: {
+            sid: sid,
+            palId:ruuid
+        },
+        success: function(data) {
+            $.simpleAlert("刷新画布成功");
+            definition = data;
+            Designer.open(definition);
+        }
+    });
+}
+
 /************************处理前后置流程***************************/
 
 /**