更新团队

o2web/source/x_component_TeamWork/$Common/default/css.wcss

@@ -93,7 +93,8 @@
                 "margin-left":"20px",
                 "font-size":"14px",
                 "color":"#666666",
-                "outline":"none"
+                "outline":"none",
+                "margin-top":"2px"
             },
             dynamicLayout:{
                 "height":"30px",

o2web/source/x_component_TeamWork/$Emoji/default/css.wcss

@@ -1,11 +1,12 @@
 {
     emojiItem:{
         "float":"left",
-        "width":"20px",
-        "height":"20px",
+        "width":"30px",
+        "height":"30px",
         "cursor":"pointer",
         "margin":"2px",
         "border":"1px solid #ffffff",
         "background":"url(/x_component_TeamWork/$Emoji/default/icon/icon_emoji.png) no-repeat center",
+        "background-size":"contain"
     }
 }

o2web/source/x_component_TeamWork/$Project/default/css.wcss

@@ -171,7 +171,7 @@
 	},
     naviTopSearchIn:{
         "width":"90%",
-        "margin":"0 10px",
+        "margin":"1px 10px",
         "border":"0px",
         "height":"32px",
         "line-height":"32px",
@@ -386,7 +386,8 @@
         //"padding-right":"10px",
         "width":"100%",
         "height":"99%",
-        "display":"flex"
+        "display":"flex",
+        "position":"relative"
 	},
 	taskGroupLayout:{
 	    //"display":"inline-table",
@@ -454,7 +455,7 @@
         "overflow":"hidden",
         "background-color":"#fff",
         "padding-bottom":"10px",
-        //"position":"absolute"
+        "position":"relative"
     },
     taskItemContainerDrag:{
         "width":"290px",
@@ -607,6 +608,48 @@
         "height":"100%",
         "overflow-y":"auto"
     },
