Ana Sayfa Keşfet Yardım
Giriş Yap
CocoRoboLabs
/
CocoRoboDesktop
3
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

update

root 3 yıl önce
ebeveyn
8c4795482c
işleme
39897fa82a
2 değiştirilmiş dosya ile 20 ekleme ve 89 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 5 75
      Office/Word/WordEditArea.htm
  2. 15 14
      js/Office/Word/Word.js

+ 5 - 75
Office/Word/WordEditArea.htm
Dosyayı Görüntüle 

@@ -33,18 +33,17 @@
 
     </script>
 
 </head>
 
 
-<body unselectable="on" style="overflow: auto; background-color: #aaaaaa;min-width: 1260px;">
 
+<body unselectable="on" style="overflow: auto; background-color: #aaaaaa;">
 
     <!--- 工具栏 --->
 
     <div id="tools" style="position: fixed; width: 100%; background: #f7f8f9; border-bottom: 1px solid silver;
 
         z-index: 999;" onmousedown="U.MD.O.W.E.onmousedown();" onclick="U.MD.O.W.E.onclick();">
 
         <div class="U_MD_O_H_Area">
 
-            <button title="新建" id="U_MD_O_H_new" onclick="U.MD.O.W.newDoc(US.userInfo)"
 
-                style="margin-left: 10px; display: none;">
 
+            <button title="新建" id="U_MD_O_H_new" onclick="U.MD.O.W.newDoc(US.userInfo)" style="margin-left: 10px;">
 
                 <div class="U_MD_O_H_icon" style="background-position: -10px -592px;">
 
                 </div>
 
                 新建
 
             </button>
 
-            <button title="保存" id="U_MD_O_H_save" onclick="U.MD.O.W.save()" style=" display: none;">
 
+            <button title="保存" id="U_MD_O_H_save" onclick="U.MD.O.W.save()">
 
                 <div class="U_MD_O_H_icon" style="background-position: -38px -592px;">
 
                 </div>
 
                 保存
 
@@ -196,7 +195,7 @@
 
                 <div class="U_MD_O_H_icon" style="background-position: -675px -593px; width: 22px;">
 
                 </div>
 
             </button>
 
-            <button title="下载" onclick="U.MD.O.W.E.downOfficeWord('doc',$('#U_MD_O_H_wordEditor')[0])">
 
+            <button title="下载" id="U_MD_O_H_Area_Down" onclick="U.MD.O.W.E.downOfficeWord('doc',$('#U_MD_O_H_wordEditor')[0])">
 
                 <div class="U_MD_O_H_icon" style="background-position: -1165px -594px; width: 22px;">
 
                 </div>
 
             </button>
 
@@ -222,9 +221,7 @@
 
     </div>
 
     <!--- 可编辑区域 --->
 
     <div class="U_MD_O_H_body" id="U_MD_O_R_Parent">
 
-        <div class="U_MD_O_H_body_main" style="display: flex;
 
-        flex-direction: row;
 
-        align-items: flex-start;">
 
+        <div class="U_MD_O_H_body_main">
 
             <div class="U_MD_O_H_pageSize U_MD_O_H_Nav clear" style="display: none;">
 
                 <div class="U_MD_O_H_Nav_Add" onclick="U.MD.O.W.T.N.Easy.add()">
 
                     +
 
@@ -236,78 +233,11 @@
 
                 <div class="U_MD_O_H_wordEditor U_MD_O_H_lineStyle" id="U_MD_O_H_wordEditor" contenteditable="true">
 
                 </div>
 
             </div>
 
-            <div style="
 
-            width: 350px;margin-left: 20px;">
 
-                <div style="    background: #fff;
 
-                height: 65px;
 
-                border-radius: 5px;">
 
-                    <div style="font-size: 13px;
 
-                    border-bottom: 1px solid #ccc;
 
-                    padding: 5px 15px;
 
-                ">生成链接</div>
 
-                    <div style="    height: 30px;
 
-                    padding: 8px 10px;"><a href="" style="color: #3C6A8C;">将此站点生成链接</a></div>
 
-                </div>
 
-                <div style="    background: #fff;
 
-                border-radius: 5px;margin-top: 15px;min-height: 250px;">
 
-                    <div style="font-size: 13px;
 
-                    border-bottom: 1px solid #ccc;
 
-                    padding: 5px 15px;
 
-                    display: flex;
 
-                    flex-direction: row;
 
-                    justify-content: space-between;
 
-                    align-items: center;
 
-                ">
 
-                        <div>邀请协作人员</div>
 
-                        <div><a href="" style="color: #3C6A8C;">第三方链接邀请</a></div>
 
-                    </div>
 
-                    <div style="width: 100%;
 
-                    display: flex;
 