+    viewSearchContainer:{
+        "width":"1000px",
+        "height":"60px",
+        "margin":"10px auto 0px auto",
+        "font-size":"14px",
+        "color":"#666666",
+        "border-radius":"2px",
+        "background-color":"#ffffff"
+    },
+    viewSearchContent:{
+        "float":"left",
+        "width":"700px",
+        "height":"40px",
+        "margin-left":"150px",
+        "margin-top":"10px",
+        "border":"1px solid #cccccc"
+    },
+    viewSearchInput:{
+        "float":"left",
+        "font-size":"16px",
+        "outline":"none",
+        "width":"620px",
+        "height":"30px",
+        "margin":"2px",
+        "text-indent":"5px",
+        "border":"0px"
+    },
+    viewSearchReset:{
+        "display":"none",
+        "float":"right",
+        "width":"30px",
+        "height":"100%",
+        "cursor":"pointer",
+        "background": "url(/x_component_TeamWork/$Project/default/icon/icon_off_click24.png) no-repeat center"
+    },
+    viewSearchSearch:{
+        "float":"right",
+        "width":"30px",
+        "height":"100%",
+        "cursor":"pointer",
+        "background": "url(/x_component_TeamWork/$Project/default/icon/icon_search24.png) no-repeat center"
+    },
     viewListContainer:{
         "width":"1000px",
         "margin":"10px auto",

o2web/source/x_component_TeamWork/$ProjectSetting/default/css.wcss

@@ -144,7 +144,8 @@
         "font-size":"14px",
         "border":"1px solid #dedede",
         "padding-left":"5px",
-        "border-radius":"10px"
+        "border-radius":"10px",
+        "outline":"none"
     },
     projectSettingGroupContainer:{
         "float":"left",

o2web/source/x_component_TeamWork/$Stat/default/css.wcss

@@ -1,65 +1,764 @@
 {
-    "formTopNode": {
-        "aaa":"aaa",
-        "color" : "#3587d7",
-        "height": "40px",
-        "background-color": "#eee",
-        "border-top": "1px solid #ddd",
-        "border-bottom": "1px solid #b6b6b6",
-        "border-top-left-radius": "10px",
-        "border-top-right-radius": "10px",
-        "line-height": "40px",
-        "font-size": "14px",
-        "font-weight" : "bold",
-        "padding-left" : "25px",
-        "text-align": "left"
+    topLayout:{
+        "height":"40px",
+        "width":"100%",
+        "flex":1,
+        "border-bottom":"1px solid #bebebe"
     },
-    "content":{
-        "width": "100%",
-        "height": "100%",
-        "overflow": "auto",
-        "position" : "relative"
-    },
-    "maskNode": {
-        "background-color": "#666",
-        "opacity": 0.4,
-        "z-index":100
-    },
-    "processNode_from": {
-        "width": "480px",
-        "min-height": "280px",
-        "height": "auto",
-        "z-index":300,
-        "background-color": "#FFF",
+    topImage:{
+        "float": "left",
+        "background": "url(/x_component_TeamWork/$Task/default/icon/document.png) no-repeat center"
+    },
+    topContent:{
+        "float":"left",
+        "line-height":"40px",
+        "font-size":"16px",
+        "max-width":"700px",
         "overflow": "hidden",
-        "border": "3px solid #666",
-        "border-radius": "10px",
-        "box-shadow": "0px 0px 15px #666",
-        "opacity": 0.2,
-        "position": "absolute"
+        "white-space": "nowrap",
+        "text-overflow": "ellipsis"
     },
-    "processNode": {
-        "width": "480px",
-        "min-height": "280px",
-        "height": "auto",
-        "opacity": 1,
-        "overflow": "hidden"
+    topIconContainer:{
+        "float":"right",
+        "height":"100%"
     },
-    "routeSelectorTile": {
-        "overflow": "hidden",
-        "height": "24px",
-        "line-height": "24px"
+    topIconClose:{
+        "float":"left",
+        "cursor":"pointer",
+        "height":"24px",
+        "width":"24px",
+        "margin-top":"8px",
+        "margin-left":"4px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_off.png) no-repeat center"
     },
-    "routeSelectorArea": {
-        "overflow": "hidden"
+    topIconMore:{
+        "float":"left",
+        "cursor":"pointer",
+        "height":"24px",
+        "width":"24px",
+        "margin-left":"4px",
+        "margin-top":"8px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_more.png) no-repeat center"
+    },
+    topMoreTitle:{
+        "height":"40px",
+        "line-height":"40px",
+        "width":"100%",
+        "text-align":"center",
+        "font-size":"16px",
+        "color":"#333333",
+        "border-bottom":"1px solid #bebebe"
+    },
+    topMoreItem:{
+        "cursor":"pointer",
+        "height":"40px",
+        "width":"100%",
+        "font-size":"14px",
+        "color":"#666666"
+    },
+    topMoreItemIcon:{
+        "float":"left",
+        "height":"30px",
+        "width":"30px",
+        "margin-top":"5px",
+        "margin-left":"10px"
+    },
+    topMoreItemText:{
+        "float":"left",
+        "height":"40px",
+        "line-height":"40px"
+    },
+
+
+
+    contentLayout:{
+        "width":"100%",
+        "position":"absolute",
+        "top":"40px",
+        "left":"0px",
+        "bottom":"0px",
+        "overflow-y":"hidden"
+    },
+    taskInforContainer:{
+        "position":"relative",
+        "float":"left",
+        "height":"100%",
+        "overflow":"hidden",
+        "width":"750px",
+        "font-size":"14px",
+        "border-right":"1px solid #bebebe"
+    },
+    taskInforLayout:{
+        "height":"100%"
+    },
+    taskInforContent:{
+        "overflow":"hidden",
+        "position":"absolute",
+        "top":"30px",
+        "left":"0px",
+        "right":"0px",
+        "bottom":"0px"
+    },
+    taskActionBar:{
+        "height":"30px",
+        "width":"100%"
+    },
+    taskActionParentContent:{
+        "float":"left",
+        "height":"100%",
+        "font-size":"14px",
+        "color":"#333333"
+    },
+    taskActionParentIcon:{
+        "float":"left",
+        "width":"30px",
+        "height":"40px",
+        "margin-left":"10px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_belong.png) no-repeat center"
+    },
+    taskActionParentText:{
+        "float":"left",
+        "margin-right":"10px",
+        "line-height":"40px"
+    },
+    taskActionParentValue:{
+        "float":"left",
+        "line-height":"40px",
+        "color":"#4A90E2",
+        "cursor":"pointer"
+    },
+    taskActionSave:{
+        "float":"right",
+        "width":"70px",
+        "margin-right":"20px",
+        "margin-top":"18px",
+        "height":"30px",
+        "line-height":"30px",
+        "text-align":"center",
+        "cursor":"pointer",
+        "color":"#666666",
+        "background-color":"#ffffff",
+        "border":"1px solid #bebebe",
+        "border-radius":"4px"
+    },
+    taskNameContainer:{
+        "width":"90%",
+        "height":"50px",
+        "line-height":"50px",
+        "font-size":"18px",
+        "margin":"10px auto 0px auto",
+        "border-radius":"4px"
+    },
+    taskNameInput:{
+        "line-height":"48px",
+        "height":"48px",
+        "font-size":"18px",
+        "width":"100%",
+        "color":"#666",
+        "border":"1px solid #f5f5f5",
+        "background-color":"#f5f5f5",
+        "border-radius":"4px",
+        "outline":"none",
+        "resize":"none"
+    },
+    taskStatusContainer:{
+        "width":"100%",
+        "height":"50px"
+    },
+    taskStatusIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-top":"2px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_status.png) no-repeat center"
+    },
+    taskStatusText:{
+        "float":"left",
+        "line-height":"50px",
+        "width":"80px"
+    },
+    taskStatusValue:{
+        "float":"left"
+    },
+    taskStatusValueContainer:{
+        "cursor":"pointer",
+        "height":"24px",
+        "background-color":"#f5f5f5",
+        "margin-top":"13px",
+        "border-radius":"2px",
+        "padding-left":"6px",
+        "padding-right":"10px"
+    },
+    taskStatusValueIcon:{
+        "float":"left",
+        "width":"24px",
+        "height":"24px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_draft.png) no-repeat center"
+    },
+    taskStatusValueText:{
+        "float":"left",
+        "line-height":"24px"
+    },
+    taskDutyContainer:{
+        "width":"100%",
+        "height":"50px"
+    },
+    taskDutyIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-top":"2px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_duty.png) no-repeat center"
+    },
+    taskDutyText:{
+        "float":"left",
+        "line-height":"50px",
+        "width":"80px"
+    },
+    taskDutyValue:{
+        "float":"left",
+        "line-height":"50px"
+    },
+    taskDutyValueContainer:{
+        "margin-top":"13px",
+        "height":"100%"
+    },
+    taskDutyAddIcon:{
+        "float":"left",
+        "width":"24px",
+        "height":"24px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_wcyd_xm_click.png) no-repeat center"
+    },
+    taskDutyAddText:{
+        "cursor":"pointer",
+        "float":"left",
+        "line-height":"24px"
+    },
+    taskTimeContainer:{
+        "width":"100%",
+        "height":"50px"
+    },
+    taskTimeIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-top":"2px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_time.png) no-repeat center"
+    },
+    taskTimeText:{
+        "float":"left",
+        "line-height":"50px",
+        "width":"80px"
+    },
+    taskTimeValue:{
+        "float":"left",
+        "line-height":"50px"
+    },
+    taskStartTime:{
+        "float":"left",
+        "height":"24px",
+        "color":"#999999",
+        "line-height":"24px",
+        "margin-top":"13px",
+        "padding":"0px 5px",
+        "border-radius":"4px"
+    },
+    taskTimeLine:{
+        "float":"left",
+        "height":"24px",
+        "text-align":"center",
+        "line-height":"24px",
+        "margin-top":"13px",
+        "padding":"0px 5px"
+    },
+    taskEndTime:{
+        "float":"left",
+        "height":"24px",
+        "color":"#999999",
+        "line-height":"24px",
+        "margin-top":"13px",
+        "padding":"0px 5px",
+        "border-radius":"4px"
+    },
+    taskRemarkContainer:{
+        "display":"flex",
+        "width":"100%",
+        "min-height":"30px",
+        "margin-top":"10px"
+    },
+    taskRemarkIcon:{
+        "float":"left",
+        "width":"48px",
+        //"height":"48px",
+        "margin-top":"2px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_remark.png) no-repeat top center"
+    },
+    taskRemarkText:{
+        "float":"left",
+        "width":"80px"
+    },
+    taskRemarkValue:{
+        "float":"left",
+        "border-radius":"4px",
+        //"min-height":"50px",
+        "width":"580px",
+        "height":"100%"
+    },
+    taskRemarkActionContainer:{
+        "width":"580px",
+        "height":"50px",
+    },
+    taskRemarkActionOk:{
+        "float":"right",
+        "width":"60px",
+        "height":"25px",
+        "line-height":"25px",
+        "margin-top":"10px",
+        "margin-left":"20px",
+        "color":"#ffffff",
+        "text-align":"center",
+        "cursor":"pointer",
+        "background-color":"#4A90E2",
+        "border-radius":"2px"
+    },
+    taskRemarkActionCancel:{
+        "float":"right",
+        "width":"60px",
+        "height":"25px",
+        "line-height":"25px",
+        "margin-top":"10px",
+        "color":"#999999",
+        "text-align":"center",
+        "cursor":"pointer"
+    },
+    taskPriorityContainer:{
+        "width":"100%",
+        "height":"50px"
+    },
+    taskPriorityIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-top":"2px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_priority.png) no-repeat center"
+    },
+    taskPriorityText:{
+        "float":"left",
+        "line-height":"50px",
+        "width":"80px"
+    },
+    taskPriorityValue:{
+        "float":"left",
+        "line-height":"50px"
+    },
+    taskPriorityValueText:{
+        "width":"50px",
+        "height":"25px",
+        "line-height":"25px",
+        "text-align":"center",
+        "font-size":"14px",
+        "margin-top":"12px",
+        "color":"#999999",
+        "border":"1px solid #999999",
+        "border-radius":"4px",
+        "cursor":"pointer"
+    },
+    taskTagContainer:{
+        "margin-top":"10px",
+        "width":"100%",
+        "overflow":"auto",
+        "min-height":"50px"
+    },
+    taskTagIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-top":"2px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_tag.png) no-repeat center top"
+    },
+    taskTagText:{
+        "cursor":"arrow",
+        "float":"left",
+        "width":"80px"
+    },
+    taskTagValue:{
+        "float":"left",
+        "width":"490px"
+    },
+    tagItemContainer:{
+        "float":"left",
+        "height":"25px",
+        "min-widht":"30px",
+        "color":"#ffffff",
+        "margin-right":"6px",
+        "margin-bottom":"6px",
+        "border-radius":"12px"
+    },
+    tagItemText:{
+        "float":"left",
+        "height":"25px",
+        "line-height":"25px",
+        "margin":"0 10px",
+        "max-width":"100px",
+        "overflow":"hidden",
+        "text-overflow": "ellipsis",
+        "white-space": "nowrap"
+    },
+    tagItemClose:{
+        "float":"left",
+        "width":"20px",
+        "height":"20px",
+        "margin-top":"2px",
+        "cursor":"pointer",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_off_round_grey.png) no-repeat center"
+    },
+    taskTagAddText:{
+        "color":"#666666",
+        "cursor":"pointer"
+    },
+    taskTagAdd:{
+        "float":"left",
+        "width":"20px",
+        "height":"20px",
+        "cursor":"pointer",
+        "margin-top":"4px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_jia.png) no-repeat center"
+    },
+    taskExtFieldContainer:{
+
+    },
+    taskExtFieldItem:{
+        "width":"100%",
+        "height":"50px"
+    },
+    taskExtFieldIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-top":"2px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_extend.png) no-repeat center"
+    },
+    taskExtFieldText:{
+        "float":"left",
+        "height":"50px",
+        "width":"80px"
+    },
+
+    taskAttachmentContainer:{
+        "width":"100%",
+        "min-height":"50px",
+        "margin-top":"10px",
+        "display":"flex"
+    },
+    taskAttachmentIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-top":"10px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_attachment.png) no-repeat top"
+    },
+    taskAttachmentText:{
+        "float":"left",
+        "margin-top":"10px",
+        "width":"80px"
+    },
+    taskAttachmentValue:{
+        "float":"left",
+        "width":"482px",
+        "line-height":"50px"
+    },
+    taskAttachmentListContainer:{
+        "color":"#666666",
+        "font-size":"14px",
+        "margin-top":"10px"
+    },
+    subTaskContainer:{
+        "color":"#666666",
+        "font-size":"14px",
+        "margin-top":"10px"
+    },
+    subTaskTitleContent:{
+        "height":"50px",
+        "width":"100%"
+    },
+    subTaskTitleIcon:{
+        "float":"left",
+        "width":"48px",
+        "height":"48px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_subtask.png) no-repeat center"
+    },
+    subTaskTitleText:{
+        "float":"left",
+        "height":"100%",
+        "line-height":"50px"
+    },
+    subTaskValueContent:{
+        "width":"688px",
+        "margin-left":"40px",
+        "border":"1px solid #dedede",
+        "border-radius":"4px",
+        "min-height":"40px"
+    },
+    subTaskItemContainer:{
+        "margin-top":"2px",
+        "width":"100%",
+        "height":"40px"
+    },
+    subTaskItemText:{
+        "float":"left",
+        "cursor":"pointer",
+        "border-radius":"4px",
+        "padding-left":"5px",
+        "height":"40px",
+        "line-height":"40px",
+        "width":"500px",
+        "margin-left":"15px",
+        "overflow":"hidden",
+        "text-overflow": "ellipsis",
+        "white-space": "nowrap"
+    },
+    subTaskItemPerson:{
+        "float":"right",
+        "width":"30px",
+        "height":"30px",
+        "cursor":"pointer",
+        "margin-top":"5px",
+        "margin-right":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_wcyd_xm_click.png) no-repeat center"
+    },
+    subTaskAddContainer:{
+        "width":"100%"
+    },
+    subTaskNewContent:{
+        "cursor":"pointer",
+        "width":"100%",
+        "height":"40px"
+    },
+    subTaskNewIcon:{
+        "float":"left",
+        "width":"40px",
+        "height":"40px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_subtask_add.png) no-repeat center"
+    },
+    subTaskNewText:{
+        "float":"left",
+        "color":"#4A90E2",
+        "line-height":"40px"
+    },
+    subTaskNewContainer:{
+
+    },
+    subTaskNewValue:{
+        "width":"100%",
+        "height":"40px"
+    },
+    subTaskNewInput:{
+        "float":"left",
+        "width":"600px",
+        "height":"30px",
+        "color":"#666666",
+        "margin-top":"4px",
+        "margin-left":"12px",
+        "border":"1px solid #dedede",
+        "border-radius":"4px",
+        "text-indent":"5px"
+    },
+    subTaskNewPerson:{
+        "cursor":"pointer",
+        "float":"right",
+        "width":"30px",
+        "height":"30px",
+        "margin-top":"5px",
+        "margin-right":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_wcyd_xm_click.png) no-repeat center"
+    },
+    subTaskNewAction:{
+        "width":"100%",
+        "height":"40px"
+    },
+    subTaskNewOK:{
+        "cursor":"pointer",
+        "float":"left",
+        "height":"30px",
+        "line-height":"30px",
+        "color":"#ffffff",
+        "width":"75px",
+        "margin-top":"4px",
+        "margin-left":"20px",
+        "text-align":"center",
+        "border-radius":"2px",
+        "background-color":"#4A90E2"
+    },
+    subTaskNewCancel:{
+        "cursor":"pointer",
+        "float":"left",
+        "height":"30px",
+        "margin-top":"4px",
+        "margin-left":"446px",
+        "line-height":"30px",
+        "width":"75px",
+        "text-align":"center",
+        "border-radius":"2px"
+    },
+
+    taskDetailLayout:{
+        "float":"left",
+        "height":"100%",
+        "width":"440px",
+        "position":"relative"
+    },
+    taskParticipateContainer:{
+        "display":"inline-block",
+        "width":"100%",
+        "font-size":"14px",
+        "color":"#666666",
+        "border-bottom":"1px solid #bebebe"
+    },
+    participateTitle:{
+        "margin-left":"20px",
+        "height":"50px"
+    },
+    participateTitleText:{
+        "float":"left",
+        "height":"50px",
+        "line-height":"50px"
+    },
+    participateTitleIcon:{
+        "float":"left",
+        "width":"24px",
+        "height":"24px",
+        "margin-top":"13px",
+        "margin-left":"10px",
+        "cursor":"pointer",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_wcyd_xm_click.png) no-repeat center"
+    },
+    participateValue:{
+        "margin-left":"20px",
+        "height":"60px",
+        "overflow":"hidden"
+    },
+    taskDynamicContainer:{
+        "position":"absolute",
+        "left":"0px",
+        "top":"110px",
+        "bottom":"120px",
+        "width":"100%"
+    },
+    dynamicBar:{
+        "cursor":"pointer",
+        "width":"120px",
+        "height":"40px"
+    },
+    dynamicText:{
+        "margin-left":"20px",
+        "float":"left",
+        "line-height":"40px"
+    },
+    dynamicIcon:{
+        "float":"left",
+        "margin-top":"10px",
+        "margin-left":"4px",
+        "width":"24px",
+        "height":"24px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_dw.png) no-repeat center"
+    },
+    dynamicContent:{
+        "font-size":"12px",
+        "position":"absolute",
+        "top":"40px",
+        "left":"0px",
+        "bottom":"0px",
+        "right":"0px",
+        "margin-bottom":"10px",
+        "overflow-y":"auto"
+    },
+    dynamicItem:{
+        "color":"#999999",
+        "min-height":"10px",
+        "margin-top":"25px"
+    },
+    dynamicItemIcon:{
+        "width":"30px",
+        "height":"30px",
+        "margin-left":"10px",
+        "margin-top":"2px",
+        "margin-right":"10px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_attachment.png) no-repeat center top",
+        "float":"left"
+    },
+    dynamicItemText:{
+        "float":"left",
+        "width":"300px"
+    },
+    dynamicItemTime:{
+        "width":"60px",
+        "float":"right"
+    },
+    taskChatContainer:{
+        "position":"absolute",
+        "left":"0px",
+        //"top":"140px",
+        "bottom":"0px",
+        "width":"100%",
+        "height":"120px",
+        "border-top":"1px solid #dedede"
+    },
+    chatContent:{
+        "width":"100%",
+        "height":"80px"
+    },
+    chatTextarea:{
+        "color":"#999999",
+        "width":"330px",
+        "height":"70px",
+        "margin-top":"10px",
+        "margin-left":"10px",
+        "padding":"0",
+        "border":"0px",
+        "overflow":"auto",
+        "outline":"none",
+        "resize":"none"
+    },
+
+    chatBarContent:{
+        "height":"40px",
+        "width":"100%"
+    },
+    chatBarTool:{
+        "float":"left"
+    },
+    chatBarEmoji:{
+        "height":"24px",
+        "width":"24px",
+        "cursor":"pointer",
+        "margin-top":"8px",
+        "margin-left":"20px",
+        "background":"url(/x_component_TeamWork/$Task/default/icon/icon_emoji.png) no-repeat center"
+    },
+    chatBarSend:{
+        "float":"right",
+        "cursor":"pointer",
+        "height":"40px",
+        "line-height":"40px",
+        "color":"#4a90e2",
+        "margin-right":"20px"
     },
 
     "formMaskNode": {
         "width": "100%",
         "height": "100%",
-        "opacity": 0.6,
+        "opacity": 0.2,
         "position": "absolute",
-        "background-color": "#CCC",
+        "background-color": "#999999",
         "top": "0px",
         "left": "0px"
     },