-                    flex-direction: row;
 
-                    justify-content: flex-start;
 
-                    align-items: center;
 
-                    flex-wrap: wrap;
 
-                    ">
 
-                        <div style="display: flex;
 
-                        flex-direction: column;
 
-                        justify-content: center;
 
-                        align-items: center;
 
-                        width: 25%;
 
-                        margin: 10px 0;">
 
-                            <div style="width: 50px;"><img src="../../img/icon/portal.png"
 
-                                    style="width: 100%;height:100%;" alt=""></div>
 
-                            <div>陈慧</div>
 
-                        </div>
 
-                        <div style="display: flex;
 
-                        flex-direction: column;
 
-                        justify-content: center;
 
-                        align-items: center;
 
-                        width: 25%;
 
-                        margin: 10px 0;">
 
-                            <div style="width: 50px;"><img src="../../img/icon/portal.png"
 
-                                    style="width: 100%;height:100%;" alt=""></div>
 
-                            <div>李小欣</div>
 
-                        </div>
 
-                        <div style="display: flex;
 
-                        flex-direction: column;
 
-                        justify-content: center;
 
-                        align-items: center;
 
-                        width: 25%;
 
-                        margin: 10px 0;">
 
-                            <div style="width: 50px;"><img src="../../img/icon/portal.png"
 
-                                    style="width: 100%;height:100%;" alt=""></div>
 
-                            <div>旺旺</div>
 
-                        </div>
 
-
 
-                    </div>
 
-                </div>
 
-            </div>
 
         </div>
 
         <!--- 互联办公的功能 --->
 
         <div class="U_MD_O_H_body_left" id="U_MD_O_H_body_left">
 
         </div>
 
     </div>
 
-
 
 </body>
 
 
 </html>

+ 15 - 14
js/Office/Word/Word.js
Dosyayı Görüntüle 

@@ -31,7 +31,7 @@ US = parent.US;
 
 * @param   {object}    登录用户信息  

 * @return  {object}    返回当前窗体 

 */

-U.MD.O.W.load = function (fileid, userinfo) {

+U.MD.O.W.load = async function (fileid, userinfo) {

     var fileinfo = U.MD.O.W.getfile(fileid),

         userinfo = await U.MD.O.W.getuser();

 

@@ -40,20 +40,21 @@ U.MD.O.W.load = function (fileid, userinfo) {
 
     U.MD.O.W.setEvent(); //设置事件

     U.MD.O.W.E.createSelection(); //创建下拉框

     U.MD.O.W.E.toolsbind(); //初始化工具栏

-    U.MD.O.W.loadContent(fileinfo); //加载内容

+    //U.MD.O.W.loadContent(fileinfo); //加载内容

     //加载功能

     U.MD.O.W.Panel.loadlink(fileinfo); //加载链接窗体

-    U.MD.O.W.Panel.loadHotTemplates(); //加载热门模板

-    U.MD.O.W.Panel.loadOfficeHistory(fileinfo); //加载历史记录

-    //如果是协作文档，加载协作窗体

-    if (U.MD.O.W.permission.web) {

-        U.MD.O.W.Panel.loadPlayUser(fileinfo); //加载协助人员窗体

-    }

-    //如果不是协同文档，那么协同文档的窗体不显示，那么热门和链接窗体向上移

-    else {

-        $("#LoadOfficeHistory")[0].style.top = "140px";

-        $("#LoadHotTemplates")[0].style.top = "434px";

-    }

+    //U.MD.O.W.Panel.loadHotTemplates(); //加载热门模板

+    //U.MD.O.W.Panel.loadOfficeHistory(fileinfo); //加载历史记录

+    U.MD.O.W.Panel.loadPlayUser(fileinfo); //加载协助人员窗体

+    // //如果是协作文档，加载协作窗体

+    // if (U.MD.O.W.permission.web) {

+    //     U.MD.O.W.Panel.loadPlayUser(fileinfo); //加载协助人员窗体

+    // }

+    // //如果不是协同文档，那么协同文档的窗体不显示，那么热门和链接窗体向上移

+    // else {

+    //     $("#LoadOfficeHistory")[0].style.top = "140px";

+    //     $("#LoadHotTemplates")[0].style.top = "434px";

+    // }

 }

 

 /**

@@ -61,7 +62,7 @@ U.MD.O.W.load = function (fileid, userinfo) {
 
 *

 */

 U.MD.O.W.getuser = async function () {

-    await new Promise((resolve, reject) => {

+    return new Promise((resolve, reject) => {

         U.A.Request(US.Config.server + "profile", [], function (res) {

             if (res.value && res.value[0] && res.value[0][0]) {

                 US.userinfo = res.value[0][0]; //记录用户数据