@@ -71,54 +770,52 @@
     "formNode": {
         "background-color": "#FFF",
         "box-shadow": "0px 0px 10px #999",
-        "border-radius": "10px",
+        "border-radius": "5px",
         "margin": "auto",
         "border": "1px solid #fff",
-        "overflow": "hidden"
+        "overflow": "hidden",
+        "color":"#333333"
     },
-
-    "formTopTextNode" : {
-        "font-size": "16px",
-        "float": "left",
-        "width" : "480px",
-        "overflow" : "hidden",
-        "text-overflow" : "ellipsis",
-        "white-space":"nowrap"
+    "formTopNode": {
+        "color": "#fff",
+        "height": "40px",
+        "background-color": "#fff",
+        "border-bottom": "1px solid #b6b6b6",
+        "line-height": "40px",
+        "font-size": "14px",
+        "padding-left": "5px",
+        "text-align": "left"
     },
-    "formTopTextNodeTopSetting" : {
-        "font-size": "16px",
+    "formTopIconNode": {
+        "width": "32px",
+        "height": "32px",
         "float": "left",
-        "width" : "80px",
-        "overflow" : "hidden",
-        "text-overflow" : "ellipsis",
-        "white-space":"nowrap"
+        "background": "url(/x_component_TeamWork/$Task/default/icon/document.png) no-repeat center 4px"
     },
-    "formTopTextNodeImageLink" : {
+    "formTopTextNode": {
         "font-size": "16px",
         "float": "left",
-        "width" : "280px",
-        "overflow" : "hidden",
-        "text-overflow" : "ellipsis",
-        "white-space":"nowrap"
+        "width": "500px",
+        "overflow": "hidden",
+        "text-overflow": "ellipsis",
+        "white-space": "nowrap"
     },
     "formTopCloseActionNode": {
-        "width": "32px",
-        "height": "32px",
+        "width": "40px",
+        "height": "40px",
         "float": "right",
-        "padding-left" : "30px",
-        "padding-right" : "10px",
-        "background": "url(/x_component_cms_Document/$Main/default/close.png) no-repeat center 10px",
+        "padding-right": "4px",
+        "background": "url(/x_component_TeamWork/$Task/default/icon/icon_off.png) no-repeat center",
         "cursor": "pointer"
     },
-    "formTopContentNode" : {
-        "float" : "right",
-        "padding-right" : "10px",
-        "text-align" : "right"
-    },
-    "formTopContentTitle" : {
+    "formTopContentNode": {
+        "float": "right",
+        "padding-right": "10px",
+        "text-align": "right"
     },
-    "formTopContentValue" : {
-        "padding-right" : "20px",
+    "formTopContentTitle": {},
+    "formTopContentValue": {
+        "padding-right": "20px",
         "font-size": "12px"
     },
     "formNewNode": {
@@ -138,99 +835,67 @@
         "border": "0px solid #666",
         "width": "100%",
         "margin": "auto",
-        "font-size": "12px",
+        "font-size": "14px",
         "color": "#666",
         "font-family": "Microsoft YaHei",
-        "overflow" : "hidden"
+        "overflow": "hidden"
     },
-    "formTableContainer" : {
+    "formTableContainer": {
         "margin": "0px 10px",
-        "overflow" : "hidden",
-        "positon" : "static"
-    },
-    "formTableValue14" : {
-        "text-align": "left",
-        "font-size" : "14px"
-    },
-    "formBottomNode" : {
-        "height" : "50px",
-        "line-height" : "50px",
-        "background-color" : "#eee",
-        "overflow" : "hidden",
-        "padding-left" : "20px",
-        "border-bottom-left-radius": "10px",
-        "border-bottom-right-radius": "10px"
+        "overflow": "hidden",
+        "positon": "static"
+    },
+    "formTableArea":{
+        "height":"100%"
+    },
+    "formBottomNode": {
+        "height": "40px",
+        "line-height": "40px",
+        "background-color": "#3d77c1",
+        "overflow": "hidden",
+        "padding-top": "10px"
     },
     "formOkActionNode": {
         "height": "30px",
-        "line-height": "30px",
-        "text-align" : "center",
-        "width": "90px",
-        "margin-top" : "10px",
-        "margin-right" : "10px",
+        "width": "75px",
         "cursor": "pointer",
         "float": "right",
-        "font-size": "14px",
+        "line-height": "30px",
+        "text-align": "center",
+        "font-size": "16px",
         "font-family": "Microsoft YaHei",
-        "background-color":"#5c97e1",
+        "border": "1px solid #3d77c1",
+        "background-color": "#5d97e1",
         "color": "#FFF",
-        "border-radius" : "3px"
+        "margin-right": "20px",
+        "box-shadow": "0px 0px 3px #5d97e1"
     },
     "formCancelActionNode": {
         "height": "30px",
-        "line-height": "30px",
-        "text-align" : "center",
-        "width": "50px",
-        "margin-top" : "10px",
-        "margin-right" : "10px",
+        "width": "75px",
         "cursor": "pointer",
         "float": "right",
-        "font-size": "14px",
-        "font-family": "Microsoft YaHei",
-        "background-color":"#fff",
-        "color": "#333",
-        "border-radius" : "3px"
-    },
-    "cancelHotPicture" : {
-        "height": "30px",
         "line-height": "30px",
-        "text-align" : "center",
-        "width": "70px",
-        "margin-top" : "10px",
-        "margin-right" : "10px",
-        "cursor": "pointer",
-        "float": "right",
-        "font-size": "14px",
+        "text-align": "center",
+        "font-size": "16px",
         "font-family": "Microsoft YaHei",
-        "background-color":"#fff",
-        "color": "#333",
-        "border-radius" : "3px"
-    },
-    "iconNode": {
-        "width": "400px",
-        "height": "200px",
-        "float" : "left"
+        "border": "1px solid #3d77c1",
+        "background-color": "#5d97e1",
+        "color": "#FFF",
+        "margin-right": "20px",
+        "box-shadow": "0px 0px 3px #5d97e1"
     },
-    "selectActionNode" : {
-        "float": "left",
-        "background-color": "#FFF",
-        "padding": "4px 14px",
-        "border": "1px solid #999",
-        "border-radius": "3px",
-        "font-size": "14px",
-        "color": "#666",
+    "formActionNode": {
+        "height": "30px",
+        "width": "75px",
         "cursor": "pointer",
-        "margin-right" : "10px"
-    },
-    "changeIconActionNode":{
-        "margin-right": "20px",
         "float": "left",
-        "background-color": "#FFF",
-        "padding": "4px 14px",
-        "border": "1px solid #999",
-        "border-radius": "3px",
-        "font-size": "14px",
-        "color": "#666",
-        "cursor": "pointer"
+        "line-height": "30px",
+        "text-align": "center",
+        "font-size": "16px",
+        "font-family": "Microsoft YaHei",
+        "color": "#FFF",
+        "margin-left": "10px",
+        "margin-right": "20px"
     }
 }

o2web/source/x_component_TeamWork/$Task/default/css.wcss

@@ -84,7 +84,7 @@
         "float":"left",
         "height":"100%",
         "overflow":"hidden",
-        "width":"650px",
+        "width":"750px",
         "font-size":"14px",
         "border-right":"1px solid #bebebe"
     },
@@ -305,11 +305,11 @@
         "float":"left",
         "border-radius":"4px",
         //"min-height":"50px",
-        "width":"490px",
+        "width":"580px",
         "height":"100%"
     },
     taskRemarkActionContainer:{
-        "width":"480px",
+        "width":"580px",
         "height":"50px",
     },
     taskRemarkActionOk:{
@@ -502,7 +502,7 @@
         "line-height":"50px"
     },
     subTaskValueContent:{
-        "width":"588px",
+        "width":"688px",
         "margin-left":"40px",
         "border":"1px solid #dedede",
         "border-radius":"4px",
@@ -563,7 +563,7 @@
     },
     subTaskNewInput:{
         "float":"left",
-        "width":"500px",
+        "width":"600px",
         "height":"30px",
         "color":"#666666",
         "margin-top":"4px",
@@ -603,7 +603,7 @@
         "float":"left",
         "height":"30px",
         "margin-top":"4px",
-        "margin-left":"346px",
+        "margin-left":"446px",
         "line-height":"30px",
         "width":"75px",
         "text-align":"center",
@@ -613,7 +613,7 @@
     taskDetailLayout:{
         "float":"left",
         "height":"100%",
-        "width":"340px",
+        "width":"440px",
         "position":"relative"
     },
     taskParticipateContainer:{
@@ -643,13 +643,13 @@
     },
     participateValue:{
         "margin-left":"20px",
-        "height":"50px",
+        "height":"60px",
         "overflow":"hidden"
     },
     taskDynamicContainer:{
         "position":"absolute",
         "left":"0px",
-        "top":"100px",
+        "top":"110px",
         "bottom":"120px",
         "width":"100%"
     },
@@ -697,7 +697,7 @@
     },
     dynamicItemText:{
         "float":"left",
-        "width":"200px"
+        "width":"300px"
     },
     dynamicItemTime:{
         "width":"60px",

o2web/source/x_component_TeamWork/$TaskAttachmentList/default/css.wcss

@@ -17,7 +17,7 @@
         "line-height":"50px"
     },
     valueContent:{
-        "width":"588px",
+        "width":"688px",
         "margin-left":"40px",
         "border":"1px solid #dedede",
         "border-radius":"4px",
@@ -40,7 +40,7 @@
     attachmentName:{
         "cursor":"pointer",
         "float":"left",
-        "width":"450px",
+        "width":"550px",
         "overflow":"hidden",
         "text-overflow": "ellipsis",
         "white-space": "nowrap",

o2web/source/x_component_TeamWork/$TaskMove/default/css.wcss

@@ -21,7 +21,7 @@
     },
     "searchInput":{
         "outline":"none",
-        "height":"28px",
+        "height":"26px",
         "width":"95%",
         "text-indent":"5px",
         "border":"0px",
@@ -38,22 +38,22 @@
         "height":"20px",
         "background": "url(/x_component_TeamWork/$TaskSub/default/icon/icon_off.png) no-repeat center"
     },
-    taskListLayout:{
+    taskGroupLayout:{
         "width":"90%",
-        "height":"280px",
+        "height":"320px",
         "margin":"10px auto",
         "border":"1px solid #dedede",
         "overflow-y":"auto",
         "color":"#666666"
     },
-    taskItem:{
+    groupItem:{
         "height":"40px",
         "width":"100%",
         "font-size":"14px",
         "cursor":"pointer",
         "border-bottom":"1px solid #dedede"
     },
-    taskName:{
+    groupName:{
         "width":"450px",
         "height":"40px",
         "line-height":"40px",

o2web/source/x_component_TeamWork/lp/zh-cn.js

@@ -200,7 +200,7 @@ MWF.xApplication.TeamWork.LP = {
 		"fadai":"发呆",
 		"fankun":"犯困",
 		"feiwen":"飞吻",
-		"fendou":"奋斗",
+		//"fendou":"奋斗",
 		"fennu":"愤怒",
 		"ganga":"尴尬",
 		"hanyan":"汗颜",
@@ -212,7 +212,16 @@ MWF.xApplication.TeamWork.LP = {
 		"kuxiao":"哭笑",
 		"xiaolian":"笑脸",
 		"xinsui":"心碎",
-		"zhadan":"炸弹"
+		"zhadan":"炸弹",
+		"tucao":"吐槽",
+		"kouzhao":"口罩",
+		"zuqiu":"足球",
+		"lanqiu":"篮球",
+		"guzhang":"鼓掌",
+		"woshou":"握手",
+		"qidao":"祈祷",
+		"manfen":"满分",
+		"chiyao":"吃药"
 	},
 	"taskSub":{
 		"title":"转换为子任务",
@@ -223,6 +232,7 @@ MWF.xApplication.TeamWork.LP = {
 	},
 	"taskMove":{
 		"title":"转移任务",
+		"moveToSelf":"不能转移给当前分组",
 		"searchPlace":"按回车搜索",
 		"ok":"确定"
 	},